CVS commit: src/usr.bin/config

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 06:45:32 UTC 2014

Modified Files:
src/usr.bin/config: defs.h main.c util.c

Log Message:
Add debug print function.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/config/defs.h
cvs rdiff -u -r1.54 -r1.55 src/usr.bin/config/main.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/config/util.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 06:49:53 UTC 2014

Modified Files:
src/usr.bin/config: files.c main.c sem.c

Log Message:
Debug print where things are selected (by user).


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/config/files.c
cvs rdiff -u -r1.55 -r1.56 src/usr.bin/config/main.c
cvs rdiff -u -r1.43 -r1.44 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 07:05:01 UTC 2014

Modified Files:
src/usr.bin/config: gram.y

Log Message:
The word "configuration" is too ambiguous; use "selection" meaning that
user selects some of provided "definitions".


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/config/gram.y

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Martin Husemann]

Module Name: src
Committed By: martin
Date: Thu Oct 9 07:43:55 UTC 2014

Modified Files:
src/usr.bin/config: defs.h

Log Message:
Provide a CFGDBG version for the tools build.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/usr.bin/config/defs.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 09:39:24 UTC 2014

Modified Files:
src/usr.bin/config: gram.y

Log Message:
Sort definition/selection rules to clarify which is which.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/usr.bin/config/gram.y

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 10:29:36 UTC 2014

Modified Files:
src/usr.bin/config: defs.h files.c sem.c

Log Message:
If a file is marked by an atom expression, like "file a.c foo", and if the
specified expression is an attribute, mark the file as belonging to the
attribute.

At this moment this information is not used for any purpose, but can be
traced by config -ddd.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/config/defs.h
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/config/files.c
cvs rdiff -u -r1.44 -r1.45 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 15:25:26 UTC 2014

Modified Files:
src/usr.bin/config: defs.h files.c sem.c

Log Message:
Define an implicit attribute "netbsd" internally to collect files that don't
belong to any specific attribute.

Eventually, all operations doing "foreach (files)" can be rewritten as "foreach
(attributes) foreach (files)".


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/config/defs.h
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/config/files.c
cvs rdiff -u -r1.45 -r1.46 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 16:08:36 UTC 2014

Modified Files:
src/usr.bin/config: main.c sem.c

Log Message:
Always select the fallback allattr.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/usr.bin/config/main.c
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 17:00:15 UTC 2014

Modified Files:
src/usr.bin/config: mkmakefile.c

Log Message:
Implement code to generate Makefile to build netbsd via intermediate relocatable
object files. Disabled for now. Commit this for further experiments.

Kernel (netbsd) has been built as:

netbsd: *.o
ld -o netbsd *.o

Change this to:

netbsd: *.ko
ld -o netbsd *.ko
acpica.ko: ${OBJS.acpica}
ld -r acpica.ko ${OBJS.acpica}
:

You can call *.ko as a module, but this is not only beneficial for loadable
module, but also localize related text/data. Various options/flags/params
will be able to be per-ko. Unnecessary symbols can be hidden. Many ideas
will follow.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/config/mkmakefile.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 17:22:55 UTC 2014

Modified Files:
src/usr.bin/config: mkmakefile.c

Log Message:
Correct inverted logic.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/config/mkmakefile.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 17:36:10 UTC 2014

Modified Files:
src/usr.bin/config: mkmakefile.c

Log Message:
Print one file per line. Simplify code.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/config/mkmakefile.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 19:20:56 UTC 2014

Modified Files:
src/usr.bin/config: defs.h main.c mkmakefile.c

Log Message:
Steal -M to enable "modular" build.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.bin/config/defs.h
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/config/main.c
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/config/mkmakefile.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 19:22:31 UTC 2014

Modified Files:
src/usr.bin/config: mkmakefile.c

Log Message:
Kill more unused indent code in emitfiles().


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/config/mkmakefile.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 19:24:36 UTC 2014

Modified Files:
src/usr.bin/config: defs.h mkmakefile.c

