Rob Landley [Sat, 13 Dec 2014 17:56:41 +0000 (11:56 -0600)]
Remove more strncpy() calls.
The semantics of strncat() and strncpy() are non-obvious, so let's not use 'em.
Both zero all their remaining buffer space, and with strncat() the size is
the space left at the _end_ of the string (not the size of the buffer) so
it's way too easy to stomp memory you don't own. As long as we have to measure
stuff ourselves to get it right, just use memcpy().
Elliott Hughes [Fri, 12 Dec 2014 02:17:28 +0000 (20:17 -0600)]
here's a patch that should let us replace toolbox's chcon.
(it also adds a feature, -R, because toybox makes that so easy.)
you'll probably want fancier configuration here because although the
--as-needed works okay, a typical Ubuntu box will have the .so but not
the .h files. i did consider adding a toys/selinux/ directory, but
given that existing tools like ls and id will want -Z SELinux options,
i wasn't sure whether you'd think it was worth segregating the
SELinux-only toys.
note that this won't help the tizen smack users (and patch for smack
won't help SELinux users). so you might want to think about where
you'd like us to be aiming: #if USE_SELINUX/USE_SMACK in all the
relevant places, or a toys/selinux and a toys/smack (though we'd still
need #if in at least ls and id), or a lib/security.c that concentrates
all the differences into one file?
Rob Landley [Thu, 11 Dec 2014 00:59:22 +0000 (18:59 -0600)]
Make unescape_delimited_string() copy the string so error reporting isn't so messed up.
Rob Landley [Wed, 10 Dec 2014 23:59:00 +0000 (17:59 -0600)]
Fix some sed bugs and improve error reporting.
A newline after 'b' commands in -e command line patterns was being discarded
as whitespace, a single element regex match on a {} was leaving stale state
for the next line, and giant -e blobs of instructions were saying things
like problem at character 432 (note: nulls inserted for regex processing
aren't always cleaned up, screws up error reporting).
Rob Landley [Fri, 5 Dec 2014 03:46:59 +0000 (21:46 -0600)]
Work with buildroot's extensively patched uClibc, and for nommu support move xfork() to portability.h and #ifdef based on __uClinux__ (which seems to be the nommu compiler define).
Rob Landley [Fri, 5 Dec 2014 03:41:12 +0000 (21:41 -0600)]
Implement xstrncat() and fix xstrndup().
Rob Landley [Thu, 4 Dec 2014 22:42:01 +0000 (16:42 -0600)]
Add shred.
Rob Landley [Wed, 3 Dec 2014 19:09:15 +0000 (13:09 -0600)]
More gzip stuff: now creates -0 compression files (store only), and does so to stdout.
Rob Landley [Tue, 2 Dec 2014 22:02:50 +0000 (16:02 -0600)]
Fix bug pointed out by Elliott Hughes ("vmstat 1" should repeat endlessly), and remove final delay (after all output) for "vmstat 2 3" case.
Rob Landley [Tue, 2 Dec 2014 19:00:08 +0000 (13:00 -0600)]
Note posix mailing list posting correcting a bug in the web version of the standard.
Rob Landley [Tue, 2 Dec 2014 09:17:34 +0000 (03:17 -0600)]
Don't mount a filesystem over an existing one with the same /dev and /dir.
The OS mostly catches this for block devices, but calling "mount -a" twice
shouldn't overmount tmpfs entries with new tmpfs instances. (This needs a test
suite entry, and the test suite needs a root context to run in...)
Rob Landley [Tue, 2 Dec 2014 09:12:58 +0000 (03:12 -0600)]
Switching on fortify was not kind to the pending directory. Fix the actual build break (open(O_CREAT) without permissions).
Rob Landley [Tue, 2 Dec 2014 09:05:01 +0000 (03:05 -0600)]
Start of deflate compress-side code, mostly refactoring and stubs so far.
Rob Landley [Mon, 1 Dec 2014 18:52:55 +0000 (12:52 -0600)]
Ashwini Sharma pointed out that "mkdir sub; ln -s . sub/up; du -L sub" shouldn't loop endlessly.
Rob Landley [Mon, 1 Dec 2014 09:15:25 +0000 (03:15 -0600)]
Refactor expr and add another test entry that works with TEST_HOST=1 but not with the one in pending.
Rob Landley [Sun, 30 Nov 2014 20:10:36 +0000 (14:10 -0600)]
Tests for operator priority groupings.
Rob Landley [Sun, 30 Nov 2014 17:05:39 +0000 (11:05 -0600)]
Remove the strncpy from mountpoint, and make a lot of other changes while I'm here (to be described on the mailing list).
Rob Landley [Sun, 30 Nov 2014 03:11:34 +0000 (21:11 -0600)]
The "re-exec to regain root permissions" logic broke the error message when calling root-only commands through the multiplexer.
It would say "no such command" when it should say "not root".
Rob Landley [Sun, 30 Nov 2014 01:07:08 +0000 (19:07 -0600)]
Minor whitespace cleanups.
Ashwini Sharma [Sun, 30 Nov 2014 00:38:05 +0000 (18:38 -0600)]
expr.c: Added '==' sign into list of operations. Also added support for regex pattern match.
Rob Landley [Fri, 28 Nov 2014 23:30:46 +0000 (17:30 -0600)]
Improve error reporting in parallel build. (On error, wait for all children to finish before exiting.)
Rob Landley [Fri, 28 Nov 2014 22:57:45 +0000 (16:57 -0600)]
Make sendfile use libbuf.
Rob Landley [Fri, 28 Nov 2014 22:56:53 +0000 (16:56 -0600)]
Tiny in-passing cleanups to more.c.
Rob Landley [Fri, 28 Nov 2014 22:53:59 +0000 (16:53 -0600)]
Check in most recent release notes.
Rob Landley [Fri, 28 Nov 2014 22:52:06 +0000 (16:52 -0600)]
When running a test, the diff is always an ascii diff, not binary.
Rob Landley [Fri, 28 Nov 2014 22:51:32 +0000 (16:51 -0600)]
Add "change" subdirectory to make clean.
Rob Landley [Fri, 28 Nov 2014 22:49:46 +0000 (16:49 -0600)]
Add "make change" target to build the big toybox binary as a bunch of little ones (in the "change" subdirectory), and tweak scripts/make.sh to avoid redundant work when rebuilding.
Rob Landley [Fri, 28 Nov 2014 02:38:21 +0000 (20:38 -0600)]
sed: c needs to trigger range logic like d, D works like d when there isn't anything left in the line, and more tests.
Rob Landley [Thu, 27 Nov 2014 06:28:13 +0000 (00:28 -0600)]
New ifconfig tests from Cynt Rynt.
(I added the "only run if root" stanza at the beginning.)
Rob Landley [Wed, 26 Nov 2014 03:45:18 +0000 (21:45 -0600)]
Update dmesg, loosely based on a patch from Elliott Hughes.
Probe the default buffer size, replace the constants with FLAG_x macros, add -r,
replace the byte at a time output with a single xwrite(), more comments.
Rob Landley [Wed, 26 Nov 2014 00:49:34 +0000 (18:49 -0600)]
Variant of a patch from Ashwini Sharma, making df /dev/node work and tweaking the spacing.
I didn't apply the POSIXLY_CORRECT gnuism because it's a can of worms (as would
be LSB_CORRECT), and you can presumably alias df="df -P" if you want that.
Possibly in future I should factor out the "readahead and align columns based
on measuring the largest value in each" code from ls and apply it here.
enh [Mon, 24 Nov 2014 23:26:09 +0000 (17:26 -0600)]
Android-related roadmap.html updates.
most notably:
* Android switched to mksh several releases ago.
* system/core/reboot is Android's reboot(1) (and sdcard is how
emulated sdcards work in production, not a testing thing).
* I removed all the "apparently unused" tools from the tree, since
they were all actually unused with the exception of lsusb which people
would build as/when they needed it. (which may need resurrecting when
they come back and find there's no "lsusb -v" in toolbox.)
Rob Landley [Mon, 24 Nov 2014 23:23:23 +0000 (17:23 -0600)]
Tweak the "ignoring return value" fortify workaround for readlinkat.
We zero the buffer and if the link read fails that's left alone, so
it's ok for the symlink not to be there. Unfortunately, typecasting the
return value to (void) doesn't shut up gcc, and having an if(); with the
semicolon on the same line doesn't shut up llvm. (The semicolon on a new
line would, but C does not have significant whitespace and I'm not going
to humor llvm if it plans to start.)
So far, empty curly brackets consistently get the warning to shut up.
Rob Landley [Sat, 22 Nov 2014 06:36:45 +0000 (00:36 -0600)]
As long as Android's going to require fortify, fixup the warnings it generates.
Rob Landley [Sat, 22 Nov 2014 06:31:03 +0000 (00:31 -0600)]
Whitespace/code style.
Elliott Hughes [Sat, 22 Nov 2014 03:49:05 +0000 (21:49 -0600)]
A patch against your current ToT that builds in AOSP
Rob Landley [Fri, 21 Nov 2014 16:06:45 +0000 (10:06 -0600)]
Don't include asm/* files directly.
Rob Landley [Fri, 21 Nov 2014 12:42:37 +0000 (06:42 -0600)]
Patch from Elliott Hughes for Android/bionic build.
Rob Landley [Thu, 20 Nov 2014 03:38:00 +0000 (21:38 -0600)]
Make md5sum and sha1sum work on big endian systems.
Rob Landley [Wed, 19 Nov 2014 22:55:12 +0000 (16:55 -0600)]
Fixups for the android/bionic build probes patch.
The CFG_* symbols are always defined so if() can use them as compile-time
constants, so don't if defined() them.
Doing USE_BLAH() around variable definitions opens up the same potential for
config-dependent build breaks as #ifdefs do, just make the whole command
depend on the symbol for now, factor out the utmpx infrastructure later.
The PTY probe was always failing because it used NULL without #including
the header that defines it. Substitute 0 instead.
Isaac Dunham [Wed, 19 Nov 2014 22:38:46 +0000 (16:38 -0600)]
probe for getspnam(), forkpty(), utmpx, replace sethostname()
Android is missing all of these; we need to probe for some so we have
a config symbol to depend on.
sethostname() is easily replaced.
We got termios.h via pty.h; now it's not included in configure-step tools,
so we need termios.h to generate globals.
Rob Landley [Wed, 19 Nov 2014 20:29:53 +0000 (14:29 -0600)]
Fix "tail -c 10" segfault spotted by Lukasz Szpakowski.
Once we've read through the initial TT.bytes backlog we discard the extra data,
meaning we adjust the remaining amount each time so the overflow is zero bytes.
We were doing the adjustment right, but not zeroing out the overflow counter
after we did so.
Rob Landley [Tue, 18 Nov 2014 10:25:27 +0000 (04:25 -0600)]
More sed bugfixes.
Rob Landley [Tue, 18 Nov 2014 03:21:04 +0000 (21:21 -0600)]
sed: fix 'q', and { }, and } after s/// with no semicolon.
Rob Landley [Mon, 17 Nov 2014 09:14:05 +0000 (03:14 -0600)]
More sed corner cases. (Empty regex repeats previous regex, implement -i, etc.)
Rob Landley [Mon, 17 Nov 2014 00:58:22 +0000 (18:58 -0600)]
Fix more sed bugs.
Rob Landley [Sun, 16 Nov 2014 20:21:42 +0000 (14:21 -0600)]
Fix sed 'b' with no label and 'N' in general.
Rob Landley [Sat, 15 Nov 2014 23:19:23 +0000 (17:19 -0600)]
More sed bugfixes. (Did you know s/[/]// is a valid sed expression?)
Rob Landley [Sat, 15 Nov 2014 22:16:29 +0000 (16:16 -0600)]
Debugging pass on sed: make the existing test suite pass.
Rob Landley [Fri, 14 Nov 2014 22:44:21 +0000 (16:44 -0600)]
Add a few more sed tests.
Rob Landley [Fri, 14 Nov 2014 22:44:00 +0000 (16:44 -0600)]
Add color support for scripts/test.sh and new SKIP_HOST for tests expected to fail on non-toybox implementations.
Rob Landley [Fri, 14 Nov 2014 21:53:17 +0000 (15:53 -0600)]
sed: implement s & and \1 backrefs.
Rob Landley [Wed, 12 Nov 2014 20:47:57 +0000 (14:47 -0600)]
Implement more sed plumbing, including s/// (without \1 or & yet).
Rob Landley [Tue, 11 Nov 2014 21:08:25 +0000 (15:08 -0600)]
Remove unnecessary assignment spotted by Cynt Rynt.
Rob Landley [Mon, 10 Nov 2014 23:17:17 +0000 (17:17 -0600)]
Implement another largeish chunk of sed. Untested, unfinished, do not use yet.
Rob Landley [Mon, 10 Nov 2014 23:14:11 +0000 (17:14 -0600)]
First cleanup pass on hwclock.
Ashwini Sharma [Mon, 10 Nov 2014 21:26:08 +0000 (15:26 -0600)]
hwclock: get and set the hwclock
Ashwini Sharma [Mon, 10 Nov 2014 21:25:35 +0000 (15:25 -0600)]
ipcrm : remove msg que, sem or shared memory
Rob Landley [Sun, 9 Nov 2014 20:16:33 +0000 (14:16 -0600)]
Yet more sed tests.
Rob Landley [Sat, 8 Nov 2014 07:51:59 +0000 (01:51 -0600)]
Implement a few sed commands. Not done, and not tested yet.
Rob Landley [Thu, 6 Nov 2014 22:26:59 +0000 (16:26 -0600)]
More sed tests.
Rob Landley [Wed, 5 Nov 2014 00:07:46 +0000 (18:07 -0600)]
Next round of sed infrastructure, parses most commands now, doesn't implement them yet.
Ashwini Sharma [Thu, 30 Oct 2014 23:36:09 +0000 (18:36 -0500)]
Attached are new toys TR and CRONTAB.
*tr.c*: It translate, squezze and delete characters.
Supported classes are alpha, alnum, digit, lower, upper
space, blank, puct, cntrl and xdigit.
*crontab.c*: Companion of crond. It maintains crontab files.
Rob Landley [Thu, 30 Oct 2014 21:47:29 +0000 (16:47 -0500)]
Test for ls -d from Isaac Dunham, and he pointed out -F also disables symlink following.
Rob Landley [Thu, 30 Oct 2014 10:32:54 +0000 (05:32 -0500)]
Bug report from Isaac Dunham: ls -d shouldn't follow command line symlinks without -H or -L (just like ls -l).
Rob Landley [Wed, 29 Oct 2014 23:44:33 +0000 (18:44 -0500)]
First batch of sed tests.
Only good for TEST_HOST=1 at the moment because the test infrastructure itself
depends on sed, so if an unfinished sed is in the $PATH it goes boing. But
hey, corner cases!
I have... more.
Rob Landley [Wed, 29 Oct 2014 19:49:47 +0000 (14:49 -0500)]
Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet.
Rob Landley [Wed, 29 Oct 2014 04:43:58 +0000 (23:43 -0500)]
Fill out rest of help text for sed.
Rob Landley [Tue, 28 Oct 2014 00:20:31 +0000 (19:20 -0500)]
Fix use after free error spotted by ?ukasz Szpakowski.
Rob Landley [Mon, 27 Oct 2014 23:08:59 +0000 (18:08 -0500)]
O_CLOEXEC was confusing the O_RDONLY test in loopfiles(), resulting in attempts to read from stdout instead of stdin for "-" or no arguments.
Rob Landley [Sun, 26 Oct 2014 18:34:33 +0000 (13:34 -0500)]
xexec() recursion limiter has to go after rebound or toy_init() zeroes it.
Rob Landley [Sun, 26 Oct 2014 17:56:41 +0000 (12:56 -0500)]
Cosmetic tweak: no trailing spaces when ./toybox lists command names.
Rob Landley [Fri, 24 Oct 2014 23:16:32 +0000 (18:16 -0500)]
Basic sed range support, enough for "sed -n 9,11p README" to work.
Rob Landley [Wed, 22 Oct 2014 22:11:06 +0000 (17:11 -0500)]
Teach ln -f to leave original target alone if link creation fails.
Suggested by Ashwini Sharma, I wound up implementing it by creating the new
link at a temporary name and renaming it over the old one instead of renaming
the old file out of the way and putting it back if it failed.
(Because "mkdir -p one/one/blah && ln -sf /bin/one one" would otherwise
rename one/one out of the way and only notice it can't delete it way at the
end when recovery's darn awkward, vs create new thing and if rename fails
(including EISDIR) that's the main error path. And yes the temporary name
is in the same directory as the destination so we never rename between mounts.)
link over the old one instead of renaming the old file and renaming it back.
Rob Landley [Tue, 21 Oct 2014 02:07:16 +0000 (21:07 -0500)]
Random in-progress snapshot of sed, not finished yet.
Rob Landley [Tue, 21 Oct 2014 00:56:05 +0000 (19:56 -0500)]
More static analysis fixes from Ashwini Sharma.
Rob Landley [Tue, 21 Oct 2014 00:52:29 +0000 (19:52 -0500)]
Add TOYBOX_NORECURSE so xexec() won't make internal function calls.
Andy Lutomirski [Sun, 19 Oct 2014 17:08:25 +0000 (12:08 -0500)]
nsenter: A tool to use setns(2)
This implements all of the namespace parts of nsenter, but UID and GID
switching are missing, as are -r and -w (both because they're not strictly
necessary and because the nsenter manpage has an insufficient
description of how they work).
Andy Lutomirski [Sat, 18 Oct 2014 01:40:03 +0000 (18:40 -0700)]
unshare: Fix help and option parsing
The help text was inconsistent, and option parsing was completely broken
(the options mostly did the wrong thing).
Rob Landley [Sat, 18 Oct 2014 22:14:12 +0000 (17:14 -0500)]
Factor out printf-style escape parsing logic from echo.c.
Rob Landley [Thu, 16 Oct 2014 10:58:35 +0000 (05:58 -0500)]
Even bigger ip.c, from Ashwini Sharma.
Rob Landley [Tue, 14 Oct 2014 19:16:34 +0000 (14:16 -0500)]
Use O_CLOEXEC instead of O_RDONLY to signal loopfiles_rw() to close filehandles.
Rob Landley [Tue, 14 Oct 2014 16:40:03 +0000 (11:40 -0500)]
Fix last night's mv commit (use dest, not source).
Rob Landley [Tue, 14 Oct 2014 05:01:22 +0000 (00:01 -0500)]
Implement mv -f and -i.
Rob Landley [Mon, 13 Oct 2014 15:49:24 +0000 (10:49 -0500)]
Started over on sed (by reading the posix spec).
Isaac Dunham [Fri, 10 Oct 2014 14:47:35 +0000 (09:47 -0500)]
acpi: implement -ctV, fix recursion, plug a small leak
* acpi_callback had blindly assumed that a path of 26 chars or more was
the right depth; rely on depth from dirtree root
* acpi -c shows cooling device state
some backlights are set up so that they will report dimmer as higher,
but that's a hardware issue that can't be sanely worked around.
* acpi -t shows temperatures
this implementation will pick up fan, battery temperatures, etc.
(but currently not hwmon-type temperatures, or hdd temps;
acpi 1.7 does not measure these either)
we handle milli-C (typical) and deci-C (I've seen this on Qualcomm
batteries, and not yet anywhere else)
we do *not* handle deci-K yet
* acpi -V shows all sensors
* without saving the result of dirtree_path() to free later, we had
a slow leak.
all callbacks call this once, so save it in GLOBALS()
acpi -t happens to need this anyhow, though using openat()/readall()
instead of readfile() would work.
Rob Landley [Thu, 9 Oct 2014 18:43:32 +0000 (13:43 -0500)]
Various bugfixes (mostly resource leaks) from Ashwini Sharma's static analysis, plus occasional tweak by me while reviewing them.
Rob Landley [Thu, 9 Oct 2014 17:17:36 +0000 (12:17 -0500)]
Fix use-after-free spotted by Ashwini Sharma's static analysis.
We xstrdup() an optargs string to avoid modifying our environment space
(because it can change what "ps" shows to other processes), and then parse
out colon delimited strings and save them in globals that can later be used
in the -v codepath and so on. But those globals _aren't_ strdup (no point)
which means we can't free the string while we're still using pointers into
the middle of it. So move the free to the end.
(I hardly ever test with CFG_TOYBOX_FREE switched on because even nommu
doesn't need it.)
Rob Landley [Wed, 8 Oct 2014 18:59:16 +0000 (13:59 -0500)]
Update status lists. (Once the pending-not-in-pending files go away (see toys/pending/README), this can be probed from the source.)
Rob Landley [Tue, 7 Oct 2014 19:11:54 +0000 (14:11 -0500)]
Basic update of the roadmap and status pages. (Both need a good scrub and polish beyond this.)
Rob Landley [Thu, 2 Oct 2014 12:53:27 +0000 (07:53 -0500)]
Release notes for 0.5.0.
Rob Landley [Thu, 2 Oct 2014 12:47:08 +0000 (07:47 -0500)]
Added tag 0.5.0 for changeset
7afd32673a5c
Rob Landley [Thu, 2 Oct 2014 12:24:38 +0000 (07:24 -0500)]
Workaround for musl's faccessat bug (the rm -r "error: is a directory" thing).
The Linux man page says I can use AT_SYMLINK_NOFOLLOW. It works in glibc,
uclibc, and klibc, but musl returns -EINVAL any time you pass in that flag
and the maintainer says that's not a bug and insists the man page and those
other libraries all change to match musl's behavior.
Toybox uses it to avoid scheduling unnecessary metadata writes for things we're
about to delete (have to chmod unreadable directories so we can descend into
them to delete their contents, the chmod happens before we descend so the
disk I/O has plenty of time to be scheduled) because the extra writes wear out
SSD faster. It's just an optimization and I don't really care if it works
_well_ (the fchmodat call _also_ takes AT_SYMLINK_NOFOLLOW so that's covered),
but musl's behavior uniquely makes the check always error and thus breaks normal
"rm -r".
Yes this workaround is checking #ifdef __MUSL__ which the library does not
supply (because its code is perfect and will thus never need to be worked
around). You can CFLAGS=-D__MUSL__ if you don't echo "#define __MUSL__" >>
include/features.h when installing the library.
Rob Landley [Thu, 2 Oct 2014 00:57:34 +0000 (19:57 -0500)]
Bugfix from Ashwini Sharma: Z timezone required by posix for touch but not for libc, so we have to implement it here.
Ashwini Sharma [Mon, 29 Sep 2014 00:34:53 +0000 (19:34 -0500)]
Updated version, having complete support for ip _link_, _addr_, _rule_, _route_ and _tunnel_ options.
Rob Landley [Sun, 28 Sep 2014 23:22:34 +0000 (18:22 -0500)]
Fix two mount bugs: 1) Don't skip a filesystem type when setting up loopback mount, 2) Don't stop checking filesystem types due to EBUSY, it may mean already mounted by another filesystem type you haven't tried yet.
Rob Landley [Sun, 28 Sep 2014 18:15:41 +0000 (13:15 -0500)]
mount: terminate list so unknown user mount attempts don't endlessly loop, add better error reporting.
Rob Landley [Sun, 28 Sep 2014 18:11:20 +0000 (13:11 -0500)]
Brown paper bag time: comma_scan() didn't work for anything but the last entry.
Rob Landley [Sun, 28 Sep 2014 02:07:00 +0000 (21:07 -0500)]
Multi-build single.sh should exit with an error when build breaks.
Rob Landley [Sun, 28 Sep 2014 02:04:47 +0000 (21:04 -0500)]
Cleanup pass on groupdel.