* 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
*/
/*-
#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.30 2000/11/30 09:53:14 stelian Exp $";
+ "$Id: main.c,v 1.39 2001/03/20 20:46:08 stelian Exp $";
#endif /* not lint */
+#include <config.h>
+#include <ctype.h>
+#include <compaterr.h>
+#include <fcntl.h>
+#include <fstab.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
#include <sys/param.h>
#include <sys/time.h>
#ifdef __linux__
#include <linux/ext2_fs.h>
+#include <ext2fs/ext2fs.h>
+#include <time.h>
#include <sys/stat.h>
#include <bsdcompat.h>
-#else
-#ifdef sunos
+#elif defined sunos
#include <sys/vnode.h>
#include <ufs/inode.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
#endif
-#endif
#include <protocols/dumprestore.h>
-#include <ctype.h>
-#include <compaterr.h>
-#include <fcntl.h>
-#include <fstab.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef __linux__
-#include <ext2fs/ext2fs.h>
-#endif
-
#include "dump.h"
#include "pathnames.h"
#include "bylabel.h"
long blocksperfile; /* output blocks per file */
char *host = NULL; /* remote host (if any) */
int sizest = 0; /* return size estimate only */
+int compressed = 0; /* use zlib to compress the output, compress level 1-9 */
+long long bytes_written = 0; /* total bytes written */
+long uncomprblks = 0;/* uncompressed blocks written */
#ifdef __linux__
char *__progname;
static void obsolete __P((int *, char **[]));
static void usage __P((void));
-ino_t iexclude_list[IEXCLUDE_MAXNUM]; /* the inode exclude list */
+dump_ino_t iexclude_list[IEXCLUDE_MAXNUM];/* the inode exclude list */
int iexclude_num = 0; /* number of elements in the list */
int
main(int argc, char *argv[])
{
- register ino_t ino;
+ register dump_ino_t ino;
register int dirty;
register struct dinode *dp;
register struct fstab *dt;
register char *map;
register int ch;
int i, anydirskipped, bflag = 0, Tflag = 0, honorlevel = 1;
- ino_t maxino;
+ dump_ino_t maxino;
#ifdef __linux__
errcode_t retval;
char directory[MAXPATHLEN];
char *diskparam;
spcl.c_label[0] = '\0';
- spcl.c_date = 0;
-#ifdef __linux__
- (void)time4(&spcl.c_date);
-#else
- (void)time((time_t *)&spcl.c_date);
-#endif
+ spcl.c_date = time(NULL);
#ifdef __linux__
__progname = argv[0];
usage();
obsolete(&argc, &argv);
+
+ while ((ch = getopt(argc, argv,
+ "0123456789aB:b:cd:e:f:F:h:L:"
#ifdef KERBEROS
-#define optstring "0123456789aB:b:cd:e:f:F:h:kL:Mns:ST:uWw"
-#else
-#define optstring "0123456789aB:b:cd:e:f:F:h:L:Mns:ST:uWw"
+ "k"
#endif
- while ((ch = getopt(argc, argv, optstring)) != -1)
+ "Mns:ST:uWw"
+#ifdef HAVE_ZLIB
+ "z::"
+#endif
+ )) != -1)
#undef optstring
switch (ch) {
/* dump level */
}
iexclude_list[iexclude_num++] = numarg("inode to exclude",0L,0L);
if (iexclude_list[iexclude_num-1] <= ROOTINO) {
- (void)fprintf(stderr, "Cannot exclude inode %ld\n", iexclude_list[iexclude_num-1]);
+ (void)fprintf(stderr, "Cannot exclude inode %ld\n", (long)iexclude_list[iexclude_num-1]);
exit(X_STARTUP);
}
msg("Added %d to exclude list\n",
case 'w':
lastdump(ch);
exit(X_FINOK); /* do nothing else */
+#ifdef HAVE_ZLIB
+ case 'z':
+ compressed = 2;
+ if (optarg)
+ compressed = numarg("compress level", 1L, 9L);
+ break;
+#endif /* HAVE_ZLIB */
default:
usage();
}
diskparam = *argv++;
if (strlen(diskparam) >= MAXPATHLEN) {
- (void)fprintf(stderr, "Disk or filesystem name too long: %s\n", diskparam);
+ (void)fprintf(stderr, "Disk or filesystem name too long: %s\n",
+ diskparam);
exit(X_STARTUP);
}
argc--;
set_operators(); /* /etc/group snarfed */
getfstab(); /* /etc/fstab snarfed */
+ /*
+ * disk may end in / and this can confuse
+ * fstabsearch.
+ */
+ i = strlen(diskparam) - 1;
+ if (i > 1 && diskparam[i] == '/')
+ diskparam[i] = '\0';
+
disk = get_device_name(diskparam);
if (!disk) { /* null means the disk is some form
of LABEL= or UID= but it was not
msg("Cannot find a disk having %s\n", diskparam);
exit(X_STARTUP);
}
- /*
- * disk may end in / and this can confuse
- * fstabsearch.
- */
- if (strlen(disk) > 1 && disk[strlen(disk) - 1] == '/')
- disk[strlen(disk) - 1] = '\0';
/*
* disk can be either the full special file name,
* the suffix of the special file name,
if (!sizest) {
msg("Date of this level %c dump: %s", level,
-#ifdef __linux__
- spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date));
-#else
- spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date));
-#endif
- msg("Date of last level %c dump: %s", lastlevel,
-#ifdef __linux__
- spcl.c_ddate == 0 ? "the epoch\n" : ctime4(&spcl.c_ddate));
-#else
- spcl.c_ddate == 0 ? "the epoch\n" : ctime(&spcl.c_ddate));
-#endif
+ ctime4(&spcl.c_date));
+ if (spcl.c_ddate)
+ msg("Date of last level %c dump: %s", lastlevel,
+ ctime4(&spcl.c_ddate));
msg("Dumping %s (%s) ", disk, spcl.c_filesys);
if (host)
msgtail("to %s on host %s\n", tape, host);
msg("Label: %s\n", spcl.c_label);
+ if (compressed)
+ msg("Compressing output at compression level %d\n", compressed);
+
#if defined(SIGINFO)
(void)signal(SIGINFO, statussig);
#endif
"can't allocate tape buffers - try a smaller blocking factor.\n");
startnewtape(1);
-#ifdef __linux__
- (void)time4(&(tstart_writing));
-#else
- (void)time((time_t *)&(tstart_writing));
-#endif
+ tstart_writing = time(NULL);
dumpmap(usedinomap, TS_CLRI, maxino - 1);
msg("dumping (Pass III) [directories]\n");
(void)dumpino(dp, ino);
}
-#ifdef __linux__
- (void)time4(&(tend_writing));
-#else
- (void)time((time_t *)&(tend_writing));
-#endif
+ tend_writing = time(NULL);
spcl.c_type = TS_END;
for (i = 0; i < ntrec; i++)
writeheader(maxino - 1);
spcl.c_tapea / (tend_writing - tstart_writing));
putdumptime();
-#ifdef __linux__
msg("Date of this level %c dump: %s", level,
spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date));
-#else
- msg("Date of this level %c dump: %s", level,
- spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date));
-#endif
msg("Date this dump completed: %s", ctime(&tnow));
msg("Average transfer rate: %ld KB/s\n", xferrate / tapeno);
+ if (compressed) {
+ long tapekb = bytes_written / 1024;
+ double rate = .0005 + (double) spcl.c_tapea / tapekb;
+ msg("Wrote %ldKB uncompressed, %ldKB compressed,"
+ " %1.3f:1\n",
+ spcl.c_tapea, tapekb, rate);
+ }
broadcast("DUMP IS DONE!\7\7\n");
msg("DUMP IS DONE\n");
usage(void)
{
char white[MAXPATHLEN];
- int i;
-
- strncpy(white, __progname, MAXPATHLEN-1);
- white[MAXPATHLEN-1] = '\0';
- for (i=0; i<MAXPATHLEN; ++i)
- if (white[i] != '\0') white[i] = ' ';
+ const char *ext2ver, *ext2date;
- fprintf(stderr,
- "%s %s\n", __progname, _DUMP_VERSION);
+ memset(white, ' ', MAXPATHLEN);
+ white[MIN(strlen(__progname), MAXPATHLEN - 1)] = '\0';
+
+#ifdef __linux__
+ ext2fs_get_library_version(&ext2ver, &ext2date);
+ fprintf(stderr, "%s %s (using libext2fs %s of %s)\n",
+ __progname, _DUMP_VERSION, ext2ver, ext2date);
+#else
+ fprintf(stderr, "%s %s\n", __progname, _DUMP_VERSION);
+#endif
fprintf(stderr,
"usage:\t%s [-0123456789ac"
#ifdef KERBEROS
"k"
#endif
- "MnSu] [-B records] [-b blocksize] [-d density]\n"
- "\t%s [-e inode#] [-f file] [-h level] [-s feet] [-T date] filesystem\n"
- "\t%s [-W | -w]\n", __progname, white, __progname);
+ "MnSu"
+ "] [-B records] [-b blocksize]\n"
+ "\t%s [-d density] [-e inode#] [-f file] [-h level] [-s feet]\n"
+ "\t%s [-T date] "
+#ifdef HAVE_ZLIB
+ "[-z zlevel] "
+#endif
+ "filesystem\n"
+ "\t%s [-W | -w]\n",
+ __progname, white, white, __progname);
exit(X_STARTUP);
}
}
}
-char *
-rawname(char *cp)
+const char *
+rawname(const char *cp)
{
#ifdef __linux__
return cp;
if (dp == NULL)
return (NULL);
- *dp = '\0';
- (void)strncpy(rawbuf, cp, MAXPATHLEN - 1);
- rawbuf[MAXPATHLEN-1] = '\0';
- *dp = '/';
+ (void)strncpy(rawbuf, cp, min(dp-cp, MAXPATHLEN - 1));
+ rawbuf[min(dp-cp, MAXPATHLEN-1)] = '\0';
(void)strncat(rawbuf, "/r", MAXPATHLEN - 1 - strlen(rawbuf));
(void)strncat(rawbuf, dp + 1, MAXPATHLEN - 1 - strlen(rawbuf));
return (rawbuf);
git.wh0rd.org / dump.git / blobdiff