Cosmetic refactoring

[mmh] / sbr / makedir.c

diff --git a/sbr/makedir.c b/sbr/makedir.c
index 1c13bb6..d5d536c 100644 (file)
--- a/sbr/makedir.c
+++ b/sbr/makedir.c
@@ -68,15 +68,13 @@ makedir(char *dir)
                        *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 {
                /*
@@ -94,24 +92,24 @@ makedir(char *dir)
                ** -- Dan Harkless <dan-nmh@dilvish.speed.net>
                */
                switch (pid = vfork()) {
-                       case -1:
-                               advise("fork", "unable to");
+               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);
@@ -119,8 +117,5 @@ makedir(char *dir)
 
        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;
 }