Build on IRIX again, fix symbol name clash with dirname.
authorNathan Scott <nathans@sgi.com>
Mon, 15 Nov 2004 13:50:09 +0000 (13:50 +0000)
committerNathan Scott <nathans@sgi.com>
Mon, 15 Nov 2004 13:50:09 +0000 (13:50 +0000)
Merge of xfs-cmds-melb:slinx:20143a by kenmcd.

src/dirperf.c

index fb58fb3e0fcc4b61fc3d31701bd585b6367bf8f6..1a84581f47890afde1e01b3dd998c8bc0ea6056c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
  * 
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -43,7 +43,9 @@
 #include <unistd.h>
 
 #define MAXNAMELEN 256
+#ifndef __sgi__
 typedef unsigned int uint_t;
+#endif
 
 /*
  * Loop over directory sizes:
@@ -59,7 +61,7 @@ typedef unsigned int uint_t;
 
 static uint_t  addval;
 static uint_t  dirchars;
-static char    *dirname;
+static char    *directory;
 static uint_t  firstsize;
 static uint_t  lastsize;
 static uint_t  minchars;
@@ -106,7 +108,7 @@ main(int argc, char **argv)
                        nchars = (uint_t)atoi(optarg);
                        break;
                case 'd':
-                       dirname = optarg;
+                       directory = optarg;
                        break;
                case 'f':
                        firstsize = (uint_t)atoi(optarg);
@@ -137,15 +139,15 @@ main(int argc, char **argv)
        }
        if (stats == 0)
                stats = 1;
-       if (!dirname)
-               dirname = ".";
+       if (!directory)
+               directory = ".";
        else {
-               if (mkdir(dirname, 0777) < 0 && errno != EEXIST) {
-                       perror(dirname);
+               if (mkdir(directory, 0777) < 0 && errno != EEXIST) {
+                       perror(directory);
                        exit(1);
                }
-               if (chdir(dirname) < 0) {
-                       perror(dirname);
+               if (chdir(directory) < 0) {
+                       perror(directory);
                        exit(1);
                }
        }