diff options
| author | bviktor <bviktor@outlook.com> | 2012-11-11 19:40:33 -0800 |
|---|---|---|
| committer | bviktor <bviktor@outlook.com> | 2012-11-11 19:40:33 -0800 |
| commit | aaa863535d86962be82f9d9e31638458598e320b (patch) | |
| tree | a896a6016ba8dc92c2b365d6332ce7502650610c | |
| parent | 49d5234b39aa491747864efba1c2246c6e960b6f (diff) | |
| parent | ed269176919c766ead728e08663715b7f9b1c349 (diff) | |
Merge pull request #248 from Arnavion/utf8-everywhere
Fixed some remaining C file I/O API calls to use the glib API
| -rw-r--r-- | src/common/cfgfiles.c | 6 | ||||
| -rw-r--r-- | src/common/util.c | 10 | ||||
| -rw-r--r-- | src/fe-gtk/menu.c | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index 8484845e..ffa2e531 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -849,11 +849,9 @@ save_config (void) check_prefs_dir (); config = default_file (); - new_config = malloc (strlen (config) + 5); - strcpy (new_config, config); - strcat (new_config, ".new"); + new_config = g_strdup_printf (config, ".new"); - fh = open (new_config, OFLAGS | O_TRUNC | O_WRONLY | O_CREAT, 0600); + fh = g_open (new_config, OFLAGS | O_TRUNC | O_WRONLY | O_CREAT, 0600); if (fh == -1) { free (new_config); diff --git a/src/common/util.c b/src/common/util.c index d4bfeac9..2587a7fa 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1607,25 +1607,25 @@ file_exists (char *fname) } static gboolean -copy_file (char *dl_src, char *dl_dest, int permissions) /* FS encoding */ +copy_file (char *dl_src, char *dl_dest, int permissions) { int tmp_src, tmp_dest; gboolean ok = FALSE; char dl_tmp[4096]; int return_tmp, return_tmp2; - if ((tmp_src = open (dl_src, O_RDONLY | OFLAGS)) == -1) + if ((tmp_src = g_open (dl_src, O_RDONLY | OFLAGS)) == -1) { - fprintf (stderr, "Unable to open() file '%s' (%s) !", dl_src, + g_fprintf (stderr, "Unable to open() file '%s' (%s) !", dl_src, strerror (errno)); return FALSE; } if ((tmp_dest = - open (dl_dest, O_WRONLY | O_CREAT | O_TRUNC | OFLAGS, permissions)) < 0) + g_fprintf (dl_dest, O_WRONLY | O_CREAT | O_TRUNC | OFLAGS, permissions)) < 0) { close (tmp_src); - fprintf (stderr, "Unable to create file '%s' (%s) !", dl_src, + g_fprintf (stderr, "Unable to create file '%s' (%s) !", dl_src, strerror (errno)); return FALSE; } diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index b28b1a3c..3daf42c8 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.c @@ -1258,7 +1258,7 @@ savebuffer_req_done (session *sess, char *file) if (!file) return; - fh = open (file, O_TRUNC | O_WRONLY | O_CREAT, 0600); + fh = g_open (file, O_TRUNC | O_WRONLY | O_CREAT, 0600); if (fh != -1) { gtk_xtext_save (GTK_XTEXT (sess->gui->xtext), fh); |