moreproc will always be set in config/config.c, thus eliminated the ISTTY case.

[mmh] / sbr / makedir.c

diff --git a/sbr/makedir.c b/sbr/makedir.c
index 89e9045..f064f77 100644 (file)
--- a/sbr/makedir.c
+++ b/sbr/makedir.c
@@ -16,7 +16,7 @@
 #include <sys/file.h>
 
 int
-makedir (char *dir)
+makedir(char *dir)
 {
        char path[PATH_MAX];
        char* folder_perms_ASCII;
@@ -28,7 +28,7 @@ makedir (char *dir)
        context_save();  /* save the context file */
        fflush(stdout);
 
-       if (!(folder_perms_ASCII = context_find ("folder-protect")))
+       if (!(folder_perms_ASCII = context_find("folder-protect")))
                folder_perms_ASCII = foldprot;  /* defaults to "700" */
 
        /*
@@ -49,75 +49,73 @@ makedir (char *dir)
        */
        saved_umask = umask(0);
 
-       if (getuid () == geteuid ()) {
+       if (getuid() == geteuid()) {
                c = strncpy(path, dir, sizeof(path));
 
                while (!had_an_error && (c = strchr((c + 1), '/')) != NULL) {
                        *c = (char)0;
                        if (access(path, X_OK)) {
                                if (errno != ENOENT){
-                                       advise (dir, "unable to create directory");
+                                       advise(dir, "unable to create directory");
                                        had_an_error = 1;
                                }
                                /* Create an outer directory. */
                                if (mkdir(path, folder_perms)) {
-                                       advise (dir, "unable to create directory");
+                                       advise(dir, "unable to create directory");
                                        had_an_error = 1;
                                }
                        }
                        *c = '/';
                }
 
-               if (!had_an_error) {
-                       /*
-                       ** Create the innermost nested subdirectory of the
-                       ** path we're being asked to create.
-                       */
-                       if (mkdir (dir, folder_perms) == -1) {
-                               advise (dir, "unable to create directory");
-                               had_an_error = 1;
-                       }
+               /*
+               ** Create the innermost nested subdirectory of the
+               ** path we're being asked to create.
+               */
+               if (!had_an_error && mkdir(dir, folder_perms)==-1) {
+                       advise(dir, "unable to create directory");
+                       had_an_error = 1;
                }
        } else {
-               /* Ummm, why do we want to avoid creating directories with the effective
-                  user ID?  None of the nmh tools are installed such that the effective
-                  should be different from the real, and if some parent process made
-                  the two be different, I don't see why it should be our job to enforce
-                  the real UID.  Also, why the heck do we call the mkdir executable
-                  rather than the library function in this case??  If we do want to
-                  call the mkdir executable, we should at least be giving it -p (and
-                  change the single chmod() call below) so it can successfully create
-                  nested directories like the above code can.
-
-                  -- Dan Harkless <dan-nmh@dilvish.speed.net> */
-               switch (pid = vfork()) {
-                       case -1:
-                               advise ("fork", "unable to");
+               /*
+               ** Ummm, why do we want to avoid creating directories
+               ** with the effective user ID?  None of the nmh tools are
+               ** installed such that the effective should be different
+               ** from the real, and if some parent process made the two
+               ** be different, I don't see why it should be our job to
+               ** enforce the real UID.  Also, why the heck do we call
+               ** the mkdir executable rather than the library function in
+               ** this case??  If we do want to call the mkdir executable,
+               ** we should at least be giving it -p (and change the single
+               ** chmod() call below) so it can successfully create nested
+               ** directories like the above code can.
+               ** -- Dan Harkless <dan-nmh@dilvish.speed.net>
+               */
+               switch (pid = fork()) {
+               case -1:
+                       advise("fork", "unable to");
+                       return 0;
+
+               case 0:
+                       setgid(getgid());
+                       setuid(getuid());
+
+                       execl("/bin/mkdir", "mkdir", dir, NULL);
+                       execl("/usr/bin/mkdir", "mkdir", dir, NULL);
+                       fprintf(stderr, "unable to exec ");
+                       perror("mkdir");
+                       _exit(-1);
+
+               default:
+                       if (pidXwait(pid, "mkdir"))
                                return 0;
-
-                       case 0:
-                               setgid (getgid ());
-                               setuid (getuid ());
-
-                               execl ("/bin/mkdir", "mkdir", dir, NULL);
-                               execl ("/usr/bin/mkdir", "mkdir", dir, NULL);
-                               fprintf (stderr, "unable to exec ");
-                               perror ("mkdir");
-                               _exit (-1);
-
-                       default:
-                               if (pidXwait(pid, "mkdir"))
-                                       return 0;
-                               break;
+                       break;
                }
 
-               chmod (dir, folder_perms);
+               chmod(dir, folder_perms);
        }
 
        umask(saved_umask);  /* put the user's umask back */
 
-       if (had_an_error)
-               return 0;  /* opposite of UNIX error return convention */
-       else
-               return 1;
+       return (had_an_error) ? 0 : 1;
 }