From: markus schnalke Date: Wed, 8 Feb 2012 12:32:06 +0000 (+0100) Subject: Cosmetic changes. X-Git-Tag: mmh-thesis-end~364 X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;ds=sidebyside;h=946f59629730dd1683f54d7171ee381208ebe9f0;p=mmh Cosmetic changes. --- diff --git a/uip/sendsbr.c b/uip/sendsbr.c index f8b415c..029ccb7 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -414,7 +414,6 @@ make_mime_composition_file_entry(char *file_name) ** Annotate original message, and ** call `postproc' to send message. */ - static int sendaux(char **vec, int vecp, char *drft, struct stat *st) { @@ -499,7 +498,6 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st) ** Mail error notification (and possibly a copy of the ** message) back to the user, using the mailproc */ - static void alert(char *file, int out) { @@ -601,6 +599,7 @@ anno(int fd, struct stat *st) advise(NULL, "unable to fork, so doing annotations by hand..."); if (cwd == NULL) cwd = getcpy(pwd()); + /* fall */ case OK: /* block a few signals */ @@ -672,8 +671,7 @@ annoaux(int fd) && (fd2 = dup(fileno(stderr))) != NOTOK) { dup2(fd3, fileno(stderr)); close(fd3); - } - else + } else fd2 = NOTOK; for (ap = brkstring(cp = getcpy(cp), " ", NULL); *ap; ap++) m_convert(mp, *ap); diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index 8cb6744..bd40904 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -784,6 +784,8 @@ sendfile(char **arg, char *file, int pushsw) return 1; } + /* some different sendproc */ + context_save(); /* save the context file */ fflush(stdout); @@ -792,6 +794,7 @@ sendfile(char **arg, char *file, int pushsw) switch (child_id) { case NOTOK: advise(NULL, "unable to fork, so sending directly..."); + /* fall */ case OK: vecp = 0; vec[vecp++] = invo_name; @@ -908,7 +911,7 @@ sendit(char *sp, char **arg, char *file, int pushed) ** Merge any arguments from command line (now in vec) ** and arguments from profile. */ - arguments = getarguments (sp, n, vec, 1); + arguments = getarguments(sp, n, vec, 1); argp = arguments; debugsw = 0;