History log of /system/core/toolbox/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
bfcd810b792f7ffbb2ec1360c0c2662725fd0362 22-Aug-2012 Jeff Sharkey <jsharkey@android.com> Iteration on multi-user external storage.

Define /storage as top-level concept, so that we enforce permissions
uniformly. Moves external storage paths from headers to per-device
environment variables. Added missing mount flags, and we no longer
have adb-specific external storage.

Bug: 6925012
Change-Id: Ic7ca953be2f552d3f0ec9e69f89fef751daa1b29
ount.c
2ab69388cb4e26855cc7a9f3584935b927a3659e 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 76080925: am 52d5dfc8: Merge "vmstat: Fix -n flag"

* commit '76080925410db41cfa5c70ffcffaa2b3b4d59aad':
vmstat: Fix -n flag
52d5dfc8d30890734ee7122c3139f8637e196a1c 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "vmstat: Fix -n flag"
ba822edb30d5221934137052d42a81ad993b3ea9 14-Aug-2012 Kenny Root <kroot@android.com> am 02e9f8d5: am 53dab583: Merge "Make setenforce usage function static."

* commit '02e9f8d5aa390d89f79b2b3bb8630af4062b4d2c':
Make setenforce usage function static.
492051ed2a06ea902d7b7e8ba1998121ced9b0be 18-Jul-2012 Matt Finifter <finifter@google.com> Make setenforce usage function static.

Change-Id: I6de204dc072418805160a35d799b8948ecb39251
etenforce.c
605103fb553a8b872aa8dd0aef76ae8b3bfe47fa 13-Aug-2012 Kenny Root <kroot@google.com> resolved conflicts for merge of 4dcd52ab to jb-mr1-dev

Change-Id: Ibd0c03a7883a2e31adab18543c016776b7b36866
ae6f3d7c05070f7e0e56fe0056c8923c6ee2f473 01-May-2012 Stephen Smalley <sds@tycho.nsa.gov> Add support for reloading policy from /data/system.

To support runtime policy management, add support for reloading
policy from /data/system. This can be triggered by setting the
selinux.loadpolicy property to 1, whether from init.rc after
mounting /data or from the system_server (e.g. upon invocation of
a new device admin API for provisioning policy). ueventd and
installd are restarted upon policy reloads to pick up the new
policy configurations relevant to their operation.

Change-Id: I97479aecef8cec23b32f60e09cc778cc5520b691
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
estorecon.c
8268a75e86c086c4618c2f8d8e9531eb8d7b30f5 08-Aug-2012 Elliott Hughes <enh@google.com> am c5db017c: am 63b2c577: Merge "Conditionally use SIGSTKFLT"

* commit 'c5db017cc3d30b1b15544ca9889e66890710f93c':
Conditionally use SIGSTKFLT
7ac420972adc71d0654d10446078751b571aa301 10-Jul-2012 Chris Dearman <chris@mips.com> Conditionally use SIGSTKFLT

Change-Id: I555b33b5a93df332c556944a1c00fff417825247
ill.c
3e8b1581ff0f2daa934eb9d6362dfe4e2b4fa8c9 14-Jul-2012 Jeff Sharkey <jsharkey@android.com> Ported "grep" from NetBSD to toolbox.

Bug: 6798417
Change-Id: I581c496a726a4814edaaa3672849c090bac8552c
ndroid.mk
rep/fastgrep.c
rep/file.c
rep/grep.c
rep/grep.h
rep/queue.c
rep/util.c
57df14c654a968e5b85d508cbd0871632011cb0e 14-Jul-2012 Jeff Sharkey <jsharkey@android.com> Ported "cp" from NetBSD to toolbox.

Bug: 6798417
Change-Id: I716ab459b9edf4c7405bf042adbee0300b6f51c9
ndroid.mk
p/cp.c
p/extern.h
p/utils.c
6caab4ce959478b96c40955236e13e80ef83145d 10-Jan-2012 Arun Raghavan <arun.raghavan@collabora.co.uk> vmstat: Fix -n flag

The loop condition for the number of iterations basically caused the
argument to -n to be ignored. This fixes the condition appropriately.
mstat.c
8103e9148378fb8879e3bc7d8504d267c2d9daa9 10-Jul-2012 Ken Sumrall <ksumrall@android.com> Add the du command to toolbox

The code is from NetBSD, with the -n and -h options removed to make
porting easy. Also, removed support for the BLOCKSIZE environment
variable for the same reason.

Change-Id: Ib927ff3527e02802785fdd7f75bab1f05222918e
ndroid.mk
u.c
3f2b0a506f1e09e6960c050778870da289fc4702 26-Jun-2012 Nick Kralevich <nnk@google.com> Add mode when open(O_CREAT) is used.

When creating a new file using open(..., O_CREAT), it is an error
to fail to specify a creation mode. If a mode is not specified, a
random stack provided value is used as the "mode".

This will become a runtime error in a future version of Android.

Change-Id: I00609f37d2ea68e21b6404d542830386be354202
d.c
60f3d65c831a40897a942513147039eef20d2149 12-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 2a2e10fb: am 16d2b6ae: am 91e5551f: Merge "toolbox: rmmod: fix module unloading"

* commit '2a2e10fbb38e4f4d7759f619275fa4ebd596259a':
toolbox: rmmod: fix module unloading
2a2e10fbb38e4f4d7759f619275fa4ebd596259a 12-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 16d2b6ae: am 91e5551f: Merge "toolbox: rmmod: fix module unloading"

* commit '16d2b6ae4050b1232fd164cef1dbade532fe29a4':
toolbox: rmmod: fix module unloading
91e5551f88aea5aa64e1b4f8b4b52d7be2b28b64 12-Jun-2012 Jean-Baptiste Queru <jbq@google.com> Merge "toolbox: rmmod: fix module unloading"
393e559ddc06e8698841f8e141f5a5e24cffb942 29-May-2012 Jeff Sharkey <jsharkey@android.com> Enable conv=fdatasync in dd.

Matches behavior of coreutils dd. Also removes unsupported
conversions.

Change-Id: I9ed5a7d43b5b083041b261ce70f6c835b41dc7ac
d.c
d.h
79c71831ca1ee795c56dab4bb7704d6c835a53ce 25-May-2012 Jean-Baptiste Queru <jbq@google.com> am a802b837: am 1d5e7885: Merge "toolbox: implement rm -f flag"

* commit 'a802b8374a22da9f52541e1fc286dcbdb1cfa1b4':
toolbox: implement rm -f flag
fc26c0ba59ab1f74251fb95de2ee6837035e74e4 14-May-2012 Vishal Bhoj <vishal.bhoj@linaro.org> toolbox: rmmod: fix module unloading

Replace "-" with "_" in module name. This would keep
rmmod compatible with module-init-tools version of rmmod

Change-Id: I4470d9a98bc2f299acd94859fca4403aee279d2b
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
mmod.c
1ee467c7604642139a98123131489aaad4d70221 12-May-2012 Jeff Brown <jeffbrown@google.com> Delete dead code.

This file is not compiled and not used.

