emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* robustness/cleanup fixes: 

- mu-util.c: don't raise errors when fputs failes (this would spam us when a
    pipe broke)
  - mu-cmd-server.c: handle SIGPIPE, ignore empty command lines
This commit is contained in:
djcb 2012-06-26 13:11:50 +03:00
parent 8b6a65114e
commit e5448adbb8
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/mu-util.c
View File

@ -431,12 +431,7 @@ mu_util_fputs_encoded (const char *str, FILE *stream)
g_free (conv);
}
if (rv == EOF) { /* note, apparently, does not set errno */
g_warning ("%s: fputs failed", __FUNCTION__);
return FALSE;
}
return TRUE;
return (rv == EOF) ? FALSE : TRUE;
}

20
mu/mu-cmd-server.c
View File

@ -67,7 +67,7 @@ static void
install_sig_handler (void)
{
struct sigaction action;
int i, sigs[] = { SIGINT, SIGHUP, SIGTERM };
int i, sigs[] = { SIGINT, SIGHUP, SIGTERM, SIGPIPE };
MU_TERMINATE = FALSE;
@ -123,15 +123,18 @@ print_expr (const char* frm, ...)
* COOKIE_PRE <len-of-following-sexp-in-hex> COOKIE_POST
*/
rv = write (outfd, cookie, lenlen + 2);
if (rv != -1)
if (rv != -1) {
rv = write (outfd, expr, exprlen);
g_free (expr);
}
if (rv != -1)
rv = write (outfd, "\n", 1);
if (rv == -1)
g_warning ("%s: write() failed: %s",
if (rv == -1) {
g_critical ("%s: write() failed: %s",
__FUNCTION__, strerror(errno));
g_free (expr);
/* terminate ourselves */
raise (SIGTERM);
}
}
@ -1351,6 +1354,11 @@ handle_args (MuStore *store, MuQuery *query, GSList *args, GError **err)
};
cmd = (const char*) args->data;
/* ignore empty */
if (strlen (cmd) == 0)
return MU_OK;
for (u = 0; u != G_N_ELEMENTS (cmd_map); ++u)
if (g_strcmp0(cmd, cmd_map[u].cmd) == 0)
return cmd_map[u].func (store, query,