Added version in usage text.

Added CVS tag in files for 'ident' usage.

diff --git a/CHANGES b/CHANGES
index 71fdc679af6a589d8ae5a06d30016cf298b6f7e7..78e5758af29832e509729ea4da15e6bcc5d09878 100644 (file)
--- 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 ???????????????)
 ===================================================================
 
 
 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)
 ===================================================================
 
 Changes between versions 0.4b6 and 0.4b7 (released October 8, 1999)
 ===================================================================

diff --git a/COPYRIGHT b/COPYRIGHT
index cd9b353da75a8d13bb02a41c2a2836c28f2a1c1b..96ad8087b18f26a19c9a568b8ceac7729306f646 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999
- *
- * $Id: COPYRIGHT,v 1.3 1999/10/11 13:31:03 stelian Exp $
+ *     Stelian Pop <pop@cybercable.fr>, 1999

  */
 
 /*-
  */
 
 /*-

diff --git a/MCONFIG.in b/MCONFIG.in
index 308441df4ca4520c37951bc1da11e4fe70066141..abbb434d145284ea921b077dddf0bd1c125ff7a1 100644 (file)
--- 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@
 
 
 VPATH=         $(srcdir)
 
 top_builddir=  @top_builddir@
 

-VERSION=       dump 0.4b7
+VERSION=       0.4b7

 DATE=          October 8, 1999
 
 AR=            @AR@
 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)
 #
 #
 # 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::
 
 
 all::
 

diff --git a/common/dumprmt.c b/common/dumprmt.c
index 33f712b1e9f65a23323d4692a7ac2d75f3c300e2..4caedfa3384804c3f8ccd6b0f137cd85ac270479 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999
- *
- * $Id: dumprmt.c,v 1.5 1999/10/11 13:31:08 stelian Exp $
+ *     Stelian Pop <pop@cybercable.fr>, 1999

  */
 
 /*-
  */
 
 /*-


@@ -41,11 +39,8 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-#if 0
-static char sccsid[] = "@(#)dumprmt.c  8.3 (Berkeley) 4/28/95";
-#endif

 static const char rcsid[] =
 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__
 #endif /* not lint */
 
 #ifdef __linux__

diff --git a/compat/include/Makefile.in b/compat/include/Makefile.in
index 0ad890895d75261f01ef415476c8d691442a87f0..7a52c7b67a7a279981d26e30f9898664bf26ca0a 100644 (file)
--- 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@
 
 
 top_srcdir=    @top_srcdir@
 srcdir=                @srcdir@
 
 @MCONFIG@
 

-all::          pathnames.h
-
-pathnames.h:   pathnames.h.in
-       sed -e "s|__DUMPDATES__|$(DUMPDATESPATH)|g" $< > $@
+all::

 
 install::
 
 clean::
 
 install::
 
 clean::

-       $(RM) -f \#* *~ core pathnames.h
+       $(RM) -f \#* *~ core

 
 distclean::    clean
        $(RM) -f Makefile Makefile.old .depend
 
 distclean::    clean
        $(RM) -f Makefile Makefile.old .depend

diff --git a/compat/include/bsdcompat.h b/compat/include/bsdcompat.h
index 89d7ae98aebb565f7d7329381bfd0f7945480066..ede26408f2429c4f7471df6413fe8d58e9906f78 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999
+ *     Stelian Pop <pop@cybercable.fr>, 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 <config.h>
  */
 
 #include <config.h>

diff --git a/compat/include/compaterr.h b/compat/include/compaterr.h
index 759db4d76d2af0b65d9fb8ff74f1526f6223eed3..dd0a196c1630a4629ae499c432a40231e45063ef 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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_
  */
 
 #ifndef _ERR_H_

diff --git a/compat/include/compatglob.h b/compat/include/compatglob.h
index 26432e4f4bc46f362c3d07f567e42bd883f9f6f1..2ccbbe496741c1ed50c4479e0748142a9565e513 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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_
  */
 
 #ifndef _GLOB_H_

diff --git a/compat/include/fstab.h b/compat/include/fstab.h
index 2ca06ece86acc551130103f91a3ba1dff48a3b5c..7cad9312960717157a46035960ee16107ac3ae57 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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_
  */
 
 #ifndef _FSTAB_H_

diff --git a/compat/include/pathnames.h b/compat/include/pathnames.h
new file mode 100644 (file)
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 <card@Linux.EU.Org>, 1994-1997
+ *     Stelian Pop <pop@cybercable.fr>, 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 <paths.h>
+
+#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 (file)
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 <card@Linux.EU.Org>, 1994-1997
- *      Stelian Pop <pop@cybercable.fr>, 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 <paths.h>
-
-#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 0388baab98e90ab6a5734ad74320431e507f0a3b..2f91af9912c302e0aebb9e4d74e41bebb631ab8f 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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 <compaterr.h>
 #include <errno.h>
 #include <stdio.h>
 #include <compaterr.h>
 #include <errno.h>
 #include <stdio.h>

