Doubled size of buffers used by m_getfld(), scan, and fmttest to

[nmh] / uip / slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index 8daf6081ac9ccf2c3dd1f2a8c00e3b91e598ef22..8afef253c815a8204b8b64e87e5ee3cf6daabf92 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -183,19 +183,12 @@ 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);
     arguments = getarguments (invo_name, argc, argv, 0);
 
     mts_init (invo_name);
     arguments = getarguments (invo_name, argc, argv, 0);


@@ -290,11 +283,15 @@ main (int argc, char **argv)
     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 = "";
 


@@ -317,14 +314,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)


@@ -341,7 +340,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");


@@ -1198,7 +1197,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 +1204,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)


@@ -1416,6 +1414,7 @@ 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) {
        int bufsz = sizeof buf;
        state = m_getfld (&gstate, name, buf, &bufsz, in);
        switch (state) {


@@ -1453,7 +1452,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);