Module Name: src
Committed By: joerg
Date: Fri Apr 3 16:13:32 UTC 2020
Modified Files:
src/bin/pax: extern.h options.c
Log Message:
Move definition of chdname and do_chroot to options.c
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/bin/pax/extern.h
cvs rdiff -u -r1.118 -r1.119 src/bin/pax/options.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/extern.h
diff -u src/bin/pax/extern.h:1.59 src/bin/pax/extern.h:1.60
--- src/bin/pax/extern.h:1.59 Thu Aug 9 08:09:21 2012
+++ src/bin/pax/extern.h Fri Apr 3 16:13:32 2020
@@ -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 @@ 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
/*
Index: src/bin/pax/options.c
diff -u src/bin/pax/options.c:1.118 src/bin/pax/options.c:1.119
--- src/bin/pax/options.c:1.118 Sat Dec 19 18:45:52 2015
+++ src/bin/pax/options.c Fri Apr 3 16:13:32 2020
@@ -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 @@ __RCSID("$NetBSD: options.c,v 1.118 2015
#include "mtree.h"
#endif /* SMALL */
+char *chdname;
+#if !HAVE_NBTOOL_CONFIG_H
+int do_chroot;
+#endif
+
/*
* Routines which handle command line options
*/
