Don't include linux/fs.h since it will break compilation in some cases.

[dump.git] / dump / main.c

diff --git a/dump/main.c b/dump/main.c
index ac6a7a14417f0af477a58220a642b6f7af30592f..3d4e693fc4ea6cb8672edd8a38716cd1959f0121 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: main.c,v 1.67 2002/01/25 14:59:53 stelian Exp $";
+       "$Id: main.c,v 1.70 2002/03/11 10:17:43 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -61,7 +61,6 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <time.h>
 #ifdef __linux__
-#include <linux/fs.h>
 #ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
 #else
@@ -192,12 +191,12 @@ static int iexclude_num = 0;                      /* number of elements in the list */
 int
 main(int argc, char *argv[])
 {
-       register dump_ino_t ino;
-       register int dirty;
-       register struct dinode *dp;
-       register struct fstab *dt;
-       register char *map;
-       register int ch;
+       dump_ino_t ino;
+       int dirty;
+       struct dinode *dp;
+       struct  fstab *dt;
+       char *map;
+       int ch;
        int i, anydirskipped;
        int aflag = 0, bflag = 0, Tflag = 0, honorlevel = 1;
        dump_ino_t maxino;
@@ -210,7 +209,7 @@ main(int argc, char *argv[])
 #endif
        time_t tnow;
        char *diskparam;
-       char *Apath;
+       char *Apath = NULL;
 
        spcl.c_label[0] = '\0';
        spcl.c_date = time(NULL);
@@ -531,7 +530,8 @@ main(int argc, char *argv[])
         */
        i = strlen(diskparam) - 1;
        if (i > 1 && diskparam[i] == '/')
-               diskparam[i] = '\0';
+               if (!(i == 6 && !strcmp(diskparam, "LABEL=/")))
+                       diskparam[i] = '\0';
 
        disk = get_device_name(diskparam);
        if (!disk) {            /* null means the disk is some form