#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.31 2000/12/04 15:43:16 stelian Exp $";
+ "$Id: main.c,v 1.35 2001/03/19 13:22:48 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 */
+long long bytes_written = 0; /* total bytes written */
+long uncomprblks = 0;/* uncompressed blocks written */
#ifdef __linux__
char *__progname;
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
+ "Mns:ST:uWw"
+#ifdef HAVE_ZLIB
+ "z"
#endif
- while ((ch = getopt(argc, argv, optstring)) != -1)
+ )) != -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 = 1;
+ 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,
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,"
+ " compression ratio %1.3f\n",
+ spcl.c_tapea, tapekb, rate);
+ }
broadcast("DUMP IS DONE!\7\7\n");
msg("DUMP IS DONE\n");
#ifdef KERBEROS
"k"
#endif
- "MnSu] [-B records] [-b blocksize] [-d density]\n"
+ "MnSu"
+#ifdef HAVE_ZLIB
+ "z"
+#endif
+ "] [-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);
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);