oweals/busybox.git
23 years agoFix compile error, sync() always returns 0 anyway.
Glenn L McGrath [Fri, 16 Feb 2001 10:21:35 +0000 (10:21 -0000)]
Fix compile error, sync() always returns 0 anyway.

23 years agoAnother small formatting change from Larry Doolittle.
Mark Whitley [Thu, 15 Feb 2001 23:31:40 +0000 (23:31 -0000)]
Another small formatting change from Larry Doolittle.

23 years agoApplied patch from Larry Doolittle that does the following:
Mark Whitley [Thu, 15 Feb 2001 23:00:48 +0000 (23:00 -0000)]
Applied patch from Larry Doolittle that does the following:
 - style changes
 - It actually returns the code computed by INET_setroute (wasn't being done
   properly before)
 - The displayroute() format string now matches net-tools

23 years agoAcknowledge Kenneth Chalmers ln fix.
Eric Andersen [Thu, 15 Feb 2001 20:13:59 +0000 (20:13 -0000)]
Acknowledge Kenneth Chalmers ln fix.

23 years agouse perror_msg instead of perror to print the applet name.
Eric Andersen [Thu, 15 Feb 2001 20:12:05 +0000 (20:12 -0000)]
use perror_msg instead of perror to print the applet name.
 -Erik

23 years agofix a few mallocs to be xmallocs.
Eric Andersen [Thu, 15 Feb 2001 19:50:11 +0000 (19:50 -0000)]
fix a few mallocs to be xmallocs.
 -Erik

23 years agoPatch from Matt Kraai to fix bug #1103. I've tested it,
Eric Andersen [Thu, 15 Feb 2001 19:07:43 +0000 (19:07 -0000)]
Patch from Matt Kraai to fix bug #1103.  I've tested it,
and it indeed seems to fix things.
 -Erik

23 years agoFixed 'ls -s' so it actually displays block sizes again.
Eric Andersen [Thu, 15 Feb 2001 18:59:02 +0000 (18:59 -0000)]
Fixed 'ls -s' so it actually displays block sizes again.
 -Erik

23 years agoMake usage.c depend on usage.h
Eric Andersen [Wed, 14 Feb 2001 21:52:18 +0000 (21:52 -0000)]
Make usage.c depend on usage.h
 -Erik

23 years agoFins find message.
Eric Andersen [Wed, 14 Feb 2001 21:51:54 +0000 (21:51 -0000)]
Fins find message.

23 years agoI forgot to add usage.h, so here it is, with a few extra cleanups.
Eric Andersen [Wed, 14 Feb 2001 21:46:30 +0000 (21:46 -0000)]
I forgot to add usage.h, so here it is, with a few extra cleanups.
Also update show_usage to handle the updated usage.h.  Again,
nearly all the work to get usage.h into shape was done by
Manuel Novoa III.
 -Erik