Bug: 6435382
Change-Id: I3a08690950f1c77f8b0bc57a9e5cdb6eb402ac77
owerd.c
0ffc5b37e553f4514121d2775879a153e6ea5ecc 04-May-2012 Tanguy Pruvot <tanguy.pruvot@gmail.com> toolbox: implement rm -f flag

this prevent compatibility errors in scripts (file "-f" not found)
The force flag will not return an error if the file doesnt exist.

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>

Change-Id: I3267963284ee247629da5ab299e900c6e4a4ac68
m.c
a64adba539c290624c27a8506ee6c0ba39f44ffc 06-Apr-2012 Kenny Root <kroot@google.com> Add signal names to kill

mksh provides a kill primitive with signal names, but also offer it in
our toolbox binary. This will allow anyone to use "kill -HUP <pid>" or
"kill -l" to look at the name to number signal mapping.

Change-Id: Id683721f4ad3f2b518b4dc54a6073510290cbe04
ill.c
ec3b164524fda0beb30354627f3e3f9d0c45126a 15-Dec-2011 Ken Sumrall <ksumrall@android.com> Make sure FAT32 filesystems contain a minimum of 65527 clusters

Some versions of windows cannot handle FAT32 filesystems with less
than 65527 clusters, so make sure we don't create such beasts.

Change-Id: Id00fb02c4f8476f7dcc0ef137bd9e4975d740591
ewfs_msdos.c
86c7cc81891a69ace7044de667b0624c284ee82b 06-Mar-2012 Glenn Kasten <gkasten@google.com> Add get_sched_policy_name() and use in ps and top

This will make it easier to add additional policies (cgroups) if needed.
Also added comments to the sched_policy APIs.

Change-Id: I33ce1cc4deae10983241f7391294b7a512d2c47c
s.c
op.c
0afee8b668d1ff5bae4294108d5e21abfae28d12 03-Mar-2012 Jeff Sharkey <jsharkey@android.com> Merge "Change "chown" to coreutils syntax."
474cea824fde58a7a2b81b9edc2ffe68d4843177 03-Mar-2012 Jeff Sharkey <jsharkey@android.com> Change "chown" to coreutils syntax.

Change-Id: I7d997b3254354908317feee54b6df9b2419718a6
hown.c
ca3bf25570c197757f75b749cddecfea88cbcdc1 29-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 25443f80: am 1e28088f: am 5cc398ef: Merge "Toolbox implementation of chown has a bad print"

* commit '25443f80a27c6153c3406b4443fd07442e410a57':
Toolbox implementation of chown has a bad print
5cc398ef00b439bcf85b65c894433dd52362dff7 28-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Toolbox implementation of chown has a bad print"
1ae8d4eaa3d52e0b61728c7fc709d28e85c7ce21 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 44898072 to master

Change-Id: Ib77a4d9161261306253a174727801526e7149621
8290d1083ec7eee3f32265012f5d6be2774c4afc 13-Jan-2012 Stephen Smalley <sds@tycho.nsa.gov> Extend toolbox with SE Android support.

Add -Z option to ls and ps for displaying security contexts.
Modify id to display security context.
Add new SELinux commands: chcon, getenforce, getsebool, load_policy, restorecon, runcon, setenforce, setsebool.

Change-Id: Ia20941be4a6cd706fe392fed6e38a37d880ec5f1
ndroid.mk
hcon.c
etenforce.c
etsebool.c
d.c
oad_policy.c
s.c
s.c
estorecon.c
uncon.c
etenforce.c
etsebool.c
69ab6de33319c111a6b9ff4c78474d7605b28175 24-May-2011 Johan Norberg <johan.xx.norberg@stericsson.com> Toolbox implementation of chown has a bad print

When the chown program fails it prints out an error message
and is describing itself as chmod. This has been corrected.

Change-Id: I2c489975f09343bdf66acbf7df6e7183c2daff78
Signed-off-by: christian bejram <christian.bejram@stericsson.com>
hown.c
f124435c4604ad5746135acca5cbc682bedba847 13-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 82dd6af8: am e7b1f132: Merge "rmmod: fix full path syntax"

* commit '82dd6af84676f1ea6f67ce6fbd2c5cea7a8aa601':
rmmod: fix full path syntax
7e4c303fe0f490be04400f3f3a08f0c4f5553a96 12-Jan-2012 Scott Anderson <saa@google.com> Fix hd command so it doesn't error out on EOF

hd would error out on files that were not a multiple of its read
buffer size (4096). For example:
Read error on init.rc, offset 17040 len 4096, No such file or directory

The fix is to stop reading on EOF instead of treating it as an
error.

Signed-off-by: Scott Anderson <saa@google.com>

(cherry picked from commit a9fac4155f645b59d92028d56af573999051ab70)

Change-Id: Ib2af725fc39e96c2f81559f61979d451604d4817
d.c
ec4db51f88401ecf09769511e3c9deb58d721184 01-Sep-2011 Tanguy Pruvot <tanguy.pruvot@gmail.com> rmmod: fix full path syntax

rmmod /system/modules/multitouch.ko
rmmod: delete_module '/multitouch' failed (errno 2)

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
mmod.c
d0455c952d61d36e662f4a95d5e03689ecedca8f 12-Jan-2012 Scott Anderson <saa@google.com> Add md5 command to toolbox.

This command outputs the MD5 for specified files. The output is
in the same form as the md5sum command on Linux.

Change-Id: Ie0e6faf678469ac886bba8b46d98c0e54976a1ed
Signed-off-by: Scott Anderson <saa@google.com>
ndroid.mk
d5.c
b953fc284983ac8eac9174bcfffedd18cb48ac7e 01-Dec-2011 Kenny Root <kroot@google.com> Use strlcpy instead of strncpy

Also make sure the read cmdline is terminated with a null byte.

Change-Id: I6b4aa197ce9bc072a912b7163e8616a03b39c3fe
sof.c
e4e21796f72e09d4fab153992b31cb1c6f65d0b0 24-Nov-2011 Jeff Brown <jeffbrown@google.com> Make timestamps friendlier.

Change-Id: I378c3028630a7f805c3f730da02bbbfe07ec3654
etevent.c
9de370e165350010bc9086347cbd142aecef771e 17-Aug-2011 Jeff Brown <jeffbrown@google.com> Show the resolution of each axis.

Change-Id: I81c4b7e6480b98e59fb389060ab2c8d34257ae5f
etevent.c
4ac87154c1e659c474b8d70b4de7a7700c78b4c4 24-Jul-2011 Jeff Brown <jeffbrown@google.com> Dump the HID descriptor when available.

Also, always print the input properties when -p is
specified.

Change-Id: Ibacb6dd26ccab68c85b76928df60fdc2a53c198c
etevent.c
81231596c51ed1509bec0a871a834fb05e709b7c 15-Jul-2011 Kenny Root <kroot@google.com> am 070ec8e0: resolved conflicts for merge of 3ea075be to honeycomb-plus-aosp

* commit '070ec8e02e12aafc8a636737bba3d5ead7cecd8e':
Add -F for classify to ls
070ec8e02e12aafc8a636737bba3d5ead7cecd8e 15-Jul-2011 Kenny Root <kroot@google.com> resolved conflicts for merge of 3ea075be to honeycomb-plus-aosp

