OSDN Git Service
Elliott Hughes [Fri, 8 May 2015 18:01:42 +0000 (18:01 +0000)]
am
0a5fd80f: Regenerate generated files.
* commit '
0a5fd80f5bd4a54301e9f519520bfea853b2cf72':
Regenerate generated files.
Elliott Hughes [Fri, 8 May 2015 18:01:41 +0000 (18:01 +0000)]
am
157763b5: Merge remote-tracking branch \'toybox/master\' into HEAD
* commit '
157763b582eb4ac50fed36a901b02fee8415aa00':
Fix more with missing files.
Re-enable catv command now that flag infrastructure is updated.
Elliott Hughes [Fri, 8 May 2015 17:39:42 +0000 (10:39 -0700)]
Regenerate generated files.
Change-Id: I0fa3010adc8740b1eaf19b3d073807618ca785ff
Elliott Hughes [Fri, 8 May 2015 17:33:46 +0000 (10:33 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Thu, 7 May 2015 19:39:36 +0000 (12:39 -0700)]
Merge remote-tracking branch 'goog/mnc-dev-plus-aosp' into mm
Elliott Hughes [Wed, 6 May 2015 21:39:12 +0000 (16:39 -0500)]
Fix more with missing files.
Previously we'd go into an infinite loop because we weren't
incrementing optargs.
Also add a missing flush so an error on stderr won't overtake the
escape code that resets reverse video.
Disclaimer: the new behavior isn't exactly like the desktop version;
surprisingly they try to open the next file _before_ they prompt. That
feels weird to me as a user, and seems like it would lead to a more
awkward implementation, but if you're more concerned about
authenticity...
Rob Landley [Wed, 6 May 2015 21:21:19 +0000 (16:21 -0500)]
Re-enable catv command now that flag infrastructure is updated.
Elliott Hughes [Tue, 5 May 2015 20:17:47 +0000 (13:17 -0700)]
Regenerate generated files.
Change-Id: Ie882b61d9bf3489348d145bc127bab8a128397fe
Elliott Hughes [Tue, 5 May 2015 20:15:19 +0000 (13:15 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Mon, 4 May 2015 17:56:16 +0000 (12:56 -0500)]
Implement SELinux ls -Z support.
This patch uses lgetfilecon rather than fgetfilecon because
dirtree_parentfd always seems to return -1 in this function. If/when
the SMACK code is fixed to work with dirtree_parentfd, I'll send a
matching patch for SELinux.
In the meantime, this works, and although ls -h is still on my to-do
list, I think this patch is sufficient to let us replace toolbox ls
with toybox ls.
Elliott Hughes [Mon, 4 May 2015 01:48:57 +0000 (18:48 -0700)]
Regenerate generated files after upstream sync.
Change-Id: I21fdf950573bd41610c524c63c71c22939e5badb
Rob Landley [Mon, 4 May 2015 01:18:53 +0000 (20:18 -0500)]
Replace android-specific hack with just signal(SIGPIPE, SIG_IGN).
Rob Landley [Mon, 4 May 2015 01:15:52 +0000 (20:15 -0500)]
Yank smack from singleconfig.
Need to come up with a better solution to this, but the problem is that
single.sh's symbol enabling isn't dependency aware, and "silentoldconfig"
prompts. I suspect the better solution is "write a kconfig replacement".
Elliott Hughes [Mon, 4 May 2015 00:32:42 +0000 (17:32 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: If8daf7f2f2e1b6d688050c4543d2648320bb21ad
Elliott Hughes [Sun, 3 May 2015 21:25:09 +0000 (16:25 -0500)]
Fix dmesg -c error output.
Use perror_exit to show the likely "Operation not permitted" if klogctl fails.
Rob Landley [Sun, 3 May 2015 21:20:27 +0000 (16:20 -0500)]
Move a prototype to the start of portability.h (suggested by Elliott Hughes)
Hyejin Kim [Sun, 3 May 2015 20:53:37 +0000 (15:53 -0500)]
dhcpd writes leases on "dhcpd.leases" file.
but, dumpleases read from "udhcpd.leases".
Elliott Hughes [Sun, 3 May 2015 20:31:41 +0000 (15:31 -0500)]
Fix getprop sorting and error reporting.
Use qstrcmp instead of alphasort (which expects struct dirent arguments).
Don't use perror_exit because property_list doesn't set errno.
Rob Landley [Sun, 3 May 2015 20:13:41 +0000 (15:13 -0500)]
Minor dmesg cleanup.
Rob Landley [Sun, 3 May 2015 17:41:05 +0000 (12:41 -0500)]
If a shortopt is configured out right before a bare longopt, the option parsing infrastructure segfaults because there's no next shortopt but the list isn't empty. (There was a test for this, but we're simultaneously traversing two lists and it was testing the wrong one.)
Mark Salyzyn [Sat, 2 May 2015 22:41:27 +0000 (17:41 -0500)]
dmesg: add -t suppress timestamp flag
Elliott Hughes [Sat, 2 May 2015 18:38:41 +0000 (11:38 -0700)]
Don't build chvt.
This functionality has been disabled in Android kernels since Cupcake.
Change-Id: I1855df32b618b3889eec75fbac7faac87ea385e0
Rob Landley [Fri, 1 May 2015 19:40:49 +0000 (14:40 -0500)]
Portability bits for the recent ls smack changes.
Rob Landley [Thu, 30 Apr 2015 21:51:50 +0000 (16:51 -0500)]
More ls cleanups from squinting at Jose's most recent smack patch.
Behavior change in flags: allow -long to work together, and -l1 work like -l
not -1.
I didn't make ls -gCl remember the g, though. (Because -Cg and -gC take
the last one: I'll preserve explicit state but not implicit state. And if
-1Cl and -lC1 aren't going to behave the same, it wasn't consistent anyway.)
Rob Landley [Thu, 30 Apr 2015 20:11:34 +0000 (15:11 -0500)]
Add default sigpipe handler for android (as suggested by Elliott Hughes).
Rob Landley [Thu, 30 Apr 2015 19:18:47 +0000 (14:18 -0500)]
And remove the header part too.
Rob Landley [Thu, 30 Apr 2015 19:02:34 +0000 (14:02 -0500)]
Wild guess at cleaning up smack support. Don't have a test environment yet.
Rob Landley [Thu, 30 Apr 2015 19:01:35 +0000 (14:01 -0500)]
Remove redundant numlen.
Jan Cybulski [Mon, 20 Oct 2014 13:26:12 +0000 (15:26 +0200)]
ls: Add -Z (Smack) option
Option triggers printing security context,
for smack that is file's access smack label.
Change-Id: I9054d9bcfe4d149e8fbfa0831b6ab50165d2bd91
Signed-off-by: Jan Cybulski <j.cybulski@samsung.com>
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
Rob Landley [Tue, 28 Apr 2015 17:18:17 +0000 (12:18 -0500)]
Fix truncate prefix bug and add truncate test suite entry.
Rob Landley [Tue, 28 Apr 2015 16:45:13 +0000 (11:45 -0500)]
Add prefix support Hyejin Kim asked about.
Rob Landley [Mon, 27 Apr 2015 23:56:11 +0000 (18:56 -0500)]
Fix ls -s and -i indentation in -C and -x modes. (Spotted by Jan Cybulski.)
Rob Landley [Mon, 27 Apr 2015 16:14:46 +0000 (11:14 -0500)]
Promote hexedit to other.
Rob Landley [Mon, 27 Apr 2015 16:13:19 +0000 (11:13 -0500)]
Some infrastructure hexedit needs. (Poor man's curses.)
Rob Landley [Mon, 27 Apr 2015 16:08:40 +0000 (11:08 -0500)]
Teach hexedit to actually edit. Add -r option for read only mode.
Rob Landley [Sat, 25 Apr 2015 20:52:59 +0000 (15:52 -0500)]
Fix display and cursor control (to respect bottom boundary).
No actual editing yet.
Rob Landley [Fri, 24 Apr 2015 22:09:51 +0000 (17:09 -0500)]
Too tired on the flight back from Japan to work on thinky stuff, so...
Elliott Hughes [Sat, 18 Apr 2015 21:03:18 +0000 (14:03 -0700)]
Use "git rev-parse" for the toybox version.
This is similar to upstream commit
90afbad4c1f115d5363fe99eb797d2458cd298a0,
but without relying on tags (which we don't have) and with an extra
"-android" on the end.
Change-Id: Iec1c50acf2615236213d511ff10845a31c9b9d0f
Rob Landley [Tue, 21 Apr 2015 06:45:07 +0000 (01:45 -0500)]
Bugfix from Hyejin Kim (count=1 shouldn't change name), plus a bounds check.
Test is 'echo "AAA c 1 0 0 2 5 0 0 1" | makedevs' makes AAA not AAA0.
Rob Landley [Tue, 21 Apr 2015 01:59:00 +0000 (20:59 -0500)]
Switch setprop to use TOYBOX_ON_ANDROID and fix getprop include.
(I commented out the android-only #include in getprop to do what compile
testing I could, and then forgot to uncomment it.)
Rob Landley [Mon, 20 Apr 2015 02:50:51 +0000 (21:50 -0500)]
Cleanup getprop, add qstrcmp() to lib for qsort (because posix-2008 broke
alphasort), add compile-time probe for config symbol TOYBOX_ON_ANDROID.
Isaac Dunham [Sat, 18 Apr 2015 18:25:06 +0000 (18:25 +0000)]
mdev: implement hotplug support.
Use DEVPATH, DEVNAME, MAJOR, MINOR, and SUBSYSTEM instead of
checking the current path and reading .../dev.
While we're here, probe for partitions in block devices.
This uses a very lame check for ACTION (which can be add, remove,
or change): if it is "remove", then unlink the device.
Rob Landley [Sun, 19 Apr 2015 05:15:46 +0000 (00:15 -0500)]
Roadmap update, mostly from enh with a few other pending bits mixed in.
Rob Landley [Sun, 19 Apr 2015 01:28:15 +0000 (20:28 -0500)]
Android getprop and setprop from Elliott Hughes.
Elliott Hughes [Sat, 18 Apr 2015 20:54:00 +0000 (13:54 -0700)]
Regenerate generated files.
Also temporarily stop building pending/ps.c --- it's under construction
and doesn't currently build with clang.
Change-Id: Ie83dc65be22df5850b08569ebb1b88d26155aca5
Elliott Hughes [Sat, 18 Apr 2015 20:40:26 +0000 (13:40 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Xavier Roche [Sat, 18 Apr 2015 01:18:30 +0000 (20:18 -0500)]
Link against libattr and libsmack.
Elliott Hughes [Fri, 17 Apr 2015 07:52:11 +0000 (02:52 -0500)]
Fix a trivial typo in www/about.html.
Sticky shift key...
Rob Landley [Fri, 17 Apr 2015 07:46:11 +0000 (02:46 -0500)]
Make toybox --version use the "git describe" info if it's available.
Elliott Hughes [Fri, 17 Apr 2015 02:21:02 +0000 (21:21 -0500)]
terminal_size should use LINES, not ROWS.
The shell's pseudo-variable is called LINES. This is true of at least
bash and mksh.
Rob Landley [Fri, 17 Apr 2015 01:10:23 +0000 (20:10 -0500)]
Shout from the rooftops that pending is not like other directories.
Rob Landley [Thu, 16 Apr 2015 01:53:00 +0000 (20:53 -0500)]
Put SELINUX in a a menu, and add config option for SMACK.
Elliott Hughes [Wed, 15 Apr 2015 18:40:14 +0000 (11:40 -0700)]
Regenerate generated files.
Change-Id: Ib06b41baacadd957260434b0d9b1217002e5a754
Rob Landley [Wed, 15 Apr 2015 00:37:55 +0000 (19:37 -0500)]
Yet more ps work. Still not there yet.
Elliott Hughes [Mon, 13 Apr 2015 18:16:49 +0000 (11:16 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: Ibe0ccccb99218e9c1d00e8c41725ecbac1a068d6
Samuel Holland [Sun, 12 Apr 2015 21:00:16 +0000 (16:00 -0500)]
unshare: fix -r
Calling unshare(2) immediately puts us in the new namespace
with the "overflow" user and group ID. By calling geteuid()
and getegid() in handle_r() after calling unshare(), we try
to map that to root, which Linux refuses to let us do.
What we really want to map to root is the caller's uid/gid
in the original namespace. So we have to save them before
calling unshare().
Rob Landley [Sun, 12 Apr 2015 11:17:11 +0000 (06:17 -0500)]
Before trying to remount read only, see if block device responds to "become rw"
ioctl(). (This is a thing Android's old mount already does.)
Elliott Hughes [Tue, 7 Apr 2015 21:07:46 +0000 (14:07 -0700)]
Implement Android restorecon.
On Android, much of the restorecon logic is in libselinux, so this
isn't portable. We do want to be able to build on the host for
testing *other* toys, though, so #if keeps this building.
Change-Id: Ida5a6713a926140c549d5770d62798f4aedca748
Elliott Hughes [Tue, 7 Apr 2015 20:11:55 +0000 (13:11 -0700)]
Fix load_policy error reporting.
Also switch to xopen for O_CLOEXEC paranoia and to avoid a conditional.
Change-Id: Iee5c4c124bcac800313f586768ffcaade542bd22
Elliott Hughes [Tue, 7 Apr 2015 20:08:51 +0000 (13:08 -0700)]
getenforce takes no arguments.
Change-Id: Icbee1df8b316039c68ef326f9d4d80f32c603b21
Elliott Hughes [Tue, 7 Apr 2015 20:07:47 +0000 (13:07 -0700)]
setenforce takes exactly one argument.
Change-Id: I83c478ea9ddd456c61e3f0f99506a1028a7027a1
Elliott Hughes [Fri, 10 Apr 2015 22:04:28 +0000 (17:04 -0500)]
Make more(1) usable.
> Yes, I know, "don't use pending". Sadly, more(1) is pretty useless
> without this. It gets confused by long lines or tabs.
>
> This patch also adds the missing prompt between multiple files.
actually, it looks like we're already hard-coding some escape
sequences? more(1) doesn't need anything that isn't in ANSI, so here's
an alternative patch that fixes the same bugs as the other patch but
also has a reverse-video prompt:
Elliott Hughes [Fri, 10 Apr 2015 21:57:54 +0000 (16:57 -0500)]
Update www/roadmap.html with Android progress.
Not much progress this week. Just route and umount.
Also remove a stray reference to load_policy which already switched.
Also remove an outdated claim that Android logging is done in the
kernel. It's been in userspace for a while now.
Rob Landley [Fri, 10 Apr 2015 05:14:56 +0000 (00:14 -0500)]
Tweak .gitignore.
Rob Landley [Tue, 7 Apr 2015 19:59:32 +0000 (14:59 -0500)]
Tweak README
Rob Landley [Tue, 7 Apr 2015 19:57:55 +0000 (14:57 -0500)]
Update multiplexer help text for --version
Elliott Hughes [Wed, 8 Apr 2015 17:53:59 +0000 (10:53 -0700)]
Switch to toybox getprop and regenerate generated files.
Change-Id: Ic9ee4d9411bd8904546358db3768d95183be0e82
Rob Landley [Wed, 8 Apr 2015 09:20:31 +0000 (04:20 -0500)]
Revert last mdev commit because it copied code out of a GPLv2 program.
Guys, you CANNOT COPY CODE FROM BUSYBOX. I don't care if I was the initial
author of that file, other people have touched it since.
I know I added "pending" because I couldn't keep up with code review in
realtime and stuff was getting lost, so we needed a place to park things
before they underwent the full dorodango process. I also know none of the
binaries I distribute has anything in pending enabled. But dude, if I'm going
to find stuff like this I have to start reviewing the code BEFORE applying
it to pending, and we all know where that leads.
Please don't do this again.
Elliott Hughes [Wed, 8 Apr 2015 04:41:32 +0000 (21:41 -0700)]
Implement getprop for toybox.
Change-Id: I10cff49b7c09e9d93b3d53848f2e7d590a045405
Elliott Hughes [Wed, 8 Apr 2015 03:36:38 +0000 (20:36 -0700)]
Really switch to toybox setprop.
(I forgot to add the symbolic link.)
Change-Id: Iee0dc95ff5c3d848d37861d223b33213588b10f7
Elliott Hughes [Wed, 8 Apr 2015 00:42:12 +0000 (17:42 -0700)]
Switch to toybox setprop and regenerate generated files.
Change-Id: I63efaef8d27de661eac497a106e2c2c0cac8a9bb
Elliott Hughes [Tue, 7 Apr 2015 22:46:00 +0000 (15:46 -0700)]
Implement setprop for toybox.
Because bionic/libcutils doesn't wait for init, I've duplicated a lot
of the input validation that init does so we can give good error messages.
Change-Id: I175421f7409f88813b88109f58825ce5649f1550
Elliott Hughes [Tue, 7 Apr 2015 21:51:26 +0000 (14:51 -0700)]
Switch to toybox restorecon and regenerate generated files.
Change-Id: If77674a3fb5e0d86193bdcf8850459eef689fba7
Elliott Hughes [Tue, 7 Apr 2015 21:07:46 +0000 (14:07 -0700)]
Implement Android restorecon.
On Android, much of the restorecon logic is in libselinux, so this
isn't portable. We do want to be able to build on the host for
testing *other* toys, though, so #if keeps this building.
Change-Id: Ida5a6713a926140c549d5770d62798f4aedca748
Elliott Hughes [Tue, 7 Apr 2015 20:18:32 +0000 (20:18 +0000)]
Merge "Fix load_policy error reporting."
Elliott Hughes [Tue, 7 Apr 2015 20:14:41 +0000 (13:14 -0700)]
Regenerate generated files.
Change-Id: Id31feaf9e432c29bbd345f1f68ba0ae749005ffb
Elliott Hughes [Tue, 7 Apr 2015 20:13:45 +0000 (20:13 +0000)]
Merge "getenforce takes no arguments."
Elliott Hughes [Tue, 7 Apr 2015 20:11:55 +0000 (13:11 -0700)]
Fix load_policy error reporting.
Also switch to xopen for O_CLOEXEC paranoia and to avoid a conditional.
Change-Id: Iee5c4c124bcac800313f586768ffcaade542bd22
Elliott Hughes [Tue, 7 Apr 2015 20:08:51 +0000 (13:08 -0700)]
getenforce takes no arguments.
Change-Id: Icbee1df8b316039c68ef326f9d4d80f32c603b21
Elliott Hughes [Tue, 7 Apr 2015 20:07:47 +0000 (13:07 -0700)]
setenforce takes exactly one argument.
Change-Id: I83c478ea9ddd456c61e3f0f99506a1028a7027a1
Rob Landley [Tue, 7 Apr 2015 16:54:36 +0000 (11:54 -0500)]
Adding --version broke ./toybox command list. (Oops.)
Rob Landley [Mon, 6 Apr 2015 01:00:33 +0000 (20:00 -0500)]
Announce switch to git.
Rob Landley [Mon, 6 Apr 2015 00:23:36 +0000 (19:23 -0500)]
Add --version to multiplexer.
Can't think of a better place to stick the actual version info than a #define
at the top of main. Makefile and toys.h are equally awkward, querying git
tags wouldn't work if building a release tarball... watch me forget to update
this when cutting a release.
Rob Landley [Mon, 6 Apr 2015 00:21:39 +0000 (19:21 -0500)]
Bite the bullet and switch over to git.
Elliott Hughes [Sun, 5 Apr 2015 17:14:19 +0000 (10:14 -0700)]
Upstream has moved to git.
Change-Id: Ie895a06e69b55982b7099a9b3107af369b5eefde
Paul Barker [Sat, 4 Apr 2015 16:58:06 +0000 (11:58 -0500)]
To ensure that toybox can be installed alongside busybox without
confusing update-alternatives, the paths of the links installed by toybox should
match those installed by busybox. This is accomplished by changing the flags
of a few tools within toybox.
Rob Landley [Sat, 4 Apr 2015 06:26:58 +0000 (01:26 -0500)]
Another in-progress ps snapshot.
Rob Landley [Fri, 3 Apr 2015 16:49:31 +0000 (11:49 -0500)]
Add readfileat() to lib
Rob Landley [Fri, 3 Apr 2015 16:46:44 +0000 (11:46 -0500)]
ps checkpoint du jour. Does not work yet.
Elliott Hughes [Fri, 3 Apr 2015 04:27:05 +0000 (21:27 -0700)]
Switch to toybox umount.
Change-Id: I0714a9c83fabef22623596f42028303337f8f5fb
Rob Landley [Thu, 2 Apr 2015 20:07:36 +0000 (15:07 -0500)]
Redoing ps from scratch. Random checkpoint that probably doesn't even compile.
Checking in a stopping point where I figured out what I did wrong, before changing it.
Elliott Hughes [Mon, 30 Mar 2015 18:25:18 +0000 (11:25 -0700)]
Switch to toybox route.
Change-Id: I20ef956379fb13cf11891564b232df9dfb43be39
Elliott Hughes [Mon, 30 Mar 2015 01:20:13 +0000 (18:20 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Sun, 29 Mar 2015 18:42:22 +0000 (11:42 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Sun, 29 Mar 2015 17:03:46 +0000 (12:03 -0500)]
Add head test for -123.
Rob Landley [Sun, 29 Mar 2015 17:01:30 +0000 (12:01 -0500)]
Fix head bug pointed out by felix janda (recent -123 code broke first file argument of -n).
Rob Landley [Sun, 29 Mar 2015 01:21:03 +0000 (20:21 -0500)]
Fix sed bug David Halls hit trying to compile libiconv.
Elliott Hughes [Sat, 28 Mar 2015 19:49:31 +0000 (12:49 -0700)]
Regenerate generated files after toybox sync.
Change-Id: Ie46c47811c74decd114bfc0d0cbbc600916fa13e
Elliott Hughes [Sat, 28 Mar 2015 19:35:29 +0000 (12:35 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Sat, 28 Mar 2015 18:22:27 +0000 (13:22 -0500)]
Fix printf bug (%.s should be %.0s not %s) reported by Isabella Parakiss.