23 years agoThis patch, put together by Manuel Novoa III, is a merge of work
Eric Andersen [Wed, 14 Feb 2001 21:23:06 +0000 (21:23 -0000)]
This patch, put together by Manuel Novoa III, is a merge of work
done by Evin Robertson (bug#1105) and work from Manuel to make
usage messages occupy less space and simplify how usage messages
are displayed.

23 years agoimplemented displayroute() based on a patch from Vladimir N. Oleynik,
Eric Andersen [Wed, 14 Feb 2001 19:26:39 +0000 (19:26 -0000)]
implemented displayroute() based on a patch from Vladimir N. Oleynik,
so now route behaves as expected w/o any arguments.

23 years agoCommit Vladimir's latest version of stty.c. Nice work.
Eric Andersen [Wed, 14 Feb 2001 18:47:33 +0000 (18:47 -0000)]
Commit Vladimir's latest version of stty.c.  Nice work.
 -Erik

23 years agoAdd in ifconfig and route
Eric Andersen [Wed, 14 Feb 2001 08:11:27 +0000 (08:11 -0000)]
Add in ifconfig and route

23 years agoBump rev to 0.50pre.
Eric Andersen [Wed, 14 Feb 2001 07:55:19 +0000 (07:55 -0000)]
Bump rev to 0.50pre.

23 years agoSeveral cleanups from Manuel Novoa III.
Eric Andersen [Wed, 14 Feb 2001 07:15:30 +0000 (07:15 -0000)]
Several cleanups from Manuel Novoa III.

get_kernel_revision --  size reduction
        NOTE: may want to combine with get_kernel_version in insmod???

parse_mode -- size reduction, multiple settings with "," now work correctly,
        sticky-bit setting now implemented

process_escape_sequence -- size reduction, octal code to big for char bug fixed

format -- size reduction, val > LONG_MAX and hr = 1 printing bug fixed (was %ld),

23 years agoApply a patch from Evin Robertson -- new pivot_root applet.
Eric Andersen [Tue, 13 Feb 2001 20:04:30 +0000 (20:04 -0000)]
Apply a patch from Evin Robertson -- new pivot_root applet.
 -Erik

23 years agoCloser integration with dpkg-deb and other busybox functions.
Glenn L McGrath [Mon, 12 Feb 2001 11:33:09 +0000 (11:33 -0000)]
Closer integration with dpkg-deb and other busybox functions.
Hopefully simplified some code (works for me).

23 years agoNew dpkg-deb option, warning about dpkg usage
Glenn L McGrath [Mon, 12 Feb 2001 11:27:45 +0000 (11:27 -0000)]
New dpkg-deb option, warning about dpkg usage

23 years agoNew option 'list' produces output that can be used for the packages .list file.
Glenn L McGrath [Mon, 12 Feb 2001 11:16:26 +0000 (11:16 -0000)]
New option 'list' produces output that can be used for the packages .list file.
Will be used be bb dpkg

23 years agoNew function, deb-extract to be used by dpkg, code cleanups. saves some bytes
Glenn L McGrath [Sun, 11 Feb 2001 03:32:41 +0000 (03:32 -0000)]
New function, deb-extract to be used by dpkg, code cleanups. saves some bytes

23 years agoConsmetic changes
Glenn L McGrath [Sun, 11 Feb 2001 03:15:57 +0000 (03:15 -0000)]
Consmetic changes

23 years agoMore style changes
Glenn L McGrath [Sun, 11 Feb 2001 01:40:23 +0000 (01:40 -0000)]
More style changes

23 years agoStyle changes; use get_line_from_file from utilities
Glenn L McGrath [Sun, 11 Feb 2001 00:17:22 +0000 (00:17 -0000)]
Style changes; use get_line_from_file from utilities

23 years agoBB_DPKG uses copy_file
Glenn L McGrath [Sat, 10 Feb 2001 14:53:44 +0000 (14:53 -0000)]
BB_DPKG uses copy_file

23 years agoUse copy_file from utilty.c, remove some char defines
Glenn L McGrath [Sat, 10 Feb 2001 14:53:08 +0000 (14:53 -0000)]
Use copy_file from utilty.c, remove some char defines

23 years agoBug fix, rename status file, cleanups
Glenn L McGrath [Sat, 10 Feb 2001 14:26:48 +0000 (14:26 -0000)]
Bug fix, rename status file, cleanups

23 years agoReplace status defines with const int to conform to sytle guide, adds 32 bytes
Glenn L McGrath [Sat, 10 Feb 2001 03:19:51 +0000 (03:19 -0000)]
Replace status defines with const int to conform to sytle guide, adds 32 bytes

23 years agoInitial import
Glenn L McGrath [Sat, 10 Feb 2001 02:05:24 +0000 (02:05 -0000)]
Initial import

23 years agoNew applet: dpkg
Glenn L McGrath [Sat, 10 Feb 2001 02:04:40 +0000 (02:04 -0000)]
New applet: dpkg

23 years agoFix typo.
Matt Kraai [Fri, 9 Feb 2001 18:10:53 +0000 (18:10 -0000)]
Fix typo.

23 years agoImplemented -A, -B, and -C flags with BB_FEATURE_GREP_CONTEXT option set.
Mark Whitley [Fri, 9 Feb 2001 00:41:10 +0000 (00:41 -0000)]
Implemented -A, -B, and -C flags with BB_FEATURE_GREP_CONTEXT option set.

23 years agoMinor cleanups and clarifications.
Mark Whitley [Fri, 9 Feb 2001 00:28:59 +0000 (00:28 -0000)]
Minor cleanups and clarifications.

23 years agoAdd listening support.
Matt Kraai [Wed, 7 Feb 2001 04:09:23 +0000 (04:09 -0000)]
Add listening support.

23 years agoAdded documentation for new find options.
Matt Kraai [Wed, 7 Feb 2001 04:05:35 +0000 (04:05 -0000)]
Added documentation for new find options.

23 years agoReworked find with David Douthitt to support -type, -perm, -mtime, and
Matt Kraai [Wed, 7 Feb 2001 03:52:38 +0000 (03:52 -0000)]
Reworked find with David Douthitt to support -type, -perm, -mtime, and
other improvements.

23 years agoMake suffix_mult structures const. Thanks to Vladimir N. Oleynik.
Matt Kraai [Mon, 5 Feb 2001 17:50:03 +0000 (17:50 -0000)]
Make suffix_mult structures const.  Thanks to Vladimir N. Oleynik.

23 years agoAdded some more on paren spacing and a section on testing guidelines.
Mark Whitley [Sat, 3 Feb 2001 00:20:14 +0000 (00:20 -0000)]
Added some more on paren spacing and a section on testing guidelines.

23 years agoIt seems I stupidly checked in a silly test I was making.
Eric Andersen [Fri, 2 Feb 2001 15:15:36 +0000 (15:15 -0000)]
It seems I stupidly checked in a silly test I was making.
 -Erik

23 years agoAfter testing multi-build, I stupidly committed Config.h
Eric Andersen [Fri, 2 Feb 2001 01:08:22 +0000 (01:08 -0000)]
After testing multi-build, I stupidly committed Config.h
with nearly everything turned off.  Doh!
 -Erik

23 years agoPatch from Chris Jaeger that makes turning on and off options in the makefile
Mark Whitley [Fri, 2 Feb 2001 01:07:17 +0000 (01:07 -0000)]
Patch from Chris Jaeger that makes turning on and off options in the makefile
a bit less error prone by calling 'strip' on makefile vars before performing
truth tests against them.

23 years agoApply a patch from Larry Doolittle to add "-all" and "-none" switches
Eric Andersen [Thu, 1 Feb 2001 22:43:49 +0000 (22:43 -0000)]
Apply a patch from Larry Doolittle to add "-all" and "-none" switches
to multibuild.pl.  I did a little formatting adjustments to make it
_very_ obvious when things stop working.  I also removed the USE_PROCFS
config option -- just do the right thing when USE_DEVPS_PATCH is enabled.
 -Erik

23 years agoTightened things up a bit, saved 20 bytes, and made the code a bit clearer in
Mark Whitley [Thu, 1 Feb 2001 21:02:41 +0000 (21:02 -0000)]
Tightened things up a bit, saved 20 bytes, and made the code a bit clearer in
the process.

23 years agoApplied patch from Chris Jaeger <cjaeger@ensim.com> to do better checking for
Mark Whitley [Thu, 1 Feb 2001 19:51:13 +0000 (19:51 -0000)]
Applied patch from Chris Jaeger <cjaeger@ensim.com> to do better checking for
NFS_MOUNT_VERSION, depending on which kernel you're running.

23 years agoBuglet: 'tabstops' is unused if BB_FEATURE_AUTOWIDTH is not defined.
Mark Whitley [Thu, 1 Feb 2001 19:39:43 +0000 (19:39 -0000)]
Buglet: 'tabstops' is unused if BB_FEATURE_AUTOWIDTH is not defined.

23 years agoCreate find_applet_by_name function. Save 32 bytes.
Matt Kraai [Thu, 1 Feb 2001 19:21:20 +0000 (19:21 -0000)]
Create find_applet_by_name function.  Save 32 bytes.

23 years agoFix wget error message and add (and use) chomp library function.
Matt Kraai [Thu, 1 Feb 2001 16:49:30 +0000 (16:49 -0000)]
Fix wget error message and add (and use) chomp library function.

23 years agoMake old compilers not choke -- define the attribute in the func prototype.
Eric Andersen [Wed, 31 Jan 2001 23:00:46 +0000 (23:00 -0000)]
Make old compilers not choke -- define the attribute in the func prototype.

23 years agoRemoved trailing \n from error_msg{,_and_die} messages.
Matt Kraai [Wed, 31 Jan 2001 19:00:21 +0000 (19:00 -0000)]
Removed trailing \n from error_msg{,_and_die} messages.

23 years agoAdded floppyfw to list of known projects using BusyBox.
Mark Whitley [Wed, 31 Jan 2001 18:33:20 +0000 (18:33 -0000)]
Added floppyfw to list of known projects using BusyBox.

23 years agoxfopen now used by wget
Eric Andersen [Wed, 31 Jan 2001 17:50:35 +0000 (17:50 -0000)]
xfopen now used by wget
 -Erik

23 years agoPatch from Vladimir N. Oleynik to simplify wget file opening
Eric Andersen [Wed, 31 Jan 2001 17:49:47 +0000 (17:49 -0000)]
Patch from Vladimir N. Oleynik to simplify wget file opening
using xfopen (which is what everything should be using).

23 years agoCleanup patch from Vladimir N. Oleynik.
Eric Andersen [Wed, 31 Jan 2001 17:35:02 +0000 (17:35 -0000)]
Cleanup patch from Vladimir N. Oleynik.
    * mkdir: remove 3 lines in source code.
    * mkfs_minix: save 32 bytes, remove 4 bugs.
    * mkswap: save 64 bytes, remove 1 bug.

23 years agoPatch from Vladimir N. Oleynik to simplify/cleanup a few things in init.c
Eric Andersen [Wed, 31 Jan 2001 17:29:47 +0000 (17:29 -0000)]
Patch from Vladimir N. Oleynik to simplify/cleanup a few things in init.c

23 years agoPatch from Vladimir N. Oleynik to simplify how it decides which
Eric Andersen [Wed, 31 Jan 2001 17:29:12 +0000 (17:29 -0000)]
Patch from Vladimir N. Oleynik to simplify how it decides which
app was invoked.  This removes several strcmp calls.

23 years agoWrap a table (bg set to black, width=80%) around the screenshot
Eric Andersen [Wed, 31 Jan 2001 17:14:17 +0000 (17:14 -0000)]
Wrap a table (bg set to black, width=80%) around the screenshot
so it doesn't look like crap in Netscape.  Should look fine in
Mozilla either way.  I think.
 -Erik

23 years agoMake it validate.
Matt Kraai [Wed, 31 Jan 2001 02:13:05 +0000 (02:13 -0000)]
Make it validate.

23 years agoClose IMG tag.
Matt Kraai [Wed, 31 Jan 2001 01:59:46 +0000 (01:59 -0000)]
Close IMG tag.

23 years agoPatch from Larry Doolittle to reduce the chance that fussing with VPATH will
Eric Andersen [Wed, 31 Jan 2001 01:38:05 +0000 (01:38 -0000)]
Patch from Larry Doolittle to reduce the chance that fussing with VPATH will
break cross-compilation.
 -Erik

23 years agoIf the ioctl fails to tell us the winsize, default to 79.
Eric Andersen [Wed, 31 Jan 2001 00:30:45 +0000 (00:30 -0000)]
If the ioctl fails to tell us the winsize, default to 79.
 -Erik

23 years agoPatch from Bryan Rittmeyer -- be more conservative by default
Eric Andersen [Tue, 30 Jan 2001 23:40:39 +0000 (23:40 -0000)]
Patch from Bryan Rittmeyer -- be more conservative by default
with the lash prompt.
 -Erik

23 years agoAdded a new screenshot of Busybox. :-)
Mark Whitley [Tue, 30 Jan 2001 23:37:15 +0000 (23:37 -0000)]
Added a new screenshot of Busybox. :-)