Change-Id: Ic668cb99822d4bc44f2f57782afd1a6c1b348e9b
baf6b6bdebd6e91c401f64e8013fed49697ed2cc 14-Jul-2011 Jeff Brown <jeffbrown@google.com> Show why umount failed.

Change-Id: Id2b3fbc46b8dfbe2f05637fb35c298915cd5f524
mount.c
e877ad7ae3ea3c1a631652c86887a627ef9feb3f 14-Jul-2011 Ken Sumrall <ksumrall@android.com> Merge "Add -o loop= option to mount, and fix error detection in mount and umount"
40dac659418f84551a5637a9edee03764c570f3c 13-Jul-2011 Kenny Root <kroot@google.com> Add -F for classify to ls

Adds a field to the non-long version of ls that tells what type of file
it is (i.e., regular, directory, link, fifo, etc).

This is useful for scripts that don't have direct filesystem access.

Change-Id: I54a327390f6ed403acb13c824f62ba9594ba320d
s.c
940c81078e7291096b22f05f6b953658f1e1d730 13-Jul-2011 Ken Sumrall <ksumrall@android.com> Add -o loop= option to mount, and fix error detection in mount and umount

This fixes bug http://b.android.com/18419, which complains about a bogus
error check in the mount command (it also was wrong in the umount command)
and also asks for the mount command to support more than one loopback
device, as mentioned in the FIXME comments in mount.c. This required some
corresponding changes to umount.c

Change-Id: Ib796c70926395e61557e487bad64984d3295d5f3
ount.c
mount.c
fb9134e3d01da0681097d5bf037aae730f09a2c0 30-Jun-2011 Jeff Brown <jeffbrown@google.com> Merge "getevent: Fix a couple of bugs."
f6d0f8af1768b3b9b10760bba5583c5e721b64ea 30-Jun-2011 Jeff Brown <jeffbrown@google.com> getevent: Fix a couple of bugs.

Fixed a bug printing the event value when using labels.

Stop trying to print the available codes for EV_SYN because
we cannot actually query them. EVIOCGBIT(0, size) is a special
case that returns the set of events that are supported, and
EV_SYN == 0.

Change-Id: Iea086ba24300ca0815e4814a3bc5ff60756612c2
etevent.c
f96993eb4e09d183259fda7eca35a32974345ff8 30-Jun-2011 Jeff Brown <jeffbrown@google.com> lsof: Print process user name.

Change-Id: I6e96faba894ad8c2eeb06e514d332c8ab2ec52f0
sof.c
f8754337d82d0a1ba509311bbadd281619c7d96e 16-Jun-2011 Jeff Brown <jeffbrown@google.com> Enhance getevent to print event labels.

Added -l argument to print labels for event types, codes and values.
Added -i argument to print all device info.
Added support for printing input properties.

Change-Id: I3cacb716dbc38f50217b9dfc24ba44d08f352603
etevent.c
etevent.h
b76f0ff7005bde136c2e2f7d19359abe320ab90b 28-Apr-2011 Erik Gilling <konkers@android.com> add r to eng and userdebug builds

Change-Id: Ia52a4897e300568dad2c8c1c7af1fe228d058eaf
ndroid.mk
795165bc1512faa121083c6bf3ce6f6d83ce59e6 06-Apr-2011 Ken Sumrall <ksumrall@android.com> Add the touch command to toolbox.

I wrote this to test my fix to support utime(2) system calls in the
sdcard fuse filesystem for stingray, and decided to finish sprucing
it up and make it part of toolbox. In an effort to keep it small,
it doesn't accept dates a la touch, but just a time_t value.

Change-Id: I5dd011cd2e34d0cc605d6f40e46b96a8c949f194
ndroid.mk
ouch.c
bb889dde13c7d47b69a52159604cf5b2763ce2d2 11-Mar-2011 Ken Sumrall <ksumrall@android.com> am 276df093: am 70987108: Merge "Try to unmount writable filesystems when rebooting" into honeycomb-mr1

* commit '276df0936dbf438b32ab099b04f69f01d7f1eed7':
Try to unmount writable filesystems when rebooting
e3aeeb4de34dbb93e832e6554f494122ba633f3b 08-Mar-2011 Ken Sumrall <ksumrall@android.com> Try to unmount writable filesystems when rebooting

Ext4 filesystems like to be unmounted before rebooting. The Android system
doesn't have a traditional Linux init setup, and shutting down the system
was not much more than calling sync(2) and reboot(2). This adds a new
function to libcutils called android_reboot(). By default, it calls sync()
and then remounts all writable filesystems as read-only and marks them clean.
There is a flag parameter in which the caller can ask for sync() not to be
called, or to not remount the filesystems as read-only. Then it will call
reboot(2) as directed by the other parameters. This change also updates
adb, init and toolbox to call the new android_reboot() function.
Fixes bugs 3350709 and 3495575.

Change-Id: I16d71ffce3134310d7a260f61ec6f4dd204124a7
eboot.c
ipe.c
d8ed091c6eaa5f44b84407af5d8e902f9358dc60 05-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Restart surfaceflinger with stop/start too.

Change-Id: Ide045fc3baced9e1bde95cb26d0b835511c21780
tart.c
top.c
53df0b6393979e7f35ab271683429aa1ea1230cd 17-Feb-2011 Mike Lockwood <lockwood@android.com> Merge "lsof: Add support for printing open files for a single process"
a95abdd8ed69bff64f272f21cfad9c3d4b006c4c 15-Feb-2011 Brian Muramatsu <btmura@google.com> Fix getprop Format

getprop used to output a colon after the property name like:
[property.name]: [property.value]

Add back the colon that was missing, because
com.android.ddmlib.GetPropReceiver's regex expects it. Without
the colon, the GetPropReceiver doesn't parse the device's
properties causing CTS to not recognize the device.

Change-Id: I9bef5ab2b310c831c49c8c51cae7f129167c2dc5
etprop.c
0f951a4fb85c29c4aebef123e8e247316ee13c5b 20-Jan-2011 Colin Cross <ccross@android.com> am 618eca4e: am 6fa54fa2: Merge "Accept address ranges in r" into honeycomb

* commit '618eca4ed91af2d2a2c618168327ca4a6a496669':
Accept address ranges in r
2ad280f07a97e9ed0dfd86202abe659ad0ca9ccd 20-Jan-2011 Colin Cross <ccross@android.com> Accept address ranges in r

Change-Id: Ifece1b37d018216462844cc89e0f2f6a2b7d287d
.c
318f00c043f231bf40c1a7e6460ee36c6450b95a 10-Jan-2011 David 'Digit' Turner <digit@google.com> Merge "toolbox: make getprop print a sorted list of properties"
a8d1afb3e91b043fcd303a40ca4ac9293bbd2781 06-Jan-2011 David 'Digit' Turner <digit@google.com> toolbox: make getprop print a sorted list of properties

This patch also factors out the dynarray_t/strlist_t code
from ls.c and moves it to dynarray.[hc].

Change-Id: Ifae2b364d7c2733aad5551ad3c78ae72f8ac31f4
ndroid.mk
ynarray.c
ynarray.h
etprop.c
s.c
9d6d030f83f682a0ab944260eca8402d85fb008c 06-Jan-2011 Colin Cross <ccross@android.com> uptime: Use clock_gettime to get monotonic time

