Moved upcase(), update_attr(), content_charset(), and

[nmh] / uip / slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index 7ffbe57d8d85ef125a1660ae07dc3fe65120116b..fb21c88015faed6b40ea8f58cef52c1ba9004104 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -188,14 +188,7 @@ main (int argc, char **argv)
     char mailbox[BUFSIZ], tmpfil[BUFSIZ];
     char **argp, **arguments;
 
     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 = "";
 


@@ -343,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");


@@ -1207,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)