]> git.cameronkatri.com Git - bsdgames-darwin.git/log
bsdgames-darwin.git
15 years agoCreate some abstraction for sending messages.
dholland [Sat, 14 Mar 2009 22:52:52 +0000 (22:52 +0000)]
Create some abstraction for sending messages.
Make a send and receive function for each possible message.
Make these have useful argument signatures.
Hide the list of message codes inside sync.c.

15 years agoDon't use perror()
dholland [Sat, 14 Mar 2009 20:14:56 +0000 (20:14 +0000)]
Don't use perror()

15 years agoconstify the version string
dholland [Sat, 14 Mar 2009 20:10:43 +0000 (20:10 +0000)]
constify the version string

15 years agoSprinkle some "bool". And don't use '\0' to mean 'false'.
dholland [Sat, 14 Mar 2009 20:04:43 +0000 (20:04 +0000)]
Sprinkle some "bool". And don't use '\0' to mean 'false'.

15 years agoUse \a instead of \7 for BEL.
dholland [Sat, 14 Mar 2009 19:57:14 +0000 (19:57 +0000)]
Use \a instead of \7 for BEL.

15 years agoPrune a comment referring to objects that (AFAICT) didn't even exist in -r1.1.
dholland [Sat, 14 Mar 2009 19:55:16 +0000 (19:55 +0000)]
Prune a comment referring to objects that (AFAICT) didn't even exist in -r1.1.

15 years agoDon't cast the return value of calloc().
dholland [Sat, 14 Mar 2009 19:36:42 +0000 (19:36 +0000)]
Don't cast the return value of calloc().

15 years agoLines <= 80 chars, remove trailing whitespace, other formatting adjustments.
dholland [Sat, 14 Mar 2009 19:35:13 +0000 (19:35 +0000)]
Lines <= 80 chars, remove trailing whitespace, other formatting adjustments.
No functional change.

15 years agoRemove some unnecessary casts.
dholland [Sat, 14 Mar 2009 18:41:21 +0000 (18:41 +0000)]
Remove some unnecessary casts.

15 years agoString buffer cleanup. sprintf bad.
dholland [Sat, 14 Mar 2009 18:32:47 +0000 (18:32 +0000)]
String buffer cleanup. sprintf bad.

15 years agoDon't use char for random state variables; use int or bool.
dholland [Sat, 14 Mar 2009 17:10:01 +0000 (17:10 +0000)]
Don't use char for random state variables; use int or bool.

15 years agoFix list markup. Use .Ic for key as suggested by wiz.
joerg [Wed, 11 Mar 2009 16:37:06 +0000 (16:37 +0000)]
Fix list markup. Use .Ic for key as suggested by wiz.

15 years agoFix preamble
joerg [Wed, 11 Mar 2009 13:06:10 +0000 (13:06 +0000)]
Fix preamble

15 years agoRemove redundant .br
joerg [Wed, 11 Mar 2009 13:05:59 +0000 (13:05 +0000)]
Remove redundant .br

15 years agoFix markup
joerg [Wed, 11 Mar 2009 13:05:46 +0000 (13:05 +0000)]
Fix markup

15 years agoFix preamble
joerg [Wed, 11 Mar 2009 13:01:49 +0000 (13:01 +0000)]
Fix preamble

15 years agoFix markup
joerg [Wed, 11 Mar 2009 13:00:37 +0000 (13:00 +0000)]
Fix markup

15 years agosprintf -> snprintf
dholland [Mon, 9 Mar 2009 04:38:39 +0000 (04:38 +0000)]
sprintf -> snprintf

15 years agoMove HISTORY to proper place.
dholland [Mon, 2 Mar 2009 10:16:54 +0000 (10:16 +0000)]
Move HISTORY to proper place.

15 years agoEdit. Sync with reality, at least partway. Bump date.
dholland [Mon, 2 Mar 2009 10:14:41 +0000 (10:14 +0000)]
Edit. Sync with reality, at least partway. Bump date.

15 years agoSort options. End sentence with a dot.
wiz [Mon, 2 Mar 2009 09:39:10 +0000 (09:39 +0000)]
Sort options. End sentence with a dot.

15 years agomdocify. Partly merged from OpenBSD. Not by any means perfect yet.
dholland [Mon, 2 Mar 2009 09:23:57 +0000 (09:23 +0000)]
mdocify. Partly merged from OpenBSD. Not by any means perfect yet.

15 years agoMore fixes from OpenBSD: use err instead of perror, don't hork on EOF
dholland [Mon, 2 Mar 2009 07:33:30 +0000 (07:33 +0000)]
More fixes from OpenBSD: use err instead of perror, don't hork on EOF
during the initial setup questions.

15 years agoCheck for failure of fgets when reading the captain's name, and don't
dholland [Mon, 2 Mar 2009 07:21:56 +0000 (07:21 +0000)]
Check for failure of fgets when reading the captain's name, and don't
allow it to be empty. From OpenBSD.

15 years agoUse errx() to send fatal error messages. From OpenBSD.
dholland [Mon, 2 Mar 2009 07:17:24 +0000 (07:17 +0000)]
Use errx() to send fatal error messages. From OpenBSD.

15 years agoUse errx/warnx instead of printing to stderr. From OpenBSD.
dholland [Mon, 2 Mar 2009 06:54:01 +0000 (06:54 +0000)]
Use errx/warnx instead of printing to stderr. From OpenBSD.

15 years agoUse err(3) and errx(3), not perror and fprintf to stderr. From OpenBSD.
dholland [Mon, 2 Mar 2009 06:44:22 +0000 (06:44 +0000)]
Use err(3) and errx(3), not perror and fprintf to stderr. From OpenBSD.

15 years agoBraces around a nested if, for clarity; suggested by diffing against OpenBSD.
dholland [Mon, 2 Mar 2009 06:43:53 +0000 (06:43 +0000)]
Braces around a nested if, for clarity; suggested by diffing against OpenBSD.

16 years agoFix bogus conditional caught by today's make. It looks as if MKHIDEGAME
dholland [Sun, 18 Jan 2009 20:22:45 +0000 (20:22 +0000)]
Fix bogus conditional caught by today's make. It looks as if MKHIDEGAME
has never worked since it was introduced in 2002... clearly a lot of
people care about that.

It should work now, but because it's evidently never been tested it
may also require setlist adjustments.

16 years agouse %zu to print size_t
tnn [Sun, 18 Jan 2009 13:30:33 +0000 (13:30 +0000)]
use %zu to print size_t

16 years agofix -Wsign-compare issues
lukem [Sun, 18 Jan 2009 00:24:29 +0000 (00:24 +0000)]
fix -Wsign-compare issues

16 years agoFix fiance/fiancee confusion. Fix another typo.
wiz [Tue, 2 Dec 2008 14:21:26 +0000 (14:21 +0000)]
Fix fiance/fiancee confusion. Fix another typo.
Jason McIntyre <jmc@kerhand.co.uk>.

16 years agoFix insure -> ensure confusion. From Jason McIntyre <jmc@kerhand.co.uk>.
wiz [Tue, 2 Dec 2008 14:21:02 +0000 (14:21 +0000)]
Fix insure -> ensure confusion. From Jason McIntyre <jmc@kerhand.co.uk>.

16 years agoPR/39923: Valery Ushakov: trek(6) can spin, consuming 100% CPU on powerpc
christos [Fri, 14 Nov 2008 21:10:44 +0000 (21:10 +0000)]
PR/39923: Valery Ushakov: trek(6) can spin, consuming 100% CPU on powerpc
On systems where char is unsigned the number of black holes can end up being
very large (instead of negative).

16 years agomore MKSHARE == no fixes:
mrg [Thu, 30 Oct 2008 21:37:55 +0000 (21:37 +0000)]
more MKSHARE == no fixes:
- move installation of atf pkg-config files out of share/atf/
- don't install spell or ching share files
- update some directory entries to not have 'share' tag

now my MKLINT=no MKSHARE=no MKPROFILE=no builds work again.

16 years agoUse uint32_t and include <stdint.h>, instead of using u_int32_t
apb [Sun, 19 Oct 2008 07:56:42 +0000 (07:56 +0000)]
Use uint32_t and include <stdint.h>, instead of using u_int32_t
and including <sys/types.h>.

16 years agoMake this build on Mac OS X.
agc [Mon, 29 Sep 2008 12:30:12 +0000 (12:30 +0000)]
Make this build on Mac OS X.

