.

diff --git a/lib/fsusage.c b/lib/fsusage.c
index 9bef62aba72966d14b07ca07c5bdec41847cf896..503b3875ecd69ce210532ad68a9e716a20bf0365 100644 (file)
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -25,39 +25,36 @@
 
 int statfs ();
 
-#if defined (STAT_STATFS3_OSF1)        /* DEC Alpha running OSF/1 */
-#  include <sys/mount.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
 #endif
 
-#if defined(STAT_STATFS2_BSIZE) && !defined(_IBMR2) /* 4.3BSD, SunOS 4, HP-UX, AIX PS/2.  */
-#include <sys/vfs.h>
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
 #endif
 
-#ifdef STAT_STATFS2_FSIZE      /* 4.4BSD.  */
-#include <sys/mount.h>
+#ifdef HAVE_SYS_VFS_H
+#include <sys/vfs.h>
 #endif
 
-#ifdef STAT_STATFS2_FS_DATA    /* Ultrix.  */
-#include <sys/param.h>
-#include <sys/mount.h>
+#ifdef HAVE_SYS_FILSYS_H
+#include <sys/filsys.h>                /* SVR2.  */
 #endif
 
-#ifdef STAT_READ               /* SVR2.  */
-#include <sys/param.h>
-#include <sys/filsys.h>
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 
-#if defined(STAT_STATFS4) || (defined(_AIX) && defined(_IBMR2)) /* SVR3, Dynix, Irix, AIX RS6000.  */
+#ifdef HAVE_SYS_STATFS_H
 #include <sys/statfs.h>
 #endif
 
-#if defined(_AIX) && defined(_I386) /* AIX PS/2.  */
+#ifdef HAVE_DUSTAT_H           /* AIX PS/2.  */
 #include <sys/stat.h>
 #include <sys/dustat.h>
 #endif
 
-#ifdef STAT_STATVFS            /* SVR4.  */
+#ifdef HAVE_SYS_STATVFS_H      /* SVR4.  */
 #include <sys/statvfs.h>
 int statvfs ();
 #endif
@@ -116,7 +113,7 @@ get_fs_usage (path, disk, fsp)
   fsp->fsu_ffree = fsd.fd_req.gfree;
 #endif
 
-#ifdef STAT_READ               /* SVR2.  */
+#ifdef STAT_READ_FILSYS                /* SVR2.  */
 #ifndef SUPERBOFF
 #define SUPERBOFF (SUPERB * 512)
 #endif
@@ -173,7 +170,7 @@ get_fs_usage (path, disk, fsp)
 #endif
 #endif
 
-#ifdef STAT_STATVFS            /* SVR4.  */
+#ifdef HAVE_SYS_STATVFS_H      /* SVR4.  */
   struct statvfs fsd;
 
   if (statvfs (path, &fsd) < 0)
@@ -183,7 +180,7 @@ get_fs_usage (path, disk, fsp)
   adjust_blocks ((b), fsd.f_frsize ? fsd.f_frsize : fsd.f_bsize, 512)
 #endif
 
-#if !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ) /* !Ultrix && !SVR2.  */
+#if !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ_FILSYS) /* !Ultrix && !SVR2.  */
   fsp->fsu_blocks = CONVERT_BLOCKS (fsd.f_blocks);
   fsp->fsu_bfree = CONVERT_BLOCKS (fsd.f_bfree);
   fsp->fsu_bavail = CONVERT_BLOCKS (fsd.f_bavail);

diff --git a/lib/mkdir.c b/lib/mkdir.c
index 3726cbbcc1a7a94ca401502c50f2012226064ae7..59650d90ccad1d174b2cf96cde9c3685902f9efd 100644 (file)
--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -16,14 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>
@@ -67,7 +60,7 @@ mkdir (dpath, dmode)
 
   if (SAFE_STAT (dpath, &statbuf) == 0)
     {
-      errno = EEXIST;          /* stat worked, it already exists */
+      errno = EEXIST;          /* stat worked, so it already exists.  */
       return -1;
     }
 
@@ -78,33 +71,27 @@ mkdir (dpath, dmode)
   cpid = fork ();
   switch (cpid)
     {
-    case -1:                   /* cannot fork */
-      return -1;               /* errno already set */
-
-    case 0:                    /* child process */
+    case -1:                   /* Cannot fork.  */
+      return -1;               /* errno is already set.  */
 
+    case 0:                    /* Child process.  */
       /* Cheap hack to set mode of new directory.  Since this child
-        process is going away anyway, we zap its umask.  This won't
-        suffice to set SUID, SGID, etc. on this directory, so the parent
-        process calls chmod afterward.  */
-
-      status = umask (0);
-      umask (status | (0777 & ~dmode));
+        process is going away anyway, we zap its umask.
+        This won't suffice to set SUID, SGID, etc. on this
+        directory, so the parent process calls chmod afterward.  */
+      status = umask (0);      /* Get current umask.  */
+      umask (status | (0777 & ~dmode));        /* Set for mkdir.  */
       execl ("/bin/mkdir", "mkdir", dpath, (char *) 0);
       _exit (1);
 
-    default:                   /* parent process */
-
+    default:                   /* Parent process.  */
       /* Wait for kid to finish.  */
-
       while (wait (&status) != cpid)
        /* Do nothing.  */ ;
 
       if (status & 0xFFFF)
        {
-
          /* /bin/mkdir failed.  */
-
          errno = EIO;
          return -1;
        }