Log Message:
FIT_NOPROLOGUE is never set anywhere.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/usr.bin/config/defs.h
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/config/mkmakefile.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 19:27:05 UTC 2014

Modified Files:
src/usr.bin/config: defs.h files.c

Log Message:
FIT_FORCESELECT is never set anywhere.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/usr.bin/config/defs.h
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/config/files.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 19:33:43 UTC 2014

Modified Files:
src/usr.bin/config: mkmakefile.c

Log Message:
Style.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/config/mkmakefile.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 05:27:29 UTC 2014

Modified Files:
src/usr.bin/config: defs.h sem.c

Log Message:
Refactor attr definition and initialization a little.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/usr.bin/config/defs.h
cvs rdiff -u -r1.47 -r1.48 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 06:13:30 UTC 2014

Modified Files:
src/usr.bin/config: gram.y sem.c sem.h

Log Message:
Split plain/interface/devclass attribute initializers.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/config/gram.y
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/config/sem.c
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/config/sem.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 06:59:38 UTC 2014

Modified Files:
src/usr.bin/config: sem.c sem.h

Log Message:
Implicitly define empty "attribute" for "device attachment". Much less
troublesome than "device" and "interface attribute".


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/config/sem.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/config/sem.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 07:08:26 UTC 2014

Modified Files:
src/usr.bin/config: main.c sem.c

Log Message:
Implicitly define attribute for filesystem.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/usr.bin/config/main.c
cvs rdiff -u -r1.50 -r1.51 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 07:48:51 UTC 2014

Modified Files:
src/usr.bin/config: main.c sem.c sem.h

Log Message:
Implicitly define attribute for options.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/usr.bin/config/main.c
cvs rdiff -u -r1.51 -r1.52 src/usr.bin/config/sem.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/config/sem.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 08:14:48 UTC 2014

Modified Files:
src/usr.bin/config: sem.c

Log Message:
Implicitly define attribute for device.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 10:16:19 UTC 2014

Modified Files:
src/usr.bin/config: sem.c

Log Message:
If an attribute is selected, select its dependencies too.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 10:22:49 UTC 2014

Modified Files:
src/usr.bin/config: main.c

Log Message:
If an option is selected, select the matching (lowercased) attribute. Handle
dependencies too.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/config/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 10:46:06 UTC 2014

Modified Files:
src/usr.bin/config: main.c

Log Message:
Select attributes for filesystem options too.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/usr.bin/config/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 11:09:50 UTC 2014

Modified Files:
src/usr.bin/config: gram.y sem.c sem.h

Log Message:
Allow dependency on undefined attributes, so that attribute definitions can
be written out-of-order, like:

# b is not defined yet
define a: b
file a.c a

# b is defined here
define b
fine b.c


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/config/gram.y
cvs rdiff -u -r1.54 -r1.55 src/usr.bin/config/sem.c
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/config/sem.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 11:38:42 UTC 2014

Added Files:
src/usr.bin/config: TODO

Log Message:
Put TODO ideas (to keep your fun).


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/usr.bin/config/TODO

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 11:49:15 UTC 2014

Modified Files:
src/usr.bin/config: config.1

Log Message:
Document -M.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/config/config.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Thomas Klausner]

Module Name: src
Committed By: wiz
Date: Fri Oct 10 11:58:59 UTC 2014

Modified Files:
src/usr.bin/config: config.1

Log Message:
Fix two typos.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/config/config.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 15:35:08 UTC 2014

Modified Files:
src/usr.bin/config: main.c

Log Message:
Revert a mistakenly added, superflous attribute match test that caused some
valid options to get lost.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/usr.bin/config/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 16:17:27 UTC 2014

Modified Files:
src/usr.bin/config: main.c

Log Message:
Remove an unsed var.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/usr.bin/config/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Sat Oct 11 03:17:40 UTC 2014

Modified Files:
src/usr.bin/config: defs.h main.c util.c