The first field in /proc/uptime is bootbased time, not monotonic
time. If the kernel tracks bootbased time correctly, it counts
elapsed run time as well as sleep time, which is the same as the
elapsed time in the android alarm driver, and sleep time is
always returned as 0.

Use clock_gettime(CLOCK_MONOTONIC) instead, which will return
elapsed run time not counting sleep time on all platforms.

Change-Id: I28a22e8c93d78f62666ee8c877c7c6718a2b640a
ptime.c
123538954b9c8ad8fe7c2d755391f0b7cbaa1d6f 29-Dec-2010 Mike Lockwood <lockwood@android.com> Change libusbhost from static to shared library

Change-Id: I0c16cc4536c4ab700c33433c8a6323ade7cfc95d
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
794cc3fdd32e713145a2aa55c7a34c91d2a8fa5f 22-Dec-2010 Mike Lockwood <lockwood@android.com> lsof: Add support for printing open files for a single process

Change-Id: If2afa0937064dffca6df2a8642ca75009dc6e70e
Signed-off-by: Mike Lockwood <lockwood@android.com>
sof.c
bec29d4b48619bbbcf49421c78b3529c742e8506 10-Dec-2010 Erik Gilling <konkers@android.com> toolbox: add verbose option for lsusb

Change-Id: If9c51d96af7d69395917af55bb337352576f9422
susb.c
fd1e8553232aa6f3bfbb609158b24fa2e1c3d40b 09-Dec-2010 Erik Gilling <konkers@android.com> toolbox: add lsusb command

Change-Id: I166d2859633ba4e15f170938262dcf6505b78dd3
ndroid.mk
susb.c
b93e5812faffd3b6c5fb349072413aace31918d8 17-Nov-2010 Olivier Bailly <olivier@google.com> Add missing headers for compilation on x86 targets

Change-Id: I5f4dc797b353a0f01fa00d38375ec303bf863254
mp.c
ate.c
d.h
d.c
octl.c
andread.c
otify.c
chedtop.c
etconsole.c
e7fe5bf3ac2c0218bda75da78975d6a18fe7c167 25-Oct-2010 Brad Fitzpatrick <bradfitz@android.com> Add ls -n to toolbox.

Change-Id: I641f9504554d14fb1289ac470e6e61c5bc12e9c7
s.c
e3ba1801f0b6f9a1fc1c46e4c057afdd8a45efe1 29-Sep-2010 Brian Carlstrom <bdc@google.com> am f1fd5eb8: am 2f7b72f9: netstat should include /proc/net/tcp6 and /proc/net/udp6 data

Merge commit 'f1fd5eb8cca9f1096c4d0de5abbbd2b264fd1b9e'

* commit 'f1fd5eb8cca9f1096c4d0de5abbbd2b264fd1b9e':
netstat should include /proc/net/tcp6 and /proc/net/udp6 data
f1fd5eb8cca9f1096c4d0de5abbbd2b264fd1b9e 29-Sep-2010 Brian Carlstrom <bdc@google.com> am 2f7b72f9: netstat should include /proc/net/tcp6 and /proc/net/udp6 data

Merge commit '2f7b72f9e8d06c80957cdf384d23d3bf5bd5ce5c' into gingerbread-plus-aosp

* commit '2f7b72f9e8d06c80957cdf384d23d3bf5bd5ce5c':
netstat should include /proc/net/tcp6 and /proc/net/udp6 data
2f7b72f9e8d06c80957cdf384d23d3bf5bd5ce5c 28-Sep-2010 Brian Carlstrom <bdc@google.com> netstat should include /proc/net/tcp6 and /proc/net/udp6 data

Update netstat.c to process /proc/net/tcp6 and /proc/net/udp6.
Example input and output and output follows.

cat /proc/net/tcp:
sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode
0: 0100007F:13AD 00000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 669 1 c74dbb40 300 0 0 2 -1
1: 0100007F:A432 0100007F:2253 01 00000000:00000000 00:00000000 00000000 0 0 15257 1 c74da040 22 4 16 2 -1

cat /proc/net/udp:
sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode ref pointer drops

cat /proc/net/tcp6:
sl local_address remote_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode
0: 00000000000000000000000000000000:8A88 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 15461 1 c730aaa0 300 0 0 2 -1
1: 00000000000000000000000000000000:2253 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 15255 1 c7393060 300 0 0 2 -1
2: 00000000000000000000000000000000:C91B 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 15261 1 c6591080 300 0 0 2 -1
3: 0000000000000000FFFF00000100007F:C91B 0000000000000000FFFF00000100007F:9238 01 00000000:00000000 00:00000000 00000000 0 0 15263 1 c7394aa0 22 4 29 4 -1
4: 0000000000000000FFFF00000100007F:C0E9 0000000000000000FFFF00000100007F:D3A4 01 00000000:00000000 00:00000000 00000000 0 0 15274 1 c7393aa0 22 4 26 4 -1
5: 0000000000000000FFFF00000100007F:C41A 0000000000000000FFFF00000100007F:B031 01 00000000:00000000 00:00000000 00000000 0 0 15269 1 c7126ac0 22 4 29 4 -1
6: 0000000000000000FFFF00000100007F:2253 0000000000000000FFFF00000100007F:A432 01 00000000:00000000 00:00000000 00000000 0 0 15256 1 c65e9040 21 0 0 5 -1
7: 0000000000000000FFFF00000100007F:9238 0000000000000000FFFF00000100007F:C91B 01 00000000:00000000 00:00000000 00000000 0 0 15262 1 c7394580 22 4 16 4 -1
8: 0000000000000000FFFF00000100007F:B031 0000000000000000FFFF00000100007F:C41A 01 00000000:00000000 00:00000000 00000000 0 0 15268 1 c71585a0 22 4 16 4 -1
9: 0000000000000000FFFF00000100007F:8A88 0000000000000000FFFF00000100007F:8A31 01 00000000:00000000 00:00000000 00000000 0 0 15503 1 c71265a0 22 4 30 2 -1
10: 0000000000000000FFFF00000100007F:D3A4 0000000000000000FFFF00000100007F:C0E9 01 00000000:00000000 00:00000000 00000000 0 0 15273 1 c7126080 22 4 12 4 -1
11: 0000000000000000FFFF00000100007F:8A31 0000000000000000FFFF00000100007F:8A88 01 00000000:00000000 00:00000000 00000000 0 0 15502 1 c730a060 22 0 0 3 -1

cat /proc/net/udp6:
sl local_address remote_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode ref pointer drops
86: 00000000000000000000000000000000:A256 00000000000000000000000000000000:0000 07 00000000:00000000 00:00000000 00000000 1000 0 14302 2 c6d13820 0
102: 00000000000000000000000000000000:A466 00000000000000000000000000000000:0000 07 00000000:00000000 00:00000000 00000000 1000 0 14301 2 c6d13ac0 0
125: 00000000000000000000000000000000:8B7D 00000000000000000000000000000000:0000 07 00000000:00000000 00:00000000 00000000 1000 0 14295 2 c6d13d60 0

