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

[nmh] / uip / forw.c

diff --git a/uip/forw.c b/uip/forw.c
index 18a4f03bf2ded18e82a707241d1fee7cc3c94eb4..5b4d90145d204ddafdd1d927ba2873ac517a9455 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -116,16 +116,9 @@ main (int argc, char **argv)
     char **argp, **arguments;
     struct stat st;
     struct msgs_array msgs = { 0, 0, NULL };
     char **argp, **arguments;
     struct stat st;
     struct msgs_array msgs = { 0, 0, NULL };

-

     int buildsw = 0;
 
     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;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -218,7 +211,7 @@ main (int argc, char **argv)
                case DGSTSW: 
                    if (!(cp = *argp++) || *cp == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                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:
                    mime = 0;
                    continue;
                case ISSUESW:


@@ -283,7 +276,7 @@ main (int argc, char **argv)
                case SUBJECTSW:
                    if (!(cp = *argp++) || *cp == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                case SUBJECTSW:
                    if (!(cp = *argp++) || *cp == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);

-                   subject = getcpy(cp);
+                   subject = mh_xstrdup(cp);

                    continue;
 
                case WIDTHSW:
                    continue;
 
                case WIDTHSW:


@@ -304,7 +297,7 @@ main (int argc, char **argv)
        }
     }
 
        }
     }
 

-    cwd = getcpy (pwd ());
+    cwd = mh_xstrdup(pwd ());

 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
     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 (!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: 
                done (1);
            switch (i = smatch (*argp, isdf ? aqrnl : aqrl)) {
                case NOSW: 


@@ -363,7 +357,7 @@ try_it_again:
            adios (maildir, "unable to change directory to");
 
        /* read folder and create message structure */
            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 */
            adios (NULL, "unable to read folder %s", folder);
 
        /* check for empty folder */


@@ -461,10 +455,10 @@ try_it_again:
        if (digest) {
            snprintf (buf, sizeof(buf), IFORMAT, digest);
            snprintf (value, sizeof(value), "%d", issue);
        if (digest) {
            snprintf (buf, sizeof(buf), IFORMAT, digest);
            snprintf (value, sizeof(value), "%d", issue);

-           context_replace (buf, getcpy (value));
+           context_replace (buf, mh_xstrdup(value));

            snprintf (buf, sizeof(buf), VFORMAT, digest);
            snprintf (value, sizeof(value), "%d", volume);
            snprintf (buf, sizeof(buf), VFORMAT, digest);
            snprintf (value, sizeof(value), "%d", volume);

-           context_replace (buf, getcpy (value));
+           context_replace (buf, mh_xstrdup(value));

        }
 
        context_replace (pfolder, folder);      /* update current folder   */
        }
 
        context_replace (pfolder, folder);      /* update current folder   */


@@ -516,7 +510,6 @@ mhl_draft (int out, char *digest, int volume, int issue,
            dup2 (pd[1], 1);
            close (pd[1]);
 
            dup2 (pd[1], 1);
            close (pd[1]);
 

-           i = 1;

            app_msgarg(&vec, "-forwall");
            app_msgarg(&vec, "-form");
            app_msgarg(&vec, filter);
            app_msgarg(&vec, "-forwall");
            app_msgarg(&vec, "-form");
            app_msgarg(&vec, filter);


@@ -544,7 +537,7 @@ mhl_draft (int out, char *digest, int volume, int issue,
 
            for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
                if (is_selected (mp, msgnum))
 
            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);
            }
 
            app_msgarg(&vec, NULL);


@@ -575,7 +568,7 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst
 {
     int fd,i, msgcnt, msgnum;
     int len, buflen;
 {
     int fd,i, msgcnt, msgnum;
     int len, buflen;

-    register char *bp, *msgnam;
+    char *bp, *msgnam;

     char buffer[BUFSIZ];
 
     msgcnt = 1;
     char buffer[BUFSIZ];
 
     msgcnt = 1;


@@ -606,7 +599,9 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst
 
                strncpy (bp, "\n\n", buflen);
            }
 
                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");
 
            if ((fd = open (msgnam = m_name (msgnum), O_RDONLY)) == NOTOK) {
                admonish (msgnam, "unable to read message");


@@ -633,7 +628,9 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst
        snprintf (buffer, sizeof(buffer), "\n------- End of Forwarded Message%s\n",
                mp->numsel > 1 ? "s" : "");
     }
        snprintf (buffer, sizeof(buffer), "\n------- End of Forwarded Message%s\n",
                mp->numsel > 1 ? "s" : "");
     }

-    write (out, buffer, strlen (buffer));
+    if (write (out, buffer, strlen (buffer)) < 0) {
+       advise (drft, "write");
+    }

 
     if (digest) {
        snprintf (buffer, sizeof(buffer), "End of %s Digest [Volume %d Issue %d]\n",
 
     if (digest) {
        snprintf (buffer, sizeof(buffer), "End of %s Digest [Volume %d Issue %d]\n",


@@ -643,7 +640,9 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst
            *bp++ = '*';
        *bp++ = '\n';
        *bp = 0;
            *bp++ = '*';
        *bp++ = '\n';
        *bp = 0;

-       write (out, buffer, strlen (buffer));
+       if (write (out, buffer, strlen (buffer)) < 0) {
+           advise (drft, "write");
+       }

     }
 }
 
     }
 }
 


@@ -660,11 +659,17 @@ copy_mime_draft (int out)
 
     snprintf (buffer, sizeof(buffer), "#forw [forwarded message%s] +%s",
        mp->numsel == 1 ? "" : "s", mp->foldpath);
 
     snprintf (buffer, sizeof(buffer), "#forw [forwarded message%s] +%s",
        mp->numsel == 1 ? "" : "s", mp->foldpath);

-    write (out, buffer, strlen (buffer));
+    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));
     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");
+    }

 }
 }