Log Message:
Enable debug for tools.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/usr.bin/config/defs.h
cvs rdiff -u -r1.64 -r1.65 src/usr.bin/config/main.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/config/util.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Sat Oct 11 06:07:20 UTC 2014

Modified Files:
src/usr.bin/config: sem.c

Log Message:
Resolve "device" definition dependency lazily.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Sat Oct 11 06:18:29 UTC 2014

Modified Files:
src/usr.bin/config: sem.c

Log Message:
Pass stricter build.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Sat Oct 11 09:06:29 UTC 2014

Modified Files:
src/usr.bin/config: sem.c

Log Message:
Redo "device" dependency. It was completely wrong to select things just
after definitions at enddefs(). Resolve dependency in selectbase().


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Sat Oct 11 09:09:19 UTC 2014

Modified Files:
src/usr.bin/config: main.c

Log Message:
After yyparse() is done, print not file but stage for debug.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/usr.bin/config/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Sat Oct 11 09:27:51 UTC 2014

Modified Files:
src/usr.bin/config: sem.c

Log Message:
Don't conplain devclass redifition to the same value; it can happen while
resolving dependency.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Sat Oct 11 15:20:36 UTC 2014

Modified Files:
src/usr.bin/config: scan.l sem.c

Log Message:
On second thought, resolving "device" dependency in enddefs() is correct.
The problem was to select things. So put back the code to record dependency
as attributes.

While here, sprinkle more debug messages.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/config/scan.l
cvs rdiff -u -r1.59 -r1.60 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Sat Oct 11 15:47:38 UTC 2014

Modified Files:
src/usr.bin/config: main.c sem.c

Log Message:
More debug messages.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/usr.bin/config/main.c
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Martin Husemann]

Module Name: src
Committed By: martin
Date: Sat Oct 11 17:27:42 UTC 2014

Modified Files:
src/usr.bin/config: sem.c

Log Message:
Remove a set but not used variable


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Sun Oct 12 04:23:47 UTC 2014

Modified Files:
src/usr.bin/config: TODO

Log Message:
More TODOs.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/config/TODO

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Sun Oct 12 05:20:54 UTC 2014

Modified Files:
src/usr.bin/config: defs.h hash.c

Log Message:
Make hash capable of taking two key strings.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/usr.bin/config/defs.h
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/config/hash.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Sun Oct 12 05:25:21 UTC 2014

Modified Files:
src/usr.bin/config: hash.c

Log Message:
Fix typos in previous.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/config/hash.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Thomas Klausner]

Module Name: src
Committed By: wiz
Date: Sun Oct 12 08:04:30 UTC 2014

Modified Files:
src/usr.bin/config: TODO

Log Message:
Spelling.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/config/TODO

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Sun Oct 12 15:35:40 UTC 2014

Modified Files:
src/usr.bin/config: sem.c

Log Message:
Don't shadow global 'devname' on macppc.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/usr.bin/config/sem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Alan Barrett]

Module Name: src
Committed By: apb
Date: Sun Oct 12 15:54:19 UTC 2014

Modified Files:
src/usr.bin/config: TODO

Log Message:
Allow easier adding/removing of options without regard to
whether or not they were already defined.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/config/TODO

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Tue Oct 14 08:00:27 UTC 2014

Modified Files:
src/usr.bin/config: main.c

Log Message:
Revert implicit attribute (module) declaration for options (flag/param).

Flag and param are to change contents of attributes (modules). These don't
have code (*.[coS]).

Filesystem definition still defines an attribute (module) implicitly.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/usr.bin/config/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Masao Uebayashi]

Module Name: src
Committed By: uebayasi
Date: Sat Oct 18 06:36:40 UTC 2014

Modified Files:
src/usr.bin/config: defs.h main.c sem.c sem.h

Log Message:
Keep track of attribute (module) dependency using hash2.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/config/defs.h
cvs rdiff -u -r1.68 -r1.69 src/usr.bin/config/main.c
cvs rdiff -u -r1.63 -r1.64 src/usr.bin/config/sem.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/config/sem.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.