diff --git a/compat/lib/compatglob.c b/compat/lib/compatglob.c
index 7616b808f01507f2e6f738209a4cf06511661ca4..d20a8933448420f040fba331941c4578731db7b1 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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.
  */
 
  *     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 <config.h>
 
 #ifndef HAVE_GLOB
 #include <config.h>
 
 #ifndef HAVE_GLOB

diff --git a/compat/lib/fstab.c b/compat/lib/fstab.c
index 32e6b028444fac6ff915308ac52f617280775842..3bbae804403891945327967a8cd5ee9e54b3496c 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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 <errno.h>
 #include <fstab.h>
 #include <mntent.h>
 #include <errno.h>
 #include <fstab.h>
 #include <mntent.h>

diff --git a/dump/dump.8.in b/dump/dump.8.in
index 262685868d0891e2808cdd0a89c350cf81bb5e76..67fab473e46372a341dbbc9cf4efd894320e4bde 100644 (file)
--- 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.
 .\"
 .\" 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
 .\"
 .Dd __DATE__
 .Dt DUMP 8

-.Os "__VERSION__"
+.Os "dump __VERSION__"

 .Sh NAME
 .Nm dump
 .Nd ext2 filesystem backup
 .Sh NAME
 .Nm dump
 .Nd ext2 filesystem backup

diff --git a/dump/dump.h b/dump/dump.h
index d47b0714877a22129fd5b77eab423d141513d7a7..12228ec154637d70665a3e877aa8e8d9c4d37647 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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))
  */
 
 #define MAXINOPB       (MAXBSIZE / sizeof(struct dinode))

diff --git a/dump/itime.c b/dump/itime.c
index 2529865cb06da1e02d5a52aa035c75ada3bbf621..f0fa41454de2856c2906b0125cd0de6efcbee7b5 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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 <sys/param.h>
 #include <sys/time.h>
 #ifdef __linux__
 #include <sys/param.h>
 #include <sys/time.h>
 #ifdef __linux__

diff --git a/dump/main.c b/dump/main.c
index 1dc780d210ef662256706cd492000de71578082d..3348e18ab83637fe2c8ee7cec14028631e88a5c0 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -3,7 +3,6 @@
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
  *     Stelian Pop <pop@cybercable.fr>, 1999 
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
  *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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 <sys/param.h>
 #include <sys/time.h>
 #ifdef __linux__
 #include <sys/param.h>
 #include <sys/time.h>
 #ifdef __linux__


@@ -639,14 +641,24 @@ main(int argc, char *argv[])
 static void
 usage(void)
 {
 static void
 usage(void)
 {

+       char white[MAXPATHLEN];
+       int i;
+       
+       strncpy(white, __progname, MAXPATHLEN-1);
+       white[MAXPATHLEN-1] = '\0';
+       for (i=0; i<MAXPATHLEN; ++i)
+               if (white[i] != '\0') white[i] = ' ';
+
+       fprintf(stderr,
+               "%s %s\n", __progname, _DUMP_VERSION);

        fprintf(stderr,
        fprintf(stderr,

-               "usage: %s [-0123456789ac"
+               "usage:\t%s [-0123456789ac"

 #ifdef KERBEROS
                "k"
 #endif
 #ifdef KERBEROS
                "k"
 #endif

-               "nu] [-B records] [-b blocksize] [-d density] [-f file]\n"
-               "            [-h level] [-s feet] [-T date] filesystem\n"
-               "       %s [-W | -w]\n", __progname, __progname);
+               "nu] [-B records] [-b blocksize] [-d density]\n"
+               "\t%s [-f file] [-h level] [-s feet] [-T date] filesystem\n"
+               "\t%s [-W | -w]\n", __progname, white, __progname);

        exit(X_STARTUP);
 }
 
        exit(X_STARTUP);
 }
 

diff --git a/dump/optr.c b/dump/optr.c
index 6c2efb703287a6ad2d80ef52c7b33b5dfd680285..b17cd556bbf871ce97839e98201b36a33061cd9b 100644 (file)
--- a/dump/optr.c
+++ b/dump/optr.c
@@ -2,8 +2,7 @@
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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 <sys/param.h>
 #include <sys/wait.h>
 #include <sys/time.h>
 #include <sys/param.h>
 #include <sys/wait.h>
 #include <sys/time.h>

