Alter HasSuffixC()'s char * to be const.

[nmh] / uip / whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 21988791ba2729b075f212f8252a89568e852e40..69cbf795d8bebab4c26db28b480f83baeaa25990 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -144,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");
     }
 
@@ -216,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);
@@ -237,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);
@@ -318,20 +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) {
+           if ((f = popen_in_dir(cwd, buf, "r")) != NULL) {
                if (fgets(cwd, sizeof (cwd), f) == NULL) {
                    advise (buf, "fgets");
                }
-
-               if (strchr(cwd, '\n') != (char *)0)
-                       *strchr(cwd, '\n') = '\0';
-
+                TrimSuffixC(cwd, '\n');
                pclose(f);
            }
            else {
@@ -366,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 = "/";
 
@@ -388,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);
@@ -415,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;
            }
@@ -434,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));
@@ -476,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;
@@ -491,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 = "";
@@ -521,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);
@@ -565,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;
 
@@ -573,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;
@@ -942,12 +939,11 @@ 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("draftfolder +folder", 0, SDRFSW) \
+    X("draftmessage msg", 0, SDRMSW) \
+    X("nodraftfolder", 0, SNDRFSW) \
     X("sasl", SASLminc(4), SASLSW) \
     X("nosasl", SASLminc(6), NOSASLSW) \
-    X("saslmaxssf", SASLminc(10), SASLMXSSFSW) \
     X("saslmech", SASLminc(5), SASLMECHSW) \
     X("authservice", SASLminc(0), AUTHSERVICESW) \
     X("user username", SASLminc(4), USERSW) \
@@ -1165,7 +1161,6 @@ sendit (char *sp, char **arg, char *file, int pushed)
                case WIDTHSW:
                case CLIESW:
                case SERVSW:
-               case SASLMXSSFSW:
                case USERSW:
                case PORTSW:
                case MTSSM:
@@ -1209,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;
@@ -1238,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);
@@ -1255,13 +1250,6 @@ sendit (char *sp, char **arg, char *file, int pushed)
         if (user == NULL) {
             adios (NULL, "must specify -user with -saslmech xoauth2");
         }
-
-        vec[vecp++] = "-authservice";
-        if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
-            vec[vecp++] = mh_oauth_do_xoauth (user, auth_svc, snoop ? stderr : NULL);
-        } else {
-            vec[vecp++] = auth_svc;
-        }
     }
 #else
     NMH_UNUSED(saslmech);
@@ -1277,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);
 }