From: Stelian Pop Date: Wed, 13 Oct 1999 09:57:12 +0000 (+0000) Subject: Added version in usage text. X-Git-Tag: release_0_4b8~6 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=df9ae507502f413c72119dde6ea3d35c91dba5bf;p=dump.git Added version in usage text. Added CVS tag in files for 'ident' usage. --- diff --git a/CHANGES b/CHANGES index 71fdc67..78e5758 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,13 @@ -$Id: CHANGES,v 1.5 1999/10/11 13:31:03 stelian Exp $ +$Id: CHANGES,v 1.6 1999/10/13 09:57:12 stelian Exp $ Changes between versions 0.4b7 and 0.4b8 (released ???????????????) =================================================================== -1. Put dump sources under CVS, added Id tags in all files. +1. Put dump sources under CVS, added Id tags in all files so + one can use 'ident' on binary files. + +2. Added the dump/restore version in the usage text so one can + easily verify the version he is using. Changes between versions 0.4b6 and 0.4b7 (released October 8, 1999) =================================================================== diff --git a/COPYRIGHT b/COPYRIGHT index cd9b353..96ad808 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -2,9 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * - * $Id: COPYRIGHT,v 1.3 1999/10/11 13:31:03 stelian Exp $ + * Stelian Pop , 1999 */ /*- diff --git a/MCONFIG.in b/MCONFIG.in index 308441d..abbb434 100644 --- a/MCONFIG.in +++ b/MCONFIG.in @@ -1,10 +1,10 @@ -# $Id: MCONFIG.in,v 1.4 1999/10/11 13:31:03 stelian Exp $ +# $Id: MCONFIG.in,v 1.5 1999/10/13 09:57:12 stelian Exp $ VPATH= $(srcdir) top_builddir= @top_builddir@ -VERSION= dump 0.4b7 +VERSION= 0.4b7 DATE= October 8, 1999 AR= @AR@ @@ -49,7 +49,7 @@ GLIBS= $(GLIBDIR) -L../compat/lib -lcompat -lext2fs -lcom_err # # Definitions (don't change them unless you know what you are doing) # -DEFS= -DRDUMP -DRRESTORE -D_BSD_SOURCE -D_USE_BSD_SIGNAL -DLINUX_FORK_BUG +DEFS= -DRDUMP -DRRESTORE -D_BSD_SOURCE -D_USE_BSD_SIGNAL -DLINUX_FORK_BUG -D_PATH_DUMPDATES=\"$(DUMPDATESPATH)\" -D_DUMP_VERSION=\"$(VERSION)\" all:: diff --git a/common/dumprmt.c b/common/dumprmt.c index 33f712b..4caedfa 100644 --- a/common/dumprmt.c +++ b/common/dumprmt.c @@ -2,9 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * - * $Id: dumprmt.c,v 1.5 1999/10/11 13:31:08 stelian Exp $ + * Stelian Pop , 1999 */ /*- @@ -41,11 +39,8 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)dumprmt.c 8.3 (Berkeley) 4/28/95"; -#endif static const char rcsid[] = - "$Id: dumprmt.c,v 1.5 1999/10/11 13:31:08 stelian Exp $"; + "$Id: dumprmt.c,v 1.6 1999/10/13 09:57:18 stelian Exp $"; #endif /* not lint */ #ifdef __linux__ diff --git a/compat/include/Makefile.in b/compat/include/Makefile.in index 0ad8908..7a52c7b 100644 --- a/compat/include/Makefile.in +++ b/compat/include/Makefile.in @@ -1,19 +1,16 @@ -# $Id: Makefile.in,v 1.2 1999/10/11 13:31:08 stelian Exp $ +# $Id: Makefile.in,v 1.3 1999/10/13 09:57:18 stelian Exp $ top_srcdir= @top_srcdir@ srcdir= @srcdir@ @MCONFIG@ -all:: pathnames.h - -pathnames.h: pathnames.h.in - sed -e "s|__DUMPDATES__|$(DUMPDATESPATH)|g" $< > $@ +all:: install:: clean:: - $(RM) -f \#* *~ core pathnames.h + $(RM) -f \#* *~ core distclean:: clean $(RM) -f Makefile Makefile.old .depend diff --git a/compat/include/bsdcompat.h b/compat/include/bsdcompat.h index 89d7ae9..ede2640 100644 --- a/compat/include/bsdcompat.h +++ b/compat/include/bsdcompat.h @@ -2,9 +2,9 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 + * Stelian Pop , 1999 * - * $Id: bsdcompat.h,v 1.5 1999/10/11 13:31:08 stelian Exp $ + * $Id: bsdcompat.h,v 1.6 1999/10/13 09:57:18 stelian Exp $ */ #include diff --git a/compat/include/compaterr.h b/compat/include/compaterr.h index 759db4d..dd0a196 100644 --- a/compat/include/compaterr.h +++ b/compat/include/compaterr.h @@ -2,8 +2,9 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 + * Stelian Pop , 1999 * + * $Id: compaterr.h,v 1.4 1999/10/13 09:57:18 stelian Exp $ */ /*- @@ -37,8 +38,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: compaterr.h,v 1.3 1999/10/11 13:31:09 stelian Exp $ */ #ifndef _ERR_H_ diff --git a/compat/include/compatglob.h b/compat/include/compatglob.h index 26432e4..2ccbbe4 100644 --- a/compat/include/compatglob.h +++ b/compat/include/compatglob.h @@ -2,8 +2,9 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 + * Stelian Pop , 1999 * + * $Id: compatglob.h,v 1.3 1999/10/13 09:57:18 stelian Exp $ */ /* @@ -40,8 +41,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: compatglob.h,v 1.2 1999/10/11 13:31:09 stelian Exp $ */ #ifndef _GLOB_H_ diff --git a/compat/include/fstab.h b/compat/include/fstab.h index 2ca06ec..7cad931 100644 --- a/compat/include/fstab.h +++ b/compat/include/fstab.h @@ -2,8 +2,9 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 + * Stelian Pop , 1999 * + * $Id: fstab.h,v 1.4 1999/10/13 09:57:18 stelian Exp $ */ /* @@ -37,8 +38,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: fstab.h,v 1.3 1999/10/11 13:31:09 stelian Exp $ */ #ifndef _FSTAB_H_ diff --git a/compat/include/pathnames.h b/compat/include/pathnames.h new file mode 100644 index 0000000..20454e3 --- /dev/null +++ b/compat/include/pathnames.h @@ -0,0 +1,48 @@ +/* + * Ported to Linux's Second Extended File System as part of the + * dump and restore backup suit + * Remy Card , 1994-1997 + * Stelian Pop , 1999 + * + * $Id: pathnames.h,v 1.5 1999/10/13 09:57:18 stelian Exp $ + */ + +/* + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 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 + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#define _PATH_DEFTAPE "/dev/st0" +#define _PATH_DTMP "/etc/dtmp" +#define _PATH_LOCK "/tmp/dumplockXXXXXX" +#define _PATH_RMT "/etc/rmt" /* path on remote host */ diff --git a/compat/include/pathnames.h.in b/compat/include/pathnames.h.in deleted file mode 100644 index 21e8dea..0000000 --- a/compat/include/pathnames.h.in +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Ported to Linux's Second Extended File System as part of the - * dump and restore backup suit - * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * - */ - -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $Id: pathnames.h.in,v 1.2 1999/10/11 13:31:09 stelian Exp $ - */ - -#include - -#define _PATH_DEFTAPE "/dev/st0" -#define _PATH_DTMP "/etc/dtmp" -#define _PATH_DUMPDATES "__DUMPDATES__" -#define _PATH_LOCK "/tmp/dumplockXXXXXX" -#define _PATH_RMT "/etc/rmt" /* path on remote host */ diff --git a/compat/lib/compaterr.c b/compat/lib/compaterr.c index 0388baa..2f91af9 100644 --- a/compat/lib/compaterr.c +++ b/compat/lib/compaterr.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /*- @@ -37,10 +36,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: compaterr.c,v 1.3 1999/10/11 13:31:10 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: compaterr.c,v 1.4 1999/10/13 09:57:19 stelian Exp $"; +#endif /* not lint */ + #include #include #include diff --git a/compat/lib/compatglob.c b/compat/lib/compatglob.c index 7616b80..d20a893 100644 --- a/compat/lib/compatglob.c +++ b/compat/lib/compatglob.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /* @@ -40,8 +39,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: compatglob.c,v 1.2 1999/10/11 13:31:10 stelian Exp $ */ /* @@ -69,6 +66,11 @@ * Number of matches in the current invocation of glob. */ +#ifndef lint +static const char rcsid[] = + "$Id: compatglob.c,v 1.3 1999/10/13 09:57:19 stelian Exp $"; +#endif /* not lint */ + #include #ifndef HAVE_GLOB diff --git a/compat/lib/fstab.c b/compat/lib/fstab.c index 32e6b02..3bbae80 100644 --- a/compat/lib/fstab.c +++ b/compat/lib/fstab.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /* @@ -37,10 +36,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: fstab.c,v 1.4 1999/10/11 13:31:10 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: fstab.c,v 1.5 1999/10/13 09:57:19 stelian Exp $"; +#endif /* not lint */ + #include #include #include diff --git a/dump/dump.8.in b/dump/dump.8.in index 2626858..67fab47 100644 --- a/dump/dump.8.in +++ b/dump/dump.8.in @@ -30,11 +30,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: dump.8.in,v 1.2 1999/10/11 13:31:10 stelian Exp $ +.\" $Id: dump.8.in,v 1.3 1999/10/13 09:57:19 stelian Exp $ .\" .Dd __DATE__ .Dt DUMP 8 -.Os "__VERSION__" +.Os "dump __VERSION__" .Sh NAME .Nm dump .Nd ext2 filesystem backup diff --git a/dump/dump.h b/dump/dump.h index d47b071..12228ec 100644 --- a/dump/dump.h +++ b/dump/dump.h @@ -2,8 +2,9 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 + * Stelian Pop , 1999 * + * $Id: dump.h,v 1.6 1999/10/13 09:57:19 stelian Exp $ */ /*- @@ -37,8 +38,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: dump.h,v 1.5 1999/10/11 13:31:11 stelian Exp $ */ #define MAXINOPB (MAXBSIZE / sizeof(struct dinode)) diff --git a/dump/itime.c b/dump/itime.c index 2529865..f0fa414 100644 --- a/dump/itime.c +++ b/dump/itime.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /*- @@ -37,10 +36,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: itime.c,v 1.5 1999/10/11 13:31:11 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: itime.c,v 1.6 1999/10/13 09:57:19 stelian Exp $"; +#endif /* not lint */ + #include #include #ifdef __linux__ diff --git a/dump/main.c b/dump/main.c index 1dc780d..3348e18 100644 --- a/dump/main.c +++ b/dump/main.c @@ -3,7 +3,6 @@ * dump and restore backup suit * Remy Card , 1994-1997 * Stelian Pop , 1999 - * */ /*- @@ -37,10 +36,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: main.c,v 1.5 1999/10/11 13:31:11 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: main.c,v 1.6 1999/10/13 09:57:19 stelian Exp $"; +#endif /* not lint */ + #include #include #ifdef __linux__ @@ -639,14 +641,24 @@ main(int argc, char *argv[]) static void usage(void) { + char white[MAXPATHLEN]; + int i; + + strncpy(white, __progname, MAXPATHLEN-1); + white[MAXPATHLEN-1] = '\0'; + for (i=0; i, 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /*- @@ -37,10 +36,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: optr.c,v 1.5 1999/10/11 13:31:11 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: optr.c,v 1.6 1999/10/13 09:57:20 stelian Exp $"; +#endif /* not lint */ + #include #include #include diff --git a/dump/tape.c b/dump/tape.c index 4aaffb3..b0d7fd4 100644 --- a/dump/tape.c +++ b/dump/tape.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /*- @@ -37,10 +36,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: tape.c,v 1.5 1999/10/11 13:31:11 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: tape.c,v 1.6 1999/10/13 09:57:20 stelian Exp $"; +#endif /* not lint */ + #ifdef __linux__ #include #include diff --git a/dump/traverse.c b/dump/traverse.c index c4e739c..0865527 100644 --- a/dump/traverse.c +++ b/dump/traverse.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /*- @@ -37,10 +36,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: traverse.c,v 1.5 1999/10/11 13:31:11 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: traverse.c,v 1.6 1999/10/13 09:57:20 stelian Exp $"; +#endif /* not lint */ + #include #include #ifdef __linux__ diff --git a/dump/unctime.c b/dump/unctime.c index 845a333..a51c863 100644 --- a/dump/unctime.c +++ b/dump/unctime.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /*- @@ -37,10 +36,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: unctime.c,v 1.5 1999/10/11 13:31:12 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: unctime.c,v 1.6 1999/10/13 09:57:20 stelian Exp $"; +#endif /* not lint */ + #include #ifdef __STDC__ #include diff --git a/restore/dirs.c b/restore/dirs.c index e4cffd9..abc6181 100644 --- a/restore/dirs.c +++ b/restore/dirs.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /* @@ -42,10 +41,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: dirs.c,v 1.5 1999/10/11 13:31:12 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: dirs.c,v 1.6 1999/10/13 09:57:20 stelian Exp $"; +#endif /* not lint */ + #include #include #include diff --git a/restore/extern.h b/restore/extern.h index 8cf3f2c..eb004e2 100644 --- a/restore/extern.h +++ b/restore/extern.h @@ -2,8 +2,9 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 + * Stelian Pop , 1999 * + * $Id: extern.h,v 1.6 1999/10/13 09:57:20 stelian Exp $ */ /*- @@ -37,8 +38,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: extern.h,v 1.5 1999/10/11 13:31:12 stelian Exp $ */ struct entry *addentry __P((char *, ino_t, int)); diff --git a/restore/interactive.c b/restore/interactive.c index 24cf18c..1bfd201 100644 --- a/restore/interactive.c +++ b/restore/interactive.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /* @@ -37,10 +36,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: interactive.c,v 1.5 1999/10/11 13:31:12 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: interactive.c,v 1.6 1999/10/13 09:57:20 stelian Exp $"; +#endif /* not lint */ + #include #include diff --git a/restore/main.c b/restore/main.c index b3a09ff..61ad4e6 100644 --- a/restore/main.c +++ b/restore/main.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /* @@ -37,10 +36,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: main.c,v 1.5 1999/10/11 13:31:13 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: main.c,v 1.6 1999/10/13 09:57:21 stelian Exp $"; +#endif /* not lint */ + #include #include #include @@ -354,12 +356,15 @@ usage(void) #else #define kerbflag #endif - (void)fprintf(stderr, "usage:\t%s\n\t%s\n\t%s\n\t%s\n\t%s\n", - "restore -i [-ch" kerbflag "muvy] [-b blocksize] [-f file] [-s fileno]", - "restore -r [-c" kerbflag "uvy] [-b blocksize] [-f file] [-s fileno]", - "restore -R [-c" kerbflag "uvy] [-b blocksize] [-f file] [-s fileno]", - "restore -x [-ch" kerbflag "muvy] [-b blocksize] [-f file] [-s fileno] [file ...]", - "restore -t [-ch" kerbflag "kuvy] [-b blocksize] [-f file] [-s fileno] [file ...]"); + (void)fprintf(stderr, + "%s %s\n", __progname, _DUMP_VERSION); + (void)fprintf(stderr, + "usage:\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n", + __progname, " -i [-ch" kerbflag "muvy] [-b blocksize] [-f file] [-s fileno]", + __progname, " -r [-c" kerbflag "uvy] [-b blocksize] [-f file] [-s fileno]", + __progname, " -R [-c" kerbflag "uvy] [-b blocksize] [-f file] [-s fileno]", + __progname, " -x [-ch" kerbflag "muvy] [-b blocksize] [-f file] [-s fileno] [file ...]", + __progname, " -t [-ch" kerbflag "kuvy] [-b blocksize] [-f file] [-s fileno] [file ...]"); exit(1); } diff --git a/restore/restore.8.in b/restore/restore.8.in index 7d846d6..712dcf4 100644 --- a/restore/restore.8.in +++ b/restore/restore.8.in @@ -29,11 +29,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: restore.8.in,v 1.2 1999/10/11 13:31:13 stelian Exp $ +.\" $Id: restore.8.in,v 1.3 1999/10/13 09:57:21 stelian Exp $ .\" .Dd __DATE__ .Dt RESTORE 8 -.Os "__VERSION__" +.Os "restore __VERSION__" .Sh NAME .Nm restore .Nd "restore files or file systems from backups made with dump" diff --git a/restore/restore.c b/restore/restore.c index 2c10892..b2defc2 100644 --- a/restore/restore.c +++ b/restore/restore.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /* @@ -37,10 +36,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: restore.c,v 1.5 1999/10/11 13:31:13 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: restore.c,v 1.6 1999/10/13 09:57:21 stelian Exp $"; +#endif /* not lint */ + #include #ifdef __linux__ diff --git a/restore/restore.h b/restore/restore.h index 87a0397..d6c4d99 100644 --- a/restore/restore.h +++ b/restore/restore.h @@ -2,8 +2,9 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 + * Stelian Pop , 1999 * + * $Id: restore.h,v 1.5 1999/10/13 09:57:21 stelian Exp $ */ /* @@ -42,8 +43,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: restore.h,v 1.4 1999/10/11 13:31:13 stelian Exp $ */ /* diff --git a/restore/symtab.c b/restore/symtab.c index 35d0064..3fd05a6 100644 --- a/restore/symtab.c +++ b/restore/symtab.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /* @@ -37,10 +36,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: symtab.c,v 1.5 1999/10/11 13:31:13 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: symtab.c,v 1.6 1999/10/13 09:57:21 stelian Exp $"; +#endif /* not lint */ + /* * These routines maintain the symbol table which tracks the state * of the file system being restored. They provide lookup by either diff --git a/restore/tape.c b/restore/tape.c index 32a5582..5551981 100644 --- a/restore/tape.c +++ b/restore/tape.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /* @@ -42,10 +41,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: tape.c,v 1.5 1999/10/11 13:31:13 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: tape.c,v 1.6 1999/10/13 09:57:21 stelian Exp $"; +#endif /* not lint */ + #include #include #include diff --git a/restore/utilities.c b/restore/utilities.c index 44cea04..de508cd 100644 --- a/restore/utilities.c +++ b/restore/utilities.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /* @@ -37,10 +36,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: utilities.c,v 1.5 1999/10/11 13:31:14 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: utilities.c,v 1.6 1999/10/13 09:57:21 stelian Exp $"; +#endif /* not lint */ + #include #include diff --git a/rmt/rmt.8.in b/rmt/rmt.8.in index e887878..33b1bff 100644 --- a/rmt/rmt.8.in +++ b/rmt/rmt.8.in @@ -29,11 +29,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: rmt.8.in,v 1.2 1999/10/11 13:31:14 stelian Exp $ +.\" $Id: rmt.8.in,v 1.3 1999/10/13 09:57:22 stelian Exp $ .\" .Dd __DATE__ .Dt RMT 8 -.Os "__VERSION__" +.Os "rmt __VERSION__" .Sh NAME .Nm rmt .Nd remote magtape protocol module diff --git a/rmt/rmt.c b/rmt/rmt.c index 590bbc4..fc1a5d1 100644 --- a/rmt/rmt.c +++ b/rmt/rmt.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /* @@ -37,10 +36,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: rmt.c,v 1.5 1999/10/11 13:31:14 stelian Exp $ */ +#ifndef lint +static const char rcsid[] = + "$Id: rmt.c,v 1.6 1999/10/13 09:57:22 stelian Exp $"; +#endif /* not linux */ + /* * rmt */