summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2015-03-15 21:53:10 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2015-03-15 21:53:10 +0000
commitda7e09cae7446a0739a522efa7531e2dbcb5d512 (patch)
tree770da046a7712bd2724af41d8c49a2a8a4610bd8
parent8148e79b802332afc1da2c302d8083d512ec112f (diff)
Define chdname once in a .c and make it extern in the .h
-rw-r--r--bin/pax/extern.h4
-rw-r--r--bin/pax/options.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/bin/pax/extern.h b/bin/pax/extern.h
index 3ceb90eef40..866e119a03e 100644
--- a/bin/pax/extern.h
+++ b/bin/pax/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.51 2015/03/15 19:47:27 guenther Exp $ */
+/* $OpenBSD: extern.h,v 1.52 2015/03/15 21:53:09 guenther Exp $ */
/* $NetBSD: extern.h,v 1.5 1996/03/26 23:54:16 mrg Exp $ */
/*-
@@ -190,7 +190,7 @@ void options(int, char **);
OPLIST * opt_next(void);
int opt_add(const char *);
int bad_opt(void);
-char *chdname;
+extern char *chdname;
/*
* pat_rep.c
diff --git a/bin/pax/options.c b/bin/pax/options.c
index da10851c3fe..4d6fb63c62b 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.88 2015/03/15 19:47:27 guenther Exp $ */
+/* $OpenBSD: options.c,v 1.89 2015/03/15 21:53:09 guenther Exp $ */
/* $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $ */
/*-
@@ -170,9 +170,10 @@ FSUB fsub[] = {
int ford[] = {5, 4, 9, 8, 7, 6, 3, 2, 1, 0, -1};
/*
- * Do we have -C anywhere?
+ * Do we have -C anywhere and what is it?
*/
int havechd = 0;
+char *chdname = NULL;
/*
* options()