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

[nmh] / uip / slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index ebc2c26b9854ca3abf2e36b1eafce51abb8ef2d2..772c4e2bb0fc55dd88abdf60021c4cf0dc5f0b16 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -31,7 +31,6 @@
 #include <h/utils.h>
 
 #include <pwd.h>
 #include <h/utils.h>
 
 #include <pwd.h>

-#include <signal.h>

 #include <sys/ioctl.h>
 #include <fcntl.h>
 
 #include <sys/ioctl.h>
 #include <fcntl.h>
 


@@ -184,21 +183,14 @@ int
 main (int argc, char **argv)
 {
     int fd, status;
 main (int argc, char **argv)
 {
     int fd, status;

-    FILE *fp = stdin;
+    FILE *fp;

     char *cp, *mdlvr = NULL, buf[BUFSIZ];
     char mailbox[BUFSIZ], tmpfil[BUFSIZ];
     char **argp, **arguments;
 
     char *cp, *mdlvr = NULL, buf[BUFSIZ];
     char mailbox[BUFSIZ], tmpfil[BUFSIZ];
     char **argp, **arguments;
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (*argv, '/');
-
-    /* foil search of user profile/context */
-    if (context_foil (NULL) == -1)
-       done (1);
+    if (nmh_init(argv[0], 0 /* use context_foil() */)) { return 1; }

 
 

-    mts_init (invo_name);
+    mts_init ();

     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;
 


@@ -281,21 +273,28 @@ main (int argc, char **argv)
 
     if (addr == NULL)
        addr = getusername ();
 
     if (addr == NULL)
        addr = getusername ();

-    if (user == NULL)
-       user = (cp = strchr(addr, '.')) ? ++cp : addr;
+    if (user == NULL) {
+       user = getusername ();
+    }

     if ((pw = getpwnam (user)) == NULL)
        adios (NULL, "no such local user as %s", user);
 
     if (chdir (pw->pw_dir) == -1)
     if ((pw = getpwnam (user)) == NULL)
        adios (NULL, "no such local user as %s", user);
 
     if (chdir (pw->pw_dir) == -1)

-       chdir ("/");
+       if (chdir ("/") < 0) {
+           advise ("/", "chdir");
+       }

     umask (0077);
 
     if (geteuid() == 0) {
     umask (0077);
 
     if (geteuid() == 0) {

-       setgid (pw->pw_gid);
+       if (setgid (pw->pw_gid) != 0) {
+           adios ("setgid", "unable to set group to %ld", (long) pw->pw_gid);
+       }

        initgroups (pw->pw_name, pw->pw_gid);
        initgroups (pw->pw_name, pw->pw_gid);

-       setuid (pw->pw_uid);
+       if (setuid (pw->pw_uid) != 0) {
+           adios ("setuid", "unable to set user to %ld", (long) pw->pw_uid);
+       }

     }
     }

-    
+

     if (info == NULL)
        info = "";
 
     if (info == NULL)
        info = "";
 


@@ -318,14 +317,16 @@ main (int argc, char **argv)
        if (debug)
            debug_printf ("retrieving message from file \"%s\"\n", file);
        if ((fd = copy_message (tempfd, tmpfil, 1)) == -1)
        if (debug)
            debug_printf ("retrieving message from file \"%s\"\n", file);
        if ((fd = copy_message (tempfd, tmpfil, 1)) == -1)

-           adios (NULL, "unable to create temporary file");
+           adios(NULL, "unable to create temporary file in %s",
+                  get_temp_dir());

        close (tempfd);
     } else {
        /* getting message from stdin */
        if (debug)
            debug_printf ("retrieving message from stdin\n");
        if ((fd = copy_message (fileno (stdin), tmpfil, 1)) == -1)
        close (tempfd);
     } else {
        /* getting message from stdin */
        if (debug)
            debug_printf ("retrieving message from stdin\n");
        if ((fd = copy_message (fileno (stdin), tmpfil, 1)) == -1)

-           adios (NULL, "unable to create temporary file");
+           adios(NULL, "unable to create temporary file in %s",
+                  get_temp_dir());

     }
 
     if (debug)
     }
 
     if (debug)


