[src/trunk]: src/bin/pax Move definition of chdname and do_chroot to options.c

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f49da3b9919e
branches:  trunk
changeset: 970751:f49da3b9919e
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Apr 03 16:13:32 2020 +0000

description:
Move definition of chdname and do_chroot to options.c

diffstat:

 bin/pax/extern.h  |  5 ++---
 bin/pax/options.c |  9 +++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r 26a3b9d2275d -r f49da3b9919e bin/pax/extern.h
--- a/bin/pax/extern.h  Fri Apr 03 15:02:11 2020 +0000
+++ b/bin/pax/extern.h  Fri Apr 03 16:13:32 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.h,v 1.59 2012/08/09 08:09:21 christos Exp $     */
+/*     $NetBSD: extern.h,v 1.60 2020/04/03 16:13:32 joerg Exp $        */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -204,9 +204,8 @@
 OPLIST * opt_next(void);
 int bad_opt(void);
 int mkpath(char *);
-char *chdname;
 #if !HAVE_NBTOOL_CONFIG_H
-int do_chroot;
+extern int do_chroot;
 #endif
 
 /*
diff -r 26a3b9d2275d -r f49da3b9919e bin/pax/options.c
--- a/bin/pax/options.c Fri Apr 03 15:02:11 2020 +0000
+++ b/bin/pax/options.c Fri Apr 03 16:13:32 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: options.c,v 1.118 2015/12/19 18:45:52 christos Exp $   */
+/*     $NetBSD: options.c,v 1.119 2020/04/03 16:13:32 joerg Exp $      */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c  8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: options.c,v 1.118 2015/12/19 18:45:52 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.119 2020/04/03 16:13:32 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -74,6 +74,11 @@
 #include "mtree.h"
 #endif /* SMALL */
 
+char *chdname;
+#if !HAVE_NBTOOL_CONFIG_H
+int do_chroot;
+#endif
+
 /*
  * Routines which handle command line options
  */