Remove DUX/OSF code

[openafs.git] / src / vfsck / dirutils.c

diff --git a/src/vfsck/dirutils.c b/src/vfsck/dirutils.c
index fd5afc2..ed89f16 100644 (file)
--- a/src/vfsck/dirutils.c
+++ b/src/vfsck/dirutils.c
@@ -1,27 +1,27 @@
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
- * 
+ *
  * This software has been released under the terms of the IBM Public
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
 
-RCSID("$Header$");
+#include <roken.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
+#include <afs/afsint.h>
+#include <afs/ihandle.h>
 #include <afs/partition.h>
 
 /* ensure that we don't have a "/" instead of a "/dev/rxd0a" type of device.
  * Overwrites abuffer with the corrected name.
  */
-EnsureDevice(abuffer)
-char *abuffer; {
+int
+EnsureDevice(char *abuffer)
+{
     struct dirent *dp;
     char pbuffer[128];
     struct stat tstat;
@@ -31,29 +31,29 @@ char *abuffer; {
     short dev;
 
     code = stat(abuffer, &tstat);
-    if (code) return code;
-    if (((tstat.st_mode & S_IFMT) == S_IFBLK) || ((tstat.st_mode & S_IFMT) == S_IFCHR)) {
-       return 0;       /* already a block or char device */
+    if (code)
+       return code;
+    if (((tstat.st_mode & S_IFMT) == S_IFBLK)
+       || ((tstat.st_mode & S_IFMT) == S_IFCHR)) {
+       return 0;               /* already a block or char device */
     }
     /* otherwise, assume we've got a normal file, and we look up its device */
     dev = tstat.st_dev;                /* remember device for this file */
 
     /* now, look in /dev for the appropriate file */
     dirp = opendir(dirName = AFS_DSKDEV);
-    while (dp=readdir(dirp)) {
+    while (dp = readdir(dirp)) {
        strcpy(pbuffer, dirName);
        strcat(pbuffer, "/");
        strcat(pbuffer, dp->d_name);
-       if (stat(pbuffer, &tstat) != -1 &&
-           (tstat.st_mode & S_IFMT) == S_IFBLK &&
-           (tstat.st_rdev == dev)) {
-               strcpy(abuffer, pbuffer);
-               closedir(dirp);
-               return 0;
-           }
+       if (stat(pbuffer, &tstat) != -1 && (tstat.st_mode & S_IFMT) == S_IFBLK
+           && (tstat.st_rdev == dev)) {
+           strcpy(abuffer, pbuffer);
+           closedir(dirp);
+           return 0;
+       }
     }
     closedir(dirp);
 
-    return 1;  /* failed */
+    return 1;                  /* failed */
 }
-