netstat:
Proto Recv-Q Send-Q Local Address Foreign Address State
tcp 0 0 127.0.0.1:5037 0.0.0.0:* LISTEN
tcp 0 0 127.0.0.1:42034 127.0.0.1:8787 ESTABLISHED
tcp6 0 0 :::35464 :::* LISTEN
tcp6 0 0 :::8787 :::* LISTEN
tcp6 0 0 :::51483 :::* LISTEN
tcp6 0 0 ::ffff:127.0.0.1:51483 ::ffff:127.0.0.1:37432 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:49385 ::ffff:127.0.0.1:54180 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:50202 ::ffff:127.0.0.1:45105 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:8787 ::ffff:127.0.0.1:42034 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:37432 ::ffff:127.0.0.1:51483 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:45105 ::ffff:127.0.0.1:50202 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:35464 ::ffff:127.0.0.1:35377 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:54180 ::ffff:127.0.0.1:49385 ESTABLISHED
tcp6 0 0 ::ffff:127.0.0.1:35377 ::ffff:127.0.0.1:35464 ESTABLISHED
udp6 0 0 :::41558 :::* CLOSE
udp6 0 0 :::42086 :::* CLOSE
udp6 0 0 :::35709 :::* CLOSE

Bug: 2511871

Change-Id: I25e0470ba65e8a88e57506ae26232a7c43a9c16b
ndroid.mk
etstat.c
14200b4c3b04ccdcd45420fa9394fb6412728906 12-Sep-2010 Brian Swetland <swetland@google.com> am 5833769d: am 09dd3e57: make df more readable

Merge commit '5833769d9aa41dfb28a74c665fda0fca9c321fc1'

* commit '5833769d9aa41dfb28a74c665fda0fca9c321fc1':
make df more readable
5833769d9aa41dfb28a74c665fda0fca9c321fc1 12-Sep-2010 Brian Swetland <swetland@google.com> am 09dd3e57: make df more readable

Merge commit '09dd3e57b920c8f65cb486313a4c0f35b8cb9f46' into gingerbread-plus-aosp

* commit '09dd3e57b920c8f65cb486313a4c0f35b8cb9f46':
make df more readable
09dd3e57b920c8f65cb486313a4c0f35b8cb9f46 12-Sep-2010 Brian Swetland <swetland@google.com> make df more readable

Filesystem Size Used Free Blksize
/dev 164M 32K 164M 4096
/system 442M 117M 325M 4096
/cache 492M 8M 483M 4096
/data 984M 59M 925M 4096
/mnt/sdcard 12G 27M 12G 32768

Change-Id: I9a84b7b84ae528ee5cf0b1e92a8bee032b87703b
f.c
4358544a3ffde4ffd1e9434b99b2a7179f05cce4 31-Aug-2010 Dmitry Shmidt <dimitrysh@google.com> toolbox: top: Add processor field

Change-Id: I9f8e45a963a0773f27ddcd1d249aecac1ab9152e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
op.c
8b37c91b934bf22d8ae52bebad7f1f22f16d1132 19-Aug-2010 Dmitry Shmidt <dimitrysh@google.com> ps: Add -c flag to show CPU number last executed on

Change-Id: I9a8faef0824c390ef980ce6c33e9c79102884879
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
s.c
30be93c6e2b5c2eb6c6e9e21a04dc0dbe2f4c8ca 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 60c8f863: resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp

Merge commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53'

* commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53':
Userland support for VM interconnection
60c8f863ca84f3e5bb8e78d8001c53511f094d53 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp

Change-Id: I1396cd97b28f316849016d55596ad52fffd3235c
0fcbdb4147858d40d581d3b034f5150962632943 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Userland support for VM interconnection"
7a58bcfb1e8b5c80703be8cd88caefe1c0433d0b 27-Jul-2010 Kenny Root <kroot@google.com> am 331eb52d: am 5a0adf95: Merge "Add basic lsof command" into gingerbread

Merge commit '331eb52d611de6bd2e70a2b0bde1f3c3733ce657'

* commit '331eb52d611de6bd2e70a2b0bde1f3c3733ce657':
Add basic lsof command
331eb52d611de6bd2e70a2b0bde1f3c3733ce657 27-Jul-2010 Kenny Root <kroot@google.com> am 5a0adf95: Merge "Add basic lsof command" into gingerbread

Merge commit '5a0adf95b1170d3d9ec91b0106662cd17514f0e4' into gingerbread-plus-aosp

* commit '5a0adf95b1170d3d9ec91b0106662cd17514f0e4':
Add basic lsof command
5a0adf95b1170d3d9ec91b0106662cd17514f0e4 27-Jul-2010 Kenny Root <kroot@google.com> Merge "Add basic lsof command" into gingerbread
2d392f24b8dc30553b6e7992af5315e458fbbabc 27-Jul-2010 Kenny Root <kroot@google.com> am 65757da0: am 53308d4c: Correct copyright header for uptime and NOTICE

Merge commit '65757da0c99cb4b49e1dc9e21facc7b4e67192cd'

* commit '65757da0c99cb4b49e1dc9e21facc7b4e67192cd':
Correct copyright header for uptime and NOTICE
65757da0c99cb4b49e1dc9e21facc7b4e67192cd 27-Jul-2010 Kenny Root <kroot@google.com> am 53308d4c: Correct copyright header for uptime and NOTICE

Merge commit '53308d4cd5c4414402e979a6771f7ef3b35f5c2f' into gingerbread-plus-aosp

* commit '53308d4cd5c4414402e979a6771f7ef3b35f5c2f':
Correct copyright header for uptime and NOTICE
53308d4cd5c4414402e979a6771f7ef3b35f5c2f 27-Jul-2010 Kenny Root <kroot@google.com> Correct copyright header for uptime and NOTICE

Change-Id: I89f91c21db87955b20b1ef9b4590f7009f106b26
OTICE
ptime.c
8b9b105bc7bf6428591d55462b3e727ba7504b29 27-Jul-2010 Kenny Root <kroot@google.com> Add basic lsof command

Basic "list open files" command.

Supports reading all processes for their "exe", "cwd", "root", and "fd"
entries.

Change-Id: I2e2f0911dd65a1993aa1ce9f51222bf264a9d68d
ndroid.mk
sof.c
534bc027a2fc5136988e6785c2d647054daf2713 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 869cc685: merge from open-source master

Merge commit '869cc685b171c5c0c1efbad5df693cfaebe0af43'

* commit '869cc685b171c5c0c1efbad5df693cfaebe0af43':
fix insmod reading more than one module parameter
869cc685b171c5c0c1efbad5df693cfaebe0af43 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I9365615f5f94484fb5ab28bb076b25fb4721e2bc
e3f6a6e1d3e52c1d25d55b6556cc1f2c0598b576 16-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "fix insmod reading more than one module parameter"
2a743730c7d1a8adba8a922f7af46cef0b35363a 18-Jan-2010 Dries Harnie <botje.linux@gmail.com> Userland support for VM interconnection

Change-Id: I699608f3072b39c8da1a7cc313bd0b736e90f225
ndroid.mk
oute.c
f4f7697f69a68abc755d9c4d1ef384984d81b164 15-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 0bcda269: merge from open-source master