@@ -342,7 +343,7 @@ main (int argc, char **argv)
        thing would be to delay this unlink() until later if debug == 1, but I'll
        leave that for someone who cares about the temp-file-accessing
        functionality (they'll have to watch out for cases where we adios()). */
        thing would be to delay this unlink() until later if debug == 1, but I'll
        leave that for someone who cares about the temp-file-accessing
        functionality (they'll have to watch out for cases where we adios()). */

-    unlink (tmpfil);
+    (void) m_unlink (tmpfil);

 
     if (!(fp = fdopen (fd, "r+")))
        adios (NULL, "unable to access temporary file");
 
     if (!(fp = fdopen (fd, "r+")))
        adios (NULL, "unable to access temporary file");


@@ -422,7 +423,7 @@ usr_delivery (int fd, char *delivery, int su)
     int i, accept, status=1, won, vecp, next;
     char *field, *pattern, *action, *result, *string;
     char buffer[BUFSIZ], tmpbuf[BUFSIZ];
     int i, accept, status=1, won, vecp, next;
     char *field, *pattern, *action, *result, *string;
     char buffer[BUFSIZ], tmpbuf[BUFSIZ];

-    char *cp, *vec[NVEC];
+    char *vec[NVEC];

     struct stat st;
     struct pair *p;
     FILE *fp;
     struct stat st;
     struct pair *p;
     FILE *fp;


@@ -451,9 +452,7 @@ usr_delivery (int fd, char *delivery, int su)
        if (*buffer == '#' || *buffer == '\n')
            continue;
 
        if (*buffer == '#' || *buffer == '\n')
            continue;
 

-       /* zap trailing newline */
-       if ((cp = strchr(buffer, '\n')))
-           *cp = 0;
+        TrimSuffixC(buffer, '\n');

 
        /* split buffer into fields */
        vecp = split (buffer, vec);
 
        /* split buffer into fields */
        vecp = split (buffer, vec);


@@ -516,7 +515,7 @@ usr_delivery (int fd, char *delivery, int su)
        }
 
        if (vecp > 5) {
        }
 
        if (vecp > 5) {

-           if (!mh_strcasecmp (vec[5], "select")) {
+           if (!strcasecmp (vec[5], "select")) {

                if (logged_in () != -1)
                    continue;
                if (vecp > 7 && timely (vec[6], vec[7]) == -1)
                if (logged_in () != -1)
                    continue;
                if (vecp > 7 && timely (vec[6], vec[7]) == -1)


@@ -535,7 +534,7 @@ usr_delivery (int fd, char *delivery, int su)
             * "default" matches only if the message hasn't
             * been delivered yet.
             */
             * "default" matches only if the message hasn't
             * been delivered yet.
             */

-               if (!mh_strcasecmp (field, "default")) {
+               if (!strcasecmp (field, "default")) {

                    if (won)
                        continue;
                    break;
                    if (won)
                        continue;
                    break;


@@ -565,7 +564,7 @@ usr_delivery (int fd, char *delivery, int su)
        switch (*action) {
            case 'q':
                /* deliver to quoted pipe */
        switch (*action) {
            case 'q':
                /* deliver to quoted pipe */

-               if (mh_strcasecmp (action, "qpipe"))
+               if (strcasecmp (action, "qpipe"))

                    continue;   /* else fall */
            case '^':
                expand (tmpbuf, string, fd);
                    continue;   /* else fall */
            case '^':
                expand (tmpbuf, string, fd);


@@ -576,7 +575,7 @@ usr_delivery (int fd, char *delivery, int su)
 
            case 'p': 
                /* deliver to pipe */
 
            case 'p': 
                /* deliver to pipe */

-               if (mh_strcasecmp (action, "pipe"))
+               if (strcasecmp (action, "pipe"))

                    continue;   /* else fall */
            case '|': 
                vec[2] = "sh";
                    continue;   /* else fall */
            case '|': 
                vec[2] = "sh";


@@ -589,12 +588,12 @@ usr_delivery (int fd, char *delivery, int su)
 
            case 'f': 
                /* mbox format */
 
            case 'f': 
                /* mbox format */

-               if (!mh_strcasecmp (action, "file")) {
+               if (!strcasecmp (action, "file")) {

                    status = usr_file (fd, string, MBOX_FORMAT);
                    break;
                }
                /* deliver to nmh folder */
                    status = usr_file (fd, string, MBOX_FORMAT);
                    break;
                }
                /* deliver to nmh folder */

-               else if (mh_strcasecmp (action, "folder"))
+               else if (strcasecmp (action, "folder"))

                    continue;   /* else fall */
            case '+':
                status = usr_folder (fd, string);
                    continue;   /* else fall */
            case '+':
                status = usr_folder (fd, string);


@@ -602,12 +601,12 @@ usr_delivery (int fd, char *delivery, int su)
 
            case 'm':
                /* mmdf format */
 
            case 'm':
                /* mmdf format */

-               if (!mh_strcasecmp (action, "mmdf")) {
+               if (!strcasecmp (action, "mmdf")) {

                    status = usr_file (fd, string, MMDF_FORMAT);
                    break;
                }
                /* mbox format */
                    status = usr_file (fd, string, MMDF_FORMAT);
                    break;
                }
                /* mbox format */

-               else if (mh_strcasecmp (action, "mbox"))
+               else if (strcasecmp (action, "mbox"))

                    continue;   /* else fall */
 
            case '>': 
                    continue;   /* else fall */
 
            case '>': 


@@ -617,7 +616,7 @@ usr_delivery (int fd, char *delivery, int su)
 
            case 'd': 
                /* ignore message */
 
            case 'd': 
                /* ignore message */

-               if (mh_strcasecmp (action, "destroy"))
+               if (strcasecmp (action, "destroy"))

                    continue;
                status = 0;
                break;
                    continue;
                status = 0;
                break;


@@ -743,7 +742,7 @@ parse (int fd)
                    lp = add (field, lp);
                }
                for (p = hdrs; p->p_name; p++) {
                    lp = add (field, lp);
                }
                for (p = hdrs; p->p_name; p++) {

-                   if (!mh_strcasecmp (p->p_name, name)) {
+                   if (!strcasecmp (p->p_name, name)) {

                        if (!(p->p_flags & P_HID)) {
                            if ((cp = p->p_value)) {
                                if (p->p_flags & P_ADR) {
                        if (!(p->p_flags & P_HID)) {
                            if ((cp = p->p_value)) {
                                if (p->p_flags & P_ADR) {


@@ -762,7 +761,7 @@ parse (int fd)
                    }
                }
                if (p->p_name == NULL && i < NVEC) {
                    }
                }
                if (p->p_name == NULL && i < NVEC) {

-                   p->p_name = getcpy (name);
+                   p->p_name = mh_xstrdup(name);

                    p->p_value = lp;
                    p->p_flags = P_NIL;
                    p++, i++;
                    p->p_value = lp;
                    p->p_flags = P_NIL;
                    p++, i++;


@@ -873,7 +872,7 @@ glob (int fd)
     if ((p = lookup (vars, "size"))) {
        snprintf (buffer, sizeof(buffer), "%d",
                fstat (fd, &st) != -1 ? (int) st.st_size : 0);
     if ((p = lookup (vars, "size"))) {
        snprintf (buffer, sizeof(buffer), "%d",
                fstat (fd, &st) != -1 ? (int) st.st_size : 0);

-       p->p_value = getcpy (buffer);
+       p->p_value = mh_xstrdup(buffer);

     }
     if ((p = lookup (vars, "info")))
        p->p_value = getcpy (info);
     }
     if ((p = lookup (vars, "info")))
        p->p_value = getcpy (info);


@@ -895,7 +894,7 @@ static struct pair *
 lookup (struct pair *pairs, char *key)
 {
     for (; pairs->p_name; pairs++)
 lookup (struct pair *pairs, char *key)
 {
     for (; pairs->p_name; pairs++)

-       if (!mh_strcasecmp (pairs->p_name, key))
+       if (!strcasecmp (pairs->p_name, key))

            return pairs;
 
     return NULL;
            return pairs;
 
     return NULL;


@@ -1043,8 +1042,9 @@ usr_folder (int fd, char *string)
  */
 
 static int
  */
 
 static int

-usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
+usr_pipe (int fd_arg, char *cmd, char *pgm, char **vec, int suppress)

 {
 {

+    volatile int fd = fd_arg;

     pid_t child_id;
     int i, bytes, seconds, status;
     struct stat st;
     pid_t child_id;
     int i, bytes, seconds, status;
     struct stat st;


@@ -1068,8 +1068,12 @@ usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
            /* child process */
            if (fd != 0)
                dup2 (fd, 0);
            /* child process */
            if (fd != 0)
                dup2 (fd, 0);

-           freopen ("/dev/null", "w", stdout);
-           freopen ("/dev/null", "w", stderr);
+           if (freopen ("/dev/null", "w", stdout) == NULL) {
+               advise ("stdout", "freopen");
+           }
+           if (freopen ("/dev/null", "w", stderr) == NULL) {
+               advise ("stderr", "freopen");
+           }

            if (fd != 3)
                dup2 (fd, 3);
            closefds (4);
            if (fd != 3)
                dup2 (fd, 3);
            closefds (4);


@@ -1121,16 +1125,15 @@ usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
                            pidstatus (status, stdout, ", failed");
                }
                return (status == 0 ? 0 : -1);
                            pidstatus (status, stdout, ", failed");
                }
                return (status == 0 ? 0 : -1);

-           } else {
-               /*
-                * Ruthlessly kill the child and anything
-                * else in its process group.
-                */
-               killpg(child_id, SIGKILL);
-               if (verbose)
-                   verbose_printf (", timed-out; terminated\n");
-               return -1;

            }
            }

+            /*
+             * Ruthlessly kill the child and anything
+             * else in its process group.
+             */
+            killpg(child_id, SIGKILL);
+            if (verbose)
+                verbose_printf (", timed-out; terminated\n");
+            return -1;

     }
 }
 
     }
 }
 


@@ -1157,11 +1160,11 @@ get_sender (char *envelope, char **sender)
     char buffer[BUFSIZ];
 
     if (envelope == NULL) {
     char buffer[BUFSIZ];
 
     if (envelope == NULL) {

-       *sender = getcpy ("");
+       *sender = mh_xstrdup("");

        return;
     }
 
        return;
     }
 

-    i = strlen ("From ");
+    i = LEN("From ");

     strncpy (buffer, envelope + i, sizeof(buffer));
     if ((cp = strchr(buffer, '\n'))) {
        *cp = 0;
     strncpy (buffer, envelope + i, sizeof(buffer));
     if ((cp = strchr(buffer, '\n'))) {
        *cp = 0;


@@ -1178,7 +1181,7 @@ get_sender (char *envelope, char **sender)
            *cp = 0;
        else
            break;
            *cp = 0;
        else
            break;

-    *sender = getcpy (buffer);
+    *sender = mh_xstrdup(buffer);

 }
 
 
 }
 
 


@@ -1198,7 +1201,6 @@ copy_message (int qd, char *tmpfil, int fold)
 
     tfile = m_mktemp2(NULL, invo_name, &fd1, NULL);
     if (tfile == NULL) return -1;
 
     tfile = m_mktemp2(NULL, invo_name, &fd1, NULL);
     if (tfile == NULL) return -1;

-    fchmod(fd1, 0600);

     strncpy (tmpfil, tfile, BUFSIZ);
 
     if (!fold) {
     strncpy (tmpfil, tfile, BUFSIZ);
 
     if (!fold) {


@@ -1206,7 +1208,7 @@ copy_message (int qd, char *tmpfil, int fold)
            if (write (fd1, buffer, i) != i) {
 you_lose:
                close (fd1);
            if (write (fd1, buffer, i) != i) {
 you_lose:
                close (fd1);

-               unlink (tmpfil);
+               (void) m_unlink (tmpfil);

                return -1;
            }
        if (i == -1)
                return -1;
            }
        if (i == -1)


@@ -1248,13 +1250,13 @@ you_lose:
      * and massage the headers.  Save
      * a copy of the "From " line for later.
      */
      * and massage the headers.  Save
      * a copy of the "From " line for later.
      */

-    i = strlen ("From ");
+    i = LEN("From ");

     while (fgets (buffer, sizeof(buffer), qfp)) {
        if (first) {
            first = 0;
            if (!strncmp (buffer, "From ", i)) {
                /* get copy of envelope information ("From " line) */
     while (fgets (buffer, sizeof(buffer), qfp)) {
        if (first) {
            first = 0;
            if (!strncmp (buffer, "From ", i)) {
                /* get copy of envelope information ("From " line) */

-               envelope = getcpy (buffer);
+               envelope = mh_xstrdup(buffer);

 
                /* Put the delivery date in message */
                fputs (ddate, ffp);
 
                /* Put the delivery date in message */
                fputs (ddate, ffp);


@@ -1323,7 +1325,7 @@ trim (char *cp)
            *sp = ' ';
 
     /* now return a copy */
            *sp = ' ';
 
     /* now return a copy */

-    return getcpy(bp);
+    return mh_xstrdup(bp);

 }
 
 /*
 }
 
 /*


@@ -1416,13 +1418,14 @@ suppress_duplicates (int fd, char *file)
     rewind (in);
 
     for (;;) {
     rewind (in);
 
     for (;;) {

+        int failed_to_lock = 0;

        int bufsz = sizeof buf;
        state = m_getfld (&gstate, name, buf, &bufsz, in);
        switch (state) {
            case FLD:
            case FLDPLUS:
                /* Search for the message ID */
        int bufsz = sizeof buf;
        state = m_getfld (&gstate, name, buf, &bufsz, in);
        switch (state) {
            case FLD:
            case FLDPLUS:
                /* Search for the message ID */

-               if (mh_strcasecmp (name, "Message-ID")) {
+               if (strcasecmp (name, "Message-ID")) {

                    while (state == FLDPLUS) {
                        bufsz = sizeof buf;
                        state = m_getfld (&gstate, name, buf, &bufsz, in);
                    while (state == FLDPLUS) {
                        bufsz = sizeof buf;
                        state = m_getfld (&gstate, name, buf, &bufsz, in);


@@ -1453,7 +1456,8 @@ suppress_duplicates (int fd, char *file)
                 * This will fail if your Maildelivery file doesn't
                 * exist.
                 */
                 * This will fail if your Maildelivery file doesn't
                 * exist.
                 */

-               if ((lockfd = lkopendata(file, O_RDWR, 0)) == -1) {
+               if ((lockfd = lkopendata(file, O_RDWR, 0, &failed_to_lock))
+                   == -1) {

                    advise (file, "unable to perform file locking on");
                    free (cp);
                    fclose (in);
                    advise (file, "unable to perform file locking on");
                    free (cp);
                    fclose (in);


@@ -1478,7 +1482,6 @@ suppress_duplicates (int fd, char *file)
                free (cp);
                fclose (in);
                return result;
                free (cp);
                fclose (in);
                return result;

-               break;

 
           case BODY:
           case FILEEOF:
 
           case BODY:
           case FILEEOF: