oweals/busybox.git
23 years agoDoc update for the 0.51 release. 0_51
Eric Andersen [Tue, 10 Apr 2001 20:10:55 +0000 (20:10 -0000)]
Doc update for the 0.51 release.
 -Erik

23 years agoFix up changelog for 0.51 release
Eric Andersen [Tue, 10 Apr 2001 20:10:14 +0000 (20:10 -0000)]
Fix up changelog for 0.51 release

23 years agoBring Debian config files into sync with the master one.
Eric Andersen [Tue, 10 Apr 2001 20:07:19 +0000 (20:07 -0000)]
Bring Debian config files into sync with the master one.

23 years agoHa. Regression testing found a bug with uClibc support. Fixed.
Eric Andersen [Tue, 10 Apr 2001 19:03:03 +0000 (19:03 -0000)]
Ha.  Regression testing found a bug with uClibc support.  Fixed.
 -Erik

23 years agoFix up the uClibc compiler name (its format was recently changed slightly)
Eric Andersen [Tue, 10 Apr 2001 18:35:02 +0000 (18:35 -0000)]
Fix up the uClibc compiler name (its format was recently changed slightly)

23 years agoThis patch from Laurence Anderson <laurence@zxmail.com> fixes
Eric Andersen [Tue, 10 Apr 2001 18:17:05 +0000 (18:17 -0000)]
This patch from Laurence Anderson <laurence@zxmail.com> fixes
wget HTTP 1.1 support and addes chunked encoding so bb wget
is now fully RFC compliant.

23 years agoPatch from Valdimir to reduce stack usage, since recursive_action
Eric Andersen [Tue, 10 Apr 2001 17:53:49 +0000 (17:53 -0000)]
Patch from Valdimir to reduce stack usage, since recursive_action
is (as the name implies) is recursive, reducing stack memory usage
is important to avoid exhausting available stack memory.

23 years agoFix double quote handling.
Matt Kraai [Tue, 10 Apr 2001 00:00:05 +0000 (00:00 -0000)]
Fix double quote handling.

23 years ago"I will always compile before I commit" x 100
Eric Andersen [Mon, 9 Apr 2001 23:54:15 +0000 (23:54 -0000)]
"I will always compile before I commit" x 100

23 years agoUpdate how we detect if libc5 is in use.
Eric Andersen [Mon, 9 Apr 2001 23:52:18 +0000 (23:52 -0000)]
Update how we detect if libc5 is in use.
 -Erik

23 years agoFix warning generated by pod2html about unterminated list.
Matt Kraai [Mon, 9 Apr 2001 23:27:51 +0000 (23:27 -0000)]
Fix warning generated by pod2html about unterminated list.

23 years agoMake 'grep -l' work
Eric Andersen [Mon, 9 Apr 2001 23:26:31 +0000 (23:26 -0000)]
Make 'grep -l' work

23 years agoFixed option parsing. Grep would continue grepping, even when given a bad /
Mark Whitley [Mon, 9 Apr 2001 23:00:07 +0000 (23:00 -0000)]
Fixed option parsing. Grep would continue grepping, even when given a bad /
invalid option. Closes bug #1146.

23 years agoApply Vladimir's latest cleanup patch.
Eric Andersen [Mon, 9 Apr 2001 22:48:12 +0000 (22:48 -0000)]
Apply Vladimir's latest cleanup patch.
 -Erik

23 years agoBump version number to 0.51
Eric Andersen [Mon, 9 Apr 2001 22:18:14 +0000 (22:18 -0000)]
Bump version number to 0.51

23 years agoEnable freeramdisk and pivot_root, disable lash for the Debian .udeb
Eric Andersen [Mon, 9 Apr 2001 22:17:10 +0000 (22:17 -0000)]
Enable freeramdisk and pivot_root, disable lash for the Debian .udeb
 -Erik

23 years agomake sure we auto-close debian bug #91758
Eric Andersen [Mon, 9 Apr 2001 22:15:27 +0000 (22:15 -0000)]
make sure we auto-close debian bug #91758
 -Erik

23 years agoupdate the changelog, prepatory to the 0.51 release. Please review
Eric Andersen [Mon, 9 Apr 2001 22:09:41 +0000 (22:09 -0000)]
update the changelog, prepatory to the 0.51 release.  Please review
for correctness!
 -Erik

23 years agoUpdate changelog
Eric Andersen [Mon, 9 Apr 2001 19:00:29 +0000 (19:00 -0000)]
Update changelog

23 years agouse 'USE_SYSTEM_PWD_GRP=false' for the Debian packages so the boot-floppies
Eric Andersen [Mon, 9 Apr 2001 18:42:52 +0000 (18:42 -0000)]
use 'USE_SYSTEM_PWD_GRP=false' for the Debian packages so the boot-floppies
do not need any of the nss crap installed.  As was, things like 'id' would
fail.  Fixed now (with thanks to Matt Kraai for his help).
 -Erik

23 years agoReorganise status field to use 3 chars instead of one bit shifted long int.
Glenn L McGrath [Sun, 8 Apr 2001 13:27:39 +0000 (13:27 -0000)]
Reorganise status field to use 3 chars instead of one bit shifted long int.
Generates status file properly now, not compatable with full dpkg yet.

23 years agoUse create_path instead of mkdir
Glenn L McGrath [Sun, 8 Apr 2001 07:23:53 +0000 (07:23 -0000)]
Use create_path instead of mkdir

23 years agoIt now correctly backs up the (still corrupt) status file
Glenn L McGrath [Sun, 8 Apr 2001 07:18:08 +0000 (07:18 -0000)]
It now correctly backs up the (still corrupt) status file

23 years agoSome fixes, but still broken... (cont)
Glenn L McGrath [Sun, 8 Apr 2001 05:27:18 +0000 (05:27 -0000)]
Some fixes, but still broken... (cont)
Make better use of some libbb functions
New remove dir code to avoid depending on the rm applet
dont use copy_file() it doesnt fail elegantly
Use getopt.
Generate correct /var/lib/dpkg/info/ files
Status file is broken, working on it now

23 years agoIgnore SIGTERM prior to gz_close()
Glenn L McGrath [Sat, 7 Apr 2001 02:40:59 +0000 (02:40 -0000)]
Ignore SIGTERM prior to gz_close()

23 years agoFix warning
Glenn L McGrath [Sat, 7 Apr 2001 02:17:36 +0000 (02:17 -0000)]
Fix warning

23 years agoNote that insmod now also supports powerpc and mips. Thanks Larry.
Eric Andersen [Fri, 6 Apr 2001 22:02:49 +0000 (22:02 -0000)]
Note that insmod now also supports powerpc and mips.  Thanks Larry.

23 years agoAn optimization from Vladimir
Eric Andersen [Fri, 6 Apr 2001 16:02:22 +0000 (16:02 -0000)]
An optimization from Vladimir

23 years agomore FILE_OFFSET_BITS == 64 adjustments.
Eric Andersen [Thu, 5 Apr 2001 23:26:44 +0000 (23:26 -0000)]
more FILE_OFFSET_BITS == 64 adjustments.

23 years agoA first pass at making D_FILE_OFFSET_BITS=64 work, from
Eric Andersen [Thu, 5 Apr 2001 23:07:25 +0000 (23:07 -0000)]
A first pass at making D_FILE_OFFSET_BITS=64 work, from
Jari Ruusu <jari.ruusu@pp.inet.fi>

23 years agoAdd support of /W prompts
Eric Andersen [Thu, 5 Apr 2001 23:00:47 +0000 (23:00 -0000)]
Add support of /W prompts
 -Erik

23 years agoHandle glibc 2.0.7 as well
Eric Andersen [Thu, 5 Apr 2001 22:38:32 +0000 (22:38 -0000)]
Handle glibc 2.0.7 as well

23 years agoA patch from Dmitry Zakharov <dmit@crp.bank.gov.ua> which adds
Eric Andersen [Thu, 5 Apr 2001 21:45:54 +0000 (21:45 -0000)]
A patch from Dmitry Zakharov <dmit@crp.bank.gov.ua> which adds
- support for ftp downloads
- HTTP basic authentication support (as an optional feature)
- handling of http redirections
- protocol version changed to 1.0 (to stop servers from requesting
chunked encoding)
- bugfix: in the case when content-length not given, wget didn't
download anything
- when attempting to continue an aborted download but server doesn't
support restarts, reopen output file in write mode
- changed assumption that existing file should restart an aborted
    download.  Now the user must explicitly specify this with -c

23 years agoSome cleanups/fixes for the syslogd circular buffer code
Eric Andersen [Thu, 5 Apr 2001 20:55:17 +0000 (20:55 -0000)]
Some cleanups/fixes for the syslogd circular buffer code
from Gennady Feldman.

23 years ago- autodocifier.pl :: continuation() was modified such that '#'
John Beppu [Thu, 5 Apr 2001 20:03:33 +0000 (20:03 -0000)]
- autodocifier.pl :: continuation() was modified such that '#'
  is handled correctly.

23 years ago- use docs/autodocifier.pl to merge POD together
John Beppu [Thu, 5 Apr 2001 19:42:03 +0000 (19:42 -0000)]
- use docs/autodocifier.pl to merge POD together

23 years ago- split busybox.pod into a header and footer.
John Beppu [Thu, 5 Apr 2001 19:41:23 +0000 (19:41 -0000)]
- split busybox.pod into a header and footer.
  the body will be generated by docs/autodocifier.pl

23 years ago- documentation updates and a minor tweak to POD generation
John Beppu [Thu, 5 Apr 2001 19:35:17 +0000 (19:35 -0000)]
- documentation updates and a minor tweak to POD generation

23 years agoIt seems all the stdout munging was useless anyways, since
Eric Andersen [Thu, 5 Apr 2001 18:30:38 +0000 (18:30 -0000)]
It seems all the stdout munging was useless anyways, since
deb_extract and all its called functions do nothing with
stdout anyways.  Axe that stuff.
 -Erik

23 years agoBe more generic for libc5. We don't need to know struct definitions
Eric Andersen [Thu, 5 Apr 2001 07:41:51 +0000 (07:41 -0000)]
Be more generic for libc5.  We don't need to know struct definitions
to make the syscall finction -- use a generic pointer instead.

23 years agoAnother iteration -- adjust the init_module syscall a bit.
Eric Andersen [Thu, 5 Apr 2001 07:33:10 +0000 (07:33 -0000)]
Another iteration -- adjust the init_module syscall a bit.
 -Erik

23 years ago*** empty log message ***
Eric Andersen [Thu, 5 Apr 2001 06:24:28 +0000 (06:24 -0000)]
*** empty log message ***

23 years agoSome further syscall adjustments. Split the module syscalls out of
Eric Andersen [Thu, 5 Apr 2001 06:08:14 +0000 (06:08 -0000)]
Some further syscall adjustments.  Split the module syscalls out of
insmod and into libbb. Only enable them for libc5.  glibc and
uClibc don't need them.
 -Erik

23 years agodpkg_deb had not been updated for the new gunzip interface. Fix it.
Eric Andersen [Thu, 5 Apr 2001 06:04:11 +0000 (06:04 -0000)]
dpkg_deb had not been updated for the new gunzip interface.  Fix it.
 -Erik

23 years agoA number of cleanups. Now compiles with libc5, glibc, and uClibc. Fix a few
Eric Andersen [Thu, 5 Apr 2001 03:14:39 +0000 (03:14 -0000)]
A number of cleanups.  Now compiles with libc5, glibc, and uClibc.  Fix a few
shadowed variables.  Move (almost) all syscalls to libbb/syscalls.c, so I can
handle them sanely and all at once.
 -Erik

23 years agoPatch from Larry Doolittle to eliminate needless thrashing
Eric Andersen [Wed, 4 Apr 2001 22:49:01 +0000 (22:49 -0000)]
Patch from Larry Doolittle to eliminate needless thrashing
about when trimming long strings with lots of trailing white
space.

23 years agoRemove unused optarg variable
Eric Andersen [Wed, 4 Apr 2001 19:33:32 +0000 (19:33 -0000)]
Remove unused optarg variable

23 years agoFailed to name "Electric-fence" explicitly
Eric Andersen [Wed, 4 Apr 2001 19:32:00 +0000 (19:32 -0000)]
Failed to name "Electric-fence" explicitly

23 years agoSome cleanups for libc5 support
Eric Andersen [Wed, 4 Apr 2001 19:29:48 +0000 (19:29 -0000)]
Some cleanups for libc5 support

23 years agoFix a warning with libc5.
Eric Andersen [Wed, 4 Apr 2001 19:26:22 +0000 (19:26 -0000)]
Fix a warning with libc5.
 -Erik

23 years agoSeems that stupid libc5 doesn't implement daemon(), so conditionally
Eric Andersen [Wed, 4 Apr 2001 19:25:57 +0000 (19:25 -0000)]
Seems that stupid libc5 doesn't implement daemon(), so conditionally
inclde that here.
 -Erik

23 years agoAvoid segfault when export is invoked with no arguments. Thanks to
Matt Kraai [Wed, 4 Apr 2001 17:50:04 +0000 (17:50 -0000)]
Avoid segfault when export is invoked with no arguments.  Thanks to
Gennady Feldman.

23 years agoI said no new features till after the 0.51 release. Well, I lied. This is a
Eric Andersen [Wed, 4 Apr 2001 17:31:15 +0000 (17:31 -0000)]
I said no new features till after the 0.51 release.  Well, I lied.  This is a
vi editor for busybox, contributed by Sterling Huxley <sterling@europa.com>.
It adds 22k to the busybox binary when enabled.  Quite impressive!

23 years agoPlace a temporary bandaid on the ls/du/df human-readable issue. This method is
Eric Andersen [Tue, 3 Apr 2001 23:14:29 +0000 (23:14 -0000)]
Place a temporary bandaid on the ls/du/df human-readable issue.  This method is
not going to scale up as well as I would like, and Matt Kraai and I have
discussed a better long term solution.  But for now this will at least make all
the human-readable apps give correct answers.

Please test the human readable/non-human readable options on your systems!!!
 -Erik

23 years agoAdd in easy-to-use electric-fence support.
Eric Andersen [Tue, 3 Apr 2001 22:53:19 +0000 (22:53 -0000)]
Add in easy-to-use electric-fence support.
 -Erik

23 years agoif strlen(s) was 0, it would then end up using s[-1] as an array index. Bad,
Eric Andersen [Tue, 3 Apr 2001 22:50:52 +0000 (22:50 -0000)]
if strlen(s) was 0, it would then end up using s[-1] as an array index.  Bad,
bad, bad.  This was crashing the shell on powerpc boxes, though all other archs
seem to have a much more forgiving malloc implementations.  I finally found
this bug using electric-fence on a powerpc box.
 -Erik

23 years agoA patch from Matt Kraai that adds a new 'shutdown' action to busybox init. Now
Eric Andersen [Tue, 3 Apr 2001 18:01:51 +0000 (18:01 -0000)]
A patch from Matt Kraai that adds a new 'shutdown' action to busybox init.  Now
you can specify an arbitrary behavior for 'ctrlaltdel' without that behavior
needing to be a reboot.

23 years agoMake 'busybox --help' work as expected, closing bug #1139
Eric Andersen [Tue, 3 Apr 2001 17:05:01 +0000 (17:05 -0000)]
Make 'busybox --help' work as expected, closing bug #1139
 -Erik

23 years agoFix for bug 1143 from Larry Doolittle
Eric Andersen [Tue, 3 Apr 2001 16:38:37 +0000 (16:38 -0000)]
Fix for bug 1143 from Larry Doolittle
 -Erik

23 years agoMove the mtab support stuff into libbb
Eric Andersen [Sun, 1 Apr 2001 16:01:11 +0000 (16:01 -0000)]
Move the mtab support stuff into libbb
 -Erik

23 years agoFormatting change
Eric Andersen [Sun, 1 Apr 2001 04:49:41 +0000 (04:49 -0000)]
Formatting change

23 years agoDont try and automount devfs, rename some variables
Glenn L McGrath [Fri, 30 Mar 2001 01:28:13 +0000 (01:28 -0000)]
Dont try and automount devfs, rename some variables

23 years agoAdd in a new standalone env applet for fixing up app's environments
Eric Andersen [Thu, 29 Mar 2001 22:48:33 +0000 (22:48 -0000)]
Add in a new standalone env applet for fixing up app's environments
 -Erik

23 years agoUse daemon() to spawn syslogd and klogd daemons.
Eric Andersen [Thu, 29 Mar 2001 21:58:33 +0000 (21:58 -0000)]
Use daemon() to spawn syslogd and klogd daemons.
 -Erik

23 years agogz_open and gz_close were left in, even when BB_FEATURE_TAR_GZIP was disabled.
Eric Andersen [Thu, 29 Mar 2001 14:22:45 +0000 (14:22 -0000)]
gz_open and gz_close were left in, even when BB_FEATURE_TAR_GZIP was disabled.
Fix that.

23 years agoFix zcat
Glenn L McGrath [Thu, 29 Mar 2001 01:07:54 +0000 (01:07 -0000)]
Fix zcat

23 years agogunzip -c works again
Glenn L McGrath [Thu, 29 Mar 2001 00:57:20 +0000 (00:57 -0000)]
gunzip -c works again

23 years agoFixes from Robert Kaiser
Glenn L McGrath [Wed, 28 Mar 2001 23:57:51 +0000 (23:57 -0000)]
Fixes from Robert Kaiser

23 years agoApplied patch from David Douthitt to re-add -print option to find.
Mark Whitley [Wed, 28 Mar 2001 22:04:42 +0000 (22:04 -0000)]
Applied patch from David Douthitt to re-add -print option to find.
Closes bug #1144.

23 years agoFix ls so it uses make_human_readable_str() the same way already
Eric Andersen [Wed, 28 Mar 2001 20:26:51 +0000 (20:26 -0000)]
Fix ls so it uses make_human_readable_str() the same way already
used by 'du' and 'df'.  Now we just need to fix make_human_readable_str
so it behaves they way it used to before Matt fixed it.

23 years agoPatch bass ackwards behavior of hr flag.
Matt Kraai [Wed, 28 Mar 2001 20:10:25 +0000 (20:10 -0000)]
Patch bass ackwards behavior of hr flag.

23 years agoRewrite to fix bug #1140 and make it slightly smaller.
Matt Kraai [Wed, 28 Mar 2001 16:42:27 +0000 (16:42 -0000)]
Rewrite to fix bug #1140 and make it slightly smaller.

23 years agoEnable tar -z support again by default
Glenn L McGrath [Wed, 28 Mar 2001 07:48:10 +0000 (07:48 -0000)]
Enable tar -z support again by default

23 years agoRemove cruft
Glenn L McGrath [Wed, 28 Mar 2001 07:37:48 +0000 (07:37 -0000)]
Remove cruft

23 years agoRemove tar_unzip_init() not needed any more, uses gz_open instead
Glenn L McGrath [Wed, 28 Mar 2001 07:31:37 +0000 (07:31 -0000)]
Remove tar_unzip_init() not needed any more, uses gz_open instead

23 years agoFix tar -z, calls gz_open now
Glenn L McGrath [Wed, 28 Mar 2001 07:27:26 +0000 (07:27 -0000)]
Fix tar -z, calls gz_open now

23 years agoDisable tar -z for now
Glenn L McGrath [Wed, 28 Mar 2001 06:13:15 +0000 (06:13 -0000)]
Disable tar -z for now

23 years agoGunzip changes broke tar -z support (woops)
Glenn L McGrath [Wed, 28 Mar 2001 05:47:26 +0000 (05:47 -0000)]
Gunzip changes broke tar -z support (woops)

23 years agoMajor cleanup to better adhere to style guide and use standard busybox functions
Glenn L McGrath [Wed, 28 Mar 2001 05:38:24 +0000 (05:38 -0000)]
Major cleanup to better adhere to style guide and use standard busybox functions

23 years agoAdd functions that were shared with gunzip.c, gunzip about to change.
Glenn L McGrath [Wed, 28 Mar 2001 05:35:16 +0000 (05:35 -0000)]
Add functions that were shared with gunzip.c, gunzip about to change.