23 years agoFix the pwd and group functions. The bb_ stuff was a leftover from
Eric Andersen [Tue, 30 Jan 2001 22:23:17 +0000 (22:23 -0000)]
Fix the pwd and group functions.  The bb_ stuff was a leftover from
a brief past that mercifully (except for this) never made it into CVS.
 -Erik

23 years agoFix a stupid typo -- bug found by Larry Doolittle.
Eric Andersen [Tue, 30 Jan 2001 19:23:46 +0000 (19:23 -0000)]
Fix a stupid typo -- bug found by Larry Doolittle.

23 years agoApplied patch from Larry Doolittle to use preprocessor for defining
Mark Whitley [Tue, 30 Jan 2001 18:53:42 +0000 (18:53 -0000)]
Applied patch from Larry Doolittle to use preprocessor for defining
NFS_MOUNT_VERSION.

23 years agoFix ls behavior for broken or very narrow terminals. Fix my_*
Eric Andersen [Tue, 30 Jan 2001 18:03:11 +0000 (18:03 -0000)]
Fix ls behavior for broken or very narrow terminals.  Fix my_*
functions so they comply with the original interface (i.e. don't
exit on error, stringify uids and gids when no amtching name found).
 -Erik

23 years agoTest applets containing numbers in their name. Thanks to Larry Doolittle.
Matt Kraai [Mon, 29 Jan 2001 19:00:48 +0000 (19:00 -0000)]
Test applets containing numbers in their name.  Thanks to Larry Doolittle.

