From 717bdcef94c7487831a43048751ca868f7d8bae4 Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Tue, 24 Apr 2001 10:59:12 +0000 Subject: [PATCH] Cosmetic changes to QFA code / time.h headers. --- dump/main.c | 8 ++++---- dump/tape.c | 50 ++++++++++++++++++++++----------------------- restore/main.c | 13 ++++++++++-- restore/symtab.c | 3 ++- restore/utilities.c | 3 ++- 5 files changed, 44 insertions(+), 33 deletions(-) diff --git a/dump/main.c b/dump/main.c index d3ebc82..506c270 100644 --- a/dump/main.c +++ b/dump/main.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.45 2001/04/12 16:03:29 stelian Exp $"; + "$Id: main.c,v 1.46 2001/04/24 10:59:12 stelian Exp $"; #endif /* not lint */ #include @@ -91,7 +91,7 @@ int ntrec = NTREC; /* # tape blocks in each tape record */ int cartridge = 0; /* Assume non-cartridge tape */ #ifdef USE_QFA int tapepos = 0; /* assume no QFA tapeposition needed by user */ -#endif /* USA_QFA */ +#endif /* USE_QFA */ int dokerberos = 0; /* Use Kerberos authentication */ long dev_bsize = 1; /* recalculated below */ long blocksperfile; /* output blocks per file */ @@ -160,7 +160,7 @@ main(int argc, char *argv[]) #ifdef USE_QFA gTapeposfd = -1; -#endif /* USA_QFA */ +#endif /* USE_QFA */ while ((ch = getopt(argc, argv, "0123456789aB:b:cd:e:f:F:h:L:" @@ -282,7 +282,7 @@ main(int argc, char *argv[]) gTapeposfile = optarg; tapepos = 1; break; -#endif /* USA_QFA */ +#endif /* USE_QFA */ case 's': /* tape size, feet */ unlimited = 0; diff --git a/dump/tape.c b/dump/tape.c index 74bbcbd..cf1f5fb 100644 --- a/dump/tape.c +++ b/dump/tape.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: tape.c,v 1.43 2001/04/12 16:03:29 stelian Exp $"; + "$Id: tape.c,v 1.44 2001/04/24 10:59:12 stelian Exp $"; #endif /* not lint */ #include @@ -1056,7 +1056,7 @@ doslave(int cmd, int slave_number) long curtapepos; union u_spcl *uspclptr; struct s_spcl *spclptr; -#endif /* USA_QFA */ +#endif /* USE_QFA */ /* * Need our own seek pointer. @@ -1108,29 +1108,6 @@ doslave(int cmd, int slave_number) } } -#ifdef USE_QFA - if (gTapeposfd >= 0) { - uspclptr = (union u_spcl *)&slp->tblock[0]; - spclptr = &uspclptr->s_spcl; - if ((spclptr->c_magic == NFS_MAGIC) && - (spclptr->c_type == TS_INODE)) { - /* if an error occured previously don't - * try again */ - if (gtperr == 0) { - if ((gtperr = GetTapePos(&curtapepos)) == 0) { -#ifdef DEBUG_QFA - msg("inode %ld at tapepos %ld\n", spclptr->c_inumber, curtapepos); -#endif - sprintf(gTps, "%ld\t%d\t%ld\n", (unsigned long)spclptr->c_inumber, tapeno, curtapepos); - if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps)) { - quit("error writing tapepos file.\n"); - } - } - } - } - } -#endif /* USE_QFA */ - /* Try to write the data... */ wrote = 0; eot_count = 0; @@ -1187,6 +1164,29 @@ doslave(int cmd, int slave_number) ready = 0; caught = 0; +#ifdef USE_QFA + if (gTapeposfd >= 0) { + uspclptr = (union u_spcl *)&slp->tblock[0]; + spclptr = &uspclptr->s_spcl; + if ((spclptr->c_magic == NFS_MAGIC) && + (spclptr->c_type == TS_INODE)) { + /* if an error occured previously don't + * try again */ + if (gtperr == 0) { + if ((gtperr = GetTapePos(&curtapepos)) == 0) { +#ifdef DEBUG_QFA + msg("inode %ld at tapepos %ld\n", spclptr->c_inumber, curtapepos); +#endif + sprintf(gTps, "%ld\t%d\t%ld\n", (unsigned long)spclptr->c_inumber, tapeno, curtapepos); + if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps)) { + warn("error writing tapepos file.\n"); + } + } + } + } + } +#endif /* USE_QFA */ + while (eot_count < 10 && size < bufsize) { #ifdef RDUMP if (host) diff --git a/restore/main.c b/restore/main.c index 8911d20..64870e6 100644 --- a/restore/main.c +++ b/restore/main.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.20 2001/04/10 12:46:53 stelian Exp $"; + "$Id: main.c,v 1.21 2001/04/24 10:59:13 stelian Exp $"; #endif /* not lint */ #include @@ -50,6 +50,8 @@ static const char rcsid[] = #include #ifdef __linux__ +#include +#include #ifdef HAVE_EXT2FS_EXT2_FS_H #include #else @@ -484,11 +486,18 @@ usage(void) #else #define kerbflag #endif + +#ifdef USE_QFA +#define qfaflag "[-Q file] " +#else +#define qfaflag +#endif + (void)fprintf(stderr, "usage:\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n", __progname, " -C [-c" kerbflag "Mvy] [-b blocksize] [-D filesystem] [-f file] [-s fileno]", __progname, " -i [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno]", - __progname, " -r [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [-T directory]", + __progname, " -r [-c" kerbflag "Muvy] [-b blocksize] [-f file] " qfaflag "[-s fileno] [-T directory]", __progname, " -R [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [-T directory]", __progname, " -t [-ch" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [-X filelist] [file ...]", __progname, " -x [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno] [-X filelist] [file ...]"); diff --git a/restore/symtab.c b/restore/symtab.c index abf8d7a..4cabfb5 100644 --- a/restore/symtab.c +++ b/restore/symtab.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: symtab.c,v 1.13 2001/03/20 10:02:48 stelian Exp $"; + "$Id: symtab.c,v 1.14 2001/04/24 10:59:13 stelian Exp $"; #endif /* not lint */ /* @@ -59,6 +59,7 @@ static const char rcsid[] = #ifdef __linux__ #include +#include #include #include #else /* __linux__ */ diff --git a/restore/utilities.c b/restore/utilities.c index e2bf2e2..95cb216 100644 --- a/restore/utilities.c +++ b/restore/utilities.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: utilities.c,v 1.14 2001/04/10 12:46:53 stelian Exp $"; + "$Id: utilities.c,v 1.15 2001/04/24 10:59:13 stelian Exp $"; #endif /* not lint */ #include @@ -56,6 +56,7 @@ static const char rcsid[] = #ifdef __linux__ #include +#include #include #include #include -- 2.39.5