convert more file IO functions to use filestream, fixes encoding issues on Windows

configuration.c

@@ -25,6 +25,7 @@
 #include <compat/posix_string.h>
 #include <retro_assert.h>
 #include <string/stdstring.h>
+#include <streams/file_stream.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3699,15 +3700,15 @@ bool config_save_file(const char *path)
 
 #ifdef HAVE_LAKKA
    if (settings->bools.ssh_enable)
-      fclose(fopen(LAKKA_SSH_PATH, "w"));
+      filestream_close(filestream_open(LAKKA_SSH_PATH, RFILE_MODE_WRITE, -1));
    else
       path_file_remove(LAKKA_SSH_PATH);
    if (settings->bools.samba_enable)
-      fclose(fopen(LAKKA_SAMBA_PATH, "w"));
+      filestream_close(filestream_open(LAKKA_SAMBA_PATH, RFILE_MODE_WRITE, -1));
    else
       path_file_remove(LAKKA_SAMBA_PATH);
    if (settings->bools.bluetooth_enable)
-      fclose(fopen(LAKKA_BLUETOOTH_PATH, "w"));
+      filestream_close(filestream_open(LAKKA_BLUETOOTH_PATH, RFILE_MODE_WRITE, -1));
    else
       path_file_remove(LAKKA_BLUETOOTH_PATH);
 #endif

libretro-common/file/config_file.c

@@ -44,6 +44,7 @@
 #include <lists/string_list.h>
 #include <string/stdstring.h>
 #include <rhash.h>
+#include <streams/file_stream.h>
 
 #define MAX_INCLUDE_DEPTH 16
 
@@ -78,13 +79,13 @@ struct config_file
 static config_file_t *config_file_new_internal(
       const char *path, unsigned depth);
 
-static char *getaline(FILE *file)
+static char *getaline(RFILE *file)
 {
    char* newline     = (char*)malloc(9);
    char* newline_tmp = NULL;
    size_t cur_size   = 8;
    size_t idx        = 0;
-   int in            = getc(file);
+   int in            = filestream_getc(file);
 
    if (!newline)
       return NULL;
@@ -106,10 +107,10 @@ static char *getaline(FILE *file)
       }
 
       newline[idx++] = in;
-      in = getc(file);
+      in = filestream_getc(file);
    }
    newline[idx] = '\0';
-   return newline; 
+   return newline;
 }
 
 static char *strip_comment(char *str)