diff --git a/dump/tape.c b/dump/tape.c
index 4aaffb3271e62e17b76a76c6aefe20ef5ba314f1..b0d7fd4b01a74f9011eaacbe6dd46909667c13ce 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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 <sys/types.h>
 #include <linux/types.h>
 #ifdef __linux__
 #include <sys/types.h>
 #include <linux/types.h>

diff --git a/dump/traverse.c b/dump/traverse.c
index c4e739c30bced74fd7237df7f27e3f62f800a613..0865527eb9e69334a81f26f7f5e2d194bf86ead8 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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 <sys/param.h>
 #include <sys/stat.h>
 #ifdef __linux__
 #include <sys/param.h>
 #include <sys/stat.h>
 #ifdef __linux__

diff --git a/dump/unctime.c b/dump/unctime.c
index 845a333451c3e94b147da86cce719d88c8223836..a51c863227b8ad7435c1b4521c317b2301332e16 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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 <time.h>
 #ifdef __STDC__
 #include <stdlib.h>
 #include <time.h>
 #ifdef __STDC__
 #include <stdlib.h>

diff --git a/restore/dirs.c b/restore/dirs.c
index e4cffd956755f3d25a55eecbbd211aaefc8f102e..abc618148d54fda14cd5795dd949c9df82b69cf7 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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 <sys/param.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/stat.h>

diff --git a/restore/extern.h b/restore/extern.h
index 8cf3f2c9527506cc544faf4bab7bfdfe2d356e7e..eb004e26a1a8891af06b8a724d846cdb342c6e67 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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));
  */
 
 struct entry   *addentry __P((char *, ino_t, int));

diff --git a/restore/interactive.c b/restore/interactive.c
index 24cf18cd5727025a07f5ba3494565ebfc5df587f..1bfd201789c725f4b18bae862505c755502a817f 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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 <sys/param.h>
 #include <sys/stat.h>
 
 #include <sys/param.h>
 #include <sys/stat.h>
 

diff --git a/restore/main.c b/restore/main.c
index b3a09ff9c53237f11d1023fdafe2cff958864b20..61ad4e6407a128d4b07d7ad244b575801f928d10 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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 <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>


@@ -354,12 +356,15 @@ usage(void)
 #else
 #define kerbflag
 #endif
 #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);
 }
 
        exit(1);
 }
 

diff --git a/restore/restore.8.in b/restore/restore.8.in
index 7d846d67173d7da53134125dbf56312094f044bb..712dcf467b01e74f8177019145cf482da127af71 100644 (file)
--- 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.
 .\"
 .\" 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
 .\"
 .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"
 .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 2c1089248180076059f675994228debd44b8a85a..b2defc2199dac074f89ef94622a26a748e6eaa48 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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 <sys/types.h>
 
 #ifdef __linux__
 #include <sys/types.h>
 
 #ifdef __linux__

diff --git a/restore/restore.h b/restore/restore.h
index 87a03972ce42320da4d6486bf2122e725d2f60a3..d6c4d99dd11b5bf1d7fcd19b55aa3aba03d2f9d7 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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 35d0064cb09e958467f40ec2b198ba7b40bfcb24..3fd05a6fce68f991ad5a0431c7c4e45d8c1f811a 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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
 /*
  * 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 32a5582d1e32f11e51ef1a69e4a2f2117a79d611..55519818bc61fc636029ee1c84a97c617aef7ac4 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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 <sys/param.h>
 #include <sys/file.h>
 #include <sys/mtio.h>
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/mtio.h>

diff --git a/restore/utilities.c b/restore/utilities.c
index 44cea0454c343c9d513b72da27444320384eb3ca..de508cd26d92c378be4716b112ab7921927236ea 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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 <sys/param.h>
 #include <sys/stat.h>
 
 #include <sys/param.h>
 #include <sys/stat.h>
 

diff --git a/rmt/rmt.8.in b/rmt/rmt.8.in
index e88787894ff96b5f01b26b40fd3b0813f94a33d0..33b1bffa621cc426e9f217a6ac951e6af4ae2a35 100644 (file)
--- 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.
 .\"
 .\" 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
 .\"
 .Dd __DATE__
 .Dt RMT 8

-.Os "__VERSION__"
+.Os "rmt __VERSION__"

 .Sh NAME
 .Nm rmt
 .Nd remote magtape protocol module
 .Sh NAME
 .Nm rmt
 .Nd remote magtape protocol module

diff --git a/rmt/rmt.c b/rmt/rmt.c
index 590bbc4a840360dd8409236c45d3c907c0f63f37..fc1a5d1acc01a2d10ab3c5e3c5b9a8d3eea8c3bc 100644 (file)
--- 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 <card@Linux.EU.Org>, 1994-1997
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997

- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@cybercable.fr>, 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.
  * 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
  */
 /*
  * rmt
  */