OSDN Git Service
William Haddon [Sun, 10 Nov 2013 01:37:41 +0000 (19:37 -0600)]
grep doesn't allocate enough space
Grep miscalculates the amount of memory it needs to allocate when "converting
strings to one big regex" when the -e flag is not specified. Since in this case
"\|" is inserted between strings rather than "|", two extra bytes rather than
one need to be provided for each string. I noticed this because it caused grep
to seg-fault on musl when a regex of exactly seven characters is provided.
Rob Landley [Sat, 9 Nov 2013 18:23:48 +0000 (12:23 -0600)]
Typo spotted by Anca Emanuel.
Rob Landley [Thu, 7 Nov 2013 15:04:50 +0000 (09:04 -0600)]
Tweak terminal_size to never set either to 0, and return true/false whether it could determine at least one coordinate.
(If you set $COLUMNS but not $ROWS, we assume you're happy with the 80x25 default for the other.)
Rob Landley [Sun, 3 Nov 2013 23:09:33 +0000 (17:09 -0600)]
Fix off by one, pointed out by Ashwini Sharma.
Rob Landley [Sat, 2 Nov 2013 20:10:55 +0000 (15:10 -0500)]
Sceond cleanup pass on vconfig
Rob Landley [Sat, 2 Nov 2013 19:24:54 +0000 (14:24 -0500)]
Give xstrncpy() a more informative error message.
Rob Landley [Sat, 2 Nov 2013 19:24:33 +0000 (14:24 -0500)]
Merge toynet.h into toys.h: musl supports it and micromanaging uClibc config options isn't very interesting anymore.
Rob Landley [Sat, 2 Nov 2013 16:07:25 +0000 (11:07 -0500)]
Cleanup vconfig.
Rob Landley [Fri, 1 Nov 2013 03:22:21 +0000 (22:22 -0500)]
Patch from William Haddon to make xargs with blank input call its command line once. (Tweaked slightly for whitespace and to collate variable declarations.)
Rob Landley [Thu, 31 Oct 2013 14:36:55 +0000 (09:36 -0500)]
Make the patch -x option (only enabled with CONFIG_DEBUG) provide more information about why a patch didn't apply. (Offset of first nonmatching character at each line during seek phase.)
Rob Landley [Sun, 27 Oct 2013 07:50:55 +0000 (02:50 -0500)]
Promote nl from pending to posix, and add tests.
Rob Landley [Sun, 27 Oct 2013 07:48:13 +0000 (02:48 -0500)]
Cleanup nl, add support for more bits of posix.
Isaac Dunham [Mon, 28 Oct 2013 00:11:07 +0000 (19:11 -0500)]
Here's a revised cpio.
I've reduced the use of malloc(), dropped an extra function call, and
-at least in theory- allowed proper handling of non-regular files.
(If we have a file we can't read, we still should record it when it's
of a type where file content is ignored).
Rob Landley [Sun, 27 Oct 2013 05:02:56 +0000 (00:02 -0500)]
Refactor terminal querying.
Elie De Brauwer [Sun, 13 Oct 2013 13:33:32 +0000 (15:33 +0200)]
watch: Add support for -e option, remove memory leak and deal with not-wide terminals
Jeroen van Rijn [Sat, 26 Oct 2013 17:59:28 +0000 (12:59 -0500)]
I noticed the user count was missing and added this, borrowing a bit of code from toys/posix/who.c.
Rob Landley [Wed, 23 Oct 2013 07:52:01 +0000 (02:52 -0500)]
Don't use $CC without $CROSS_COMPILE because $HOSTCC could be something else entirely.
Rob Landley [Thu, 17 Oct 2013 19:43:38 +0000 (14:43 -0500)]
Minor cleanup of reboot
Elie De Brauwer [Tue, 1 Oct 2013 18:57:21 +0000 (20:57 +0200)]
New toy: reboot/halt/poweroff
Rob Landley [Thu, 17 Oct 2013 01:41:56 +0000 (20:41 -0500)]
useradd, groupadd, and mkpasswd submitted by Ashwini Sharma.
Rob Landley [Thu, 17 Oct 2013 01:01:46 +0000 (20:01 -0500)]
Minor lib/password.c cleanup, described on the list. (Inline two functions.)
Rob Landley [Thu, 17 Oct 2013 00:30:17 +0000 (19:30 -0500)]
Prep work for useradd by Ashwini Sharma.
Rob Landley [Tue, 15 Oct 2013 05:57:39 +0000 (00:57 -0500)]
Teach scripts/test.sh to call scripts/single.sh.
Isaac Dunham [Mon, 14 Oct 2013 16:15:22 +0000 (11:15 -0500)]
I've finally gotten 'cpio' into a shape where it could be useable.
This version can archive and extract directories, sockets, FIFOs, devices,
symlinks, and regular files.
Supported options are -iot, -H FMT (which is a dummy right now).
It only writes newc, and could read newc or newcrc.
This does NOT implement -d, which essentially is equivalent to
mkdir -p $(dirname $FILE)
for every file that needs it.
Hard links are not supported, though it would be easy to add them given
a hash table or something like that.
I also have not implemented the "<n> blocks" output on stderr.
If desired, I can add it pretty simply.
There is one assumption this makes: that the mode of a file, as mode_t,
is bitwise equivalent to the mode as defined for the cpio format.
This is true of Linux, but is not mandated by POSIX.
If it is compiled for a system where that is false, the archives will
not be portable.
Rob Landley [Tue, 8 Oct 2013 23:02:23 +0000 (18:02 -0500)]
Move blkid out of pending, default y.
Rob Landley [Tue, 8 Oct 2013 20:58:08 +0000 (15:58 -0500)]
Cleanup chvt
Rob Landley [Tue, 8 Oct 2013 17:25:02 +0000 (12:25 -0500)]
Cleanup blkid
Rob Landley [Mon, 7 Oct 2013 20:04:09 +0000 (15:04 -0500)]
blkid cleanup: more whitespace (including fixing a strange unindented if block), convert strange fstype inclusion to OLDTOY(), use "<1" arg so calling with no arguments doesn't hang, convert typedef to normal struct.
Rob Landley [Mon, 7 Oct 2013 19:37:41 +0000 (14:37 -0500)]
blkid cleanup: Convert tabs to spaces.
Brad Conroy [Mon, 7 Oct 2013 19:12:35 +0000 (14:12 -0500)]
Add blkid.c
I finally figured out the NTFS labels after reading a rant on how UTF-8 rocks
and how MS switched to UTF16 or UCS1 or whatever. The reason I couldn't grep
for the label (mine was "myntfs") was that it is stored as
"m\0y\0n\0t\0f\0s\0\0" - found another good use for hexdump :)
Notes:
I only have x86 to test on, so there are a couple of places that may need
bswap_{16,32} for endianness. I used a 65k buf instead of toybuf (4k) for
simplicity, but tried to organize it for toybuf if wanted. I have info on
more fs types, to patch with after review. blkid does output for all devices
if 0 args -> read /proc/partitions?
Rob Landley [Sun, 6 Oct 2013 21:02:20 +0000 (16:02 -0500)]
Whitespace tweaks and remove unused variable.
Rob Landley [Sun, 6 Oct 2013 08:12:48 +0000 (03:12 -0500)]
top submitted by Ashwini Sharma
Rob Landley [Sun, 6 Oct 2013 22:35:57 +0000 (17:35 -0500)]
It's not a problem to exactly fill up the buffer with a run if the next symbol is the terminating symbol. Fixes https://jira.cyanogenmod.org/browse/CYAN-1896
Rob Landley [Fri, 4 Oct 2013 19:32:39 +0000 (14:32 -0500)]
Typo: fdisk != fsck.
Rob Landley [Thu, 3 Oct 2013 08:18:00 +0000 (03:18 -0500)]
Switch flag generation from shell to C.
This should actually generate FLAG_longopt 0 #defines for disabled bare
longopts (ala ls without --color). Put temporary executables under "generated"
(including instlist for install).
Rob Landley [Sun, 22 Sep 2013 16:21:06 +0000 (11:21 -0500)]
traceroute from Ashwini Sharma
Rob Landley [Sun, 22 Sep 2013 08:37:39 +0000 (03:37 -0500)]
Fix generated/oldtoys.h to contain option strings with USE() macros in them.
Rob Landley [Sat, 21 Sep 2013 19:27:26 +0000 (14:27 -0500)]
Update lib/args.c docs.
Rob Landley [Sat, 21 Sep 2013 18:46:44 +0000 (13:46 -0500)]
Tweak args (yank old + that never worked, rename | to +), and add uname -o as a synonym for -s.
Rob Landley [Sat, 21 Sep 2013 17:24:04 +0000 (12:24 -0500)]
Fluff out option parsing documentation, add another DEBUG test.
Rob Landley [Tue, 17 Sep 2013 04:41:51 +0000 (23:41 -0500)]
Fix -t c0 and -J as reported by heehooman at gmail on the list.
Also fix up help text, and hook up -c.
Rob Landley [Wed, 18 Sep 2013 15:50:38 +0000 (10:50 -0500)]
Release announcement on web page.
Rob Landley [Wed, 11 Sep 2013 17:09:53 +0000 (12:09 -0500)]
Ah, that's why commit 1057 was skipped last pull: it was unfinished. Oops. (Fix it.)
Rob Landley [Tue, 10 Sep 2013 07:04:45 +0000 (02:04 -0500)]
First pass of cut cleanup, and make test script slightly happier with the concept of 80 character lines.
Rob Landley [Tue, 10 Sep 2013 06:01:35 +0000 (01:01 -0500)]
Remove two unused functions and shrink another.
Rob Landley [Mon, 9 Sep 2013 16:39:18 +0000 (11:39 -0500)]
Cleanup on acpi, switch to default y.
Isaac Dunham [Mon, 9 Sep 2013 16:19:59 +0000 (11:19 -0500)]
I got tired of trying to guess how much terminal time I could get in on my phone, so here's a basic acpi.
I could probably add -c fairly easily (print type, cur_state, and max_state)
-t is more difficult, since temperatures are reported in at least
1000 * degrees F and 10 * degrees C.
Rob Landley [Mon, 9 Sep 2013 16:18:18 +0000 (11:18 -0500)]
Minor cleanups.
Rob Landley [Mon, 9 Sep 2013 11:50:00 +0000 (06:50 -0500)]
Don't write a zero past end of toybuf with large -d value.
Rob Landley [Mon, 9 Sep 2013 10:52:49 +0000 (05:52 -0500)]
Minor cosmetic tweaks to expand.
Working my way through the to-review list that predates the "pending"
directory. This gets expand off my to-review list. (Proof that "need to
review" doesn't mean it's in bad shape, this command was fine. Changed
capitalization in the help text because I'm trying to have "user supplies
this value" be all caps, switched a read() to readall() although I'm not
sure modern kernels actually allow -EINTR to generate zero length reads
anymore, and since most of the loopfiles() target functions are called
do_commandname() changed the name to that just so it's regular. None of
the changes are actually important. :)
Rob Landley [Mon, 9 Sep 2013 10:26:52 +0000 (05:26 -0500)]
Adjust patch to use dlist_pop()
Rob Landley [Mon, 9 Sep 2013 09:26:03 +0000 (04:26 -0500)]
Redo tail closer to the original design. Add more tests for large data sets. (Still no -f support yet.)
Rob Landley [Mon, 9 Sep 2013 07:44:02 +0000 (02:44 -0500)]
Fix [-group] argument dropping.
Rob Landley [Tue, 3 Sep 2013 23:43:32 +0000 (18:43 -0500)]
Replace for_each_pid_with_name_in_array_perform_callback_function_upon_translated_value() with name_to_pid(), comparing absolute paths or just basename() consistently as spotted by Lukasz Skalski, and adjust callers.
Rob Landley [Fri, 6 Sep 2013 04:58:35 +0000 (23:58 -0500)]
Pending cleanup page, less than half done. Some of it should probably move to the code style section.
Rob Landley [Fri, 6 Sep 2013 17:21:28 +0000 (12:21 -0500)]
Ashwini Sharma submitted route.c, adding it to pending.
Rob Landley [Fri, 6 Sep 2013 17:18:46 +0000 (12:18 -0500)]
Make [-abc] exclude logic clear argument slots when disabling options.
Rob Landley [Fri, 6 Sep 2013 09:45:36 +0000 (04:45 -0500)]
Fix for xpidfile spotted by Felix Janda.
Rob Landley [Fri, 6 Sep 2013 06:55:53 +0000 (01:55 -0500)]
Missing typecast in recent rm fix. Oops.
Rob Landley [Thu, 5 Sep 2013 11:54:46 +0000 (06:54 -0500)]
Allow shipped generated/help.h to still be used, until I rewrite the generator in C.
Elie De Brauwer [Fri, 30 Aug 2013 21:59:10 +0000 (23:59 +0200)]
make.sh: Fix probing for python2.x and be verbose in error reporting
Elie De Brauwer [Fri, 30 Aug 2013 21:31:00 +0000 (23:31 +0200)]
uname: Fix help string
Jacek Bukarewicz [Thu, 5 Sep 2013 09:58:06 +0000 (04:58 -0500)]
env - there were 2 segfaults when run on my Ubuntu 12.04 machine:
- one is because eglibc sets environ to NULL on clearenv(). I added check for environ being not NULL when iterating over environment variables
- switched xexec to xexec_optargs because command argument is a pointer to optarg which is freed by xexec.
Rob Landley [Thu, 5 Sep 2013 09:28:40 +0000 (04:28 -0500)]
Make chdir handle permissions according to posix, reported by Jacek Bukarewicz..
Rob Landley [Thu, 5 Sep 2013 09:19:37 +0000 (04:19 -0500)]
fix rm to handle "mkdir sub/sub && chmod 007 sub/sub && rm -rf sub".
Previous version didn't delete it, but exited without error. Neither was right.
Rob Landley [Thu, 5 Sep 2013 00:09:00 +0000 (19:09 -0500)]
Don't pad stat's %a field.
Rob Landley [Wed, 4 Sep 2013 06:40:41 +0000 (01:40 -0500)]
First pass at umount, not quite done yet.
Rob Landley [Tue, 3 Sep 2013 22:56:28 +0000 (17:56 -0500)]
Introduce libbuf analogous to toybuf but for use by lib/*.c. Change readfile() semantics to be able to read into an existing buffer, or malloc its own if that's NULL.
Rob Landley [Tue, 3 Sep 2013 13:30:47 +0000 (08:30 -0500)]
Remove itoa/utoa, let libc do this with sprintf.
Rob Landley [Tue, 3 Sep 2013 13:16:42 +0000 (08:16 -0500)]
Convert dhcp/dhcpd from utoa() to sprintf().
Rob Landley [Tue, 3 Sep 2013 03:20:29 +0000 (22:20 -0500)]
Switch ls from utoa to sprintf.
Rob Landley [Mon, 2 Sep 2013 23:48:59 +0000 (18:48 -0500)]
Cleanup pwdx
Rob Landley [Mon, 2 Sep 2013 10:06:05 +0000 (05:06 -0500)]
pwdx by Lukasz Skalski.
Rob Landley [Sun, 1 Sep 2013 13:00:41 +0000 (08:00 -0500)]
Implement ls --color=auto, suggested by Rich Felker.
Rob Landley [Sun, 1 Sep 2013 12:50:32 +0000 (07:50 -0500)]
Improve --longopt parsing: general bugfixes, better error reporting, new ; option for optional arguments only suppliable with =.
Rob Landley [Sun, 1 Sep 2013 12:25:37 +0000 (07:25 -0500)]
Update status and roadmap pages, and status page generator script.
Felix Janda [Sat, 31 Aug 2013 10:30:41 +0000 (12:30 +0200)]
tail: Some fixes
- Rewrite most of the not lseek() logic
- Change meaning of len in line_list
- Use single instead of double linked list
Rob Landley [Fri, 30 Aug 2013 22:34:24 +0000 (17:34 -0500)]
Allow getmountlist to read fstab too.
Rob Landley [Fri, 30 Aug 2013 06:53:31 +0000 (01:53 -0500)]
Add scripts/single.sh to build individual non-multiplexed standalone commands.
Alas, you can't quite do this yet:
make defconfig
make
for i in $(./toybox)
do
echo $i
PREFIX=singles/ scripts/single.sh $i || break
done
Because the OLDTOY() aliases for commands won't build without the base command.
And I can't just skip them because chown/chmod or mv/cp aren't the same thing.
Rob Landley [Thu, 29 Aug 2013 22:55:46 +0000 (17:55 -0500)]
PID and UID namespaces for unshare, pointed out by heehooman@gmail.com.
Rob Landley [Wed, 28 Aug 2013 04:48:54 +0000 (23:48 -0500)]
Rewrite pmap to be simpler and match other implementation's output more closely.
Ashwini Sharma [Tue, 27 Aug 2013 08:31:27 +0000 (03:31 -0500)]
Add pmap.
Felix Janda [Mon, 26 Aug 2013 19:55:33 +0000 (21:55 +0200)]
syslogd: cleanup
- fix bugs introduced in the cleanups
- inline addrfds() and open_unix_socks() and simplify them
- use xpidfile()
- remove isNetwork from struct logfile
- invert the meaning of facility and level in struct logfile so
that they are automatically correctly initialized
- fix memory leak regarding the filenames of logfiles
- TT.sd was unused
Felix Janda [Sat, 24 Aug 2013 10:04:45 +0000 (12:04 +0200)]
syslogd: cleanup
- fix bugs in previous cleanups
- remove config from struct logfile
- simplify parse_config()
Felix Janda [Fri, 23 Aug 2013 20:50:29 +0000 (22:50 +0200)]
syslogd: stop abusing arg_list
Felix Janda [Fri, 23 Aug 2013 20:19:55 +0000 (22:19 +0200)]
syslogd: cleanup
- simplify resolveconfig() -> now logger_lookup is also used in syslogd.c
- inline addrfds
- small cosmetical changes in parse_config_file()
Felix Janda [Wed, 21 Aug 2013 19:24:45 +0000 (21:24 +0200)]
syslogd: cleanup
- remove flag macros
- remove some unecessary gotos
- inline open_udp_socks() and getport()
- simplify resulting open_logfiles()
Now in the syslog.conf the port numbers for remote hosts are no
longer allowed to be hexadecimal. If there is need for hexadecimal
port numbers, one can as well accept octal ones and use base 0
in strtoul.
Rob Landley [Wed, 21 Aug 2013 10:38:53 +0000 (05:38 -0500)]
Fix bug where exit code was only correct for -q.
Rob Landley [Wed, 21 Aug 2013 08:03:47 +0000 (03:03 -0500)]
Fix --help option to multiplexer.
Felix Janda [Tue, 20 Aug 2013 21:15:48 +0000 (23:15 +0200)]
syslogd: cleanup
- Remove structure fd_pair so that sigfd can go into GLOBALS
- Remove struct typedefs
- Inline setup_signal()
- Small fix in Usage message
Rob Landley [Tue, 20 Aug 2013 20:37:42 +0000 (15:37 -0500)]
Add watch and ps, sent by Ashwini Sharma.
Felix Janda [Mon, 19 Aug 2013 20:11:22 +0000 (22:11 +0200)]
In logger and syslogd remove duplicated definitions of facilities and priorities
In syslogd.c get the definitions from <syslog.h>. For logger.c we
can't do this as well since it causes multiply defined symbols.
Instead we define a non-static lookup function in syslog.c for
logger.
Rob Landley [Mon, 19 Aug 2013 09:23:16 +0000 (04:23 -0500)]
Move grep from pending to posix, switch default to y.
Rob Landley [Mon, 19 Aug 2013 08:17:51 +0000 (03:17 -0500)]
Finish grep rewrite and fleshing out test suite. Several of the grep tests fail with the ubuntu version, I _think_ these are upstream bugs? (Second opinions welcome...)
Rob Landley [Sun, 18 Aug 2013 21:12:28 +0000 (16:12 -0500)]
Use OPTSTR_command macro for more oldtoys, to avoid keeping two option strings in sync. (todo: figure out how to make OLDTOY() automatically use macro. Still need the raw version for subset ala cp/mv though.)
Rob Landley [Sun, 18 Aug 2013 19:24:59 +0000 (14:24 -0500)]
Document the toybox entry path from main() into a command.
Rob Landley [Sun, 18 Aug 2013 19:04:18 +0000 (14:04 -0500)]
Fix wrong printf type.
Rob Landley [Sun, 18 Aug 2013 19:01:46 +0000 (14:01 -0500)]
Whitespace changes to passwd.
Rob Landley [Sun, 18 Aug 2013 18:52:08 +0000 (13:52 -0500)]
Fix usage: lines for a couple commands.
Rob Landley [Sun, 18 Aug 2013 09:12:51 +0000 (04:12 -0500)]
Remove files du no longer needs.