16 years agoInstall unstr:
apb [Fri, 26 Sep 2008 18:56:43 +0000 (18:56 +0000)]
Install unstr:
* in games/fortune/Makefile, add unstr to SUBDIR;
* in games/fortune/unstr/Makefile, include ../../Makefile.inc;
* in games/fortune/strfile/Makefile, add MLINKS for unstr man page;
* in distrib/sets/lists/games/mi, add new files.

16 years agoBuild strfile both as a host tool and as an installed program:
apb [Fri, 26 Sep 2008 18:23:09 +0000 (18:23 +0000)]
Build strfile both as a host tool and as an installed program:
* in games/fortune/strfile/Makefile, build strfile as a
  regular program instead of as a host tool;
* add tools/strfile directory to build strfile as a host tool;
* in tools/Makefile, add strfile to SUBDIR list;
* in BSD.*.mk, define TOOL_STRFILE variable;
* in games/fortune/datfiles/Makefile, use TOOL_STRFILE when creating
  databases at build time;
* in distrib/sets/lists/games/mi, mention usr/games/strfile.

16 years agoMake this pass WARNS=4:
apb [Fri, 26 Sep 2008 13:46:48 +0000 (13:46 +0000)]
Make this pass WARNS=4:
* u_int32_t -> uint32_t, and remove ifdef test.
* add function prototypes.

16 years agoBoth legs of the conditional operator must return the same type.
gmcgarry [Fri, 29 Aug 2008 00:37:38 +0000 (00:37 +0000)]
Both legs of the conditional operator must return the same type.

16 years agoWrap compiler-specific flags with HAVE_GCC and HAVE_PCC as necessary. Add a few flags...
gmcgarry [Fri, 29 Aug 2008 00:02:21 +0000 (00:02 +0000)]
Wrap compiler-specific flags with HAVE_GCC and HAVE_PCC as necessary. Add a few flags for PCC.

16 years agoif initscr() fails, exit with a message rather than crash in the
drochner [Fri, 8 Aug 2008 16:10:47 +0000 (16:10 +0000)]
if initscr() fails, exit with a message rather than crash in the
next curses call

16 years agoRemove the \n and tabs from the __COPYRIGHT() strings.
lukem [Mon, 21 Jul 2008 13:24:38 +0000 (13:24 +0000)]
Remove the \n and tabs from the __COPYRIGHT() strings.

16 years agoRemove the \n and tabs from the __COPYRIGHT() strings.
lukem [Sun, 20 Jul 2008 00:52:39 +0000 (00:52 +0000)]
Remove the \n and tabs from the __COPYRIGHT() strings.

16 years agoClarify how one is supposed to use the pointers returned by getutentries()
dholland [Sun, 13 Jul 2008 20:07:48 +0000 (20:07 +0000)]
Clarify how one is supposed to use the pointers returned by getutentries()
(the utmpentry.c code), specifically with respect to who owns them and
when to free them. Now they're owned by utmpentry.c, only. Abolish the
freeutentries() function, which was the wrong abstraction; add instead
endutentries(), which flushes out the internally managed memory.

Update callers as necessary. Some (e.g. talkd) had been leaking memory;
others (e.g. syslogd) had been accidentally freeing and reloading utmp
more often than necessary. There are a couple untidy bits in users and
rwhod that someone should look after sometime, maybe.

Fixes PR bin/35131, which was about talkd's memory leak.

16 years agoAdd test for HAVE_PCC with HAVE_GCC which turn off compiler warning flags.
gmcgarry [Sat, 12 Jul 2008 12:29:42 +0000 (12:29 +0000)]
Add test for HAVE_PCC with HAVE_GCC which turn off compiler warning flags.

16 years agoremove clause #3 from my license where there are no other
mrg [Thu, 29 May 2008 14:51:25 +0000 (14:51 +0000)]
remove clause #3 from my license where there are no other
copyright holders involved.

16 years ago2-clause my license.
wiz [Thu, 8 May 2008 15:31:07 +0000 (15:31 +0000)]
2-clause my license.

16 years agoRename MKPRIVATELIB to LIBISPRIVATE, to make it clearer that this is
lukem [Sat, 3 May 2008 14:48:30 +0000 (14:48 +0000)]
Rename MKPRIVATELIB to LIBISPRIVATE, to make it clearer that this is
a variable that is used by in-tree Makefiles to control behaviour.
(MKsomevar variables are generally intended to be controlled by the end-user)

