Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-9]: src Pull up following revision(s) (requested by mrg in ticket...
details: https://anonhg.NetBSD.org/src/rev/554be42df2e6
branches: netbsd-9
changeset: 962071:554be42df2e6
user: martin <martin%NetBSD.org@localhost>
date: Fri Apr 30 14:07:02 2021 +0000
description:
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:
bin/pax/extern.h | 5 +-
bin/pax/options.c | 9 ++-
sbin/newfs_udf/newfs_udf.h | 6 +-
sbin/newfs_udf/udf_create.c | 8 +-
usr.bin/config/defs.h | 144 +++++++++++++++++++++++--------------------
usr.bin/config/main.c | 76 ++++++++++++++++++++++-
usr.bin/config/scan.l | 5 +-
usr.bin/make/main.c | 8 +-
usr.bin/make/make.h | 4 +-
9 files changed, 176 insertions(+), 89 deletions(-)
diffs (truncated from 442 to 300 lines):
diff -r 06eff604088f -r 554be42df2e6 bin/pax/extern.h
--- a/bin/pax/extern.h Fri Apr 30 13:57:00 2021 +0000
+++ b/bin/pax/extern.h Fri Apr 30 14:07:02 2021 +0000
@@ -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 @@
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 06eff604088f -r 554be42df2e6 bin/pax/options.c
--- a/bin/pax/options.c Fri Apr 30 13:57:00 2021 +0000
+++ b/bin/pax/options.c Fri Apr 30 14:07:02 2021 +0000
@@ -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 @@
#include "mtree.h"
#endif /* SMALL */
+char *chdname;
+#if !HAVE_NBTOOL_CONFIG_H
+int do_chroot;
+#endif
+
/*
* Routines which handle command line options
*/
diff -r 06eff604088f -r 554be42df2e6 sbin/newfs_udf/newfs_udf.h
--- a/sbin/newfs_udf/newfs_udf.h Fri Apr 30 13:57:00 2021 +0000
+++ b/sbin/newfs_udf/newfs_udf.h Fri Apr 30 14:07:02 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: newfs_udf.h,v 1.6 2019/06/30 11:38:16 sevan Exp $ */
+/* $NetBSD: newfs_udf.h,v 1.6.2.1 2021/04/30 14:07:02 martin Exp $ */
/*
* Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
@@ -54,10 +54,6 @@
extern float meta_fract;
-/* shared structure between udf_create.c users */
-struct udf_create_context context;
-struct udf_disclayout layout;
-
/* prototypes */
int udf_write_sector(void *sector, uint64_t location);
int udf_update_trackinfo(struct mmc_discinfo *di, struct mmc_trackinfo *ti);
diff -r 06eff604088f -r 554be42df2e6 sbin/newfs_udf/udf_create.c
--- a/sbin/newfs_udf/udf_create.c Fri Apr 30 13:57:00 2021 +0000
+++ b/sbin/newfs_udf/udf_create.c Fri Apr 30 14:07:02 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_create.c,v 1.26 2018/12/09 17:52:48 christos Exp $ */
+/* $NetBSD: udf_create.c,v 1.26.2.1 2021/04/30 14:07:02 martin Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -30,7 +30,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: udf_create.c,v 1.26 2018/12/09 17:52:48 christos Exp $");
+__RCSID("$NetBSD: udf_create.c,v 1.26.2.1 2021/04/30 14:07:02 martin Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -52,6 +52,10 @@
# endif
#endif
+/* shared structure between udf_create.c users */
+struct udf_create_context context;
+struct udf_disclayout layout;
+
/*
* NOTE that there is some overlap between this code and the udf kernel fs.
* This is intentially though it might better be factored out one day.
diff -r 06eff604088f -r 554be42df2e6 usr.bin/config/defs.h
--- a/usr.bin/config/defs.h Fri Apr 30 13:57:00 2021 +0000
+++ b/usr.bin/config/defs.h Fri Apr 30 14:07:02 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.104.2.1 2020/03/09 15:22:21 martin Exp $ */
+/* $NetBSD: defs.h,v 1.104.2.2 2021/04/30 14:07:02 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -437,80 +437,88 @@
*/
struct hashtab;
-int lkmmode;
-const char *conffile; /* source file, e.g., "GENERIC.sparc" */
-const char *machine; /* machine type, e.g., "sparc" or "sun3" */
-const char *machinearch; /* machine arch, e.g., "sparc" or "m68k" */
-struct nvlist *machinesubarches;
+extern int lkmmode;
+extern const char *conffile; /* source file, e.g., "GENERIC.sparc" */
+extern const char *machine; /* machine type, e.g., "sparc" or "sun3" */
+extern const char *machinearch; /* machine arch, e.g., "sparc" or "m68k" */
+extern struct nvlist *machinesubarches;
/* machine subarches, e.g., "sun68k" or "hpc" */
-const char *ioconfname; /* ioconf name, mutually exclusive to machine */
-const char *srcdir; /* path to source directory (rel. to build) */
-const char *builddir; /* path to build directory */
-const char *defbuilddir; /* default build directory */
-const char *ident; /* kernel "ident"ification string */
-int errors; /* counts calls to error() */
-int minmaxusers; /* minimum "maxusers" parameter */
-int defmaxusers; /* default "maxusers" parameter */
-int maxmaxusers; /* default "maxusers" parameter */
-int maxusers; /* configuration's "maxusers" parameter */
-int maxpartitions; /* configuration's "maxpartitions" parameter */
-int version; /* version of the configuration file */
-struct nvlist *options; /* options */
-struct nvlist *fsoptions; /* filesystems */
-struct nvlist *mkoptions; /* makeoptions */
-struct nvlist *appmkoptions; /* appending mkoptions */
-struct nvlist *condmkoptions; /* conditional makeoption table */
-struct hashtab *devbasetab; /* devbase lookup */
-struct hashtab *devroottab; /* attach at root lookup */
-struct hashtab *devatab; /* devbase attachment lookup */
-struct hashtab *devitab; /* device instance lookup */
-struct hashtab *deaddevitab; /* removed instances lookup */
-struct hashtab *selecttab; /* selects things that are "optional foo" */
-struct hashtab *needcnttab; /* retains names marked "needs-count" */
-struct hashtab *opttab; /* table of configured options */
-struct hashtab *fsopttab; /* table of configured file systems */
-struct dlhash *defopttab; /* options that have been "defopt"'d */
-struct dlhash *defflagtab; /* options that have been "defflag"'d */
-struct dlhash *defparamtab; /* options that have been "defparam"'d */
-struct dlhash *defoptlint; /* lint values for options */
-struct nvhash *deffstab; /* defined file systems */
-struct dlhash *optfiletab; /* "defopt"'d option .h files */
-struct hashtab *attrtab; /* attributes (locators, etc.) */
-struct hashtab *attrdeptab; /* attribute dependencies */
-struct hashtab *bdevmtab; /* block devm lookup */
-struct hashtab *cdevmtab; /* character devm lookup */
+extern const char *ioconfname; /* ioconf name, mutually exclusive to machine */
+extern const char *srcdir; /* path to source directory (rel. to build) */
+extern const char *builddir; /* path to build directory */
+extern const char *defbuilddir; /* default build directory */
+extern const char *ident; /* kernel "ident"ification string */
+extern int errors; /* counts calls to error() */
+extern int minmaxusers; /* minimum "maxusers" parameter */
+extern int defmaxusers; /* default "maxusers" parameter */
+extern int maxmaxusers; /* default "maxusers" parameter */
+extern int maxusers; /* configuration's "maxusers" parameter */
+extern int maxpartitions; /* configuration's "maxpartitions" parameter */
+extern int version; /* version of the configuration file */
+extern struct nvlist *options; /* options */
+extern struct nvlist *fsoptions; /* filesystems */
+extern struct nvlist *mkoptions; /* makeoptions */
+extern struct nvlist *appmkoptions; /* appending mkoptions */
+extern struct nvlist *condmkoptions; /* conditional makeoption table */
+extern struct hashtab *devbasetab; /* devbase lookup */
+extern struct hashtab *devroottab; /* attach at root lookup */
+extern struct hashtab *devatab; /* devbase attachment lookup */
+extern struct hashtab *devitab; /* device instance lookup */
+extern struct hashtab *deaddevitab; /* removed instances lookup */
+extern struct hashtab *selecttab; /* selects things that are "optional foo" */
+extern struct hashtab *needcnttab; /* retains names marked "needs-count" */
+extern struct hashtab *opttab; /* table of configured options */
+extern struct hashtab *fsopttab; /* table of configured file systems */
+extern struct dlhash *defopttab; /* options that have been "defopt"'d */
+extern struct dlhash *defflagtab; /* options that have been "defflag"'d */
+extern struct dlhash *defparamtab; /* options that have been "defparam"'d */
+extern struct dlhash *defoptlint; /* lint values for options */
+extern struct nvhash *deffstab; /* defined file systems */
+extern struct dlhash *optfiletab; /* "defopt"'d option .h files */
+extern struct hashtab *attrtab; /* attributes (locators, etc.) */
+extern struct hashtab *attrdeptab; /* attribute dependencies */
+extern struct hashtab *bdevmtab; /* block devm lookup */
+extern struct hashtab *cdevmtab; /* character devm lookup */
-TAILQ_HEAD(, devbase) allbases; /* list of all devbase structures */
-TAILQ_HEAD(, deva) alldevas; /* list of all devbase attachments */
-TAILQ_HEAD(conftq, config) allcf; /* list of configured kernels */
-TAILQ_HEAD(, devi) alldevi, /* list of all instances */
- allpseudo; /* list of all pseudo-devices */
-TAILQ_HEAD(, devm) alldevms; /* list of all device-majors */
-TAILQ_HEAD(, pspec) allpspecs; /* list of all parent specs */
-int ndevi; /* number of devi's (before packing) */
-int npspecs; /* number of parent specs */
-devmajor_t maxbdevm; /* max number of block major */
-devmajor_t maxcdevm; /* max number of character major */
-int do_devsw; /* 0 if pre-devsw config */
-int oktopackage; /* 0 before setmachine() */
-int devilevel; /* used for devi->i_level */
+TAILQ_HEAD(devbasetq, devbase);
+TAILQ_HEAD(devatq, deva);
+TAILQ_HEAD(conftq, config);
+TAILQ_HEAD(devitq, devi);
+TAILQ_HEAD(devmtq, devm);
+TAILQ_HEAD(pspectq, pspec);
-struct filelist allfiles; /* list of all kernel source files */
-struct filelist allcfiles; /* list of all .c files */
-struct filelist allsfiles; /* list of all .S files */
-struct filelist allofiles; /* list of all .o files */
+extern struct devbasetq allbases; /* list of all devbase structures */
+extern struct devatq alldevas; /* list of all devbase attachments */
+extern struct conftq allcf; /* list of configured kernels */
+extern struct devitq alldevi, /* list of all instances */
+ allpseudo; /* list of all pseudo-devices */
+extern struct devmtq alldevms; /* list of all device-majors */
+extern struct pspectq allpspecs; /* list of all parent specs */
+extern int ndevi; /* number of devi's (before packing) */
+extern int npspecs; /* number of parent specs */
+extern devmajor_t maxbdevm; /* max number of block major */
+extern devmajor_t maxcdevm; /* max number of character major */
+extern int do_devsw; /* 0 if pre-devsw config */
+extern int oktopackage; /* 0 before setmachine() */
+extern int devilevel; /* used for devi->i_level */
-struct prefixlist prefixes, /* prefix stack */
- allprefixes; /* all prefixes used (after popped) */
-struct prefixlist buildprefixes, /* build prefix stack */
- allbuildprefixes;/* all build prefixes used (after popped) */
-SLIST_HEAD(, prefix) curdirs; /* curdir stack */
+extern struct filelist allfiles; /* list of all kernel source files */
+extern struct filelist allcfiles; /* list of all .c files */
+extern struct filelist allsfiles; /* list of all .S files */
+extern struct filelist allofiles; /* list of all .o files */
+
+extern struct prefixlist prefixes, /* prefix stack */
+ allprefixes; /* all prefixes used
+ * (after popped) */
+extern struct prefixlist buildprefixes, /* build prefix stack */
+ allbuildprefixes;/* all build prefixes used
+ * (after popped) */
extern struct attr allattr;
-struct devi **packed; /* arrayified table for packed devi's */
-size_t npacked; /* size of packed table, <= ndevi */
+extern struct devi **packed; /* arrayified table for packed devi's */
+extern size_t npacked; /* size of packed table, <= ndevi */
-struct { /* loc[] table for config */
+extern struct locators { /* loc[] table for config */
const char **vec;
int used;
} locators;
diff -r 06eff604088f -r 554be42df2e6 usr.bin/config/main.c
--- a/usr.bin/config/main.c Fri Apr 30 13:57:00 2021 +0000
+++ b/usr.bin/config/main.c Fri Apr 30 14:07:02 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.98.2.1 2020/03/09 15:22:21 martin Exp $ */
+/* $NetBSD: main.c,v 1.98.2.2 2021/04/30 14:07:02 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.98.2.1 2020/03/09 15:22:21 martin Exp $");
+__RCSID("$NetBSD: main.c,v 1.98.2.2 2021/04/30 14:07:02 martin Exp $");
#ifndef MAKE_BOOTSTRAP
#include <sys/cdefs.h>
@@ -86,6 +86,78 @@
#define LINE_MAX 1024
#endif
+struct devbasetq allbases;
+struct devatq alldevas;
+struct conftq allcf;
+struct devitq alldevi, allpseudo;
+struct devmtq alldevms;
+struct pspectq allpspecs;
+
+struct devi **packed;
+size_t npacked;
+
+struct locators locators;
+
+int lkmmode;
+const char *conffile; /* source file, e.g., "GENERIC.sparc" */
Home |
Main Index |
Thread Index |
Old Index