From: Stelian Pop Date: Mon, 13 Aug 2001 16:17:52 +0000 (+0000) Subject: Cleaned up the external variables definition mess... X-Git-Tag: release_0_4b24~10 X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=commitdiff_plain;h=f48a055e452249091f3c6851a20431a8c87135b1 Cleaned up the external variables definition mess... --- diff --git a/CHANGES b/CHANGES index 2514ada..ff90fc7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,13 @@ -$Id: CHANGES,v 1.129 2001/08/13 15:48:51 stelian Exp $ +$Id: CHANGES,v 1.130 2001/08/13 16:17:52 stelian Exp $ Changes between versions 0.4b23 and 0.4b24 (released ?????????????) =================================================================== -1. Fix the permissions of a newly created QFA file by dump. +1. Fixed the permissions of a newly created QFA file by dump. + +2. Cleaned up the source of dump (the external variables + definition was a complete mess, making possible to have + objects overlap). Changes between versions 0.4b22 and 0.4b23 (released July 20, 2001) =================================================================== diff --git a/common/dumprmt.c b/common/dumprmt.c index 12d60fc..941f7dd 100644 --- a/common/dumprmt.c +++ b/common/dumprmt.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: dumprmt.c,v 1.17 2001/06/18 10:58:28 stelian Exp $"; + "$Id: dumprmt.c,v 1.18 2001/08/13 16:17:52 stelian Exp $"; #endif /* not lint */ #include @@ -89,8 +89,8 @@ static const char rcsid[] = #include #endif -#include "pathnames.h" -#include "dump.h" +#include +#include "dump.h" /* for X_STARTUP, X_ABORT etc */ #define TS_CLOSED 0 #define TS_OPEN 1 diff --git a/compat/lib/system.c b/compat/lib/system.c index 3f94008..6b73d63 100644 --- a/compat/lib/system.c +++ b/compat/lib/system.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: system.c,v 1.1 2001/07/18 12:54:06 stelian Exp $"; + "$Id: system.c,v 1.2 2001/08/13 16:17:52 stelian Exp $"; #endif /* not lint */ #include @@ -52,6 +52,7 @@ static const char rcsid[] = #include #include #include +#include "system.h" /* * Executes the command in a shell. diff --git a/dump/dump.h b/dump/dump.h index dacfee1..4836ba8 100644 --- a/dump/dump.h +++ b/dump/dump.h @@ -5,7 +5,7 @@ * Stelian Pop , 1999-2000 * Stelian Pop - Alcôve , 2000 * - * $Id: dump.h,v 1.29 2001/07/20 11:02:45 stelian Exp $ + * $Id: dump.h,v 1.30 2001/08/13 16:17:52 stelian Exp $ */ /*- @@ -50,10 +50,10 @@ /* * Dump maps used to describe what is to be dumped. */ -int mapsize; /* size of the state maps */ -char *usedinomap; /* map of allocated inodes */ -char *dumpdirmap; /* map of directories to be dumped */ -char *dumpinomap; /* map of files to be dumped */ +extern int mapsize; /* size of the state maps */ +extern char *usedinomap; /* map of allocated inodes */ +extern char *dumpdirmap; /* map of directories to be dumped */ +extern char *dumpinomap; /* map of files to be dumped */ /* * Map manipulation macros. */ @@ -67,54 +67,54 @@ char *dumpinomap; /* map of files to be dumped */ /* * All calculations done in 0.1" units! */ -const char *disk; /* name of the disk file */ -char tape[MAXPATHLEN]; /* name of the tape file */ -char *tapeprefix; /* prefix of the tape file */ -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 uflag; /* update flag */ -int Mflag; /* multi-volume flag */ -char *eot_script; /* end of volume script fiag */ -int diskfd; /* disk file descriptor */ -int tapefd; /* tape file descriptor */ -int pipeout; /* true => output to standard output */ -int fifoout; /* true => output to fifo */ -dump_ino_t curino; /* current inumber; used globally */ -int newtape; /* new tape flag */ -int density; /* density in 0.1" units */ -long tapesize; /* estimated tape size, blocks */ -long tsize; /* tape size in 0.1" units */ -long asize; /* number of 0.1" units written on current tape */ -int etapes; /* estimated number of tapes */ -int nonodump; /* if set, do not honor UF_NODUMP user flags */ -int unlimited; /* if set, write to end of medium */ -int compressed; /* if set, dump is to be compressed */ -long long bytes_written;/* total bytes written to tape */ -long uncomprblks; /* uncompressed blocks written to tape */ -int notify; /* notify operator flag */ -int blockswritten; /* number of blocks written on current tape */ -int tapeno; /* current tape number */ -time_t tstart_writing; /* when started writing the first tape block */ -time_t tend_writing; /* after writing the last tape block */ +extern const char *disk; /* name of the disk file */ +extern char tape[MAXPATHLEN];/* name of the tape file */ +extern char *tapeprefix; /* prefix of the tape file */ +extern char *dumpdates; /* name of the file containing dump date information*/ +extern char lastlevel; /* dump level of previous dump */ +extern char level; /* dump level of this dump */ +extern int uflag; /* update flag */ +extern int Mflag; /* multi-volume flag */ +extern char *eot_script; /* end of volume script fiag */ +extern int diskfd; /* disk file descriptor */ +extern int tapefd; /* tape file descriptor */ +extern int pipeout; /* true => output to standard output */ +extern int fifoout; /* true => output to fifo */ +extern dump_ino_t curino; /* current inumber; used globally */ +extern int newtape; /* new tape flag */ +extern int density; /* density in 0.1" units */ +extern long tapesize; /* estimated tape size, blocks */ +extern long tsize; /* tape size in 0.1" units */ +extern long asize; /* number of 0.1" units written on current tape */ +extern int etapes; /* estimated number of tapes */ +extern int nonodump; /* if set, do not honor UF_NODUMP user flags */ +extern int unlimited; /* if set, write to end of medium */ +extern int compressed; /* if set, dump is to be compressed */ +extern long long bytes_written;/* total bytes written to tape */ +extern long uncomprblks; /* uncompressed blocks written to tape */ +extern int notify; /* notify operator flag */ +extern int blockswritten; /* number of blocks written on current tape */ +extern int tapeno; /* current tape number */ +extern time_t tstart_writing; /* when started writing the first tape block */ +extern time_t tend_writing; /* after writing the last tape block */ #ifdef __linux__ -ext2_filsys fs; +extern ext2_filsys fs; #else -struct fs *sblock; /* the file system super block */ -char sblock_buf[MAXBSIZE]; +extern struct fs *sblock; /* the file system super block */ +extern char sblock_buf[MAXBSIZE]; #endif -long xferrate; /* averaged transfer rate of all volumes */ -long dev_bsize; /* block size of underlying disk device */ -int dev_bshift; /* log2(dev_bsize) */ -int tp_bshift; /* log2(TP_BSIZE) */ +extern long xferrate; /* averaged transfer rate of all volumes */ +extern long dev_bsize; /* block size of underlying disk device */ +extern int dev_bshift; /* log2(dev_bsize) */ +extern int tp_bshift; /* log2(TP_BSIZE) */ #ifdef USE_QFA #define QFA_MAGIC "495115637697" #define QFA_VERSION "1.0" -int gTapeposfd; -char *gTapeposfile; -char gTps[255]; -int32_t gThisDumpDate; +extern int gTapeposfd; +extern char *gTapeposfile; +extern char gTps[255]; +extern int32_t gThisDumpDate; int GetTapePos __P((long *pos)); #endif /* USE_QFA */ @@ -223,10 +223,10 @@ struct dumptime { struct dumpdates dt_value; struct dumptime *dt_next; }; -struct dumptime *dthead; /* head of the list version */ -int nddates; /* number of records (might be zero) */ -int ddates_in; /* we have read the increment file */ -struct dumpdates **ddatev; /* the arrayfied version */ +extern struct dumptime *dthead; /* head of the list version */ +extern int nddates; /* number of records (might be zero) */ +extern int ddates_in; /* we have read the increment file */ +extern struct dumpdates **ddatev; /* the arrayfied version */ void initdumptimes __P((int)); void getdumptime __P((int)); void putdumptime __P((void)); diff --git a/dump/main.c b/dump/main.c index 1556bf0..7a5884b 100644 --- a/dump/main.c +++ b/dump/main.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.55 2001/08/13 15:48:52 stelian Exp $"; + "$Id: main.c,v 1.56 2001/08/13 16:17:52 stelian Exp $"; #endif /* not lint */ #include @@ -88,6 +88,67 @@ static const char rcsid[] = #define SBOFF (SBLOCK * DEV_BSIZE) #endif +/* + * Dump maps used to describe what is to be dumped. + */ +int mapsize; /* size of the state maps */ +char *usedinomap; /* map of allocated inodes */ +char *dumpdirmap; /* map of directories to be dumped */ +char *dumpinomap; /* map of files to be dumped */ + +const char *disk; /* name of the disk file */ +char tape[MAXPATHLEN];/* name of the tape file */ +char *tapeprefix; /* prefix of the tape file */ +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 uflag; /* update flag */ +int Mflag; /* multi-volume flag */ +char *eot_script; /* end of volume script fiag */ +int diskfd; /* disk file descriptor */ +int tapefd; /* tape file descriptor */ +int pipeout; /* true => output to standard output */ +int fifoout; /* true => output to fifo */ +dump_ino_t curino; /* current inumber; used globally */ +int newtape; /* new tape flag */ +int density; /* density in 0.1" units */ +long tapesize; /* estimated tape size, blocks */ +long tsize; /* tape size in 0.1" units */ +long asize; /* number of 0.1" units written on current tape */ +int etapes; /* estimated number of tapes */ +int nonodump; /* if set, do not honor UF_NODUMP user flags */ +int unlimited; /* if set, write to end of medium */ +int compressed; /* if set, dump is to be compressed */ +long long bytes_written;/* total bytes written to tape */ +long uncomprblks; /* uncompressed blocks written to tape */ +int notify; /* notify operator flag */ +int blockswritten; /* number of blocks written on current tape */ +int tapeno; /* current tape number */ +time_t tstart_writing; /* when started writing the first tape block */ +time_t tend_writing; /* after writing the last tape block */ +#ifdef __linux__ +ext2_filsys fs; +#else +struct fs *sblock; /* the file system super block */ +char sblock_buf[MAXBSIZE]; +#endif +long xferrate; /* averaged transfer rate of all volumes */ +long dev_bsize; /* block size of underlying disk device */ +int dev_bshift; /* log2(dev_bsize) */ +int tp_bshift; /* log2(TP_BSIZE) */ + +#ifdef USE_QFA +int gTapeposfd; +char *gTapeposfile; +char gTps[255]; +int32_t gThisDumpDate; +#endif /* USE_QFA */ + +struct dumptime *dthead; /* head of the list version */ +int nddates; /* number of records (might be zero) */ +int ddates_in; /* we have read the increment file */ +struct dumpdates **ddatev; /* the arrayfied version */ + int notify = 0; /* notify operator flag */ int blockswritten = 0; /* number of blocks written on current tape */ int tapeno = 0; /* current tape number */ diff --git a/restore/main.c b/restore/main.c index 8b6b08e..8d9c6d2 100644 --- a/restore/main.c +++ b/restore/main.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.26 2001/07/18 13:12:33 stelian Exp $"; + "$Id: main.c,v 1.27 2001/08/13 16:17:52 stelian Exp $"; #endif /* not lint */ #include @@ -81,7 +81,7 @@ static const char rcsid[] = #include "extern.h" int bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0; -int hflag = 1, mflag = 1, Nflag = 0, zflag = 0; +int hflag = 1, mflag = 1, Mflag = 0, Nflag = 0, zflag = 0; int uflag = 0; int dokerberos = 0; char command = '\0'; @@ -101,6 +101,14 @@ char filesys[NAMELEN]; static const char *stdin_opt = NULL; char *bot_script = NULL; +#ifdef USE_QFA +FILE *gTapeposfp; +char *gTapeposfile; +char gTps[255]; +long gSeekstart; +int tapeposflag; +#endif /* USE_QFA */ + #ifdef __linux__ char *__progname; #endif diff --git a/restore/restore.h b/restore/restore.h index 0ae65ba..81dfdc7 100644 --- a/restore/restore.h +++ b/restore/restore.h @@ -5,7 +5,7 @@ * Stelian Pop , 1999-2000 * Stelian Pop - Alcôve , 2000 * - * $Id: restore.h,v 1.16 2001/07/18 12:54:06 stelian Exp $ + * $Id: restore.h,v 1.17 2001/08/13 16:17:52 stelian Exp $ */ /* @@ -166,9 +166,9 @@ typedef struct rstdirdesc RST_DIR; #ifdef USE_QFA #define QFA_MAGIC "495115637697" #define QFA_VERSION "1.0" -FILE *gTapeposfp; -char *gTapeposfile; -char gTps[255]; -long gSeekstart; -int tapeposflag; +extern FILE *gTapeposfp; +extern char *gTapeposfile; +extern char gTps[255]; +extern long gSeekstart; +extern int tapeposflag; #endif /* USE_QFA */