X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/faa25111ebcaf678a505149b2c227bc077820ae3..6fd1d18f:/uip/forw.c?ds=sidebyside diff --git a/uip/forw.c b/uip/forw.c index 97714dc4..288e85a0 100644 --- a/uip/forw.c +++ b/uip/forw.c @@ -1,6 +1,4 @@ - -/* - * forw.c -- forward a message, or group of messages. +/* forw.c -- forward a message, or group of messages. * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for @@ -10,7 +8,9 @@ #include #include #include +#include "h/done.h" #include +#include "sbr/m_maildir.h" #define IFORMAT "digest-issue-%s" @@ -41,7 +41,7 @@ X("nodashstuffing", 0, NBITSTUFFSW) \ X("version", 0, VERSIONSW) \ X("help", 0, HELPSW) \ - X("file file", 4, FILESW) /* interface from msh */ \ + X("file file", 4, FILESW) \ X("build", 5, BILDSW) /* interface from mhe */ \ X("from address", 0, FROMSW) \ X("to address", 0, TOSW) \ @@ -112,20 +112,13 @@ main (int argc, char **argv) char *dmsg = NULL, *digest = NULL, *ed = NULL; char *file = NULL, *filter = NULL, *folder = NULL, *fwdmsg = NULL; char *from = NULL, *to = NULL, *cc = NULL, *subject = NULL, *fcc = NULL; - char *form = NULL, buf[BUFSIZ], value[10]; + char *form = NULL, buf[BUFSIZ]; char **argp, **arguments; struct stat st; struct msgs_array msgs = { 0, 0, NULL }; - int buildsw = 0; -#ifdef LOCALE - setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex (argv[0], '/'); - - /* read user profile/context */ - context_read(); + if (nmh_init(argv[0], 1)) { return 1; } arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; @@ -170,7 +163,8 @@ main (int argc, char **argv) nwhat = 0; continue; case BILDSW: - buildsw++; /* fall... */ + buildsw++; + /* FALLTHRU */ case NWHATSW: nwhat++; continue; @@ -218,7 +212,7 @@ main (int argc, char **argv) case DGSTSW: if (!(cp = *argp++) || *cp == '-') adios (NULL, "missing argument to %s", argp[-2]); - digest = getcpy(cp); + digest = mh_xstrdup(cp); mime = 0; continue; case ISSUESW: @@ -254,10 +248,10 @@ main (int argc, char **argv) continue; case BITSTUFFSW: - dashstuff = 1; /* trinary logic */ + dashstuff = 1; /* ternary logic */ continue; case NBITSTUFFSW: - dashstuff = -1; /* trinary logic */ + dashstuff = -1; /* ternary logic */ continue; case FROMSW: @@ -283,7 +277,7 @@ main (int argc, char **argv) case SUBJECTSW: if (!(cp = *argp++) || *cp == '-') adios (NULL, "missing argument to %s", argp[-2]); - subject = getcpy(cp); + subject = mh_xstrdup(cp); continue; case WIDTHSW: @@ -297,14 +291,13 @@ main (int argc, char **argv) if (*cp == '+' || *cp == '@') { if (folder) adios (NULL, "only one folder at a time!"); - else - folder = pluspath (cp); + folder = pluspath (cp); } else { app_msgarg(&msgs, cp); } } - cwd = getcpy (pwd ()); + cwd = mh_xstrdup(pwd ()); if (!context_find ("path")) free (path ("./", TFOLDER)); @@ -320,7 +313,8 @@ try_it_again: if (!buildsw && stat (drft, &st) != NOTOK) { printf ("Draft \"%s\" exists (%ld bytes).", drft, (long) st.st_size); for (i = LISTDSW; i != YESW;) { - if (!(argp = getans ("\nDisposition? ", isdf ? aqrnl : aqrl))) + if (!(argp = read_switch_multiword ("\nDisposition? ", + isdf ? aqrnl : aqrl))) done (1); switch (i = smatch (*argp, isdf ? aqrnl : aqrl)) { case NOSW: @@ -338,7 +332,7 @@ try_it_again: i = YESW; break; default: - advise (NULL, "say what?"); + inform("say what?"); break; } } @@ -363,7 +357,7 @@ try_it_again: adios (maildir, "unable to change directory to"); /* read folder and create message structure */ - if (!(mp = folder_read (folder))) + if (!(mp = folder_read (folder, 1))) adios (NULL, "unable to read folder %s", folder); /* check for empty folder */ @@ -384,7 +378,7 @@ try_it_again: for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) if (is_selected (mp, msgnum)) { - fwdmsg = strdup(m_name(msgnum)); + fwdmsg = mh_xstrdup(m_name(msgnum)); break; } @@ -460,11 +454,9 @@ try_it_again: if (digest) { snprintf (buf, sizeof(buf), IFORMAT, digest); - snprintf (value, sizeof(value), "%d", issue); - context_replace (buf, getcpy (value)); + context_replace (buf, mh_xstrdup(m_str(issue))); snprintf (buf, sizeof(buf), VFORMAT, digest); - snprintf (value, sizeof(value), "%d", volume); - context_replace (buf, getcpy (value)); + context_replace (buf, mh_xstrdup(m_str(volume))); } context_replace (pfolder, folder); /* update current folder */ @@ -493,19 +485,18 @@ mhl_draft (int out, char *digest, int volume, int issue, char *file, char *filter, int dashstuff) { pid_t child_id; - int i, msgnum, pd[2]; + int msgnum, pd[2]; char buf1[BUFSIZ]; char buf2[BUFSIZ]; + char *program; struct msgs_array vec = { 0, 0, NULL }; if (pipe (pd) == NOTOK) adios ("pipe", "unable to create"); - app_msgarg(&vec, r1bindex (mhlproc, '/')); - - for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) - sleep (5); + argsplit_msgarg(&vec, mhlproc, &program); + child_id = fork(); switch (child_id) { case NOTOK: adios ("fork", "unable to"); @@ -515,7 +506,6 @@ mhl_draft (int out, char *digest, int volume, int issue, dup2 (pd[1], 1); close (pd[1]); - i = 1; app_msgarg(&vec, "-forwall"); app_msgarg(&vec, "-form"); app_msgarg(&vec, filter); @@ -543,15 +533,15 @@ mhl_draft (int out, char *digest, int volume, int issue, for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { if (is_selected (mp, msgnum)) - app_msgarg(&vec, getcpy (m_name (msgnum))); + app_msgarg(&vec, mh_xstrdup(m_name (msgnum))); } app_msgarg(&vec, NULL); - execvp (mhlproc, vec.msgs); + execvp (program, vec.msgs); fprintf (stderr, "unable to exec "); perror (mhlproc); - _exit (-1); + _exit(1); default: close (pd[1]); @@ -574,7 +564,7 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst { int fd,i, msgcnt, msgnum; int len, buflen; - register char *bp, *msgnam; + char *bp, *msgnam; char buffer[BUFSIZ]; msgcnt = 1; @@ -595,7 +585,7 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst if (msgnum == mp->lowsel) { snprintf (bp, buflen, " Forwarded Message%s", - mp->numsel > 1 ? "s" : ""); + PLURALS(mp->numsel)); } else { snprintf (bp, buflen, " Message %d", msgcnt); } @@ -605,7 +595,9 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst strncpy (bp, "\n\n", buflen); } - write (out, buffer, strlen (buffer)); + if (write (out, buffer, strlen (buffer)) < 0) { + advise (drft, "write"); + } if ((fd = open (msgnam = m_name (msgnum), O_RDONLY)) == NOTOK) { admonish (msgnam, "unable to read message"); @@ -630,9 +622,11 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst strncpy (buffer, delim4, sizeof(buffer)); } else { snprintf (buffer, sizeof(buffer), "\n------- End of Forwarded Message%s\n", - mp->numsel > 1 ? "s" : ""); + PLURALS(mp->numsel)); + } + if (write (out, buffer, strlen (buffer)) < 0) { + advise (drft, "write"); } - write (out, buffer, strlen (buffer)); if (digest) { snprintf (buffer, sizeof(buffer), "End of %s Digest [Volume %d Issue %d]\n", @@ -642,7 +636,9 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst *bp++ = '*'; *bp++ = '\n'; *bp = 0; - write (out, buffer, strlen (buffer)); + if (write (out, buffer, strlen (buffer)) < 0) { + advise (drft, "write"); + } } } @@ -658,12 +654,18 @@ copy_mime_draft (int out) char buffer[BUFSIZ]; snprintf (buffer, sizeof(buffer), "#forw [forwarded message%s] +%s", - mp->numsel == 1 ? "" : "s", mp->foldpath); - write (out, buffer, strlen (buffer)); + PLURALS(mp->numsel), mp->foldpath); + if (write (out, buffer, strlen (buffer)) < 0) { + advise (drft, "write"); + } for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) if (is_selected (mp, msgnum)) { snprintf (buffer, sizeof(buffer), " %s", m_name (msgnum)); - write (out, buffer, strlen (buffer)); + if (write (out, buffer, strlen (buffer)) < 0) { + advise (drft, "write"); + } } - write (out, "\n", 1); + if (write (out, "\n", 1) < 0) { + advise (drft, "write newline"); + } }