summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2021-04-30 14:07:02 +0000
committermartin <martin@NetBSD.org>2021-04-30 14:07:02 +0000
commitfa2651f9f4a5d315b1165e87ac57ff3eebfcb695 (patch)
treeaf4f926659e4604404e646ddfa004f27787771a4 /bin
parent94c02085334103bbc93aa6545b5bc8e41bd7e4ab (diff)
Pull up following revision(s) (requested by mrg in ticket #1263):
bin/pax/options.c: revision 1.119 usr.bin/config/scan.l: revision 1.32 usr.bin/make/main.c: revision 1.274 bin/pax/extern.h: revision 1.60 usr.bin/config/defs.h: revision 1.106 usr.bin/make/make.h: revision 1.105 sbin/newfs_udf/udf_create.c: revision 1.27 (patch) sbin/newfs_udf/newfs_udf.h: revision 1.7 (patch) usr.bin/config/main.c: revision 1.100 Avoid depending on common symbols.
Diffstat (limited to 'bin')
-rw-r--r--bin/pax/extern.h5
-rw-r--r--bin/pax/options.c9
2 files changed, 9 insertions, 5 deletions
diff --git a/bin/pax/extern.h b/bin/pax/extern.h
index 298600c2ddb..a778ffbc34b 100644
--- a/bin/pax/extern.h
+++ b/bin/pax/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.59 2012/08/09 08:09:21 christos Exp $ */
+/* $NetBSD: extern.h,v 1.59.36.1 2021/04/30 14:07:02 martin Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -204,9 +204,8 @@ void options(int, char **);
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 --git a/bin/pax/options.c b/bin/pax/options.c
index 74e148031ad..3245bcc7f90 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.118 2015/12/19 18:45:52 christos Exp $ */
+/* $NetBSD: options.c,v 1.118.18.1 2021/04/30 14:07:02 martin 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.118.18.1 2021/04/30 14:07:02 martin Exp $");
#endif
#endif /* not lint */
@@ -74,6 +74,11 @@ __RCSID("$NetBSD: options.c,v 1.118 2015/12/19 18:45:52 christos Exp $");
#include "mtree.h"
#endif /* SMALL */
+char *chdname;
+#if !HAVE_NBTOOL_CONFIG_H
+int do_chroot;
+#endif
+
/*
* Routines which handle command line options
*/