Remove broken reimplementation of a few Glib file functions.
authorAndrej Kacian <ticho@claws-mail.org>
Mon, 3 Aug 2015 21:24:05 +0000 (23:24 +0200)
committerAndrej Kacian <ticho@claws-mail.org>
Mon, 3 Aug 2015 21:28:07 +0000 (23:28 +0200)
This fixes bug #3454, and probably a few more.

src/common/utils.c

index ab08c44..b753ac8 100644 (file)
@@ -100,124 +100,6 @@ gboolean superuser_p (void)
 #endif  
 }
 
-
-
-#if !defined(G_OS_UNIX)
-gint g_chdir(const gchar *path)
-{
-#ifdef G_OS_WIN32
-       if (G_WIN32_HAVE_WIDECHAR_API()) {
-               wchar_t *wpath;
-               gint retval;
-               gint save_errno;
-
-               wpath = g_utf8_to_utf16(path, -1, NULL, NULL, NULL);
-               if (wpath == NULL) {
-                       errno = EINVAL;
-                       return -1;
-               }
-
-               retval = _wchdir(wpath);
-               save_errno = errno;
-
-               g_free(wpath);
-
-               errno = save_errno;
-               return retval;
-       } else {
-               gchar *cp_path;
-               gint retval;
-               gint save_errno;
-
-               cp_path = g_locale_from_utf8(path, -1, NULL, NULL, NULL);
-               if (cp_path == NULL) {
-                       errno = EINVAL;
-                       return -1;
-               }
-
-               retval = chdir(cp_path);
-               save_errno = errno;
-
-               g_free(cp_path);
-
-               errno = save_errno;
-               return retval;
-       }
-#else
-       return chdir(path);
-#endif
-}
-
-gint g_chmod(const gchar *path, gint mode)
-{
-#ifdef G_OS_WIN32
-       if (G_WIN32_HAVE_WIDECHAR_API()) {
-               wchar_t *wpath;
-               gint retval;
-               gint save_errno;
-
-               wpath = g_utf8_to_utf16(path, -1, NULL, NULL, NULL);
-               if (wpath == NULL) {
-                       errno = EINVAL;
-                       return -1;
-               }
-
-               retval = _wchmod(wpath, mode);
-               save_errno = errno;
-
-               g_free(wpath);
-
-               errno = save_errno;
-               return retval;
-       } else {
-               gchar *cp_path;
-               gint retval;
-               gint save_errno;
-
-               cp_path = g_locale_from_utf8(path, -1, NULL, NULL, NULL);
-               if (cp_path == NULL) {
-                       errno = EINVAL;
-                       return -1;
-               }
-
-               retval = chmod(cp_path, mode);
-               save_errno = errno;
-
-               g_free(cp_path);
-
-               errno = save_errno;
-               return retval;
-       }
-#else
-       return chmod(path, mode);
-#endif
-}
-
-FILE* g_fopen(const gchar *filename, const gchar *mode)
-{
-#ifdef G_OS_WIN32
-       char *name = g_win32_locale_filename_from_utf8(filename);
-       FILE* fp = fopen(name, mode);
-       g_free(name);
-       return fp;
-#else
-       return fopen(filename, mode);
-#endif
-}
-int g_open(const gchar *filename, int flags, int mode)
-{
-#ifdef G_OS_WIN32
-       char *name = g_win32_locale_filename_from_utf8(filename);
-       int fd = open(name, flags, mode);
-       g_free(name);
-       return fd;
-#else
-       return open(filename, flags, mode);
-#endif
-}
-#endif /* G_OS_UNIX */
-
-
 GSList *slist_copy_deep(GSList *list, GCopyFunc func)
 {
 #if GLIB_CHECK_VERSION(2, 34, 0)