23 years agoChange BB_FEATURE_TRIVIAL_HELP to BB_FEATURE_VERBOSE_USAGE (per bug #1130).
Matt Kraai [Tue, 27 Mar 2001 21:57:29 +0000 (21:57 -0000)]
Change BB_FEATURE_TRIVIAL_HELP to BB_FEATURE_VERBOSE_USAGE (per bug #1130).

23 years agoSome more words on sending patches to the bug-tracker.
Mark Whitley [Tue, 27 Mar 2001 21:20:05 +0000 (21:20 -0000)]
Some more words on sending patches to the bug-tracker.

23 years agoApplied patch from David Douthitt to fix problem where ls reports half the
Mark Whitley [Tue, 27 Mar 2001 20:59:14 +0000 (20:59 -0000)]
Applied patch from David Douthitt to fix problem where ls reports half the
file size. Should close bug #1140.

23 years agoSome more tests for cut. Craig Matsuura said he saw some problems along these
Mark Whitley [Tue, 27 Mar 2001 20:48:01 +0000 (20:48 -0000)]
Some more tests for cut. Craig Matsuura said he saw some problems along these
lines. "Works for me", but we'll keep these tests around for regression.

23 years agoApplied patch from Gennady Feldman to fix a single-threaded syslogd bug that
Mark Whitley [Tue, 27 Mar 2001 20:17:58 +0000 (20:17 -0000)]
Applied patch from Gennady Feldman to fix a single-threaded syslogd bug that
turned up. This code needs to be tested on an embedded system, since that's
where the bug turned up in the first place.

23 years agoFixed the Makefile so busybox can link against libc5 again. Putting libbb.a at
Mark Whitley [Tue, 27 Mar 2001 18:22:41 +0000 (18:22 -0000)]
Fixed the Makefile so busybox can link against libc5 again. Putting libbb.a at
the end broke it.

23 years agoIn fact, socklen_t *is* defined by libc5.
Mark Whitley [Tue, 27 Mar 2001 18:22:00 +0000 (18:22 -0000)]
In fact, socklen_t *is* defined by libc5.

23 years agoFix to last patch: locale code should be 9, not 7.
Mark Whitley [Tue, 27 Mar 2001 17:07:15 +0000 (17:07 -0000)]
Fix to last patch: locale code should be 9, not 7.

23 years agoApplied patch from Vladimir N. Oleynik to add locale support to the shell per
Mark Whitley [Tue, 27 Mar 2001 16:35:16 +0000 (16:35 -0000)]
Applied patch from Vladimir N. Oleynik to add locale support to the shell per
bug report from Ralph Jones.

23 years agoApplied patch from Anthony Towns that he posted to Debian bug tracking.
Mark Whitley [Mon, 26 Mar 2001 16:47:57 +0000 (16:47 -0000)]
Applied patch from Anthony Towns that he posted to Debian bug tracking.

23 years agoFix in_ether bug regarding hex digits reported by Jonas Holmberg <jonas.holmberg...
Manuel Novoa III [Mon, 26 Mar 2001 16:26:16 +0000 (16:26 -0000)]
Fix in_ether bug regarding hex digits reported by Jonas Holmberg <jonas.holmberg@axis.com>.

23 years agoBump version number to 0.51pre
Eric Andersen [Sat, 24 Mar 2001 06:34:59 +0000 (06:34 -0000)]
Bump version number to 0.51pre

23 years agoxstrdup xargs cleanup from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:11:22 +0000 (17:11 -0000)]
xstrdup xargs cleanup from Jeff Garzik

23 years agoxstrdup tftp cleanup from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:10:19 +0000 (17:10 -0000)]
xstrdup tftp cleanup from Jeff Garzik

23 years agoPatch to use xfopen from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:09:15 +0000 (17:09 -0000)]
Patch to use xfopen from Jeff Garzik

23 years ago-Wshadow tr fix from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:08:21 +0000 (17:08 -0000)]
-Wshadow tr fix from Jeff Garzik

23 years ago-Wshadow sh fix from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:06:01 +0000 (17:06 -0000)]
-Wshadow sh fix from Jeff Garzik

23 years ago-Wshadow logread fix from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:04:47 +0000 (17:04 -0000)]
-Wshadow logread fix from Jeff Garzik

23 years ago-Wshadow loadacm fix from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:03:28 +0000 (17:03 -0000)]
-Wshadow loadacm fix from Jeff Garzik

23 years agoincludes cleanup from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:02:05 +0000 (17:02 -0000)]
includes cleanup from Jeff Garzik