@@ -366,7 +367,7 @@ error:
 static config_file_t *config_file_new_internal(
       const char *path, unsigned depth)
 {
-   FILE               *file = NULL;
+   RFILE              *file = NULL;
    struct config_file *conf = (struct config_file*)malloc(sizeof(*conf));
    if (!conf)
       return NULL;
@@ -388,16 +389,16 @@ static config_file_t *config_file_new_internal(
       goto error;
 
    conf->include_depth = depth;
-   file                = fopen(path, "r");
+   file                = filestream_open(path, RFILE_MODE_READ_TEXT, -1);
 
    if (!file)
    {
       free(conf->path);
       goto error;
    }
-   setvbuf(file, NULL, _IOFBF, 0x4000);
+   setvbuf(filestream_get_fp(file), NULL, _IOFBF, 0x4000);
 
-   while (!feof(file))
+   while (!filestream_eof(file))
    {
       char *line                     = NULL;
       struct config_entry_list *list = (struct config_entry_list*)malloc(sizeof(*list));
@@ -405,7 +406,7 @@ static config_file_t *config_file_new_internal(
       if (!list)
       {
          config_file_free(conf);
-         fclose(file);
+         filestream_close(file);
          return NULL;
       }
 
@@ -439,7 +440,7 @@ static config_file_t *config_file_new_internal(
          free(list);
    }
 
-   fclose(file);
+   filestream_close(file);
 
    return conf;
 
@@ -894,27 +895,28 @@ void config_set_bool(config_file_t *conf, const char *key, bool val)
 
 bool config_file_write(config_file_t *conf, const char *path)
 {
-   FILE *file;
+   RFILE *file = NULL;
 
    if (!string_is_empty(path))
    {
-      file = fopen(path, "w");
+      file = filestream_open(path, RFILE_MODE_WRITE, -1);
       if (!file)
          return false;
 #ifdef WIIU
       /* TODO: use FBF everywhere once https://i.imgur.com/muVhNeF.jpg is fixed */
-      setvbuf(file, NULL, _IONBF, 0x4000);
+      setvbuf(filestream_get_fp(file), NULL, _IONBF, 0x4000);
 #else
-      setvbuf(file, NULL, _IOFBF, 0x4000);
+      setvbuf(filestream_get_fp(file), NULL, _IOFBF, 0x4000);
 #endif
+      config_file_dump(conf, filestream_get_fp(file));
    }
    else
-      file = stdout;
+   {
+      config_file_dump(conf, stdout);
+   }
 
-   config_file_dump(conf, file);
+   if (file)
-
+      filestream_close(file);
-   if (path)
-      fclose(file);
 
    return true;
 }

libretro-common/file/file_path.c

@@ -960,3 +960,69 @@ int path_file_remove(const char *path)
 
    return -1;
 }
+
+int path_file_rename(const char *old_path, const char *new_path)
+{
+   char *old_path_local    = NULL;
+   char *new_path_local    = NULL;
+   wchar_t *old_path_wide  = NULL;
+   wchar_t *new_path_wide  = NULL;
+
+   if (!old_path || !*old_path || !new_path || !*new_path)
+      return false;
+
+   (void)old_path_local;
+   (void)new_path_local;
+   (void)old_path_wide;
+   (void)new_path_wide;
+
+#if defined(_WIN32) && !defined(_XBOX)
+#if defined(_MSC_VER) && _MSC_VER < 1400
+   old_path_local = utf8_to_local_string_alloc(old_path);
+   new_path_local = utf8_to_local_string_alloc(new_path);
+
+   if (old_path_local)
+   {
+      bool ret;
+
+      if (new_path_local)
+      {
+         ret = rename(old_path_local, new_path_local);
+         free(old_path_local);
+         free(new_path_local);
+         return ret;
+      }
+
+      free(old_path_local);
+   }
+
+   if (new_path_local)
+      free(new_path_local);
+#else
+   old_path_wide = utf8_to_utf16_string_alloc(old_path);
+   new_path_wide = utf8_to_utf16_string_alloc(new_path);
+
+   if (old_path_wide)
+   {
+      bool ret;
+
+      if (new_path_wide)
+      {
+         ret = _wrename(old_path_wide, new_path_wide);
+         free(old_path_wide);
+         free(new_path_wide);
+         return ret;
+      }
+
+      free(old_path_wide);
+   }
+
+   if (new_path_wide)
+      free(new_path_wide);
+#endif
+#else
+   return rename(old_path, new_path);
+#endif
+
+   return -1;
+}

libretro-common/include/file/file_path.h

@@ -468,6 +468,8 @@ int32_t path_get_size(const char *path);
 
 int path_file_remove(const char *path);
 
+int path_file_rename(const char *old_path, const char *new_path);
+
 RETRO_END_DECLS
 
 #endif

libretro-common/include/streams/file_stream.h

@@ -23,6 +23,7 @@
 #ifndef __LIBRETRO_SDK_FILE_STREAM_H
 #define __LIBRETRO_SDK_FILE_STREAM_H
 
+#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -44,7 +45,7 @@ enum
    RFILE_MODE_WRITE,
    RFILE_MODE_READ_WRITE,
 
-   /* There is no garantee these requests will be attended. */
+   /* There is no guarantee these requests will be attended. */
    RFILE_HINT_UNBUFFERED = 1<<8,
    RFILE_HINT_MMAP       = 1<<9  /* requires RFILE_MODE_READ */
 };
@@ -91,6 +92,8 @@ int filestream_error(RFILE *stream);
 
 int filestream_get_fd(RFILE *stream);
 
+FILE* filestream_get_fp(RFILE *stream);
+
 int filestream_flush(RFILE *stream);
 
 RETRO_END_DECLS

libretro-common/streams/file_stream.c

@@ -111,6 +111,13 @@ struct RFILE
 #endif
 };
 
+FILE* filestream_get_fp(RFILE *stream)
+{
+   if (!stream)
+      return NULL;
+   return stream->fp;
+}
+
 int filestream_get_fd(RFILE *stream)
 {
    if (!stream)
@@ -369,7 +376,7 @@ char *filestream_getline(RFILE *stream)
    }
 
    newline[idx] = '\0';
-   return newline; 
+   return newline;
 }
 
 char *filestream_gets(RFILE *stream, char *s, size_t len)
