alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu-script: don't use getline, use GIOChannel

Browse Source
This commit is contained in:
djcb
2012-12-23 15:24:52 +02:00
parent 41b59f07a5
commit d17dba683f
1 changed files with 67 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
lib/mu-script.c
View File

@ -139,27 +139,72 @@ mu_script_info_list_destroy (GSList *lst)
g_slist_free (lst); g_slist_free (lst);
} }
static GIOChannel *
open_channel (const char *path)
{
GError *err;
GIOChannel *io_chan;
err = NULL;
io_chan = g_io_channel_new_file (path, "r", &err);
if (!io_chan) {
g_warning ("failed to open '%s': %s", path,
err ? err->message : "something went wrong");
g_clear_error (&err);
return NULL;
}
return io_chan;
}
static void
end_channel (GIOChannel *io_chan)
{
GIOStatus status;
GError *err;
err = NULL;
status = g_io_channel_shutdown (io_chan, FALSE,
&err);
if (status != G_IO_STATUS_NORMAL) {
g_warning ("failed to shutdown io-channel: %s",
err ? err->message : "something went wrong");
g_clear_error (&err);
}
g_io_channel_unref (io_chan);
}
static gboolean static gboolean
get_descriptions (MuScriptInfo *msi, const char *prefix) get_descriptions (MuScriptInfo *msi, const char *prefix)
{ {
FILE *script; GIOStatus io_status;
GIOChannel *script_io;
GError *err;
char *line, *descr, *oneline; char *line, *descr, *oneline;
size_t n;
if (!prefix) if (!prefix)
return TRUE; /* not an error */ return TRUE; /* not an error */
script = fopen (msi->_path, "r"); if (!(script_io = open_channel (msi->_path)))
if (!script) {
g_warning ("failed to open %s: %s",
msi->_path, strerror(errno));
return FALSE; return FALSE;
}
for (descr = oneline = NULL, line = NULL; err = NULL;
getline (&line, &n, script) != -1; free (line), line = NULL) { line = descr = oneline = NULL;
if (!g_str_has_prefix(line, prefix)) do {
g_free (line);
io_status = g_io_channel_read_line (script_io, &line,
NULL, NULL, &err);
if (io_status != G_IO_STATUS_NORMAL)
break;
if (!g_str_has_prefix (line, prefix))
continue; continue;
if (!oneline) if (!oneline)
@ -167,14 +212,21 @@ get_descriptions (MuScriptInfo *msi, const char *prefix)
else { else {
char *tmp; char *tmp;
tmp = descr; tmp = descr;
descr = g_strdup_printf ("%s%s", descr ? descr : "", descr = g_strdup_printf
("%s%s", descr ? descr : "",
line + strlen(prefix)); line + strlen(prefix));
g_free (tmp); g_free (tmp);
} }
} while (TRUE);
if (io_status != G_IO_STATUS_EOF) {
g_warning ("error reading %s: %s", msi->_path,
err ? err->message : "something went wrong");
g_clear_error (&err);
} }
fclose (script); end_channel (script_io);
msi->_oneline = oneline; msi->_oneline = oneline;
msi->_descr = descr; msi->_descr = descr;