Merge commit '0bcda269708bbc4f4bd729765e3d4d84e0fd5e60'

* commit '0bcda269708bbc4f4bd729765e3d4d84e0fd5e60':
Add -R to chmod
Add -p support to mkdir
0bcda269708bbc4f4bd729765e3d4d84e0fd5e60 15-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: If9a300a80228f30166ed42853ae13236aaa2eee5
6cebee264761cf9ed3a9b8b1ec939baf6e446afd 15-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Add -R to chmod"
34225919abe715f9ac34acfbb6eba88a282628b2 15-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Add -p support to mkdir"
365a09e817e919c491a1e8abce0b734af14d3e5f 07-Jul-2010 Anthony Newnam <anthony.newnam@garmin.com> Add -R to chmod

Change-Id: I30f976598bd937f656a3ad3395349f09e695cfce
hmod.c
b55de6798507178dc7a50570108b435afa9a8346 07-Jul-2010 Anthony Newnam <anthony.newnam@garmin.com> Add -p support to mkdir

Change-Id: Ia0298ccc6b476d6bd6756471c05ef2a345312734
kdir.c
45f7fde3c96b99d23f188bec7a269734bb1d0d35 25-Jun-2010 Kenny Root <kroot@google.com> am 0b1ff6be: am eb42170e: Display file sizes larger than 2GB correctly

Merge commit '0b1ff6be08844c541e36fd735b41990453582ec1'

* commit '0b1ff6be08844c541e36fd735b41990453582ec1':
Display file sizes larger than 2GB correctly
0b1ff6be08844c541e36fd735b41990453582ec1 25-Jun-2010 Kenny Root <kroot@google.com> am eb42170e: Display file sizes larger than 2GB correctly

Merge commit 'eb42170e6c8b70f11dca9965785aa04a80290c72' into gingerbread-plus-aosp

* commit 'eb42170e6c8b70f11dca9965785aa04a80290c72':
Display file sizes larger than 2GB correctly
eb42170e6c8b70f11dca9965785aa04a80290c72 25-Jun-2010 Kenny Root <kroot@google.com> Display file sizes larger than 2GB correctly

File size was cast to a signed integer which displayed files over 2GB as
negative sizes on devices. Use a long long for printing instead which
matches the stat struct.

Change-Id: I0ec07f33716bb4c2e5d120633ed435f637238f46
s.c
7570ab61d40190a1e9c5d4cd9dfc8220dbb18235 10-Jun-2010 Jean-Baptiste Queru <jbq@google.com> am f72961d0: merge from froyo-plus-aosp
f72961d068d7a89403f0bb828f65021ac73a5cff 10-Jun-2010 Jean-Baptiste Queru <jbq@google.com> merge from froyo-plus-aosp

Change-Id: I82ec6dbd7c8c3b37b9505eaef351042f2ee53fb5
7c84efe083f4cd6b4a322bfe018f26b2f7d1e844 09-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I2f725ca20bf08748a4b3e81a4e98fbe08fcf1a47
aa2106b008921ed8f33ee14ee70fb1b944f547ec 04-Jun-2010 David 'Digit' Turner <digit@android.com> toolbox-ls: sort file and directory lists

Sorts file and directory names properly in 'ls'
+ accept group flags (e.g. '-ld' instead of '-l -d')
+ accept flags in any position on the command line (e.g. 'ls foo -l' works)

Change-Id: Idc24a69ae31fe0c13726d39892357ac89a8830db
s.c
a92be64809e3927790c7a8535f548ab5a9105e45 19-May-2010 The Android Open Source Project <initial-contribution@android.com> am 53a79a84: am 49337b27: merge from open-source master
53a79a841b4afa5e7dc3e05cfd04b5ae44de95b6 19-May-2010 The Android Open Source Project <initial-contribution@android.com> am 49337b27: merge from open-source master

Merge commit '49337b27d9a90d7c3f703f618e7c6bfaffc2a96d' into kraken

* commit '49337b27d9a90d7c3f703f618e7c6bfaffc2a96d':
Fix "route add default dev <iface>" behaviour
49337b27d9a90d7c3f703f618e7c6bfaffc2a96d 19-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I77e33ce567b9682f51785cc574e37dc2cd15028f
4e7dd3d270aaf0b43e94b2ccaf840f86e541d21b 07-May-2010 Colin Cross <ccross@android.com> mount: Add support for remounting without specifying device

Change-Id: I48c84fab3ab2a9704ec5b7bf7002b8960fa53c27
ount.c
e898faddb3d5074a4489ce255927c6735b6f8b0d 07-Oct-2009 Daniel Baeyens <daniel.baeyens@gmail.com> Fix "route add default dev <iface>" behaviour

Previous behaviour was to set route's network mask as 255.255.255.255
Setting a destination network with netmask /32 blocks the connections
just to the specified host. 0.0.0.0/32 defines the exact IPv4 address
0.0.0.0 and not the whole IPv4 hosts range.
This patch allows traffic to any network, setting a 0.0.0.0/0 route.

Change-Id: I1665f2fac52526337bb2c48e3b09564d9da448e7
oute.c
918fb893e889b30fd1836668870a4a46586c8d25 20-Apr-2010 Viral Mehta <viral.vkm@gmail.com> fix insmod reading more than one module parameter

it seems wrong to put '/0' after reading one argument
if we are passing more than one module parameters, they are not being propogated
to the kernel properly.

Second module parameters onwards are simply being ignored by kernel
since insmod incorrectly put '/0' after reading first module parameter

Change-Id: I54283eb30a66a83d5c619ffb1fb174ccf5fdcaf7
nsmod.c
1ded19f455cee554ae482d99d53b6912da5e7f21 12-Apr-2010 Jean-Baptiste Queru <jbq@google.com> fix build

Change-Id: I93714131dc9d18797009154e6e25dc6e122058c7
ndroid.mk
a8415325a8b2638c25a6364c191ac1046c925906 12-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am 1888de8e: merge from open-source master

Merge commit '1888de8e13f82f7af21bce267254fac124237afe' into kraken

* commit '1888de8e13f82f7af21bce267254fac124237afe':
toolbox: add "uptime" command
1888de8e13f82f7af21bce267254fac124237afe 12-Apr-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ife9c7a92ed7abd59b6b3612ba908bcae77055767
5ffbf26ebf9e29fe38b325e3c8f9502a31d2ff4c 09-Apr-2010 Mike Lockwood <lockwood@android.com> toolbox: add "uptime" command

Prints elapsed real time since boot, as well as idle time and sleep time.

Change-Id: I97f482d6087e9f802d74e91147bf767e6b2d4f42
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ptime.c
a699d6256fca0336b173c524c5b3d8f7d4fcdc25 09-Apr-2010 Mike Lockwood <lockwood@android.com> toolbox: add "uptime" command

Prints elapsed real time since boot, as well as idle time and sleep time.