@@ -420,7 +427,7 @@ ssize_t filestream_seek(RFILE *stream, ssize_t offset, int whence)
 #endif
 
 #ifdef HAVE_MMAP
-   /* Need to check stream->mapped because this function is 
+   /* Need to check stream->mapped because this function is
     * called in filestream_open() */
    if (stream->mapped && stream->hints & RFILE_HINT_MMAP)
    {
@@ -493,7 +500,7 @@ ssize_t filestream_tell(RFILE *stream)
       return ftell(stream->fp);
 #endif
 #ifdef HAVE_MMAP
-   /* Need to check stream->mapped because this function 
+   /* Need to check stream->mapped because this function
     * is called in filestream_open() */
    if (stream->mapped && stream->hints & RFILE_HINT_MMAP)
       return stream->mappos;

menu/menu_setting.c

@@ -1858,7 +1858,7 @@ static void systemd_service_toggle(const char *path, char *unit, bool enable)
    args[2] = unit;
 
    if (enable)
-      fclose(fopen(path, "w"));
+      filestream_close(filestream_open(path, RFILE_MODE_WRITE, -1));
    else
       path_file_remove(path);
 

playlist.c

@@ -380,12 +380,12 @@ success:
 void playlist_write_file(playlist_t *playlist)
 {
    size_t i;
-   FILE *file = NULL;
+   RFILE *file = NULL;
 
    if (!playlist || !playlist->modified)
       return;
 
-   file = fopen(playlist->conf_path, "w");
+   file = filestream_open(playlist->conf_path, RFILE_MODE_WRITE, -1);
 
    RARCH_LOG("Trying to write to playlist file: %s\n", playlist->conf_path);
 
@@ -396,7 +396,7 @@ void playlist_write_file(playlist_t *playlist)
    }
 
    for (i = 0; i < playlist->size; i++)
-      fprintf(file, "%s\n%s\n%s\n%s\n%s\n%s\n",
+      fprintf(filestream_get_fp(file), "%s\n%s\n%s\n%s\n%s\n%s\n",
             playlist->entries[i].path    ? playlist->entries[i].path    : "",
             playlist->entries[i].label   ? playlist->entries[i].label   : "",
             playlist->entries[i].core_path,
@@ -406,7 +406,7 @@ void playlist_write_file(playlist_t *playlist)
             );
 
    playlist->modified = false;
-   fclose(file);
+   filestream_close(file);
 }
 
 /**

tasks/task_save.c

@@ -1263,9 +1263,9 @@ bool content_rename_state(const char *origin, const char *dest)
 {
    int ret = 0;
    if (path_file_exists(dest))
-      unlink(dest);
+      path_file_remove(dest);
 
-   ret = rename (origin, dest);
+   ret = path_file_rename(origin, dest);
    if (!ret)
       return true;
 

verbosity.c

@@ -34,6 +34,7 @@
 #endif
 
 #include <string/stdstring.h>
+#include <streams/file_stream.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -48,7 +49,8 @@
 
 /* If this is non-NULL. RARCH_LOG and friends
  * will write to this file. */
-static FILE *log_file            = NULL;
+static RFILE *log_file           = NULL;
+static FILE *log_file_fp         = NULL;
 static bool main_verbosity       = false;
 static bool log_file_initialized = false;
 
@@ -82,7 +84,7 @@ bool *verbosity_get_ptr(void)
 
 void *retro_main_log_file(void)
 {
-   return log_file;
+   return log_file_fp;
 }
 
 void retro_main_log_file_init(const char *path)
@@ -90,19 +92,21 @@ void retro_main_log_file_init(const char *path)
    if (log_file_initialized)
       return;
 
-   log_file             = stderr;
+   log_file_fp          = stderr;
    if (path == NULL)
       return;
 
-   log_file             = fopen(path, "wb");
+   log_file             = filestream_open(path, RFILE_MODE_WRITE, -1);
+   log_file_fp          = filestream_get_fp(log_file);
    log_file_initialized = true;
 }
 
 void retro_main_log_file_deinit(void)
 {
-   if (log_file && log_file != stderr)
+   if (log_file && log_file_fp != stderr)
-      fclose(log_file);
+      filestream_close(log_file);
    log_file = NULL;
+   log_file_fp = NULL;
 }
 
 #if !defined(HAVE_LOGGER)