23 years agoFix missing header file.
Matt Kraai [Mon, 29 Jan 2001 18:41:12 +0000 (18:41 -0000)]
Fix missing header file.

23 years agoFix up copyright msgs. Bump version to 0.49 in preparation for 0_49
Eric Andersen [Sat, 27 Jan 2001 09:33:39 +0000 (09:33 -0000)]
Fix up copyright msgs.  Bump version to 0.49 in preparation for
a release.  Update the website with release details.
 -Erik

23 years agoFix some formatting
Eric Andersen [Sat, 27 Jan 2001 08:32:57 +0000 (08:32 -0000)]
Fix some formatting

23 years agoFix header file usage -- there were many unnecessary header files included in
Eric Andersen [Sat, 27 Jan 2001 08:24:39 +0000 (08:24 -0000)]
Fix header file usage -- there were many unnecessary header files included in
busybox.h which slowed compiles.  I left only what was needed and then fixed up
all the apps to include their own header files.  I also fixed naming for pwd.h
and grp.h functions.  Tested to compile and run with libc5, glibc, and uClibc.
 -Erik

23 years agoAdd in a patch to make busybox use the normal pwd.h and grp.h
Eric Andersen [Sat, 27 Jan 2001 06:01:43 +0000 (06:01 -0000)]
Add in a patch to make busybox use the normal pwd.h and grp.h
functions.  Add in simple implementations of these functions,
which can, optionally, be used instead of the system versions.
 -Erik

