summaryrefslogtreecommitdiffstats
path: root/toolbox
Commit message (Collapse)AuthorAgeFilesLines
...
| * toolbox: schedtop 64 bit build issueMark Salyzyn2014-03-131-15/+13
| | | | | | | | Change-Id: I77b8ca2c32b9ff33abb6acadae47f0ab47b47907
* | am 6bb6372b: am 508240c3: am 2a16a584: Merge "fix: making lsof show devies ↵Dmitriy Ivanov2014-03-041-1/+1
|\ \ | |/ | | | | | | | | | | and loaded .so file names correctly" * commit '6bb6372b3ee930e2e8517262ec7db4f057a50725': fix: making lsof show devies and loaded .so file names correctly
| * fix: making lsof show devies and loaded .so file names correctlyDmitriy Ivanov2014-03-041-1/+1
| | | | | | | | Change-Id: I4b6f2e0015f8cfa18400fa4bd08460a07e29a51b
* | am 2ae567c8: am 1a5bc28f: am a0e4d164: Merge "Declare (and simplify) ↵Elliott Hughes2014-03-013-12/+41
|\ \ | |/ | | | | | | | | | | uid_from_user." * commit '2ae567c82ee34fb7e51e797fce140313de34338b': Declare (and simplify) uid_from_user.
| * Declare (and simplify) uid_from_user.Elliott Hughes2014-02-283-12/+41
| | | | | | | | | | | | | | | | | | uid_from_user doesn't need to cope with numeric ids in the BSD code like it did with the old Android code; the caller now handles those. Also explain what SUPPORT_DOT is for. Change-Id: I185c9f02b7039795069aa30545563b8a6ef54cd5
* | am f767e9c9: am 7c5a9d24: am fbcdf6f9: Merge "Switch to BSD chown (for -R, ↵Elliott Hughes2014-03-013-69/+354
|\ \ | |/ | | | | | | | | | | primarily)." * commit 'f767e9c97a0719b342e91c7770885c108a66e02f': Switch to BSD chown (for -R, primarily).
| * Merge "Switch to BSD chown (for -R, primarily)."Elliott Hughes2014-03-013-69/+354
| |\
| | * Switch to BSD chown (for -R, primarily).Elliott Hughes2014-02-283-69/+354
| | | | | | | | | | | | Change-Id: I45381b8a04f4cb651123a2d43860418e06df6e65
* | | am 1f570812: am d262b2a8: am 54bb1d3b: Merge "Fix grep -f."Elliott Hughes2014-03-011-2/+0
|\ \ \ | |/ / | | | | | | | | | * commit '1f57081216a2eae81672dadd67c94476b27fbf63': Fix grep -f.
| * | Fix grep -f.Elliott Hughes2014-02-281-2/+0
| |/ | | | | | | | | | | bionic has getline now. Change-Id: I5e4ee137768ab3113dbe8a07406fa39f4b6546af
* | am 51437ed2: am 56ae6b68: am 410f51a8: Merge "Remove unused #includes of ↵Elliott Hughes2014-02-243-3/+0
|\ \ | |/ | | | | | | | | | | <asm/page.h>." * commit '51437ed26565f4bc55e516b73b7e9cafef8e012f': Remove unused #includes of <asm/page.h>.
| * Remove unused #includes of <asm/page.h>.Elliott Hughes2014-02-243-3/+0
| | | | | | | | | | | | (<asm/page.h> is going away.) Change-Id: Id0d7ad0eb791cd47490c48458f9f8a6468ddf5c9
* | am 490963a5: am c0f95624: am 783eb168: Merge "Add -D option to restorecon ↵Nick Kralevich2014-02-201-2/+5
|\ \ | |/ | | | | | | | | | | for relabeling /data/data." * commit '490963a54e5ef0c421f0e1ac87eafc2b46c32b95': Add -D option to restorecon for relabeling /data/data.
| * Add -D option to restorecon for relabeling /data/data.Stephen Smalley2014-02-181-2/+5
| | | | | | | | | | | | | | This depends on change I137588013ed1750315702c0dbe088ce3e4a29e83. Change-Id: I5a4fef9affd6cddf98d72dc9d54899be25741779 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | am e41420bd: am 488b5eaf: am 2e7347d6: Merge "Convert all ↵Nick Kralevich2014-02-131-1/+1
|\ \ | |/ | | | | | | | | | | selinux_android_restorecon and _setfilecon calls to new API." * commit 'e41420bd8cbaa69f6eaca524b2412cb92a6d18a3': Convert all selinux_android_restorecon and _setfilecon calls to new API.
| * Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."Nick Kralevich2014-02-121-1/+1
| |\
| | * Convert all selinux_android_restorecon and _setfilecon calls to new API.Stephen Smalley2014-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libselinux selinux_android_restorecon API is changing to the more general interface with flags and dropping the older variants. Also get rid of the old, no longer used selinux_android_setfilecon API and rename selinux_android_setfilecon2 to it as it is the only API in use. Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | am a1ebd4d5: am 696c75c1: am 829ae5be: Merge "Remove a pre-uapi hack from ↵Elliott Hughes2014-02-101-4/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | nandread." * commit 'a1ebd4d5c8b0a038c39b568b33e89f1b998f0a73': Remove a pre-uapi hack from nandread.
| * | Remove a pre-uapi hack from nandread.Elliott Hughes2014-02-071-4/+0
| |/ | | | | | | | | | | We only have uapi headers now. Change-Id: I2c02e10bb3bba4006579772f3ab2a18c2df7535d
* | am 52ca10d1: am e3b1810e: am 71de56a0: Merge "Unify toolbox restorecon and ↵Nick Kralevich2014-02-071-92/+15
|\ \ | |/ | | | | | | | | | | libselinux restorecon implementations." * commit '52ca10d15aa803333467db456a40d2bbc89dc18e': Unify toolbox restorecon and libselinux restorecon implementations.
| * Unify toolbox restorecon and libselinux restorecon implementations.Stephen Smalley2014-02-061-92/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the libselinux restorecon implementation to allow reuse by the toolbox restorecon command. This simply requires adding support for the nochange (-n) and verbose (-v) options to the libselinux functions and rewriting the toolbox restorecon command to use the libselinux functions. Also add a force (-F) option to support forcing a restorecon_recursive even if the restorecon_last attribute matches the current file_contexts hash so that we can continue to force a restorecon via the toolbox command for testing or when we know something else has changed (e.g. for when we support relabeling /data/data and package information has changed). Change-Id: I92bb3259790a7195ba56a5e9555c3b6c76ceb862 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | Merge "Add mknod utility to system/core/toolbox"Sujith Ramakrishnan2014-01-242-0/+96
|\ \
| * | Add mknod utility to system/core/toolboxSujith Ramakrishnan2014-01-172-0/+96
| | | | | | | | | | | | Change-Id: I46586cba83ecb8095721be8ffad9e386d4698e4a
* | | am 1571dac4: am 1b37794b: am f62b602f: am 6192eedb: Merge "Fix \'r\' for LP64."Elliott Hughes2014-01-171-25/+31
|\ \ \ | | |/ | |/| | | | | | | * commit '1571dac49fee8d7304a082a787aed15520ed48b4': Fix 'r' for LP64.
| * | Fix 'r' for LP64.Elliott Hughes2014-01-171-25/+31
| | | | | | | | | | | | Change-Id: I8332a0a8045a70b3992fe34b0b9e334a721265a9
* | | am b1091958: am 320f2940: am e20b5f71: am 524b3a0c: Merge "Remove obsolete ↵Elliott Hughes2014-01-172-162/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | \'setconsole\' command." * commit 'b1091958bdb4bc42f66631fdf4105cbc2faec98a': Remove obsolete 'setconsole' command.
| * | Remove obsolete 'setconsole' command.Elliott Hughes2014-01-162-162/+0
| | | | | | | | | | | | Change-Id: I643a48653006b97bb10d7b996ecc003dbafad590
* | | resolved conflicts for merge of ec9e5891 to masterElliott Hughes2014-01-169-28/+15
|\ \ \ | |/ / | | / | |/ |/| Change-Id: I704e3159d529e436e060cb66c1739ef8e7b612d4
| * system/core 64-bit cleanup.Elliott Hughes2014-01-169-28/+15
| | | | | | | | | | | | | | | | | | This cleans up most of the size-related problems in system/core. There are still a few changes needed for a clean 64-bit build, but they look like they might require changes to things like the fastboot protocol. Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
* | am 58c4a7dd: am e3cd2168: am 709543a9: am 08a140e6: Merge "toolbox: Fix date ↵Benoit Goby2014-01-101-1/+1
|\ \ | |/ | | | | | | | | | | tool with /dev/alarm" * commit '58c4a7ddf227bd6977677f4c8046eab6376477b3': toolbox: Fix date tool with /dev/alarm
| * toolbox: Fix date tool with /dev/alarmBenoit Goby2014-01-091-1/+1
| | | | | | | | | | Change-Id: I6f8ad2149244c89690d5d5caae8ec55429462210 Signed-off-by: Benoit Goby <benoit@android.com>
* | am 16f0d3dc: am e61495c9: am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* ↵Elliott Hughes2014-01-081-6/+0
|\ \ | |/ | | | | | | | | | | constants are now in <sys/swap.h>." * commit '16f0d3dc3ac3ca1e47b67ae28f96c8814f2375bd': SWAP_FLAG_* constants are now in <sys/swap.h>.
| * SWAP_FLAG_* constants are now in <sys/swap.h>.Elliott Hughes2014-01-071-6/+0
| | | | | | | | | | Bug: 9336527 Change-Id: I77e2b05cefbfb4eebda39b4079107833f4160563
* | am 05bfe7fb: am ceb1c5cd: am 49264407: am 7139b0c7: Merge "toolbox-ls: ↵Nick Kralevich2014-01-031-0/+1
|\ \ | |/ | | | | | | | | | | re-introduce clobbered error message" * commit '05bfe7fb95540bae6a42a745fe3bcc1d39a67a7c': toolbox-ls: re-introduce clobbered error message
| * toolbox-ls: re-introduce clobbered error messageWilliam Roberts2014-01-031-0/+1
| | | | | | | | | | | | | | commit 403b1955 clobbered the error message on lstat() calls. Change-Id: Idbd24b648e3a85079b8f8541c0798bf944485ca1
* | am 796be8f1: am b1a82bcb: am f1da46d2: am d27498cb: Merge "toolbox: date: ↵Greg Hackmann2013-12-181-14/+80
|\ \ | |/ | | | | | | | | | | use RTC subsystem on devices without /dev/alarm" * commit '796be8f1432fd02d83f2dae9dbcf11a0976df3b5': toolbox: date: use RTC subsystem on devices without /dev/alarm
| * toolbox: date: use RTC subsystem on devices without /dev/alarmGreg Hackmann2013-12-171-14/+80
| | | | | | | | | | Change-Id: I48c0fd1f4cffef936afb8d48d6d93babf006004d Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | am 619376f4: am e34618a2: am d2ac1d8c: am eb3e9daf: Merge "toolbox: date: ↵Greg Hackmann2013-12-181-1/+1
|\ \ | |/ | | | | | | | | | | fix parameter type warnings" * commit '619376f41fb93ceb9fa634e9ddc561b90be01e23': toolbox: date: fix parameter type warnings
| * toolbox: date: fix parameter type warningsGreg Hackmann2013-12-171-1/+1
| | | | | | | | | | Change-Id: I810a9abee8bc0061c5007fe08197384f2b85754b Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | am 07dbb562: am 9d1de8a8: am 0e23a3d4: am 215f78ae: Merge "toolbox: uptime: ↵Greg Hackmann2013-12-181-4/+14
|\ \ | |/ | | | | | | | | | | use clock_gettime() on devices without /dev/alarm" * commit '07dbb562a848af658f65cd41864f31aab5f4b955': toolbox: uptime: use clock_gettime() on devices without /dev/alarm
| * toolbox: uptime: use clock_gettime() on devices without /dev/alarmGreg Hackmann2013-12-171-4/+14
| | | | | | | | | | Change-Id: Id7287ca179cc0b8390c054803a25a961dd550a34 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | am e75af574: am 70f22d6b: am 066a3862: am 83a76637: Merge "toolbox: uptime: ↵Greg Hackmann2013-12-181-1/+2
|\ \ | |/ | | | | | | | | | | fix unused parameter warnings" * commit 'e75af5745440eb70d1f5682168edb84eaa631982': toolbox: uptime: fix unused parameter warnings
| * toolbox: uptime: fix unused parameter warningsGreg Hackmann2013-12-171-1/+2
| | | | | | | | | | Change-Id: Id240ce85bf09e1a81f4e2e2a7496ac7952edbf38 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | am bfb1d8a2: am af9e9d97: am f0a68b54: am 8779c4ea: Merge "Minor cleanups."Nick Kralevich2013-12-111-3/+3
|\ \ | |/ | | | | | | * commit 'bfb1d8a27532180dd08fc48190aed464abbdd8b8': Minor cleanups.
| * Minor cleanups.Nick Kralevich2013-11-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Use ssize_t for handling the result of a readlink call. Fix the following compiler warning: system/core/toolbox/ls.c: In function 'listfile_maclabel': system/core/toolbox/ls.c:238:68: warning: unused parameter 'flags' [-Wunused-parameter] static int listfile_maclabel(const char *path, struct stat *s, int flags) Change-Id: Idd65f3349fb9dfb6f7a374c81f72d3169af33505
* | Merge "Getevent: make sure the monotonic timestamp is displayed; warning ↵Sasha Levitskiy2013-12-111-4/+10
|\ \ | | | | | | | | | cleanup."
| * | Getevent: make sure the monotonic timestamp is displayed; warning cleanup.Sasha Levitskiy2013-12-101-4/+10
| | | | | | | | | | | | | | | Change-Id: I6c500ab55470155ddf692fe5f655bdd575f195f5 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | | am 5e362c87: am 71e096c8: Merge "Increase buffer size, use bounds checking ↵Nick Kralevich2013-12-021-16/+16
|\ \ \ | | |/ | |/| | | | | | | | | | | | | functions" * commit '5e362c871a7b79b12e91a8737606988163f84dcf': Increase buffer size, use bounds checking functions
| * | Increase buffer size, use bounds checking functionsNick Kralevich2013-11-271-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase the size of the user/group buffer from 16 bytes to 32 bytes. Some OEMs are creating usernames longer than 15 bytes, causing problems. Use bounds checking functions when handling user/group data, to avoid overflowing buffers. Change-Id: I4a5824b819b0c37662ba4f33573af0d0e071b444
| * | Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEADThe Android Open Source Project2013-11-2211-82/+366
| |\ \ | | | | | | | | | | | | Change-Id: I5c469a4b738629d99d721cad7ded02d6c35f56d5