aboutsummaryrefslogtreecommitdiff
path: root/procps (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'busybox' into mergeRon Yorston2012-09-073-25/+49
|\| | | | | | | | | | | Conflicts: include/libbb.h shell/ash.c
| * sysctl: implement -qJoshua Kahlenberg2012-09-051-13/+19
| | | | | | | | | | | | | | | | | | | | function old new delta packed_usage 29208 29223 +15 sysctl_act_recursive 605 598 -7 sysctl_main 233 222 -11 Signed-off-by: Joshua Kahlenberg <jbkberg@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * Move several applets to different install dir:Denys Vlasenko2012-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Moved to [/usr]/sbin: addgroup, adduser, delgroup, deluser, arping, chat, ether-wake, fdformat, ifplugd, ip, ipaddr, iplink, iproute, iprule, iptunnel, killall5, readahead, rtcwake, tftpd, add-shell, remove-shell, powertop. Moved to /bin for /usr/bin: kbd_mode. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ps: use separate get_uptime() and make it work on non-linux tooMichael Tokarev2012-06-131-11/+29
| | | | | | | | | | | | | | | | Create get_uptime() function in procps/ps.c, and use it rather than relying on linux-specific sysinfo() inline. Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* | Merge commit '1_20_0' into mergeRon Yorston2012-04-232-2/+80
|\|
| * killall5: don't do STOP/CONT dance if the signal we send is SIGSTOP or SIGCONTDenys Vlasenko2012-04-031-2/+4
| | | | | | | | | | | | | | function old new delta kill_main 913 942 +29 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * lsof: new appletSven Oliver Moll2012-04-011-0/+76
| | | | | | | | | | | | | | | | | | | | text data bss dec hex filename 221 0 0 221 dd lsof.o Signed-off-by: Sven Oliver Moll <busybox@svol.li> Signed-off-by: souf <souf_oued@yahoo.fr> Signed-off-by: Tito Ragusa <farmatito@tiscali.it> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* | kill: no special treatment for MINGW32Ron Yorston2012-04-181-2/+0
| |
* | Merge branch 'busybox' into mergeRon Yorston2012-03-232-6/+9
|\| | | | | | | | | Conflicts: Makefile.flags
| * libbb: make xchroot do a chdir("/") after chrootDenys Vlasenko2012-03-081-2/+2
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * kill: fix segfault in arguments parsingAlexey Fomenko2011-12-221-4/+7
| | | | | | | | | | Signed-off-by: Alexey Fomenko <ext-alexey.fomenko@nokia.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* | Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into mergeRon Yorston2012-03-235-32/+140
|\| | | | | | | | | | | Conflicts: Makefile.flags scripts/basic/fixdep.c
| * nmeter: fix block i/o count on newer Linux kernelsDenys Vlasenko2011-11-011-12/+38
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ps: fix for !FEATURE_PS_LONG buildCristian Ionescu-Idbohrn2011-09-291-0/+2
| | | | | | | | | | Signed-off-by: Cristian Ionescu-Idbohrn <cii@axis.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ps: with -l, show STIME tooFlemming Madsen2011-09-271-16/+21
| | | | | | | | | | Signed-off-by: Flemming Madsen <busybox@themadsens.dk> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ps: add support for -l for !DESKTOPDenys Vlasenko2011-09-262-19/+94
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * rename archive.h to bb_archive.h. no code changesDenys Vlasenko2011-09-221-1/+1
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * add INIT_G()'s. No code changes.Denys Vlasenko2011-09-211-1/+1
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* | Merge commit 'd84b175cb6948eb17f847313bf912174e2f934e1' into mergeRon Yorston2012-03-224-25/+53
|\| | | | | | | | | Conflicts: include/platform.h
| * uptime: more compatible outputDenys Vlasenko2011-08-101-20/+20
| | | | | | | | | | | | | | | | | | | | | | was: 12:59:35 up 1:57, 4 users, load average: 0.11, 0.20, 0.53 is: 12:59:37 up 1:57, 4 users, load average: 0.11, 0.20, 0.53 While at it, switched code to unsigned division. Based on patch by Pere Orga <gotrunks@gmail.com>. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * uptime: add config flag to allow displaying the number of users currently ↵Pere Orga2011-08-092-13/+31
| | | | | | | | | | | | | | logged on Signed-off-by: Pere Orga <gotrunks@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * *: work around sysinfo.h versus linux/*.h problemsDenys Vlasenko2011-07-263-0/+10
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* | Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into mergeRon Yorston2012-03-2212-158/+141
|\| | | | | | | | | Conflicts: procps/ps.c
| * procps: remove PSSCAN_STAT define, users were using it incorrectlyDenys Vlasenko2011-06-181-12/+11
| | | | | | | | | | | | Also contains small cleanups ps. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * pkill/pgrep: support extended regular expressionsWade Berrier2011-06-101-1/+1
| | | | | | | | | | | | | | | | Done by enabling the REG_EXTENDED and REG_NOSUB regex flags, which also increases compatibility with the procps versions. Signed-off-by: Wade Berrier <wade_berrier@appsig.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * fix breakage caused by 'remove "Options:" string from help texts' commitDenys Vlasenko2011-06-051-0/+1
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * *: remove "Options:" string from help textsDenys Vlasenko2011-06-0512-23/+9
| | | | | | | | | | | | | | function old new delta packed_usage 28706 28623 -83 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * iostat: code shrinkMaksym Kryzhanovskyy2011-06-051-120/+117
| | | | | | | | | | | | | | | | | | | | function old new delta iostat_main 2048 2400 +352 is_partition 48 - -48 print_stats_dev_struct 350 - -350 Signed-off-by: Maksym Kryzhanovskyy <xmaks@email.cz> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* | Merge commit '56a3b82e9692a25ef9c9269e88feac0d579ce8e8' into mergeRon Yorston2012-03-226-521/+513
|\| | | | | | | | | | | | | Conflicts: coreutils/ls.c include/platform.h libbb/bb_basename.c
| * fuser: fix inverted access() check. Closes 3799.Denys Vlasenko2011-05-291-1/+1
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * nmeter: trim help textDenys Vlasenko2011-05-261-13/+13
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * fuser: code shrinkMaksym Kryzhanovskyy2011-05-231-196/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function old new delta scan_proc_net_or_maps - 427 +427 scan_recursive - 380 +380 search_dev_inode 74 71 -3 add_pid 39 - -39 scan_link 46 - -46 scan_dir_links 76 - -76 scan_pid_maps 222 - -222 fuser_main 871 297 -574 ------------------------------------------------------------------------------ (add/remove: 2/4 grow/shrink: 0/2 up/down: 807/-960) Total: -153 bytes Signed-off-by: Maksym Kryzhanovskyy <xmaks@email.cz> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * top: display sort indicator in memory displayDenys Vlasenko2011-05-181-1/+1
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * top: better indicator of selected field in mem viewDenys Vlasenko2011-05-141-1/+1
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * fix "variable 'foo' set but not used" warningsDenys Vlasenko2011-05-131-2/+0
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * iostat: code shrink ~0.5kMaksym Kryzhanovskyy2011-05-071-181/+125
| | | | | | | | | | Signed-off-by: Maksym Kryzhanovskyy <xmaks@email.cz> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * preparatory patchDenys Vlasenko2011-05-071-19/+20
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * top: another scripting improvementDenys Vlasenko2011-05-061-16/+27
| | | | | | | | | | | | | | function old new delta handle_input 492 493 +1 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * top: make it possible to feed commands via pipeDenys Vlasenko2011-05-061-110/+155
| | | | | | | | | | | | | | | | | | | | | | | | function old new delta handle_input - 492 +492 mult_lvl_cmp 38 49 +11 packed_usage 28247 28257 +10 top_main 1345 928 -417 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 2/1 up/down: 513/-417) Total: 96 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * mpstat.c: remove unused lineMarek Polacek2011-04-301-2/+1
| | | | | | | | | | Signed-off-by: Marek Polacek <mpolacek@redhat.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* | Merge commit 'b83c9704128dd106071184e4b00335a3b8486857' into mergeRon Yorston2012-03-2211-0/+220
|\|
| * move remaining help text from include/usage.src.hPere Orga2011-04-1110-0/+218
| | | | | | | | | | Signed-off-by: Pere Orga <gotrunks@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * pstree: fix "warning: 'handle_thread' defined but not used"Denys Vlasenko2011-03-271-0/+2
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* | Merge commit '19311bfa7b8e8c6effa9c375de9b0eb4338bee12' into mergeRon Yorston2012-03-223-3/+65
|\| | | | | | | | | | | Conflicts: coreutils/ls.c shell/ash.c
| * pwdx: new appletPere Orga2011-03-121-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function old new delta pwdx_main - 197 +197 packed_usage 28237 28261 +24 applet_names 2391 2396 +5 applet_main 1392 1396 +4 applet_nameofs 696 698 +2 applet_install_loc 174 175 +1 ------------------------------------------------------------------------------ (add/remove: 2/0 grow/shrink: 5/0 up/down: 233/0) Total: 233 bytes Signed-off-by: Pere Orga <gotrunks@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * kill: fix infinite loop when passed PIDs are not valid numbersPere Orga2011-03-071-0/+1
| | | | | | | | | | Signed-off-by: Pere Orga <gotrunks@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * Replace "depends on PLATFORM_LINUX" with "select PLATFORM_LINUX"Denys Vlasenko2011-02-261-3/+4
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* | Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into mergeRon Yorston2012-03-223-13/+58
|\| | | | | | | | | | | | | Conflicts: libbb/vfork_daemon_rexec.c networking/wget.c procps/ps.c
| * ash: fix ash-signals/signal8 testcase failureDenys Vlasenko2011-02-211-3/+22
| | | | | | | | | | | | | | | | | | | | | | function old new delta killcmd 109 224 +115 kill_main 882 910 +28 changepath 194 195 +1 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/0 up/down: 144/0) Total: 144 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * whitespace fixesDenys Vlasenko2011-02-031-1/+1
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>