23 years agoApplied patch from Larry Doolittle to list supported arches, libcs and kernels
Mark Whitley [Fri, 26 Jan 2001 20:58:23 +0000 (20:58 -0000)]
Applied patch from Larry Doolittle to list supported arches, libcs and kernels

23 years agoApplied patch from Vladimir N. Oleynik <dzo@simtreas.ru> to do tab-completion
Mark Whitley [Fri, 26 Jan 2001 20:42:23 +0000 (20:42 -0000)]
Applied patch from Vladimir N. Oleynik <dzo@simtreas.ru> to do tab-completion
in Busybox shell.  (Thanks, Vlad.)

23 years agoCleanup patch from larry doolittle
Eric Andersen [Fri, 26 Jan 2001 20:31:02 +0000 (20:31 -0000)]
Cleanup patch from larry doolittle
 -Erik

23 years agoFixed a li'l thinko.
Mark Whitley [Fri, 26 Jan 2001 19:19:23 +0000 (19:19 -0000)]
Fixed a li'l thinko.

23 years agoFix my braindamage -- remove termios and sighandling since they are not
Eric Andersen [Fri, 26 Jan 2001 18:30:12 +0000 (18:30 -0000)]
Fix my braindamage -- remove termios and sighandling since they are not
needed at all.  My bad.
 -Erik

23 years agoI am an idiot. Looking over my patch, ls doesn't need to do anything
Eric Andersen [Fri, 26 Jan 2001 18:09:13 +0000 (18:09 -0000)]
I am an idiot.  Looking over my patch, ls doesn't need to do anything
more then the ioctl to get the win size.   None of the termios handling
crap is needed.
 -Erik

23 years agoMake cin be static
Eric Andersen [Fri, 26 Jan 2001 06:50:46 +0000 (06:50 -0000)]
Make cin be static

23 years agoUpdate the arch-not-yet-supported msg to be more clear.
Eric Andersen [Fri, 26 Jan 2001 02:23:57 +0000 (02:23 -0000)]
Update the arch-not-yet-supported msg to be more clear.

23 years agoAdd errno.h
Eric Andersen [Fri, 26 Jan 2001 02:04:49 +0000 (02:04 -0000)]
Add errno.h