16 years agoRemove clause 3 and 4 from TNF licenses
martin [Mon, 28 Apr 2008 20:22:51 +0000 (20:22 +0000)]
Remove clause 3 and 4 from TNF licenses

16 years agoFix a tip: use pkg_info, not pkg_add to find out which executables
wiz [Tue, 25 Mar 2008 10:50:34 +0000 (10:50 +0000)]
Fix a tip: use pkg_info, not pkg_add to find out which executables
belong to a package.

16 years agoAdd a tip explaining how to run the tests in /usr/tests.
jmmv [Sun, 23 Mar 2008 19:48:57 +0000 (19:48 +0000)]
Add a tip explaining how to run the tests in /usr/tests.

16 years agoIn example, change dd count size and also chmod so others can't read swap.
reed [Sat, 22 Mar 2008 14:39:57 +0000 (14:39 +0000)]
In example, change dd count size and also chmod so others can't read swap.

16 years agoAdd five more tips.
reed [Fri, 21 Mar 2008 21:45:30 +0000 (21:45 +0000)]
Add five more tips.

16 years agoAdd "netbsd-tips" fortune database with 23 initial fortunes --
reed [Fri, 21 Mar 2008 21:09:48 +0000 (21:09 +0000)]
Add "netbsd-tips" fortune database with 23 initial fortunes --
actually hints or suggestions or tips on using NetBSD.
Please share your brief NetBSD usage tips.
If you want to discuss or share suggestions, have a look
at http://wiki.netbsd.se/netbsd-tips wiki page.

16 years agoDon't crash if we're asked to restore from /dev/null. (woops)
dholland [Sun, 24 Feb 2008 06:12:49 +0000 (06:12 +0000)]
Don't crash if we're asked to restore from /dev/null. (woops)

16 years agoFix a bit more lint.
dholland [Sun, 24 Feb 2008 06:07:06 +0000 (06:07 +0000)]
Fix a bit more lint.

