LFS compatibility.

[dump.git] / dump / main.c

diff --git a/dump/main.c b/dump/main.c
index b981cd8c92aa6f098c5d1b2116254bfe8a3c258e..7745e46c4e3cd4ad9b83fd1229b866f3ec0bf592 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -2,8 +2,8 @@
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
- *     Stelian Pop <pop@cybercable.fr>, 1999-2000
- *     Stelian Pop <pop@cybercable.fr> - Alcôve <www.alcove.fr>, 2000
+ *     Stelian Pop <pop@noos.fr>, 1999-2000
+ *     Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
  */
 
 /*-
@@ -41,9 +41,10 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: main.c,v 1.29 2000/11/10 14:42:25 stelian Exp $";
+       "$Id: main.c,v 1.32 2000/12/21 11:14:54 stelian Exp $";
 #endif /* not lint */
 
+#include <config.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #ifdef __linux__
@@ -513,8 +514,9 @@ main(int argc, char *argv[])
        }
        /* if no user label specified, use ext2 filesystem label if available */
        if (spcl.c_label[0] == '\0') {
-               if (fs->super->s_volume_name[0] != '\0') {
-                       strncpy(spcl.c_label, fs->super->s_volume_name,LBLSIZE);
+               const char *lbl;
+               if ( (lbl = get_device_label(disk)) != NULL) {
+                       strncpy(spcl.c_label, lbl, LBLSIZE);
                        spcl.c_label[LBLSIZE-1] = '\0';
                }
                else