X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=86878154f392d2c25321d7da005b6a1a3a62ba1f;hp=0dfc3d72194e4eaa8a70eee9f9cfa6ba9f505f13;hb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4 diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index 0dfc3d7..8687815 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -101,13 +101,13 @@ static char *myprompt = "\nWhat now? "; /* ** static prototypes */ -static int editfile (char **, char **, char *, int, struct msgs *, +static int editfile(char **, char **, char *, int, struct msgs *, char *, char *, int); -static int sendfile (char **, char *, int); -static void sendit (char *, char **, char *, int); -static int buildfile (char **, char *); -static int check_draft (char *); -static int removefile (char *); +static int sendfile(char **, char *, int); +static void sendit(char *, char **, char *, int); +static int buildfile(char **, char *); +static int check_draft(char *); +static int removefile(char *); static void writelscmd(char *, int, char **); static void writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp); static FILE* popen_in_dir(const char *dir, const char *cmd, const char *type); @@ -115,12 +115,12 @@ static int system_in_dir(const char *dir, const char *cmd); #ifdef HAVE_LSTAT -static int copyf (char *, char *); +static int copyf(char *, char *); #endif int -WhatNow (int argc, char **argv) +WhatNow(int argc, char **argv) { int nedit = 0, use = 0; char *cp; @@ -136,12 +136,12 @@ WhatNow (int argc, char **argv) char *l; /* set on -l to alist command */ int n; /* set on -n to alist command */ - invo_name = r1bindex (argv[0], '/'); + invo_name = mhbasename(argv[0]); /* read user profile/context */ context_read(); - arguments = getarguments (invo_name, argc, argv, 1); + arguments = getarguments(invo_name, argc, argv, 1); argp = arguments; /* @@ -154,26 +154,26 @@ WhatNow (int argc, char **argv) while ((cp = *argp++)) { if (*cp == '-') { - switch (smatch (++cp, whatnowswitches)) { + switch (smatch(++cp, whatnowswitches)) { case AMBIGSW: - ambigsw (cp, whatnowswitches); - done (1); + ambigsw(cp, whatnowswitches); + done(1); case UNKWNSW: - adios (NULL, "-%s unknown", cp); + adios(NULL, "-%s unknown", cp); case HELPSW: - snprintf (buf, sizeof(buf), + snprintf(buf, sizeof(buf), "%s [switches] [file]", invo_name); - print_help (buf, whatnowswitches, 1); - done (1); + print_help(buf, whatnowswitches, 1); + done(1); case VERSIONSW: print_version(invo_name); - done (1); + done(1); case EDITRSW: if (!(ed = *argp++) || *ed == '-') - adios (NULL, "missing argument to %s", + adios(NULL, "missing argument to %s", argp[-2]); nedit = 0; continue; @@ -183,7 +183,7 @@ WhatNow (int argc, char **argv) case PRMPTSW: if (!(myprompt = *argp++) || *myprompt == '-') - adios (NULL, "missing argument to %s", + adios(NULL, "missing argument to %s", argp[-2]); continue; @@ -191,26 +191,26 @@ WhatNow (int argc, char **argv) if (attach != (char *)0) adios(NULL, "only one attachment header field name at a time!"); if (!(attach = *argp++) || *attach == '-') - adios (NULL, "missing argument to %s", + adios(NULL, "missing argument to %s", argp[-2]); continue; } } if (drft) - adios (NULL, "only one draft at a time!"); + adios(NULL, "only one draft at a time!"); else drft = cp; } if ((drft == NULL && (drft = getenv("mhdraft")) == NULL) || *drft == 0) - drft = getcpy (m_draft("cur")); + drft = getcpy(m_draft("cur")); - msgnam = (cp = getenv ("mhaltmsg")) && *cp ? getcpy (cp) : NULL; + msgnam = (cp = getenv("mhaltmsg")) && *cp ? getcpy(cp) : NULL; - if ((cp = getenv ("mhuse")) && *cp) - use = atoi (cp); + if ((cp = getenv("mhuse")) && *cp) + use = atoi(cp); - if (ed == NULL && ((ed = getenv ("mheditor")) == NULL || *ed == 0)) { + if (ed == NULL && ((ed = getenv("mheditor")) == NULL || *ed == 0)) { ed = NULL; nedit++; } @@ -218,76 +218,76 @@ WhatNow (int argc, char **argv) /* start editing the draft, unless -noedit was given */ if (!nedit && editfile(&ed, NULL, drft, use, NULL, msgnam, NULL, 1) < 0) - done (1); + done(1); - snprintf (prompt, sizeof(prompt), myprompt, invo_name); + snprintf(prompt, sizeof(prompt), myprompt, invo_name); for (;;) { - if (!(argp = getans (prompt, aleqs))) { - unlink (altmsglink); - done (1); + if (!(argp = getans(prompt, aleqs))) { + unlink(altmsglink); + done(1); } - switch (smatch (*argp, aleqs)) { + switch (smatch(*argp, aleqs)) { case DISPSW: /* ** display the message being replied to, ** or distributed */ if (msgnam) - showfile (++argp, msgnam); + showfile(++argp, msgnam); else - advise (NULL, "no alternate message to display"); + advise(NULL, "no alternate message to display"); break; case BUILDMIMESW: /* Translate MIME composition file */ - buildfile (++argp, drft); + buildfile(++argp, drft); break; case EDITSW: /* Call an editor on the draft file */ if (*++argp) ed = *argp++; - if (editfile (&ed, argp, drft, NOUSE, NULL, + if (editfile(&ed, argp, drft, NOUSE, NULL, msgnam, NULL, 1) == NOTOK) - done (1); + done(1); break; case LISTSW: /* display the draft file */ - showfile (++argp, drft); + showfile(++argp, drft); break; case QUITSW: /* Quit, and possibly delete the draft */ if (*++argp && (*argp[0] == 'd' || ((*argp)[0] == '-' && (*argp)[1] == 'd'))) { - removefile (drft); + removefile(drft); } else { - if (stat (drft, &st) != NOTOK) + if (stat(drft, &st) != NOTOK) advise(NULL, "draft left on %s", drft); } - done (1); + done(1); case DELETESW: /* Delete draft and exit */ - removefile (drft); - done (1); + removefile(drft); + done(1); case PUSHSW: /* Send draft in background */ - if (sendfile (++argp, drft, 1)) - done (1); + if (sendfile(++argp, drft, 1)) + done(1); break; case SENDSW: /* Send draft */ - sendfile (++argp, drft, 0); + sendfile(++argp, drft, 0); break; case REFILEOPT: /* Refile the draft */ - if (refile (++argp, drft) == 0) - done (0); + if (refile(++argp, drft) == 0) + done(0); break; case CDCMDSW: @@ -519,7 +519,7 @@ WhatNow (int argc, char **argv) default: /* Unknown command */ - advise (NULL, "say what?"); + advise(NULL, "say what?"); break; } } @@ -632,7 +632,7 @@ static char *edsave = NULL; /* the editor we used previously */ static int -editfile (char **ed, char **arg, char *file, int use, struct msgs *mp, +editfile(char **ed, char **arg, char *file, int use, struct msgs *mp, char *altmsg, char *cwd, int save_editor) { int pid, status, vecp; @@ -651,43 +651,43 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp, if (reedit) { if (!*ed) { /* no explicit editor */ *ed = edsave; /* so use the previous one */ - if ((cp = r1bindex (*ed, '/')) == NULL) + if ((cp = mhbasename(*ed)) == NULL) cp = *ed; /* unless we've specified it via "editor-next" */ - cp = concat (cp, "-next", NULL); - if ((cp = context_find (cp)) != NULL) + cp = concat(cp, "-next", NULL); + if ((cp = context_find(cp)) != NULL) *ed = cp; } } else { /* set initial editor */ - if (*ed == NULL && (*ed = context_find ("editor")) == NULL) + if (*ed == NULL && (*ed = context_find("editor")) == NULL) *ed = defaulteditor; } if (altmsg) { if (mp == NULL || *altmsg == '/' || cwd == NULL) - strncpy (altpath, altmsg, sizeof(altpath)); + strncpy(altpath, altmsg, sizeof(altpath)); else - snprintf (altpath, sizeof(altpath), "%s/%s", + snprintf(altpath, sizeof(altpath), "%s/%s", mp->foldpath, altmsg); if (cwd == NULL) - strncpy (linkpath, altmsglink, sizeof(linkpath)); + strncpy(linkpath, altmsglink, sizeof(linkpath)); else - snprintf (linkpath, sizeof(linkpath), "%s/%s", + snprintf(linkpath, sizeof(linkpath), "%s/%s", cwd, altmsglink); } if (altmsg) { - unlink (linkpath); + unlink(linkpath); #ifdef HAVE_LSTAT - if (link (altpath, linkpath) == NOTOK) { + if (link(altpath, linkpath) == NOTOK) { #if 0 /* I don't think permission on symlinks matters /JLR */ /* PJS: else symlinks are world 'r' */ oumask = umask(0044); #endif - symlink (altpath, linkpath); + symlink(altpath, linkpath); #if 0 umask(oumask); /* PJS: else symlinks are world 'r' */ #endif @@ -696,57 +696,56 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp, slinked = 0; } #else /* not HAVE_LSTAT */ - link (altpath, linkpath); + link(altpath, linkpath); #endif /* not HAVE_LSTAT */ } - context_save (); /* save the context file */ - fflush (stdout); + context_save(); /* save the context file */ + fflush(stdout); - switch (pid = vfork ()) { + switch (pid = vfork()) { case NOTOK: - advise ("fork", "unable to"); + advise("fork", "unable to"); status = NOTOK; break; case OK: if (cwd) - chdir (cwd); + chdir(cwd); if (altmsg) { if (mp) - m_putenv ("mhfolder", mp->foldpath); - m_putenv ("editalt", altpath); + m_putenv("mhfolder", mp->foldpath); + m_putenv("editalt", altpath); } vecp = 0; - vec[vecp++] = r1bindex (*ed, '/'); + vec[vecp++] = mhbasename(*ed); if (arg) while (*arg) vec[vecp++] = *arg++; vec[vecp++] = file; vec[vecp] = NULL; - execvp (*ed, vec); - fprintf (stderr, "unable to exec "); - perror (*ed); - _exit (-1); + execvp(*ed, vec); + fprintf(stderr, "unable to exec "); + perror(*ed); + _exit(-1); default: - if ((status = pidwait (pid, NOTOK))) { + if ((status = pidwait(pid, NOTOK))) { #ifdef ATTVIBUG - if ((cp = r1bindex (*ed, '/')) - && strcmp (cp, "vi") == 0 - && (status & 0x00ff) == 0) + if ((cp = mhbasename(*ed)) && + strcmp(cp, "vi") == 0 && + (status & 0x00ff) == 0) status = 0; else { #endif if (((status & 0xff00) != 0xff00) && (!reedit || (status & 0x00ff))) { - if (!use && (status & 0xff00) && - (rename (file, cp = m_backup (file)) != NOTOK)) { - advise (NULL, "problems with edit--draft left in %s", cp); + if (!use && (status & 0xff00) && (rename(file, cp = m_backup (file)) != NOTOK)) { + advise(NULL, "problems with edit--draft left in %s", cp); } else { - advise (NULL, "problems with edit--%s preserved", file); + advise(NULL, "problems with edit--%s preserved", file); } } status = -2; /* maybe "reedit ? -2 : -1"? */ @@ -758,36 +757,33 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp, reedit++; #ifdef HAVE_LSTAT - if (altmsg - && mp - && !is_readonly(mp) - && (slinked - ? lstat (linkpath, &st) != NOTOK - && S_ISREG(st.st_mode) - && copyf (linkpath, altpath) == NOTOK - : stat (linkpath, &st) != NOTOK - && st.st_nlink == 1 - && (unlink (altpath) == NOTOK - || link (linkpath, altpath) == NOTOK))) - advise (linkpath, "unable to update %s from", altmsg); + if (altmsg && mp && !is_readonly(mp) && (slinked ? + lstat (linkpath, &st) != NOTOK && + S_ISREG(st.st_mode) && + copyf(linkpath, altpath) == NOTOK : + stat(linkpath, &st) != NOTOK && + st.st_nlink == 1 && + (unlink(altpath) == NOTOK || + link(linkpath, altpath) == NOTOK))) + advise(linkpath, "unable to update %s from", altmsg); #else /* HAVE_LSTAT */ - if (altmsg && mp && !is_readonly(mp) - && stat (linkpath, &st) != NOTOK - && st.st_nlink == 1 - && (unlink (altpath) == NOTOK - || link (linkpath, altpath) == NOTOK)) - advise (linkpath, "unable to update %s from", + if (altmsg && mp && !is_readonly(mp) && + stat(linkpath, &st) != NOTOK && + st.st_nlink == 1 && + (unlink(altpath) == NOTOK || + link(linkpath, altpath) == NOTOK)) + advise(linkpath, "unable to update %s from", altmsg); #endif /* HAVE_LSTAT */ } /* normally, we remember which editor we used */ if (save_editor) - edsave = getcpy (*ed); + edsave = getcpy(*ed); *ed = NULL; if (altmsg) - unlink (linkpath); + unlink(linkpath); return status; } @@ -795,28 +791,28 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp, #ifdef HAVE_LSTAT static int -copyf (char *ifile, char *ofile) +copyf(char *ifile, char *ofile) { int i, in, out; char buffer[BUFSIZ]; - if ((in = open (ifile, O_RDONLY)) == NOTOK) + if ((in = open(ifile, O_RDONLY)) == NOTOK) return NOTOK; - if ((out = open (ofile, O_WRONLY | O_TRUNC)) == NOTOK) { - admonish (ofile, "unable to open and truncate"); - close (in); + if ((out = open(ofile, O_WRONLY | O_TRUNC)) == NOTOK) { + admonish(ofile, "unable to open and truncate"); + close(in); return NOTOK; } - while ((i = read (in, buffer, sizeof(buffer))) > OK) - if (write (out, buffer, i) != i) { - advise (ofile, "may have damaged"); + while ((i = read(in, buffer, sizeof(buffer))) > OK) + if (write(out, buffer, i) != i) { + advise(ofile, "may have damaged"); i = NOTOK; break; } - close (in); - close (out); + close(in); + close(out); return i; } #endif /* HAVE_LSTAT */ @@ -827,21 +823,21 @@ copyf (char *ifile, char *ofile) */ static int -sendfile (char **arg, char *file, int pushsw) +sendfile(char **arg, char *file, int pushsw) { pid_t child_id; int i, vecp; char *cp, *sp, *vec[MAXARGS]; /* Translate MIME composition file, if necessary */ - if ((cp = context_find ("automimeproc")) && (!strcmp (cp, "1")) - && !getenv ("NOMHNPROC") && check_draft (file) - && (buildfile (NULL, file) == NOTOK)) + if ((cp = context_find("automimeproc")) && (!strcmp(cp, "1")) && + !getenv("NOMHNPROC") && check_draft(file) && + (buildfile(NULL, file) == NOTOK)) return 0; /* For backwards compatibility */ - if ((cp = context_find ("automhnproc")) && !getenv ("NOMHNPROC") - && check_draft (file) && (i = editfile (&cp, NULL, + if ((cp = context_find("automhnproc")) && !getenv("NOMHNPROC") + && check_draft(file) && (i = editfile(&cp, NULL, file, NOUSE, NULL, NULL, NULL, 0))) return 0; @@ -849,21 +845,21 @@ sendfile (char **arg, char *file, int pushsw) ** If the sendproc is the nmh command `send', then we call ** those routines directly rather than exec'ing the command. */ - if (strcmp (sp = r1bindex (sendproc, '/'), "send") == 0) { + if (strcmp(sp = mhbasename(sendproc), "send") == 0) { cp = invo_name; - sendit (invo_name = sp, arg, file, pushsw); + sendit(invo_name = sp, arg, file, pushsw); invo_name = cp; return 1; } - context_save (); /* save the context file */ - fflush (stdout); + context_save(); /* save the context file */ + fflush(stdout); for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++) - sleep (5); + sleep(5); switch (child_id) { case NOTOK: - advise (NULL, "unable to fork, so sending directly..."); + advise(NULL, "unable to fork, so sending directly..."); case OK: vecp = 0; vec[vecp++] = invo_name; @@ -875,14 +871,14 @@ sendfile (char **arg, char *file, int pushsw) vec[vecp++] = file; vec[vecp] = NULL; - execvp (sendproc, vec); - fprintf (stderr, "unable to exec "); - perror (sendproc); - _exit (-1); + execvp(sendproc, vec); + fprintf(stderr, "unable to exec "); + perror(sendproc); + _exit(-1); default: if (pidwait(child_id, OK) == 0) - done (0); + done(0); return 1; } } @@ -893,7 +889,7 @@ sendfile (char **arg, char *file, int pushsw) */ static int -buildfile (char **argp, char *file) +buildfile(char **argp, char *file) { int i; char **args, *ed; @@ -913,7 +909,7 @@ buildfile (char **argp, char *file) ** if we are using mhn as buildmimeproc */ i = 0; - if (strcmp (r1bindex (ed, '/'), "mhn") == 0) + if (strcmp(mhbasename(ed), "mhn") == 0) args[i++] = "-build"; /* copy any other arguments */ @@ -921,8 +917,8 @@ buildfile (char **argp, char *file) args[i++] = *argp++; args[i] = NULL; - i = editfile (&ed, args, file, NOUSE, NULL, NULL, NULL, 0); - free (args); + i = editfile(&ed, args, file, NOUSE, NULL, NULL, NULL, 0); + free(args); return (i ? NOTOK : OK); } @@ -933,16 +929,16 @@ buildfile (char **argp, char *file) */ static int -check_draft (char *msgnam) +check_draft(char *msgnam) { int state; char buf[BUFSIZ], name[NAMESZ]; FILE *fp; - if ((fp = fopen (msgnam, "r")) == NULL) + if ((fp = fopen(msgnam, "r")) == NULL) return 0; for (state = FLD;;) - switch (state = m_getfld (state, name, buf, sizeof(buf), fp)) { + switch (state = m_getfld(state, name, buf, sizeof(buf), fp)) { case FLD: case FLDPLUS: case FLDEOF: @@ -951,12 +947,12 @@ check_draft (char *msgnam) ** Content-XXX fields, then assume it already ** been converted. */ - if (uprf (name, XXX_FIELD_PRF)) { - fclose (fp); + if (uprf(name, XXX_FIELD_PRF)) { + fclose(fp); return 0; } while (state == FLDPLUS) - state = m_getfld (state, name, buf, + state = m_getfld(state, name, buf, sizeof(buf), fp); break; @@ -966,17 +962,17 @@ check_draft (char *msgnam) for (bp = buf; *bp; bp++) if (*bp != ' ' && *bp != '\t' && *bp != '\n') { - fclose (fp); + fclose(fp); return 1; } - state = m_getfld (state, name, buf, + state = m_getfld(state, name, buf, sizeof(buf), fp); } while (state == BODY); /* and fall... */ default: - fclose (fp); + fclose(fp); return 0; } } @@ -1070,7 +1066,7 @@ extern char *distfile; static void -sendit (char *sp, char **arg, char *file, int pushed) +sendit(char *sp, char **arg, char *file, int pushed) { int vecp, n = 1; char *cp, buf[BUFSIZ], **argp; @@ -1106,7 +1102,7 @@ sendit (char *sp, char **arg, char *file, int pushed) if (arg) { char **bp; - copyip (arg, vec+1, MAXARGS-1); + copyip(arg, vec+1, MAXARGS-1); bp = vec+1; while (*bp++) n++; @@ -1130,25 +1126,25 @@ sendit (char *sp, char **arg, char *file, int pushed) vecp = 1; /* we'll get the zero'th element later */ vec[vecp++] = "-library"; - vec[vecp++] = getcpy (m_maildir ("")); + vec[vecp++] = getcpy(toabsdir("+")); while ((cp = *argp++)) { if (*cp == '-') { - switch (smatch (++cp, sendswitches)) { + switch (smatch(++cp, sendswitches)) { case AMBIGSW: - ambigsw (cp, sendswitches); + ambigsw(cp, sendswitches); return; case UNKWNSW: - advise (NULL, "-%s unknown\n", cp); + advise(NULL, "-%s unknown\n", cp); return; case SHELPSW: - snprintf (buf, sizeof(buf), + snprintf(buf, sizeof(buf), "%s [switches]", sp); - print_help (buf, sendswitches, 1); + print_help(buf, sendswitches, 1); return; case SVERSIONSW: - print_version (invo_name); + print_version(invo_name); return; case SPSHSW: @@ -1209,7 +1205,7 @@ sendit (char *sp, char **arg, char *file, int pushed) case PORTSW: vec[vecp++] = --cp; if (!(cp = *argp++) || *cp == '-') { - advise (NULL, "missing argument to %s", argp[-2]); + advise(NULL, "missing argument to %s", argp[-2]); return; } vec[vecp++] = cp; @@ -1218,18 +1214,18 @@ sendit (char *sp, char **arg, char *file, int pushed) case SNDATTACHSW: if (!(attach = *argp++) || *attach == '-') { - advise (NULL, "missing argument to %s", argp[-2]); + advise(NULL, "missing argument to %s", argp[-2]); return; } continue; case SNDATTACHFORMAT: if (! *argp || **argp == '-') - adios (NULL, "missing argument to %s", argp[-1]); + adios(NULL, "missing argument to %s", argp[-1]); else { - attachformat = atoi (*argp); + attachformat = atoi(*argp); if (attachformat < 0 || attachformat > ATTACHFORMATS - 1) { - advise (NULL, "unsupported attachformat %d", attachformat); + advise(NULL, "unsupported attachformat %d", attachformat); continue; } } @@ -1237,71 +1233,70 @@ sendit (char *sp, char **arg, char *file, int pushed) continue; } } - advise (NULL, "usage: %s [switches]", sp); + advise(NULL, "usage: %s [switches]", sp); return; } /* allow Aliasfile: profile entry */ - if ((cp = context_find ("Aliasfile"))) { + if ((cp = context_find("Aliasfile"))) { char **ap, *dp; - dp = getcpy (cp); - for (ap = brkstring (dp, " ", "\n"); ap && *ap; ap++) { + dp = getcpy(cp); + for (ap = brkstring(dp, " ", "\n"); ap && *ap; ap++) { vec[vecp++] = "-alias"; vec[vecp++] = *ap; } } - if ((cp = getenv ("SIGNATURE")) == NULL || *cp == 0) - if ((cp = context_find ("signature")) && *cp) - m_putenv ("SIGNATURE", cp); + if ((cp = getenv("SIGNATURE")) == NULL || *cp == 0) + if ((cp = context_find("signature")) && *cp) + m_putenv("SIGNATURE", cp); #ifdef UCI else { - snprintf (buf, sizeof(buf), "%s/.signature", mypath); - if ((fp = fopen (buf, "r")) != NULL - && fgets (buf, sizeof(buf), fp) != NULL) { - fclose (fp); - if (cp = strchr (buf, '\n')) - *cp = 0; - m_putenv ("SIGNATURE", buf); + snprintf(buf, sizeof(buf), "%s/.signature", mypath); + if ((fp = fopen(buf, "r")) != NULL && + fgets(buf, sizeof(buf), fp) != NULL) { + fclose(fp); + if (cp = strchr(buf, '\n')) + *cp = 0; + m_putenv("SIGNATURE", buf); } } #endif /* UCI */ - if ((annotext = getenv ("mhannotate")) == NULL || *annotext == 0) + if ((annotext = getenv("mhannotate")) == NULL || *annotext == 0) annotext = NULL; - if ((altmsg = getenv ("mhaltmsg")) == NULL || *altmsg == 0) + if ((altmsg = getenv("mhaltmsg")) == NULL || *altmsg == 0) altmsg = NULL; - if (annotext && ((cp = getenv ("mhinplace")) != NULL && *cp != 0)) - inplace = atoi (cp); + if (annotext && ((cp = getenv("mhinplace")) != NULL && *cp != 0)) + inplace = atoi(cp); - if ((cp = getenv ("mhdist")) - && *cp + if ((cp = getenv("mhdist")) && *cp #ifndef lint && (distsw = atoi (cp)) #endif /* not lint */ && altmsg) { vec[vecp++] = "-dist"; - distfile = getcpy (m_mktemp2(altmsg, invo_name, NULL, NULL)); - if (link (altmsg, distfile) == NOTOK) - adios (distfile, "unable to link %s to", altmsg); + distfile = getcpy(m_mktemp2(altmsg, invo_name, NULL, NULL)); + if (link(altmsg, distfile) == NOTOK) + adios(distfile, "unable to link %s to", altmsg); } else { distfile = NULL; } - if (altmsg == NULL || stat (altmsg, &st) == NOTOK) { + if (altmsg == NULL || stat(altmsg, &st) == NOTOK) { st.st_mtime = 0; st.st_dev = 0; st.st_ino = 0; } if ((pushsw = pushed)) - push (); + push(); - vec[0] = r1bindex (postproc, '/'); - closefds (3); + vec[0] = mhbasename(postproc); + closefds(3); - if (sendsbr (vec, vecp, file, &st, 1, attach, attachformat) == OK) - done (0); + if (sendsbr(vec, vecp, file, &st, 1, attach, attachformat) == OK) + done(0); } @@ -1310,10 +1305,10 @@ sendit (char *sp, char **arg, char *file, int pushed) */ static int -removefile (char *drft) +removefile(char *drft) { - if (unlink (drft) == NOTOK) - adios (drft, "unable to unlink"); + if (unlink(drft) == NOTOK) + adios(drft, "unable to unlink"); return OK; }