summaryrefslogtreecommitdiffstats
path: root/toolbox
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEADThe Android Open Source Project2013-11-2211-82/+366
|\ | | | | | | Change-Id: I5c469a4b738629d99d721cad7ded02d6c35f56d5
| * Add standard options to readlinkMichael Wright2013-08-221-8/+44
| | | | | | | | Change-Id: I4c2624d22ce879a3578d5b17440a9895b19e2f1f
| * Add basic readlink commandMichael Wright2013-08-192-1/+61
| | | | | | | | Change-Id: I693c1098e6c6d107a9e97285bf826ab153a1c8f0
| * Move liblog headers to system/core/include/logColin Cross2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | Move the liblog headers to log/ instead of cutils/ to complete the separation of libcutils and liblog. cutils/log.h still exists and includes log/log.h in order to support the many existing modules that use cutils/log.h. Change-Id: I2758c9f4aedcb809ca7ba8383d0f55041dd44345
| * Merge "toolbox: swap utils"Rom Lemarchand2013-07-024-1/+192
| |\
| | * toolbox: swap utilsRom Lemarchand2013-06-254-1/+192
| | | | | | | | | | | | | | | | | | | | | Add swap utilities (mkswap, swapon, swapoff) to the toolbox Change-Id: If5ed6981670a1cdda6b528b587dbc1be7ccdf832 Signed-off-by: Rom Lemarchand <romlem@google.com>
| * | Merge "Do not exit early on errors when -f is specified"Ken Sumrall2013-06-281-4/+11
| |\ \
| | * | Do not exit early on errors when -f is specifiedKen Sumrall2013-06-261-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running with the -f option, do not stop recursion or proccessing command line args if an error occurs. Continue trying to remove all the items specified on the command line. However, still return an error status if some files could not be removed. Change-Id: I83d66babe833da8a68aad68248647ba0601c5d32
| * | | Merge "Update the touch command to take a human readable timestamp"Ken Sumrall2013-06-281-4/+31
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Update the touch command to take a human readable timestampKen Sumrall2013-06-261-4/+31
| | | | | | | | | | | | | | | | | | | | | Now the -t option to the toolbox touch command takes a timestamp in the form of YYYYMMDD.hhmmss Change-Id: I3812700edaa1a06590a07c15b050721b49e9b7e0
| * | toolbox: reimplement watchprops using __system_property_foreach()Greg Hackmann2013-06-181-39/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internally, replace the watchlist array with a hashmap since the array assumes properties are enumerated in a consistent order and foreach() probably won't. (find_nth() never guaranteed this either but it usually worked in practice.) Change-Id: I83843facdd671edd09652edf472e88ec3d1edd3b Signed-off-by: Greg Hackmann <ghackmann@google.com>
| * | toolbox: hide property implementation from watchpropsColin Cross2013-06-171-17/+16
| |/ | | | | | | Change-Id: Ia6609116d641d3354971ca40a16ffcab38484150
| * am 603746f0: am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q ↵Brian Carlstrom2013-06-041-2/+2
| |\ | | | | | | | | | | | | | | | | | | Send-Q columns" * commit '603746f0e3b645954f33be36f7602cc8205cb71c': Fixed reversed output in netstat Recv-Q Send-Q columns
| * | fix another misuse of strncatNick Kralevich2013-06-031-2/+2
| | | | | | | | | | | | | | | | | | | | | This has the potential to overflow "buffer" if the command line is more than 4K. Change-Id: Icdfed0d9d21804f290b75787ef3809e0475b14f0
| * | fix strncat misuseNick Kralevich2013-06-031-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The third argument of strncat() tells how much data to append from src, not the total size of the buffer. Change uses of strncat() to strlcat(), which has the buffer overflow protection behavior intended by the original author. This fixes the following compiler warning: In function 'strncat', inlined from 'print_type' at system/core/toolbox/lsof.c:76:12: bionic/libc/include/string.h:142:5: warning: call to __builtin___strncat_chk might overflow destination buffer [enabled by default] Change-Id: Id69edc641de3cb87d1867a409cd57b04b12f90a7
| * | Merge "fs_mgr: make block devices read-only"Nick Kralevich2013-04-251-0/+22
| |\ \
| | * | fs_mgr: make block devices read-onlyNick Kralevich2013-04-241-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a filesystem is mounted read-only, make the underlying block device read-only too. This helps prevent an attacker who is able to change permissions on the files in /dev (for example, symlink attack) from modifying the block device. In particular, this change would have stopped the LG Thrill / Optimus 3D rooting exploit (http://vulnfactory.org/blog/2012/02/26/rooting-the-lg-thrill-optimus-3d/) as that exploit modified the raw block device corresponding to /system. This change also makes UID=0 less powerful. Block devices cannot be made writable again without CAP_SYS_ADMIN, so an escalation to UID=0 by itself doesn't give full root access. adb/mount: Prior to mounting something read-write, remove the read-only restrictions on the underlying block device. This avoids messing up developer workflows. Change-Id: I135098a8fe06f327336f045aab0d48ed9de33807
| * | | am 4c1840e6: am 5ea58543: Merge "mount: fix incorrect string length calculation"Nick Kralevich2013-04-241-3/+4
| |\ \ \ | | |/ / | |/| | | | | | | | | | * commit '4c1840e6547266ba251d8c34905036d73240ff57': mount: fix incorrect string length calculation
| * | | am 03546553: am b73a0ef4: Merge "use lseek64 to resolve offset oveflow"Colin Cross2013-04-181-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '03546553205b56fc1ba0318b146971f43f54a155': use lseek64 to resolve offset oveflow
| * \ \ \ am 129b6d90: am 083b5ccb: Add liblogYing Wang2013-04-091-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '129b6d907b3c32a0f0a2e4fc585502484d47a1e4': Add liblog
| * \ \ \ \ am d3859e43: am 6e0b9ecb: Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"Colin Cross2013-04-061-6/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd3859e433d5a4e0da3f24851c5f5f6c9c8b97849': toolbox/dmesg: do not hardcode KLOG_BUF_LEN
| * \ \ \ \ \ am a7096004: am 911ba269: Merge "Add -i option to toolbox cmd ls"Geremy Condra2013-04-041-36/+44
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7096004f220dd7578d7b2e26a3513fa5efc0fc1': Add -i option to toolbox cmd ls
| * | | | | | | toolbox: Make reboot a separate command from toolboxBenoit Goby2013-03-262-59/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the CAP_SYS_BOOT filesystem capability on the new reboot command and keep CAP_SYS_BOOT in adb bounding set so that the shell user can run it. Change-Id: I1dd6143445ee2a952254f0452ab6e544318431dd
| * | | | | | | toolbox: Fix rm -f with multiple filesBenoit Goby2013-03-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only check errno if unlink returns -1. Continue instead of exiting if one file does not exist. Change-Id: Iaf01b8523b84e87fcb0d732b89b7be6e24279c0b
* | | | | | | | Fix nandread to build with old or uapi headers.Elliott Hughes2013-11-111-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11559337 Change-Id: I9795a16649dafdfe3df150170265157170cd5a79
* | | | | | | | am e755dfd4: Merge changes I1db3137b,I0f66144eColin Cross2013-06-191-39/+59
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e755dfd43812ebd9a0d0d6a2106316f343ffb5a2': toolbox: reimplement watchprops using __system_property_foreach() libcutils: reimplement property_list() using __system_property_foreach()
| * | | | | | | | toolbox: reimplement watchprops using __system_property_foreach()Greg Hackmann2013-06-181-39/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internally, replace the watchlist array with a hashmap since the array assumes properties are enumerated in a consistent order and foreach() probably won't. (find_nth() never guaranteed this either but it usually worked in practice.) Signed-off-by: Greg Hackmann <ghackmann@google.com> (cherry picked from commit 389e358017ad15485f2bd9120feebfffa489131b) Change-Id: I1db3137b130474f4bb205f01f0bdcf37cf974764
* | | | | | | | | resolved conflicts for merge of 95a41f6b to stage-aosp-masterColin Cross2013-06-171-17/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | Change-Id: Icfae29edf989fb43a7f0b8bda188a9807f76a3b9
| * | | | | | | toolbox: hide property implementation from watchpropsColin Cross2013-06-171-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 91779634debc79bc75d3df4e0f59d964ad4f5f78) Change-Id: I7a2d8aa507ac61cedc5f67c563531a7d4ec8e4c2
* | | | | | | | am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q Send-Q columns"Brian Carlstrom2013-06-041-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | | * commit '59fa7e107d43a4ef521413ec0bb7b0c2a5525071': Fixed reversed output in netstat Recv-Q Send-Q columns
| * | | | | | Fixed reversed output in netstat Recv-Q Send-Q columnsBrian Carlstrom2013-06-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2bc7ac6c886808910212432497f05e34596f5e85
* | | | | | | am 5ea58543: Merge "mount: fix incorrect string length calculation"Nick Kralevich2013-04-241-3/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | * commit '5ea58543154a97c42c0b7fc58c2639a4fea64f5b': mount: fix incorrect string length calculation
| * | | | | mount: fix incorrect string length calculationNick Kralevich2013-04-241-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug https://code.google.com/p/android/issues/detail?id=54192 which incorrectly calculated the length of a string. Fix compiler warning: system/core/toolbox/mount.c:59:2: warning: initializer-string for array of chars is too long [enabled by default] system/core/toolbox/mount.c:59:2: warning: (near initialization for 'options[16].str') [enabled by default] Change-Id: If8663f8311c6348a730fcf731d402b57fee10cb5
* | | | | | am b73a0ef4: Merge "use lseek64 to resolve offset oveflow"Colin Cross2013-04-181-4/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | * commit 'b73a0ef4d05ad594ba07b98e1f4aa7fe66a18c2e': use lseek64 to resolve offset oveflow
| * | | | use lseek64 to resolve offset oveflowJongrak Kwon2013-04-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The offset variable in lseek is 32 bit and get easily overflow when accessing with large offset in dd command. Use lseek64 to resolve it. Change-Id: Ib75d9dcb587004a6851365ab5bb8584ce1010b57
* | | | | am 083b5ccb: Add liblogYing Wang2013-04-091-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | * commit '083b5ccba345ed2b4950454f16bd89c5d86b6b27': Add liblog
| * | | | Add liblogYing Wang2013-04-091-0/+1
| | |/ / | |/| | | | | | | | | | | | | | Bug: 8580410 Change-Id: Iab3a9b4307f207c14a04a922cc7350c54e60e9ad
* | | | am 6e0b9ecb: Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"Colin Cross2013-04-061-6/+21
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | * commit '6e0b9ecb503b5611d815214e0a134ea0b1395089': toolbox/dmesg: do not hardcode KLOG_BUF_LEN
| * | Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"Colin Cross2013-04-061-6/+21
| |\ \
| | * | toolbox/dmesg: do not hardcode KLOG_BUF_LENJames Sullins2013-04-011-6/+21
| | | | | | | | | | | | | | | | Change-Id: Ia99654a53d6adfeba5a5088b7cff45c6e47b6188
* | | | am 911ba269: Merge "Add -i option to toolbox cmd ls"Geremy Condra2013-04-041-36/+44
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit '911ba269e369035f9a4a250fa22233b37d724356': Add -i option to toolbox cmd ls
| * | Add -i option to toolbox cmd lsWilliam Roberts2013-04-031-36/+44
| |/ | | | | | | Change-Id: I4690fc10dc07bf1883bcf8ec18399235dc97d317
* | toolbox: renice: Add -t TYPE parameter and switch to getoptDmitry Shmidt2013-01-221-24/+40
| | | | | | | | | | Change-Id: Idaedabe1505a9c373629ef1fd31aa4b4beb068c2 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | am 7ec62dbd: am 82ea44f8: Merge "Change setsebool syntax to be consistent ↵Dima Zavin2012-12-191-24/+15
|\ \ | |/ | | | | | | | | | | with other init built-ins." * commit '7ec62dbd9d2bd7369fa074bf002f642b03e6dd39': Change setsebool syntax to be consistent with other init built-ins.
| * Merge "Change setsebool syntax to be consistent with other init built-ins."Dima Zavin2012-12-181-24/+15
| |\
| | * Change setsebool syntax to be consistent with other init built-ins.Stephen Smalley2012-12-131-24/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change setsebool syntax from name=value to name value. This is to make it consistent with setprop and similar commands. Update both the init built-in command and the toolbox command for consistency. Change-Id: I2c8e016ba26731c4a2ad4a49ae3b89362bf8f8a8 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | am b8db1e09: am 777991d9: Merge "Fixed improper size displaying in \'df\' ↵Elliott Hughes2012-12-031-5/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | utility" * commit 'b8db1e093d412f57263dc597dbac14c377945781': Fixed improper size displaying in 'df' utility
| * | Merge "Fixed improper size displaying in 'df' utility"Elliott Hughes2012-12-031-5/+11
| |\ \ | | |/ | |/|
| | * Fixed improper size displaying in 'df' utilityMichal Frynas2012-10-021-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'df' command used to display filesystem usage statistics as integer values, in most cases rounding the actual value down. Because of that 'df' tended to display faulty size values. This fix to 'df' utility calculates the fractional part of the size, then it rounds it when needed to the nearest one-digit integer value and displays after decimal dot. Change-Id: I9bc52635d45d3e55ce61b3b1c6b80d1267516e75
* | | resolved conflicts for merge of 20f5daa8 to masterKenny Root2012-10-163-30/+6
|\ \ \ | |/ / | | | | | | Change-Id: Ie3e67696d265a56dfa4d089c777506f27783a9a6