X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fmain.c;h=7745e46c4e3cd4ad9b83fd1229b866f3ec0bf592;hb=d6967896bc4e18f9b4359a2ef5be5c0f1bcc456a;hp=876ea22e6d6b4cdee8793434901e83ad83c75667;hpb=95cd88019335e29909def7e0ac8794ef01380aac;p=dump.git

diff --git a/dump/main.c b/dump/main.c
index 876ea22..7745e46 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -2,7 +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@noos.fr>, 1999-2000
+ *	Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
  */
 
 /*-
@@ -40,9 +41,10 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.28 2000/11/10 13:52:43 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__
@@ -512,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