Change-Id: I97f482d6087e9f802d74e91147bf767e6b2d4f42
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ptime.c
b51cb880c02836a57426620f40a1ba9331b6c52a 08-Mar-2010 Arve Hjønnevåg <arve@android.com> Merge "toolbox: nandread: Add options to extract raw images, partial images, and fix bad block check."
b6b8793b8b6dad500f6884539e47efb4c161576a 04-Mar-2010 Arve Hjønnevåg <arve@android.com> toolbox: nandread: Add options to extract raw images, partial images, and fix bad block check.
andread.c
661aff600c5cb8e72aa2892a2a75ea6015bf1457 03-Mar-2010 San Mehat <san@google.com> newfs_msdos: Allow -s option to work by itself

Signed-off-by: San Mehat <san@google.com>
ewfs_msdos.c
10d469bff9031e857c7a290dae7d6ccf7b3a18f8 25-Feb-2010 San Mehat <san@google.com> system: Add support for getting/setting i/o priorities and include a userspace tool

Signed-off-by: San Mehat <san@google.com>
ndroid.mk
onice.c
715c889713a7b3bd2f487dd14482af9675afc5cf 12-Feb-2010 Andrew Stadler <stadler@android.com> Allow numeric uid & gid in chown

This makes it more like the POSIX version which accepts number or name.
hown.c
1b1fd61295d76b734f68309d0057699a1ba1cc37 14-Jan-2010 Colin Cross <ccross@android.com> Remove definitions that are now in bionic libc
ewfs_msdos.c
eab453c612d6d422f863c31da67f00bc4beec914 10-Jan-2010 San Mehat <san@google.com> toolbox: newfs_msdos: Exit on write failure, and handle bogus geometry from the kernel

Signed-off-by: San Mehat <san@google.com>
ewfs_msdos.c
ff3bcd03079d9e0e94f70955370f3eb940d6244a 05-Jan-2010 San Mehat <san@google.com> toolbox: newfs_msdos: If geometry is not available, use some sane-ish defaults

Signed-off-by: San Mehat <san@google.com>
ewfs_msdos.c
0163f77a831e915bcbb7b18cde486d2b081da478 29-Oct-2009 San Mehat <san@google.com> am 6dba735a: am 0d6f587f: am 39274417: toolbox: Add scheduling policy display to top/ps

Merge commit '6dba735a61d4b65594fa0ad7fd15ec09c3c42ce9'

* commit '6dba735a61d4b65594fa0ad7fd15ec09c3c42ce9':
toolbox: Add scheduling policy display to top/ps
392744175c4de67dc98e72da6745e6351118c985 27-Oct-2009 San Mehat <san@google.com> toolbox: Add scheduling policy display to top/ps

Signed-off-by: San Mehat <san@google.com>
s.c
op.c
b44224d56d2625f341f7526ccad4844527254b55 09-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ic0e6195f

* changes:
toolbox: Add nandread command
7c953d04bcc9070a1bce171e979c5201dd39325b 18-Sep-2009 Arve Hjønnevåg <arve@android.com> toolbox: Add nandread command

Extracts a nand image from an mtd partition with page data followed by
64 bytes of extra data.
ndroid.mk
andread.c
9feee025a09ace19b09dbb41d6ba87198c77cdf1 28-Sep-2009 Andy McFadden <fadden@android.com> Fix up ls -s.

Added the "total" line, which makes it easy to answer questions like,
"how the hell much space am I wasting on /data/dalvik-cache?".

Also fixed the -s filename output, which was showing mostly-full paths
when a simple filename was called for.
s.c
327e696808910f8e49370079f8d7f4db8cbe3820 18-Aug-2009 Andy McFadden <fadden@android.com> Added -s flag to ls.

This may not be useful, and may actually be misleading since yaffs2
doesn't track the blocks used for each file (it just divides the length
down by 512). I'm submitting it because yaffs2 isn't the only
filesystem we'll ever use.

I also changed some sprintf to snprintf, mostly out of paranoid habit.
s.c
c3109591d4a34d7802112706128db2bd451d853b 06-Jul-2009 San Mehat <san@google.com> resolved conflicts for merge of 72eead43 to master
72eead43c7711ca97b2d7f578e6b8854a2856ce0 06-Jul-2009 San Mehat <san@google.com> toolbox: mkdosfs: Imported new 'newfs_msdos' updated disk formatter

Signed-off-by: San Mehat <san@google.com>
ndroid.mk
kdosfs.c
ewfs_msdos.c
2f0c41ec3c5f83a02a58242e175663bdd89a9467 01-Jul-2009 Dima Zavin <dima@android.com> am 383688b5: toolbox: Fix uninitalized stack variable in mount.

Merge commit '383688b52fb19b9c4d98bb1a660febc880d0e268'

* commit '383688b52fb19b9c4d98bb1a660febc880d0e268':
toolbox: Fix uninitalized stack variable in mount.
53e6808c96aae14d34b3225de22a33155f5c9d38 01-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 5e924468: Merge change 5662 into donut

Merge commit '5e924468cd80bfadd686515a5b4193594a2811eb'

* commit '5e924468cd80bfadd686515a5b4193594a2811eb':
toolbox: Revise route utility.
383688b52fb19b9c4d98bb1a660febc880d0e268 30-Jun-2009 Dima Zavin <dima@android.com> toolbox: Fix uninitalized stack variable in mount.

Signed-off-by: Dima Zavin <dima@android.com>
ount.c
4a1465fefff747bebcf95b61ad4598e2c5417de5 29-Jun-2009 Chia-chi Yeh <chiachi@android.com> toolbox: Revise route utility.

Add copyright header.
Returns errno when something goes wrong. Otherwise returns 0.
When the route entry exists, treat it as a success.
oute.c
a47c2fdd4aa27ddffcca61b2f7f3139d2ed73622 15-May-2009 San Mehat <san@google.com> am c83cd879: init: Fix heap corruption for services with arguments

Merge commit 'c83cd879d45e667fbb4763f18c908928ee9d67d8'

* commit 'c83cd879d45e667fbb4763f18c908928ee9d67d8':
init: Fix heap corruption for services with arguments
toolbox: ifconfig: Implement mtu setting, plus setting interface addr should
toolbox: route: Reflow some of the mess, fix route add parameter names to
54a1eb7677a10c1591ba48562ae480cd71721bf6 14-May-2009 San Mehat <san@google.com> toolbox: ifconfig: Implement mtu setting, plus setting interface addr should
implicitly 'up' the iface just like normal ifconfig does.

Also convert tabs -> spaces
fconfig.c
83ec181dc74d5dab4110e1895e62f1bdbf6d7d7a 14-May-2009 San Mehat <san@google.com> toolbox: route: Reflow some of the mess, fix route add parameter names to
match standard route

Signed-off-by: San Mehat <san@google.com>
oute.c
e00d31aeb13fcf9919fd5e6598fdc6c5f178b602 13-May-2009 San Mehat <san@google.com> am 0389a12: toolbox: Make that \'pointopoint\' instead of \'pointtopoint\'

Merge commit '0389a1297d65321a882ea0dcc69f4de4e3bcb169'

* commit '0389a1297d65321a882ea0dcc69f4de4e3bcb169':
toolbox: Make that 'pointopoint' instead of 'pointtopoint'
4676aacd5e0d2916a093cf407c406b83de3146ee 13-May-2009 San Mehat <san@google.com> am fa49e28: toolbox: Add \'pointopoint\' support to ifconfig

