X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a670c9d22ff3a00459677c62d1929818c4e4c4e6..b0aa8cdb1c264e42d4931ca24968689c73381278:/uip/whatnowsbr.c diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index 6e08d3eb..69cbf795 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -44,6 +44,10 @@ #include #include +#ifdef OAUTH_SUPPORT +# include +#endif + #define WHATNOW_SWITCHES \ X("draftfolder +folder", 0, DFOLDSW) \ X("draftmessage msg", 0, DMSGSW) \ @@ -140,7 +144,7 @@ WhatNow (int argc, char **argv) * Get the initial current working directory. */ - if (getcwd(cwd, sizeof (cwd)) == (char *)0) { + if (getcwd(cwd, sizeof (cwd)) == NULL) { adios("getcwd", "could not get working directory"); } @@ -212,7 +216,7 @@ WhatNow (int argc, char **argv) if ((drft == NULL && (drft = getenv ("mhdraft")) == NULL) || *drft == 0) drft = getcpy (m_draft (dfolder, dmsg, 1, &isdf)); - msgnam = (cp = getenv ("mhaltmsg")) && *cp ? getcpy (cp) : NULL; + msgnam = (cp = getenv ("mhaltmsg")) && *cp ? mh_xstrdup(cp) : NULL; if ((cp = getenv ("mhatfile")) && *cp) atfile = atoi(cp); @@ -233,9 +237,9 @@ WhatNow (int argc, char **argv) snprintf (prompt, sizeof(prompt), myprompt, invo_name); for (;;) { #ifdef READLINE_SUPPORT - if (!(argp = getans_via_readline (prompt, aleqs))) { + if (!(argp = read_switch_multiword_via_readline (prompt, aleqs))) { #else /* ! READLINE_SUPPORT */ - if (!(argp = getans (prompt, aleqs))) { + if (!(argp = read_switch_multiword (prompt, aleqs))) { #endif /* READLINE_SUPPORT */ (void) m_unlink (LINK); done (1); @@ -314,18 +318,17 @@ WhatNow (int argc, char **argv) * is accustomed to. Read back the absolute path. */ - if (*(argp+1) == (char *)0) { - (void)sprintf(buf, "$SHELL -c \"cd&&pwd\""); + if (*(argp+1) == NULL) { + strcpy(buf, "$SHELL -c \"cd&&pwd\""); } else { writesomecmd(buf, BUFSIZ, "cd", "pwd", argp); } - if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) { - fgets(cwd, sizeof (cwd), f); - - if (strchr(cwd, '\n') != (char *)0) - *strchr(cwd, '\n') = '\0'; - + if ((f = popen_in_dir(cwd, buf, "r")) != NULL) { + if (fgets(cwd, sizeof (cwd), f) == NULL) { + advise (buf, "fgets"); + } + TrimSuffixC(cwd, '\n'); pclose(f); } else { @@ -360,10 +363,10 @@ WhatNow (int argc, char **argv) if (checkmimeheader(drft)) break; - l = (char *)0; + l = NULL; n = 0; - while (*++argp != (char *)0) { + while (*++argp != NULL) { if (strcmp(*argp, "-l") == 0) l = "/"; @@ -382,7 +385,7 @@ WhatNow (int argc, char **argv) } if (n == -1) - advise((char *)0, "usage is alist [-ln]."); + advise(NULL, "usage is alist [-ln]."); else annolist(drft, ATTACH_FIELD, l, n); @@ -409,7 +412,7 @@ WhatNow (int argc, char **argv) } } - if (*(argp+1) == (char *)0) { + if (*(argp+1) == NULL) { advise(NULL, "attach command requires file argument(s)."); break; } @@ -428,11 +431,11 @@ WhatNow (int argc, char **argv) * draft. */ - if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) { - while (fgets(shell, sizeof (shell), f) != (char *)0) { + if ((f = popen_in_dir(cwd, buf, "r")) != NULL) { + while (fgets(shell, sizeof (shell), f) != NULL) { char *ctype; - *(strchr(shell, '\n')) = '\0'; + TrimSuffixC(shell, '\n'); if (*shell == '/') { strncpy(file, shell, sizeof(file)); @@ -444,9 +447,6 @@ WhatNow (int argc, char **argv) annotate(drft, ATTACH_FIELD, file, 1, 0, -2, 1); if (verbose) { ctype = mime_type(file); - } - - if (verbose) { printf ("Attaching %s as a %s\n", file, ctype); free (ctype); } @@ -473,7 +473,7 @@ WhatNow (int argc, char **argv) if (checkmimeheader(drft)) break; - for (n = 0, arguments = argp + 1; *arguments != (char *)0; arguments++) { + for (n = 0, arguments = argp + 1; *arguments != NULL; arguments++) { if (strcmp(*arguments, "-n") == 0) { n = 1; break; @@ -488,15 +488,15 @@ WhatNow (int argc, char **argv) */ if (n == 1) { - for (arguments = argp + 1; *arguments != (char *)0; arguments++) { + for (arguments = argp + 1; *arguments != NULL; arguments++) { if (strcmp(*arguments, "-n") == 0) continue; if (**arguments != '\0') { n = atoi(*arguments); - annotate(drft, ATTACH_FIELD, (char *)0, 1, 0, n, 1); + annotate(drft, ATTACH_FIELD, NULL, 1, 0, n, 1); - for (argp = arguments + 1; *argp != (char *)0; argp++) { + for (argp = arguments + 1; *argp != NULL; argp++) { if (atoi(*argp) > n) { if (atoi(*argp) == 1) *argp = ""; @@ -518,9 +518,9 @@ WhatNow (int argc, char **argv) * provide a file name with a space in it. */ writelscmd(buf, sizeof(buf), "-d --", argp); - if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) { - while (fgets(shell, sizeof (shell), f) != (char *)0) { - *(strchr(shell, '\n')) = '\0'; + if ((f = popen_in_dir(cwd, buf, "r")) != NULL) { + while (fgets(shell, sizeof (shell), f) != NULL) { + TrimSuffixC(shell, '\n'); annotate(drft, ATTACH_FIELD, shell, 1, 0, 0, 1); } pclose(f); @@ -562,7 +562,7 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp) */ int trailln = strlen(trailcmd) + 4; if (ln < 0 || ln + trailln > bufsz) - adios((char *)0, "arguments too long"); + adios(NULL, "arguments too long"); cp = buf + ln; @@ -570,7 +570,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((char *)0, "arguments too long"); + adios(NULL, "arguments too long"); *cp++ = ' '; memcpy(cp, *argp, ln+1); cp += ln; @@ -691,7 +691,9 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp, if (atfile) { (void) m_unlink (linkpath); if (link (altpath, linkpath) == NOTOK) { - symlink (altpath, linkpath); + if (symlink (altpath, linkpath) < 0) { + adios (linkpath, "symlink"); + } slinked = 1; } else { slinked = 0; @@ -709,8 +711,11 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp, break; case OK: - if (cwd) - chdir (cwd); + if (cwd) { + if (chdir (cwd) < 0) { + advise (cwd, "chdir"); + } + } if (altmsg) { if (mp) m_putenv ("mhfolder", mp->foldpath); @@ -934,14 +939,14 @@ buildfile (char **argp, char *file) X("client host", -6, CLIESW) \ X("server host", 6, SERVSW) \ X("snoop", -5, SNOOPSW) \ - X("draftfolder +folder", -6, SDRFSW) \ - X("draftmessage msg", -6, SDRMSW) \ - X("nodraftfolder", -3, SNDRFSW) \ - X("sasl", SASLminc(-4), SASLSW) \ - X("nosasl", SASLminc(-6), NOSASLSW) \ - X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \ - X("saslmech", SASLminc(-5), SASLMECHSW) \ - X("user", SASLminc(-4), USERSW) \ + X("draftfolder +folder", 0, SDRFSW) \ + X("draftmessage msg", 0, SDRMSW) \ + X("nodraftfolder", 0, SNDRFSW) \ + X("sasl", SASLminc(4), SASLSW) \ + X("nosasl", SASLminc(6), NOSASLSW) \ + X("saslmech", SASLminc(5), SASLMECHSW) \ + X("authservice", SASLminc(0), AUTHSERVICESW) \ + X("user username", SASLminc(4), USERSW) \ X("attach fieldname", 6, SNDATTACHSW) \ X("noattach", 0, SNDNOATTACHSW) \ X("attachformat", 7, SNDATTACHFORMAT) \ @@ -949,6 +954,7 @@ buildfile (char **argp, char *file) X("tls", TLSminc(-3), TLSSW) \ X("initialtls", TLSminc(-10), INITTLSSW) \ X("notls", TLSminc(-5), NTLSSW) \ + X("sendmail program", 0, MTSSM) \ X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \ X("messageid localname|random", 2, MESSAGEIDSW) \ @@ -980,6 +986,9 @@ sendit (char *sp, char **arg, char *file, int pushed) int vecp, n = 1; char *cp, buf[BUFSIZ], **argp, *program; char **arguments, *savearg[MAXARGS], **vec; + const char *user = NULL, *saslmech = NULL; + char *auth_svc = NULL; + int snoop = 0; struct stat st; #ifndef lint @@ -1120,7 +1129,6 @@ sendit (char *sp, char **arg, char *file, int pushed) case NMSGDSW: case WATCSW: case NWATCSW: - case SNOOPSW: case SASLSW: case NOSASLSW: case TLSSW: @@ -1129,15 +1137,33 @@ sendit (char *sp, char **arg, char *file, int pushed) vec[vecp++] = --cp; 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]); +#else + NMH_UNUSED (user); + NMH_UNUSED (auth_svc); + adios (NULL, "not built with OAuth support"); +#endif + continue; + + case SASLMECHSW: + saslmech = *argp; + /* fall thru */ case ALIASW: case FILTSW: case WIDTHSW: case CLIESW: case SERVSW: - case SASLMXSSFSW: - case SASLMECHSW: case USERSW: case PORTSW: + case MTSSM: case MTSSW: case MESSAGEIDSW: vec[vecp++] = --cp; @@ -1146,6 +1172,7 @@ sendit (char *sp, char **arg, char *file, int pushed) return; } vec[vecp++] = cp; + user = cp; continue; case SDRFSW: @@ -1177,7 +1204,7 @@ sendit (char *sp, char **arg, char *file, int pushed) if ((cp = context_find ("Aliasfile"))) { char **ap, *dp; - dp = getcpy (cp); + dp = mh_xstrdup(cp); for (ap = brkstring (dp, " ", "\n"); ap && *ap; ap++) { vec[vecp++] = "-alias"; vec[vecp++] = *ap; @@ -1206,7 +1233,7 @@ sendit (char *sp, char **arg, char *file, int pushed) adios(NULL, "unable to create temporary file in %s", get_temp_dir()); } - distfile = getcpy (cp); + distfile = mh_xstrdup(cp); (void) m_unlink(distfile); if (link (altmsg, distfile) == NOTOK) adios (distfile, "unable to link %s to", altmsg); @@ -1214,6 +1241,20 @@ sendit (char *sp, char **arg, char *file, int pushed) distfile = NULL; } +#ifdef OAUTH_SUPPORT + if (auth_svc == NULL) { + if (saslmech && ! strcasecmp(saslmech, "xoauth2")) { + adios (NULL, "must specify -authservice with -saslmech xoauth2"); + } + } else { + if (user == NULL) { + adios (NULL, "must specify -user with -saslmech xoauth2"); + } + } +#else + NMH_UNUSED(saslmech); +#endif /* OAUTH_SUPPORT */ + if (altmsg == NULL || stat (altmsg, &st) == NOTOK) { st.st_mtime = 0; st.st_dev = 0; @@ -1224,7 +1265,7 @@ sendit (char *sp, char **arg, char *file, int pushed) closefds (3); - if (sendsbr (vec, vecp, program, file, &st, 1) == OK) + if (sendsbr (vec, vecp, program, file, &st, 1, auth_svc) == OK) done (0); } @@ -1249,10 +1290,10 @@ whomfile (char **arg, char *file) case OK: vec = argsplit(whomproc, &program, &vecp); - vec[vecp++] = file; if (arg) while (*arg) vec[vecp++] = *arg++; + vec[vecp++] = file; vec[vecp] = NULL; execvp (program, vec); @@ -1281,7 +1322,7 @@ removefile (char *drft) /* - * Return 1 if we already have a MIME-Verson header, 0 otherwise. + * Return 1 if we already have a MIME-Version header, 0 otherwise. */ static int