* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.81 2003/01/21 10:42:27 stelian Exp $";
+ "$Id: main.c,v 1.85 2003/03/31 09:42:58 stelian Exp $";
#endif /* not lint */
#include <config.h>
char *dumpdates; /* name of the file containing dump date information*/
char lastlevel; /* dump level of previous dump */
char level; /* dump level of this dump */
-int bzipflag; /* compression is done using bzlib */
-int Afile = 0; /* archive file descriptor */
+int zipflag; /* which compression method */
+int Afile = -1; /* archive file descriptor */
+int AfileActive = 1;/* Afile flag */
int uflag; /* update flag */
int mflag; /* dump metadata only if possible */
int Mflag; /* multi-volume flag */
"Q:"
#endif
"s:ST:uvWw"
+#ifdef HAVE_LZO
+ "y"
+#endif
#ifdef HAVE_ZLIB
"z::"
#endif
case 'A': /* archive file */
Apath = optarg;
- if ((Afile = open(Apath, O_RDWR|O_CREAT|O_TRUNC,
- S_IRUSR | S_IWUSR)) < 0) {
- msg("Cannot open %s for writing: %s\n",
- optarg, strerror(errno));
- msg("The ENTIRE dump is aborted.\n");
- exit(X_STARTUP);
- }
- memset(volinfo, 0, TP_NINOS * sizeof(dump_ino_t));
break;
case 'a': /* `auto-size', Write to EOM. */
#ifdef HAVE_BZLIB
case 'j':
compressed = 2;
- bzipflag = 1;
+ zipflag = COMPRESS_BZLIB;
if (optarg)
compressed = numarg("compress level", 1L, 9L);
break;
case 'w':
lastdump(ch);
exit(X_FINOK); /* do nothing else */
+#ifdef HAVE_LZO
+ case 'y':
+ compressed = 2;
+ zipflag = COMPRESS_LZO;
+ break;
+#endif /* HAVE_LZO */
+
#ifdef HAVE_ZLIB
case 'z':
compressed = 2;
+ zipflag = COMPRESS_ZLIB;
if (optarg)
compressed = numarg("compress level", 1L, 9L);
break;
#endif
}
(void)setuid(getuid()); /* rmthost() is the only reason to be setuid */
+ if (Apath && (Afile = open(Apath, O_WRONLY|O_CREAT|O_TRUNC,
+ S_IRUSR | S_IWUSR | S_IRGRP |
+ S_IWGRP | S_IROTH | S_IWOTH)) < 0) {
+ msg("Cannot open %s for writing: %s\n",
+ optarg, strerror(errno));
+ msg("The ENTIRE dump is aborted.\n");
+ exit(X_STARTUP);
+ }
if (signal(SIGHUP, SIG_IGN) != SIG_IGN)
signal(SIGHUP, sig);
msg("Writing %d Kilobyte records\n", ntrec);
- if (compressed)
- msg("Compressing output at compression level %d (%s)\n",
- compressed, bzipflag ? "bzlib" : "zlib");
+ if (compressed) {
+ if (zipflag == COMPRESS_LZO)
+ msg("Compressing output (lzo)\n");
+ else
+ msg("Compressing output at compression level %d (%s)\n",
+ compressed, zipflag == COMPRESS_ZLIB ? "zlib" : "bzlib");
+ }
}
#if defined(SIGINFO)
if (directory[0] == 0)
anydirskipped = mapfiles(maxino, &tapesize);
else {
- if (STAT(pathname, &statbuf) == -1) {
+ if (LSTAT(pathname, &statbuf) == -1) {
msg("File cannot be accessed (%s).\n", pathname);
msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
int anydirskipped2;
char *p = *argv;
/* check if file is available */
- if (STAT(p, &statbuf) == -1) {
+ if (LSTAT(p, &statbuf) == -1) {
msg("File cannot be accessed (%s).\n", p);
msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
#ifdef USE_QFA
if (tapepos) {
msg("writing QFA positions to %s\n", gTapeposfile);
- if ((gTapeposfd = open(gTapeposfile, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR | S_IWUSR)) < 0)
+ if ((gTapeposfd = open(gTapeposfile,
+ O_WRONLY|O_CREAT|O_TRUNC,
+ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP
+ | S_IROTH | S_IWOTH)) < 0)
quit("can't open tapeposfile\n");
/* print QFA-file header */
snprintf(gTps, sizeof(gTps), "%s\n%s\n%ld\n\n", QFA_MAGIC, QFA_VERSION, (unsigned long)spcl.c_date);
tend_writing = time(NULL);
spcl.c_type = TS_END;
- if (Afile) {
+ if (Afile >= 0) {
volinfo[1] = ROOTINO;
memcpy(spcl.c_inos, volinfo, TP_NINOS * sizeof(dump_ino_t));
spcl.c_flags |= DR_INODEINFO;
spcl.c_tapea, tapekb, rate);
}
- if (Afile)
+ if (Afile >= 0)
msg("Archiving dump to %s\n", Apath);
broadcast("DUMP IS DONE!\7\7\n");
"[-j zlevel] "
#endif
#ifdef USE_QFA
- "[-Q file] "
+ "[-Q file]\n"
+#endif
+ "\t%s [-s feet] "
+ "[-T date] "
+#ifdef HAVE_LZO
+ "[-y] "
#endif
- "[-s feet]\n"
- "\t%s [-T date] "
#ifdef HAVE_ZLIB
"[-z zlevel] "
#endif