Merge branch 'tmpfiles'

[nmh] / sbr / makedir.c

diff --git a/sbr/makedir.c b/sbr/makedir.c
index bbeef80b1db3414a4fa9c1df5168ee611b3b1d0f..67f69c86e2b1efd99c1aa3d06e9eb55d34b758f2 100644 (file)
--- a/sbr/makedir.c
+++ b/sbr/makedir.c
@@ -12,8 +12,6 @@
  */
 
 #include <h/mh.h>
-#include <errno.h>
-#include <sys/param.h>
 #include <sys/file.h>
        
 int
@@ -31,7 +29,7 @@ makedir (char *dir)
 
     if (!(folder_perms_ASCII = context_find ("folder-protect")))
        folder_perms_ASCII = foldprot;  /* defaults to "700" */
-    
+
     /* Because mh-profile.man documents "Folder-Protect:" as an octal constant,
        and we don't want to force the user to remember to include a leading
        zero, we call atooi(folder_perms_ASCII) here rather than
@@ -46,7 +44,7 @@ makedir (char *dir)
     saved_umask = umask(0);
 
     if (getuid () == geteuid ()) {
-       c = strncpy(path, dir, sizeof(path));     
+       c = strncpy(path, dir, sizeof(path));
        
        while (!had_an_error && (c = strchr((c + 1), '/')) != NULL) {   
            *c = (char)0;
@@ -85,22 +83,22 @@ makedir (char *dir)
           nested directories like the above code can.
 
           -- Dan Harkless <dan-nmh@dilvish.speed.net> */
-       switch (pid = m_vfork()) {
-           case -1: 
+       switch (pid = fork()) {
+           case -1:
                advise ("fork", "unable to");
                return 0;
                
-           case 0: 
+           case 0:
                setgid (getgid ());
                setuid (getuid ());
                
-               execl ("/bin/mkdir", "mkdir", dir, NULL);
-               execl ("/usr/bin/mkdir", "mkdir", dir, NULL);
+               execl ("/bin/mkdir", "mkdir", dir, (void *) NULL);
+               execl ("/usr/bin/mkdir", "mkdir", dir, (void *) NULL);
                fprintf (stderr, "unable to exec ");
                perror ("mkdir");
                _exit (-1);
                
-           default: 
+           default:
                if (pidXwait(pid, "mkdir"))
                    return 0;
                break;