From 95cd88019335e29909def7e0ac8794ef01380aac Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Fri, 10 Nov 2000 13:52:43 +0000 Subject: [PATCH] Save ext2 volume label into the dump label. --- CHANGES | 7 ++++++- dump/main.c | 40 ++++++++++++++++++++++++---------------- dump/traverse.c | 15 ++++++++------- 3 files changed, 38 insertions(+), 24 deletions(-) diff --git a/CHANGES b/CHANGES index 60a14c4..9d8b07a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -$Id: CHANGES,v 1.88 2000/11/10 13:22:10 stelian Exp $ +$Id: CHANGES,v 1.89 2000/11/10 13:52:43 stelian Exp $ Changes between versions 0.4b19 and 0.4b20 (released ???????????????) ===================================================================== @@ -51,6 +51,11 @@ Changes between versions 0.4b19 and 0.4b20 (released ???????????????) override the EOM detection. Thanks to Andreas Dilger for the patch. +11. Save the ext2 filesystem label into the dump volume label. + Specifying a volume label on the command line (-L option) + will override this feature. Thanks to Andreas Dilger + for the patch. + Changes between versions 0.4b18 and 0.4b19 (released August 20, 2000) ===================================================================== diff --git a/dump/main.c b/dump/main.c index 61afed8..876ea22 100644 --- a/dump/main.c +++ b/dump/main.c @@ -40,7 +40,7 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.27 2000/11/10 13:22:10 stelian Exp $"; + "$Id: main.c,v 1.28 2000/11/10 13:52:43 stelian Exp $"; #endif /* not lint */ #include @@ -126,9 +126,9 @@ main(int argc, char *argv[]) char pathname[MAXPATHLEN]; #endif time_t tnow; - char labelstr[LBLSIZE]; char *diskparam; + spcl.c_label[0] = '\0'; spcl.c_date = 0; #ifdef __linux__ (void)time4(&spcl.c_date); @@ -148,7 +148,6 @@ main(int argc, char *argv[]) if ((tapeprefix = getenv("TAPE")) == NULL) tapeprefix = _PATH_DEFTAPE; dumpdates = _PATH_DUMPDATES; - strcpy(labelstr, "none"); /* XXX safe strcpy. */ if (TP_BSIZE / DEV_BSIZE == 0 || TP_BSIZE % DEV_BSIZE != 0) quit("TP_BSIZE must be a multiple of DEV_BSIZE\n"); level = '0'; @@ -243,14 +242,14 @@ main(int argc, char *argv[]) * the last must be '\0', so the limit on strlen() * is really LBLSIZE-1. */ - strncpy(labelstr, optarg, LBLSIZE); - labelstr[LBLSIZE-1] = '\0'; + strncpy(spcl.c_label, optarg, LBLSIZE); + spcl.c_label[LBLSIZE-1] = '\0'; if (strlen(optarg) > LBLSIZE-1) { msg( "WARNING Label `%s' is larger than limit of %d characters.\n", optarg, LBLSIZE-1); msg("WARNING: Using truncated label `%s'.\n", - labelstr); + spcl.c_label); } break; @@ -390,7 +389,7 @@ main(int argc, char *argv[]) * fstabsearch. */ if (strlen(disk) > 1 && disk[strlen(disk) - 1] == '/') - disk[strlen(disk) - 1] = '\0'; + disk[strlen(disk) - 1] = '\0'; /* * disk can be either the full special file name, * the suffix of the special file name, @@ -401,8 +400,8 @@ main(int argc, char *argv[]) disk = rawname(dt->fs_spec); (void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN); (void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN); -#ifdef __linux__ } else { +#ifdef __linux__ #ifdef HAVE_REALPATH if (realpath(disk, pathname) == NULL) #endif @@ -434,14 +433,12 @@ main(int argc, char *argv[]) NAMELEN); } } - } #else - } else { (void)strncpy(spcl.c_dev, disk, NAMELEN); (void)strncpy(spcl.c_filesys, "an unlisted file system", NAMELEN); - } #endif + } if (directory[0] != 0) { if (level != '0') { @@ -453,10 +450,10 @@ main(int argc, char *argv[]) exit(X_STARTUP); } } - spcl.c_dev[NAMELEN-1]='\0'; - spcl.c_filesys[NAMELEN-1]='\0'; - (void)strncpy(spcl.c_label, labelstr, sizeof(spcl.c_label) - 1); + spcl.c_dev[NAMELEN-1] = '\0'; + spcl.c_filesys[NAMELEN-1] = '\0'; (void)gethostname(spcl.c_host, NAMELEN); + spcl.c_host[NAMELEN-1] = '\0'; spcl.c_level = level - '0'; spcl.c_type = TS_TAPE; if (!Tflag) @@ -494,8 +491,6 @@ main(int argc, char *argv[]) msgtail("to %s on host %s\n", tape, host); else msgtail("to %s\n", tape); - msg("Label: %s\n", labelstr); - } /* end of size estimate */ #ifdef __linux__ @@ -515,6 +510,15 @@ main(int argc, char *argv[]) msg("Cannot open %s\n", disk); exit(X_STARTUP); } + /* 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); + spcl.c_label[LBLSIZE-1] = '\0'; + } + else + strcpy(spcl.c_label, "none"); /* safe strcpy. */ + } sync(); dev_bsize = DEV_BSIZE; dev_bshift = ffs(dev_bsize) - 1; @@ -554,10 +558,14 @@ main(int argc, char *argv[]) usedinomap = (char *)calloc((unsigned) mapsize, sizeof(char)); dumpdirmap = (char *)calloc((unsigned) mapsize, sizeof(char)); dumpinomap = (char *)calloc((unsigned) mapsize, sizeof(char)); + if (usedinomap == NULL || dumpdirmap == NULL || dumpinomap == NULL) + quit("out of memory allocating inode maps\n"); tapesize = 2 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1); nonodump = spcl.c_level < honorlevel; + msg("Label: %s\n", spcl.c_label); + #if defined(SIGINFO) (void)signal(SIGINFO, statussig); #endif diff --git a/dump/traverse.c b/dump/traverse.c index 9182b40..bda42a9 100644 --- a/dump/traverse.c +++ b/dump/traverse.c @@ -40,7 +40,7 @@ #ifndef lint static const char rcsid[] = - "$Id: traverse.c,v 1.20 2000/09/26 13:17:09 stelian Exp $"; + "$Id: traverse.c,v 1.21 2000/11/10 13:52:43 stelian Exp $"; #endif /* not lint */ #include @@ -105,18 +105,19 @@ static int searchdir __P((ino_t ino, daddr_t blkno, long size, long filesize)); static void mapfileino __P((ino_t ino, long *tapesize, int *dirskipped)); static int exclude_ino __P((ino_t ino)); -/* #define EXT3_FEATURE_INCOMPAT_RECOVER */ +/* #define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 */ +#ifdef EXT3_FEATURE_INCOMPAT_RECOVER +#define FORCE_OPEN EXT2_FLAG_FORCE +#else +#define FORCE_OPEN 0 +#endif int dump_fs_open(const char *disk, ext2_filsys *fs) { int retval; struct ext2fs_sb *s; -#ifdef EXT3_FEATURE_INCOMPAT_RECOVER - retval = ext2fs_open(disk, EXT2_FLAG_FORCE, 0, 0, unix_io_manager, fs); -#else - retval = ext2fs_open(disk, 0, 0, 0, unix_io_manager, fs); -#endif + retval = ext2fs_open(disk, FORCE_OPEN, 0, 0, unix_io_manager, fs); #if defined(EXT2_LIB_FEATURE_COMPAT_SUPP) && defined(EXT2_LIB_FEATURE_INCOMPAT_SUPP) && defined(EXT2_LIB_FEATURE_RO_COMPAT_SUPP) && defined(EXT2_ET_UNSUPP_FEATURE) && defined(EXT2_ET_RO_UNSUPP_FEATURE) if (!retval) { s = (struct ext2fs_sb *) (*fs)->super; -- 2.39.5