* 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
*/
/*-
#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.26 2000/09/26 12:34:52 stelian Exp $";
+ "$Id: main.c,v 1.31 2000/12/04 15:43:16 stelian Exp $";
#endif /* not lint */
#include <sys/param.h>
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);
#endif
tsize = 0; /* Default later, based on 'c' option for cart tapes */
+ unlimited = 1;
eot_script = NULL;
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';
break;
case 'B': /* blocks per output file */
+ unlimited = 0;
blocksperfile = numarg("number of blocks per file",
1L, 0L);
break;
break;
case 'c': /* Tape is cart. not 9-track */
+ unlimited = 0;
cartridge = 1;
break;
case 'd': /* density, in bits per inch */
+ unlimited = 0;
density = numarg("density", 10L, 327670L) / 10;
if (density >= 625 && !bflag)
ntrec = HIGHDENSITYTREC;
* 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;
break;
case 's': /* tape size, feet */
+ unlimited = 0;
tsize = numarg("tape size", 1L, 0L) * 12 * 10;
break;
* 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,
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
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') {
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)
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__
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') {
+ const char *lbl;
+ if ( (lbl = get_device_label(disk)) != NULL) {
+ strncpy(spcl.c_label, lbl, 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;
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