Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sbin/restore fix nested extern



details:   https://anonhg.NetBSD.org/src/rev/e93e2fbe6b0d
branches:  trunk
changeset: 503329:e93e2fbe6b0d
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Feb 04 21:38:01 2001 +0000

description:
fix nested extern

diffstat:

 sbin/restore/Makefile      |  4 ++--
 sbin/restore/interactive.c |  7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r ea507b36c274 -r e93e2fbe6b0d sbin/restore/Makefile
--- a/sbin/restore/Makefile     Sun Feb 04 21:37:29 2001 +0000
+++ b/sbin/restore/Makefile     Sun Feb 04 21:38:01 2001 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.19 1997/10/10 19:52:10 christos Exp $
+#      $NetBSD: Makefile,v 1.20 2001/02/04 21:38:01 christos Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/5/93
 
 PROG=  restore
 LINKS= ${BINDIR}/restore ${BINDIR}/rrestore
-CPPFLAGS+=-DRRESTORE
+CPPFLAGS+=-DRRESTORE -DRDUMP
 SRCS=  main.c interactive.c restore.c dirs.c symtab.c tape.c utilities.c \
        dumprmt.c
 MAN=   restore.8
diff -r ea507b36c274 -r e93e2fbe6b0d sbin/restore/interactive.c
--- a/sbin/restore/interactive.c        Sun Feb 04 21:37:29 2001 +0000
+++ b/sbin/restore/interactive.c        Sun Feb 04 21:38:01 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: interactive.c,v 1.16 1999/02/09 08:55:24 erh Exp $     */
+/*     $NetBSD: interactive.c,v 1.17 2001/02/04 21:38:01 christos Exp $        */
 
 /*
  * Copyright (c) 1985, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)interactive.c      8.5 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: interactive.c,v 1.16 1999/02/09 08:55:24 erh Exp $");
+__RCSID("$NetBSD: interactive.c,v 1.17 2001/02/04 21:38:01 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -95,6 +95,8 @@
 static void     mkentry __P((char *, struct direct *, struct afile *));
 static void     printlist __P((char *, char *));
 
+extern char *__progname;       /* from crt0.o */
+
 /*
  * Read and execute commands from the terminal.
  */
@@ -312,7 +314,6 @@
        char *curdir, *cmd, *name;
        struct arglist *ap;
 {
-       extern char *__progname;        /* from crt0.o */
        char *cp;
        static char input[BUFSIZ];
        char output[BUFSIZ];



Home | Main Index | Thread Index | Old Index