16 years agoFix some more lint. (There's plenty to go around.)
dholland [Sun, 24 Feb 2008 06:03:35 +0000 (06:03 +0000)]
Fix some more lint. (There's plenty to go around.)

If we try to load a game and it bombs, keep prompting for another one,
because if we try to continue with a half-loaded game we'll probably
end up in trouble.

16 years agoDon't cast the return value of calloc.
dholland [Sun, 24 Feb 2008 05:53:33 +0000 (05:53 +0000)]
Don't cast the return value of calloc.

16 years agofix some lint
christos [Sun, 24 Feb 2008 03:56:48 +0000 (03:56 +0000)]
fix some lint

16 years agoneed errno.h
christos [Sun, 24 Feb 2008 03:52:09 +0000 (03:52 +0000)]
need errno.h

16 years agoUpdate for today's changes: 1-player games are not allowed, and cards.pck
dholland [Sun, 24 Feb 2008 03:50:07 +0000 (03:50 +0000)]
Update for today's changes: 1-player games are not allowed, and cards.pck
no longer appears.

16 years agoFix the OpenBSD housing shortage code.
dholland [Sun, 24 Feb 2008 03:26:26 +0000 (03:26 +0000)]
Fix the OpenBSD housing shortage code.

16 years agoret_card(), which I moved earlier, was consequently filed under the wrong
dholland [Sun, 24 Feb 2008 03:01:13 +0000 (03:01 +0000)]
ret_card(), which I moved earlier, was consequently filed under the wrong
source file name. fix.

16 years agoWe do not need special code for pdp11. Also, because random() returns all
dholland [Sun, 24 Feb 2008 02:58:33 +0000 (02:58 +0000)]
We do not need special code for pdp11. Also, because random() returns all
good bits (unlike rand()) we can simplify this.

16 years agoTypo patrol
dholland [Sun, 24 Feb 2008 02:55:20 +0000 (02:55 +0000)]
Typo patrol

16 years agoThis file is also no longer used.
dholland [Sun, 24 Feb 2008 02:53:18 +0000 (02:53 +0000)]
This file is also no longer used.

16 years agoAbolish the initdeck program and the weird little binary file it generates.
dholland [Sun, 24 Feb 2008 02:43:18 +0000 (02:43 +0000)]
Abolish the initdeck program and the weird little binary file it generates.
The card deck data is now compiled in. (And it always should have been,
even back when memory usage counted. It's small.)

This changes the save format slightly. (I am riding the previous
breakage an hour ago and not providing compat. There should be no
further breakage.)

16 years agoSource files should be named *.c or *.h, not random other things.
dholland [Sun, 24 Feb 2008 01:57:34 +0000 (01:57 +0000)]
Source files should be named *.c or *.h, not random other things.

Fold monop.ext (which was extern data decls) into monop.h and deck.h.
Fold monop.def (which had definitions for the extern data) into monop.c.
Fold brd.dat/mon.dat/prop.dat (which were array initializers for some of
the data) into monop.c.

Rearrange includes accordingly. No functional change.

16 years agoRemove last traces of old save/load code. We no longer need a private
dholland [Sun, 24 Feb 2008 01:41:14 +0000 (01:41 +0000)]
Remove last traces of old save/load code. We no longer need a private
copy of malloc.

16 years agoSort out the memory leak fix properly.
dholland [Sun, 24 Feb 2008 01:37:57 +0000 (01:37 +0000)]
Sort out the memory leak fix properly.

16 years agoNew save/load code. Related to (but not the same as) the new save/load
dholland [Sun, 24 Feb 2008 01:30:56 +0000 (01:30 +0000)]
New save/load code. Related to (but not the same as) the new save/load
code in OpenBSD.

Note: this breaks compatibility with old save files. However, the old
save files were missing critical information, had a completely insane
format, and didn't work anyway.

I will be riding this breakage with another breakage within a day or
two when I fix the insanity in the card deck handling.

16 years agoFixes from OpenBSD.
dholland [Sat, 23 Feb 2008 22:28:46 +0000 (22:28 +0000)]
Fixes from OpenBSD.
   - If a player goes bankrupt buying a property (which shouldn't be
allowed, but I guess it is), don't cause them to resign to themselves.
   - Use "NULL", not "0", for pointers.
   - Avoid undefined behavior adjusting the current player after resigning.
   - Don't leak the memory used to store player names.

The last of these is disabled for the moment because we have the pointers
in question tagged const. Will see to this when I'm finished merging.

16 years agoFix from OpenBSD: don't say "1 houses".
dholland [Sat, 23 Feb 2008 22:20:35 +0000 (22:20 +0000)]
Fix from OpenBSD: don't say "1 houses".

16 years agoBug fixes from OpenBSD:
dholland [Sat, 23 Feb 2008 22:17:02 +0000 (22:17 +0000)]
Bug fixes from OpenBSD:
   - don't truncate unreasonably long player names when bidding;
   - don't allow players to bid more cash than they have.

16 years agoBug fix: having $0 does not mean you need to mortgage something. Plus some
dholland [Sat, 23 Feb 2008 22:06:30 +0000 (22:06 +0000)]
Bug fix: having $0 does not mean you need to mortgage something. Plus some
tidyup.
From OpenBSD.

16 years agoMore fixes from OpenBSD:
dholland [Sat, 23 Feb 2008 21:48:46 +0000 (21:48 +0000)]
More fixes from OpenBSD:
  - initialize in the proper order
  - don't allow 1-player games
  - make the check for players named "done" work properly
  - a couple other minor things

16 years agoSanity fixes for input handling. Suggested by OpenBSD, but different code.
dholland [Sat, 23 Feb 2008 21:35:13 +0000 (21:35 +0000)]
Sanity fixes for input handling. Suggested by OpenBSD, but different code.

16 years agoA first stab at supporting the housing shortage rules. From OpenBSD.
dholland [Sat, 23 Feb 2008 21:07:52 +0000 (21:07 +0000)]
A first stab at supporting the housing shortage rules. From OpenBSD.
(note: this is not fully correct - I will fix it when I finish merging)

16 years agoDon't increment booleans. From OpenBSD
dholland [Sat, 23 Feb 2008 20:18:46 +0000 (20:18 +0000)]
Don't increment booleans. From OpenBSD

16 years agoSanity fixes for input buffer handling. From OpenBSD
dholland [Sat, 23 Feb 2008 20:12:15 +0000 (20:12 +0000)]
Sanity fixes for input buffer handling. From OpenBSD

16 years agoImprove the behavior of get-out-of-jail-free cards by returning them to
dholland [Sat, 23 Feb 2008 19:54:06 +0000 (19:54 +0000)]
Improve the behavior of get-out-of-jail-free cards by returning them to
the bottom of the deck when used. There are still a few other problems.
From OpenBSD.

16 years agoRename ->last_card to ->top_card to match OpenBSD (and also to make
dholland [Sat, 23 Feb 2008 19:49:21 +0000 (19:49 +0000)]
Rename ->last_card to ->top_card to match OpenBSD (and also to make
somewhat more sense...)

16 years agoMove ret_card() to cards.c, where it more rationally belongs. From OpenBSD.
dholland [Sat, 23 Feb 2008 19:09:00 +0000 (19:09 +0000)]
Move ret_card() to cards.c, where it more rationally belongs. From OpenBSD.

16 years agoA few more whitespace/KNF. I keep hoping I've found them all...
dholland [Wed, 20 Feb 2008 05:08:46 +0000 (05:08 +0000)]
A few more whitespace/KNF. I keep hoping I've found them all...

16 years agoAdd the sizes to the extern array declarations. This may not be
dholland [Wed, 20 Feb 2008 04:50:12 +0000 (04:50 +0000)]
Add the sizes to the extern array declarations. This may not be
necessary, but it's safe and reduces unnecessary divergence.
From OpenBSD.

16 years agoUse random() rather than rand(). Suggested by diffing against OpenBSD.
dholland [Wed, 20 Feb 2008 04:48:10 +0000 (04:48 +0000)]
Use random() rather than rand(). Suggested by diffing against OpenBSD.

16 years agoRemove unused swap() macro.
dholland [Wed, 20 Feb 2008 04:10:34 +0000 (04:10 +0000)]
Remove unused swap() macro.

16 years agoDon't misuse random strings as printf formats, even where it's harmless.
dholland [Wed, 20 Feb 2008 04:10:01 +0000 (04:10 +0000)]
Don't misuse random strings as printf formats, even where it's harmless.
Found by diffing against OpenBSD.

16 years agoOne more (hopefully the last) whitespace fix.
dholland [Tue, 19 Feb 2008 10:48:47 +0000 (10:48 +0000)]
One more (hopefully the last) whitespace fix.

16 years agogetinp() no longer magically treats the prompt arg as a printf format, so
dholland [Tue, 19 Feb 2008 10:47:40 +0000 (10:47 +0000)]
getinp() no longer magically treats the prompt arg as a printf format, so
don't escape % as %%. From OpenBSD.

16 years agoMove function heading comments to something vaguely like the right place.
dholland [Tue, 19 Feb 2008 10:46:21 +0000 (10:46 +0000)]
Move function heading comments to something vaguely like the right place.

16 years agoKNF/whitespace nits. No functional changes.
dholland [Tue, 19 Feb 2008 09:45:02 +0000 (09:45 +0000)]
KNF/whitespace nits. No functional changes.

16 years agoFix bugs in debug printouts. From OpenBSD.
dholland [Tue, 19 Feb 2008 09:34:40 +0000 (09:34 +0000)]
Fix bugs in debug printouts. From OpenBSD.

16 years agoDon't use sprintf; use snprintf.
dholland [Tue, 19 Feb 2008 09:32:34 +0000 (09:32 +0000)]
Don't use sprintf; use snprintf.

16 years agoDon't use perror(); use err/warn instead.
dholland [Tue, 19 Feb 2008 09:30:26 +0000 (09:30 +0000)]
Don't use perror(); use err/warn instead.
Suggested by diffing against OpenBSD.

16 years agoFix capitalization of street names. from pjanzen@openbsd
dholland [Tue, 19 Feb 2008 09:28:05 +0000 (09:28 +0000)]
Fix capitalization of street names. from pjanzen@openbsd

16 years agoMore typo fixes
dholland [Tue, 19 Feb 2008 09:25:21 +0000 (09:25 +0000)]
More typo fixes

16 years agoFix formatting bug apparently introduced when the page was mdoc'd. (Had
dholland [Tue, 19 Feb 2008 09:24:43 +0000 (09:24 +0000)]
Fix formatting bug apparently introduced when the page was mdoc'd. (Had
.Nm, should have been .Pp.)

Also bump date; for some reason this hadn't been done since the original
import.