X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5c01446c027960e00b33f623212de645475569aa..ec173fd2c:/uip/whatnowsbr.c?ds=inline diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index b02b5e22..945afbab 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -37,13 +37,41 @@ * by attachment number. */ -#include +#include "h/mh.h" +#include "whatnowsbr.h" +#include "sendsbr.h" +#include "annosbr.h" +#include "sbr/m_getfld.h" +#include "sbr/getarguments.h" +#include "sbr/read_switch_multiword_via_readline.h" +#include "sbr/concat.h" +#include "sbr/showfile.h" +#include "sbr/smatch.h" +#include "sbr/r1bindex.h" +#include "sbr/refile.h" +#include "sbr/closefds.h" +#include "sbr/copyip.h" +#include "sbr/getcpy.h" +#include "sbr/m_draft.h" +#include "sbr/m_backup.h" +#include "sbr/geteditor.h" +#include "sbr/context_save.h" +#include "sbr/context_find.h" +#include "sbr/brkstring.h" +#include "sbr/ambigsw.h" +#include "sbr/push.h" +#include "sbr/path.h" +#include "sbr/print_version.h" +#include "sbr/print_help.h" +#include "sbr/arglist.h" +#include "sbr/error.h" #include -#include -#include +#include "h/mime.h" +#include "h/utils.h" #ifdef OAUTH_SUPPORT -# include +#include "h/oauth.h" #endif +#include "h/done.h" #include "sbr/m_maildir.h" #include "sbr/m_mktemp.h" #include "sbr/mime_type.h" @@ -119,14 +147,15 @@ static int copyf (char *, char *); int WhatNow (int argc, char **argv) { - int isdf = 0, nedit = 0, use = 0, atfile = 1; + int isdf = 0; + bool nedit = false; + int use = 0, atfile = 1; char *cp, *dfolder = NULL, *dmsg = NULL; char *ed = NULL, *drft = NULL, *msgnam = NULL; - char buf[BUFSIZ], prompt[BUFSIZ]; + char buf[BUFSIZ]; char **argp, **arguments; struct stat st; char cwd[PATH_MAX + 1]; /* current working directory */ - char file[PATH_MAX + 1]; /* file name buffer */ char shell[PATH_MAX + 1]; /* shell response buffer */ FILE *f; /* read pointer for bgnd proc */ char *l; /* set on -l to alist command */ @@ -153,7 +182,7 @@ WhatNow (int argc, char **argv) ambigsw (cp, whatnowswitches); done (1); case UNKWNSW: - adios (NULL, "-%s unknown", cp); + die("-%s unknown", cp); case HELPSW: snprintf (buf, sizeof(buf), "%s [switches] [file]", invo_name); @@ -165,17 +194,17 @@ WhatNow (int argc, char **argv) case DFOLDSW: if (dfolder) - adios (NULL, "only one draft folder at a time!"); + die("only one draft folder at a time!"); if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); dfolder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp, *cp != '@' ? TFOLDER : TSUBCWF); continue; case DMSGSW: if (dmsg) - adios (NULL, "only one draft message at a time!"); + die("only one draft message at a time!"); if (!(dmsg = *argp++) || *dmsg == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); continue; case NDFLDSW: dfolder = NULL; @@ -184,26 +213,26 @@ WhatNow (int argc, char **argv) case EDITRSW: if (!(ed = *argp++) || *ed == '-') - adios (NULL, "missing argument to %s", argp[-2]); - nedit = 0; + die("missing argument to %s", argp[-2]); + nedit = false; continue; case NEDITSW: - nedit++; + nedit = true; continue; case PRMPTSW: if (!(myprompt = *argp++) || *myprompt == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); continue; } } if (drft) - adios (NULL, "only one draft at a time!"); + die("only one draft at a time!"); drft = cp; } if ((drft == NULL && (drft = getenv ("mhdraft")) == NULL) || *drft == 0) - drft = getcpy (m_draft (dfolder, dmsg, 1, &isdf)); + drft = mh_xstrdup(m_draft(dfolder, dmsg, 1, &isdf)); msgnam = (cp = getenv ("mhaltmsg")) && *cp ? mh_xstrdup(cp) : NULL; @@ -215,7 +244,7 @@ WhatNow (int argc, char **argv) if (ed == NULL && ((ed = getenv ("mheditor")) == NULL || *ed == 0)) { ed = NULL; - nedit++; + nedit = true; } /* start editing the draft, unless -noedit was given */ @@ -223,12 +252,11 @@ WhatNow (int argc, char **argv) NULL, 1, atfile) < 0) done (1); - snprintf (prompt, sizeof(prompt), myprompt, invo_name); for (;;) { #ifdef READLINE_SUPPORT - if (!(argp = read_switch_multiword_via_readline (prompt, aleqs))) { + if (!(argp = read_switch_multiword_via_readline(myprompt, aleqs))) { #else /* ! READLINE_SUPPORT */ - if (!(argp = read_switch_multiword (prompt, aleqs))) { + if (!(argp = read_switch_multiword(myprompt, aleqs))) { #endif /* READLINE_SUPPORT */ (void) m_unlink (LINK); done (1); @@ -386,7 +414,7 @@ WhatNow (int argc, char **argv) * Attach files to current draft. */ - int verbose = 0; + bool verbose = false; char **ap; if (checkmimeheader(drft)) @@ -395,7 +423,7 @@ WhatNow (int argc, char **argv) for (ap = argp+1; *ap; ++ap) { if (strcmp(*ap, "-v") == 0) { ++argp; - verbose = 1; + verbose = true; } else if (*ap[0] != '-') { break; } @@ -421,6 +449,8 @@ WhatNow (int argc, char **argv) */ if ((f = popen_in_dir(cwd, buf, "r")) != NULL) { + char file[2 * PATH_MAX + 2]; /* file name buffer */ + while (fgets(shell, sizeof (shell), f) != NULL) { char *ctype; @@ -551,7 +581,7 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp) */ int trailln = strlen(trailcmd) + 4; if (ln < 0 || ln + trailln > bufsz) - adios(NULL, "arguments too long"); + die("arguments too long"); cp = buf + ln; @@ -559,7 +589,7 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp) ln = strlen(*argp); /* +1 for leading space */ if (ln + trailln + 1 > bufsz - (cp-buf)) - adios(NULL, "arguments too long"); + die("arguments too long"); *cp++ = ' '; memcpy(cp, *argp, ln+1); cp += ln; @@ -634,7 +664,7 @@ popen_in_dir(const char *dir, const char *cmd, const char *type) * EDIT */ -static int reedit = 0; /* have we been here before? */ +static bool reedit; /* have we been here before? */ static char *edsave = NULL; /* the editor we used previously */ @@ -647,7 +677,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp, char *cp, *prog, **vec; struct stat st; - int slinked = 0; + bool slinked = false; /* Was there a previous edit session? */ if (reedit && (*ed || edsave)) { @@ -683,9 +713,9 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp, if (symlink (altpath, linkpath) < 0) { adios (linkpath, "symlink"); } - slinked = 1; + slinked = true; } else { - slinked = 0; + slinked = false; } } } @@ -722,7 +752,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp, execvp (prog, vec); fprintf (stderr, "unable to exec "); perror (*ed); - _exit (-1); + _exit(1); default: if ((status = pidwait (pid, NOTOK))) { @@ -739,7 +769,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp, break; } - reedit++; + reedit = true; if (altmsg && mp && !is_readonly(mp) @@ -821,8 +851,8 @@ sendfile (char **arg, char *file, int pushsw) child_id = fork(); switch (child_id) { case NOTOK: - inform("unable to fork, so sending directly..."); - /* FALLTHRU */ + adios("fork", "failed:"); + case OK: vec = argsplit(sendproc, &program, &vecp); if (pushsw) @@ -836,7 +866,7 @@ sendfile (char **arg, char *file, int pushsw) execvp (program, vec); fprintf (stderr, "unable to exec "); perror (sendproc); - _exit (-1); + _exit(1); default: if (pidwait(child_id, OK) == 0) @@ -864,7 +894,7 @@ buildfile (char **argp, char *file) while (argp[i]) i++; } - args = (char **) mh_xmalloc((i + 2) * sizeof(char *)); + args = mh_xmalloc((i + 2) * sizeof(char *)); /* * For backward compatibility, we need to add -build @@ -956,12 +986,12 @@ DEFINE_SWITCH_ARRAY(SEND, sendswitches); extern int debugsw; /* from sendsbr.c */ -extern int forwsw; +extern bool forwsw; extern int inplace; -extern int pushsw; +extern bool pushsw; extern int splitsw; -extern int unique; -extern int verbsw; +extern bool unique; +extern bool verbsw; extern char *altmsg; /* .. */ extern char *annotext; @@ -976,13 +1006,8 @@ sendit (char *sp, char **arg, char *file, int pushed) char **arguments, *savearg[MAXARGS], **vec; const char *user = NULL, *saslmech = NULL; char *auth_svc = NULL; - int snoop = 0; struct stat st; -#ifndef lint - int distsw = 0; -#endif - /* * Make sure these are defined. In particular, we need * savearg[1] to be NULL, in case "arg" is NULL below. It @@ -1017,9 +1042,9 @@ sendit (char *sp, char **arg, char *file, int pushed) argp = arguments; debugsw = 0; - forwsw = 1; + forwsw = true; inplace = 1; - unique = 0; + unique = false; altmsg = NULL; annotext = NULL; @@ -1032,7 +1057,7 @@ sendit (char *sp, char **arg, char *file, int pushed) vec = argsplit(postproc, &program, &vecp); vec[vecp++] = "-library"; - vec[vecp++] = getcpy (m_maildir ("")); + vec[vecp++] = mh_xstrdup(m_maildir("")); if ((cp = context_find ("fileproc"))) { vec[vecp++] = "-fileproc"; @@ -1083,24 +1108,24 @@ sendit (char *sp, char **arg, char *file, int pushed) continue; case UNIQSW: - unique++; + unique = true; continue; case NUNIQSW: - unique = 0; + unique = false; continue; case FORWSW: - forwsw++; + forwsw = true; continue; case NFORWSW: - forwsw = 0; + forwsw = false; continue; case VERBSW: - verbsw++; + verbsw = true; vec[vecp++] = --cp; continue; case NVERBSW: - verbsw = 0; + verbsw = false; vec[vecp++] = --cp; continue; @@ -1129,18 +1154,17 @@ sendit (char *sp, char **arg, char *file, int pushed) continue; case SNOOPSW: - snoop++; vec[vecp++] = --cp; continue; case AUTHSERVICESW: #ifdef OAUTH_SUPPORT if (!(auth_svc = *argp++) || *auth_svc == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); #else NMH_UNUSED (user); NMH_UNUSED (auth_svc); - adios (NULL, "not built with OAuth support"); + die("not built with OAuth support"); #endif continue; @@ -1205,14 +1229,11 @@ sendit (char *sp, char **arg, char *file, int pushed) if ((cp = getenv ("mhdist")) && *cp -#ifndef lint - && (distsw = atoi (cp)) -#endif /* not lint */ + && atoi(cp) && altmsg) { vec[vecp++] = "-dist"; if ((cp = m_mktemp2(altmsg, invo_name, NULL, NULL)) == NULL) { - adios(NULL, "unable to create temporary file in %s", - get_temp_dir()); + die("unable to create temporary file"); } distfile = mh_xstrdup(cp); (void) m_unlink(distfile); @@ -1225,11 +1246,11 @@ sendit (char *sp, char **arg, char *file, int pushed) #ifdef OAUTH_SUPPORT if (auth_svc == NULL) { if (saslmech && ! strcasecmp(saslmech, "xoauth2")) { - adios (NULL, "must specify -authservice with -saslmech xoauth2"); + die("must specify -authservice with -saslmech xoauth2"); } } else { if (user == NULL) { - adios (NULL, "must specify -user with -saslmech xoauth2"); + die("must specify -user with -saslmech xoauth2"); } } #else @@ -1280,7 +1301,7 @@ whomfile (char **arg, char *file) execvp (program, vec); fprintf (stderr, "unable to exec "); perror (whomproc); - _exit (-1); /* NOTREACHED */ + _exit(1); /* NOTREACHED */ default: return pidwait(pid, NOTOK) & 0377 ? 1 : 0; @@ -1312,7 +1333,8 @@ checkmimeheader (char *drft) FILE *f; m_getfld_state_t gstate; char buf[NMH_BUFSIZ], name[NAMESZ]; - int state, retval = 0; + int state; + bool retval = false; if ((f = fopen(drft, "r")) == NULL) { admonish(drft, "unable to read draft"); @@ -1328,7 +1350,7 @@ checkmimeheader (char *drft) if (strcasecmp(name, VRSN_FIELD) == 0) { inform("Cannot use attach commands with already-" "formatted MIME message \"%s\"", drft); - retval = 1; + retval = true; break; } continue;