23 years agoMake ls understand termios.
Eric Andersen [Fri, 26 Jan 2001 01:52:43 +0000 (01:52 -0000)]
Make ls understand termios.
 -Erik

23 years agoFix a stupid bug I introduced yesterday. Doh!
Eric Andersen [Fri, 26 Jan 2001 01:52:14 +0000 (01:52 -0000)]
Fix a stupid bug I introduced yesterday.  Doh!
 -Erik

23 years agoUpdate some comments to clarify things.
Eric Andersen [Fri, 26 Jan 2001 00:11:54 +0000 (00:11 -0000)]
Update some comments to clarify things.

23 years agoCommit Larry Doolittle's buffers-on-stack/buffers-via-malloc patch.
Eric Andersen [Thu, 25 Jan 2001 23:49:09 +0000 (23:49 -0000)]
Commit Larry Doolittle's buffers-on-stack/buffers-via-malloc patch.
 -Erik

23 years agoAdd in spoon's watchdog timer app.
Eric Andersen [Thu, 25 Jan 2001 23:40:32 +0000 (23:40 -0000)]
Add in spoon's watchdog timer app.
 -Erik

23 years agoBecause you demanded it, source tree snapshots are made available daily.
Mark Whitley [Thu, 25 Jan 2001 23:29:58 +0000 (23:29 -0000)]
Because you demanded it, source tree snapshots are made available daily.

23 years agoAdded Linux on nanoEngine to the list of known users.
Mark Whitley [Thu, 25 Jan 2001 23:00:12 +0000 (23:00 -0000)]
Added Linux on nanoEngine to the list of known users.

23 years agoUpdate contact info.
Eric Andersen [Thu, 25 Jan 2001 22:00:37 +0000 (22:00 -0000)]
Update contact info.

23 years agoApply a patch from Brent Priddy <brent.priddy@adtran.com> to add
Eric Andersen [Thu, 25 Jan 2001 05:12:02 +0000 (05:12 -0000)]
Apply a patch from Brent Priddy <brent.priddy@adtran.com> to add
'id -n' support.
 -Erik

23 years agoI just wrote 'insmod -o' to close bug#1049.
Eric Andersen [Thu, 25 Jan 2001 04:11:06 +0000 (04:11 -0000)]
I just wrote 'insmod -o' to close bug#1049.

23 years agoTar, by itself, could fail.
Eric Andersen [Thu, 25 Jan 2001 00:53:46 +0000 (00:53 -0000)]
Tar, by itself, could fail.

23 years agoCleanup from Larry Doolittle
Eric Andersen [Thu, 25 Jan 2001 00:47:31 +0000 (00:47 -0000)]
Cleanup from Larry Doolittle

23 years agoFix for dpkg-deb, courtesy of Larry Doolittle.
Eric Andersen [Thu, 25 Jan 2001 00:45:52 +0000 (00:45 -0000)]
Fix for dpkg-deb, courtesy of Larry Doolittle.
 -Erik

23 years agoAdd in Larry's CUSTOMIZED_BANNER patchlet, and let folks know that
Eric Andersen [Thu, 25 Jan 2001 00:04:16 +0000 (00:04 -0000)]
Add in Larry's CUSTOMIZED_BANNER patchlet, and let folks know that
BB_FEATURE_INIT_CHROOT needs to be rewritten to use pivot_root.
 -Erik

23 years agoMore regression testing found buglets
Eric Andersen [Thu, 25 Jan 2001 00:00:04 +0000 (00:00 -0000)]
More regression testing found buglets

23 years agoBug fix and small create_module cleanup from Larry Doolittle to
Eric Andersen [Wed, 24 Jan 2001 23:59:50 +0000 (23:59 -0000)]
Bug fix and small create_module cleanup from Larry Doolittle to
fix insmod, since I broke var=value args when I getopt'ified it.

23 years agoOops. I am an idiot. Put CFLAGS_EXTRA back. Sorry 'bout that.
Eric Andersen [Wed, 24 Jan 2001 23:53:43 +0000 (23:53 -0000)]
Oops.  I am an idiot.  Put CFLAGS_EXTRA back.  Sorry 'bout that.
 -Erik

23 years agoMore regression-found bug fixes
Eric Andersen [Wed, 24 Jan 2001 23:47:21 +0000 (23:47 -0000)]
More regression-found bug fixes