Merge commit 'fa49e2860bebe6bb2a26194c58992e5d5aed0b0d'

* commit 'fa49e2860bebe6bb2a26194c58992e5d5aed0b0d':
toolbox: Add 'pointopoint' support to ifconfig
0389a1297d65321a882ea0dcc69f4de4e3bcb169 13-May-2009 San Mehat <san@google.com> toolbox: Make that 'pointopoint' instead of 'pointtopoint'

Signed-off-by: San Mehat <san@google.com>
fconfig.c
fa49e2860bebe6bb2a26194c58992e5d5aed0b0d 13-May-2009 San Mehat <san@google.com> toolbox: Add 'pointopoint' support to ifconfig

Signed-off-by: San Mehat <san@google.com>
fconfig.c
f6c95712c43dc37b5cd50aeae9c9c03a1484fc36 23-Apr-2009 Jean-Baptiste Queru <jbq@google.com> Merge donut into master
41e3a2c5e8d5f23f3c280dbba10f464570622e39 19-Apr-2009 Chung-yih Wang <> Merge branch 'readonly-p4-master'
f309f77adcd7e4eda63b9bdeed9df31ab77770b4 19-Apr-2009 Chung-yih Wang <> AI 146558: am: CL 146260 Add the net-based routing entries.
e.g. route add net 172.16.0.0 mask 255.240.0.0 gw 172.19.248.10
Original author: cywang

Automated import of CL 146558
oute.c
8b0fb371c1402902a8fa56ee77af785d2e60d747 15-Apr-2009 Chung-yih Wang <> Merge branch 'readonly-p4-donut' into donut
98c297f2448fd8194cae16d213dfc9194180fa3f 15-Apr-2009 Chung-yih Wang <> AI 146260: Add the net-based routing entries.
e.g. route add net 172.16.0.0 mask 255.240.0.0 gw 172.19.248.10

Automated import of CL 146260
oute.c
33d50dc785b9985031f025802e4b0f3ee39d5743 09-Apr-2009 Andy McFadden <> Merge branch 'readonly-p4-master'
b33d3415b6c63f7b22e0863a2ac594feab9171cf 09-Apr-2009 Andy McFadden <> AI 145220: Added "-d" flag to ls.
Now you can "ls -l -d <directory>" to see directory perms.

Automated import of CL 145220
s.c
477b4307004f853bb89c62f562fc9dc90a5ae71a 09-Apr-2009 Dianne Hackborn <hackbod@google.com> Improvements to get events: -p, better output.

Add new -p option to easily get the output showing which events are reported by the devices.

Improve the reported events output a bit by including a name for each event type.

Extend help text to include a description of each options, so I don't have to look in the source code next time. :)
etevent.c
455a6dffd4db929f46b9c5a1e1f5b541b9721bfe 29-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'open_source' into google_internal
e49f9c923868fd7a62356ab1864444ade4a2cab6 26-Mar-2009 Doug Kwan <> Automated import from //branches/master/...@142981,142981
kdosfs.c
md.c
83b65486beffc7c86f24c428fbb7b50bbbe189f9 18-Mar-2009 Jean-Baptiste Queru <jbq@google.com> Merge commit 'remotes/korg/cupcake' into merge

Conflicts:
init/devices.c
libpixelflinger/Android.mk
dd7bc3319deb2b77c5d07a51b7d6cd7e11b5beb0 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ndroid.mk
ODULE_LICENSE_BSD
OTICE
larm.c
at.c
hmod.c
hown.c
mp.c
ate.c
d.c
d.h
f.c
mesg.c
xists.c
etevent.c
etprop.c
d.c
d.c
fconfig.c
ftop.c
nsmod.c
octl.c
ill.c
n.c
og.c
s.c
smod.c
kdir.c
kdosfs.c
ount.c
v.c
etstat.c
otify.c
owerd.c
rintenv.c
s.c
.c
eadtty.c
eboot.c
enice.c
m.c
mdir.c
mmod.c
otatefb.c
oute.c
chedtop.c
endevent.c
etconsole.c
etkey.c
etprop.c
leep.c
md.c
tart.c
top.c
ync.c
yren.c
oolbox.c
op.c
mount.c
mstat.c
atchprops.c
ipe.c
e54eebbf1a908d65ee8cf80bab62821c05666d70 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ndroid.mk
ODULE_LICENSE_BSD
OTICE
larm.c
at.c
hmod.c
hown.c
mp.c
ate.c
d.c
d.h
f.c
mesg.c
xists.c
etevent.c
etprop.c
d.c
d.c
fconfig.c
ftop.c
nsmod.c
octl.c
ill.c
n.c
og.c
s.c
smod.c
kdir.c
kdosfs.c
ount.c
v.c
etstat.c
otify.c
owerd.c
rintenv.c
s.c
.c
eadtty.c
eboot.c
enice.c
m.c
mdir.c
mmod.c
otatefb.c
oute.c
chedtop.c
endevent.c
etconsole.c
etkey.c
etprop.c
leep.c
md.c
tart.c
top.c
ync.c
yren.c
oolbox.c
op.c
mount.c
mstat.c
atchprops.c
ipe.c
a1e1c1b106423de09bc918502e7a51d4ffe5a4ae 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
kdosfs.c
c2d26a164fc19a6ce7cf6d0c691626bf4b5176f6 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
kdosfs.c
261ed7551e3234aa437658796afdc4eb372da9d7 19-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132276
op.c
13f797da7f190e9ea52f2f3d235210b8a4963b21 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
ndroid.mk
hown.c
nsmod.c
77d0c65b950570edd5241a8f2ebecfc3acbc5135 19-Dec-2008 Jean-Baptiste Queru <jbq@google.com> Merge commit 'remotes/korg/cupcake'

Conflicts:
init/devices.c
logwrapper/logwrapper.c
mountd/AutoMount.c
35237d135807af84bf9b0e5b8d7f8633e58db6f5 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
ndroid.mk
bc7b0cbe156da639f0cbe17bf89725d87e86512a 16-Nov-2008 Jay Freeman (saurik) <saurik@saurik.com> Open file and loop device with O_RDONLY when -o loop,ro.
Otherwise: ioctl LOOP_SET_FD failed: Bad file number.
ount.c
4f6e8d7a00cbeda1e70cc15be9c4af1018bdad53 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
ndroid.mk
ODULE_LICENSE_BSD
OTICE
larm.c
at.c
hmod.c
mp.c
ate.c
d.c
d.h
f.c
mesg.c
xists.c
etevent.c
etprop.c
d.c
d.c
fconfig.c
ftop.c
nsmod.c
octl.c
ill.c
n.c
og.c
s.c
smod.c
kdir.c
kdosfs.c
ount.c
v.c
etstat.c
otify.c
owerd.c
rintenv.c
s.c
.c
eadtty.c
eboot.c
enice.c
m.c
mdir.c
mmod.c
otatefb.c
oute.c
chedtop.c
endevent.c
etconsole.c
etkey.c
etprop.c
leep.c
md.c
tart.c
top.c
ync.c
yren.c
oolbox.c
op.c
mount.c
mstat.c
atchprops.c
ipe.c