3 files changed, 83 insertions, 81 deletions

diff --git a/init/bootchartd.c b/init/bootchartd.c
index 92aaade0f..b5dd17439 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -8,43 +8,43 @@
 //kbuild:lib-$(CONFIG_BOOTCHARTD) += bootchartd.o
 
 //config:config BOOTCHARTD
-//config:       bool "bootchartd"
+//config:       bool "bootchartd (10 kb)"
 //config:       default y
 //config:       help
-//config:         bootchartd is commonly used to profile the boot process
-//config:         for the purpose of speeding it up. In this case, it is started
-//config:         by the kernel as the init process. This is configured by adding
-//config:         the init=/sbin/bootchartd option to the kernel command line.
+//config:       bootchartd is commonly used to profile the boot process
+//config:       for the purpose of speeding it up. In this case, it is started
+//config:       by the kernel as the init process. This is configured by adding
+//config:       the init=/sbin/bootchartd option to the kernel command line.
 //config:
-//config:         It can also be used to monitor the resource usage of a specific
-//config:         application or the running system in general. In this case,
-//config:         bootchartd is started interactively by running bootchartd start
-//config:         and stopped using bootchartd stop.
+//config:       It can also be used to monitor the resource usage of a specific
+//config:       application or the running system in general. In this case,
+//config:       bootchartd is started interactively by running bootchartd start
+//config:       and stopped using bootchartd stop.
 //config:
 //config:config FEATURE_BOOTCHARTD_BLOATED_HEADER
 //config:       bool "Compatible, bloated header"
 //config:       default y
 //config:       depends on BOOTCHARTD
 //config:       help
-//config:         Create extended header file compatible with "big" bootchartd.
-//config:         "Big" bootchartd is a shell script and it dumps some
-//config:         "convenient" info int the header, such as:
-//config:           title = Boot chart for `hostname` (`date`)
-//config:           system.uname = `uname -srvm`
-//config:           system.release = `cat /etc/DISTRO-release`
-//config:           system.cpu = `grep '^model name' /proc/cpuinfo | head -1` ($cpucount)
-//config:           system.kernel.options = `cat /proc/cmdline`
-//config:         This data is not mandatory for bootchart graph generation,
-//config:         and is considered bloat. Nevertheless, this option
-//config:         makes bootchartd applet to dump a subset of it.
+//config:       Create extended header file compatible with "big" bootchartd.
+//config:       "Big" bootchartd is a shell script and it dumps some
+//config:       "convenient" info int the header, such as:
+//config:               title = Boot chart for `hostname` (`date`)
+//config:               system.uname = `uname -srvm`
+//config:               system.release = `cat /etc/DISTRO-release`
+//config:               system.cpu = `grep '^model name' /proc/cpuinfo | head -1` ($cpucount)
+//config:               system.kernel.options = `cat /proc/cmdline`
+//config:       This data is not mandatory for bootchart graph generation,
+//config:       and is considered bloat. Nevertheless, this option
+//config:       makes bootchartd applet to dump a subset of it.
 //config:
 //config:config FEATURE_BOOTCHARTD_CONFIG_FILE
 //config:       bool "Support bootchartd.conf"
 //config:       default y
 //config:       depends on BOOTCHARTD
 //config:       help
-//config:         Enable reading and parsing of $PWD/bootchartd.conf
-//config:         and /etc/bootchartd.conf files.
+//config:       Enable reading and parsing of $PWD/bootchartd.conf
+//config:       and /etc/bootchartd.conf files.
 
 #include "libbb.h"
 #include "common_bufsiz.h"
@@ -171,7 +171,9 @@ static int dump_procs(FILE *fp, int look_for_login_process)
                         p++;
                         strchrnul(p, ')')[0] = '\0';
                         /* Is it gdm, kdm or a getty? */
-                        if (((p[0] == 'g' || p[0] == 'k' || p[0] == 'x') && p[1] == 'd' && p[2] == 'm')
+                        if (((p[0] == 'g' || p[0] == 'k' || p[0] == 'x')
+                             && p[1] == 'd' && p[2] == 'm' && p[3] == '\0'
+                            )
                          || strstr(p, "getty")
                         ) {
                                 found_login_process = 1;
@@ -190,7 +192,7 @@ static char *make_tempdir(void)
         if (!tempdir) {
 #ifdef __linux__
                 /* /tmp is not writable (happens when we are used as init).
-                 * Try to mount a tmpfs, them cd and lazily unmount it.
+                 * Try to mount a tmpfs, then cd and lazily unmount it.
                  * Since we unmount it at once, we can mount it anywhere.
                  * Try a few locations which are likely ti exist.
                  */
diff --git a/init/halt.c b/init/halt.c
index f69b89772..632c6cc56 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -8,42 +8,42 @@
  */
 
 //config:config HALT
-//config:       bool "halt"
+//config:       bool "halt (3.7 kb)"
 //config:       default y
 //config:       help
-//config:         Stop all processes and halt the system.
+//config:       Stop all processes and halt the system.
 //config:
 //config:config POWEROFF
-//config:       bool "poweroff"
+//config:       bool "poweroff (3.7 kb)"
 //config:       default y
 //config:       help
-//config:         Stop all processes and power off the system.
+//config:       Stop all processes and power off the system.
 //config:
 //config:config REBOOT
-//config:       bool "reboot"
+//config:       bool "reboot (3.7 kb)"
 //config:       default y
 //config:       help
-//config:         Stop all processes and reboot the system.
+//config:       Stop all processes and reboot the system.
 //config:
 //config:config FEATURE_CALL_TELINIT
 //config:       bool "Call telinit on shutdown and reboot"
 //config:       default y
 //config:       depends on (HALT || POWEROFF || REBOOT) && !INIT
 //config:       help
-//config:         Call an external program (normally telinit) to facilitate
-//config:         a switch to a proper runlevel.
+//config:       Call an external program (normally telinit) to facilitate
+//config:       a switch to a proper runlevel.
 //config:
-//config:         This option is only available if you selected halt and friends,
-//config:         but did not select init.
+//config:       This option is only available if you selected halt and friends,
+//config:       but did not select init.
 //config:
 //config:config TELINIT_PATH
 //config:       string "Path to telinit executable"
 //config:       default "/sbin/telinit"
 //config:       depends on FEATURE_CALL_TELINIT
 //config:       help
-//config:         When busybox halt and friends have to call external telinit
-//config:         to facilitate proper shutdown, this path is to be used when
-//config:         locating telinit executable.
+//config:       When busybox halt and friends have to call external telinit
+//config:       to facilitate proper shutdown, this path is to be used when
+//config:       locating telinit executable.
 
 //applet:IF_HALT(APPLET(halt, BB_DIR_SBIN, BB_SUID_DROP))
 //                   APPLET_ODDNAME:name      main  location     suid_type     help
diff --git a/init/init.c b/init/init.c
index 4d6355167..ab137a981 100644
--- a/init/init.c
+++ b/init/init.c
@@ -10,38 +10,38 @@
  */
 
 //config:config INIT
-//config:       bool "init"
+//config:       bool "init (9.3 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         init is the first program run when the system boots.
+//config:       init is the first program run when the system boots.
 //config:
 //config:config LINUXRC
 //config:       bool "linuxrc: support running init from initrd (not initramfs)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         Legacy support for running init under the old-style initrd. Allows
-//config:         the name linuxrc to act as init, and it doesn't assume init is PID 1.
+//config:       Legacy support for running init under the old-style initrd. Allows
+//config:       the name linuxrc to act as init, and it doesn't assume init is PID 1.
 //config:
-//config:         This does not apply to initramfs, which runs /init as PID 1 and
-//config:         requires no special support.
+//config:       This does not apply to initramfs, which runs /init as PID 1 and
+//config:       requires no special support.
 //config:
 //config:config FEATURE_USE_INITTAB
 //config:       bool "Support reading an inittab file"
 //config:       default y
 //config:       depends on INIT || LINUXRC
 //config:       help
-//config:         Allow init to read an inittab file when the system boot.
+//config:       Allow init to read an inittab file when the system boot.
 //config:
 //config:config FEATURE_KILL_REMOVED
 //config:       bool "Support killing processes that have been removed from inittab"
 //config:       default n
 //config:       depends on FEATURE_USE_INITTAB
 //config:       help
-//config:         When respawn entries are removed from inittab and a SIGHUP is
-//config:         sent to init, this option will make init kill the processes
-//config:         that have been removed.
+//config:       When respawn entries are removed from inittab and a SIGHUP is
+//config:       sent to init, this option will make init kill the processes
+//config:       that have been removed.
 //config:
 //config:config FEATURE_KILL_DELAY
 //config:       int "How long to wait between TERM and KILL (0 - send TERM only)" if FEATURE_KILL_REMOVED
@@ -49,34 +49,34 @@
 //config:       default 0
 //config:       depends on FEATURE_KILL_REMOVED
 //config:       help
-//config:         With nonzero setting, init sends TERM, forks, child waits N
-//config:         seconds, sends KILL and exits. Setting it too high is unwise
-//config:         (child will hang around for too long and could actually kill
-//config:         the wrong process!)
+//config:       With nonzero setting, init sends TERM, forks, child waits N
+//config:       seconds, sends KILL and exits. Setting it too high is unwise
+//config:       (child will hang around for too long and could actually kill
+//config:       the wrong process!)
 //config:
 //config:config FEATURE_INIT_SCTTY
 //config:       bool "Run commands with leading dash with controlling tty"
 //config:       default y
 //config:       depends on INIT || LINUXRC
 //config:       help
-//config:         If this option is enabled, init will try to give a controlling
-//config:         tty to any command which has leading hyphen (often it's "-/bin/sh").
-//config:         More precisely, init will do "ioctl(STDIN_FILENO, TIOCSCTTY, 0)".
-//config:         If device attached to STDIN_FILENO can be a ctty but is not yet
-//config:         a ctty for other session, it will become this process' ctty.
-//config:         This is not the traditional init behavour, but is often what you want
-//config:         in an embedded system where the console is only accessed during
-//config:         development or for maintenance.
-//config:         NB: using cttyhack applet may work better.
+//config:       If this option is enabled, init will try to give a controlling
+//config:       tty to any command which has leading hyphen (often it's "-/bin/sh").
+//config:       More precisely, init will do "ioctl(STDIN_FILENO, TIOCSCTTY, 0)".
+//config:       If device attached to STDIN_FILENO can be a ctty but is not yet
+//config:       a ctty for other session, it will become this process' ctty.
+//config:       This is not the traditional init behavour, but is often what you want
+//config:       in an embedded system where the console is only accessed during
+//config:       development or for maintenance.
+//config:       NB: using cttyhack applet may work better.
 //config:
 //config:config FEATURE_INIT_SYSLOG
 //config:       bool "Enable init to write to syslog"
 //config:       default y
 //config:       depends on INIT || LINUXRC
 //config:       help
-//config:         If selected, some init messages are sent to syslog.
-//config:         Otherwise, they are sent to VT #5 if linux virtual tty is detected
-//config:         (if not, no separate logging is done).
+//config:       If selected, some init messages are sent to syslog.
+//config:       Otherwise, they are sent to VT #5 if linux virtual tty is detected
+//config:       (if not, no separate logging is done).
 //config:
 //config:config FEATURE_INIT_QUIET
 //config:       bool "Be quiet on boot (no 'init started:' message)"
@@ -88,37 +88,37 @@
 //config:       default n       # not Y because this is a debug option
 //config:       depends on INIT || LINUXRC
 //config:       help
-//config:         If this option is enabled and the file /.init_enable_core
-//config:         exists, then init will call setrlimit() to allow unlimited
-//config:         core file sizes. If this option is disabled, processes
-//config:         will not generate any core files.
+//config:       If this option is enabled and the file /.init_enable_core
+//config:       exists, then init will call setrlimit() to allow unlimited
+//config:       core file sizes. If this option is disabled, processes
+//config:       will not generate any core files.
 //config:
 //config:config INIT_TERMINAL_TYPE
 //config:       string "Initial terminal type"
 //config:       default "linux"
 //config:       depends on INIT || LINUXRC
 //config:       help
-//config:         This is the initial value set by init for the TERM environment
-//config:         variable. This variable is used by programs which make use of
-//config:         extended terminal capabilities.
+//config:       This is the initial value set by init for the TERM environment
+//config:       variable. This variable is used by programs which make use of
+//config:       extended terminal capabilities.
 //config:
-//config:         Note that on Linux, init attempts to detect serial terminal and
-//config:         sets TERM to "vt102" if one is found.
+//config:       Note that on Linux, init attempts to detect serial terminal and
+//config:       sets TERM to "vt102" if one is found.
 //config:
 //config:config FEATURE_INIT_MODIFY_CMDLINE
 //config:       bool "Clear init's command line"
 //config:       default y
 //config:       depends on INIT || LINUXRC
 //config:       help
-//config:         When launched as PID 1 and after parsing its arguments, init
-//config:         wipes all the arguments but argv[0] and rewrites argv[0] to
-//config:         contain only "init", so that its command line appears solely as
-//config:         "init" in tools such as ps.
-//config:         If this option is set to Y, init will keep its original behavior,
-//config:         otherwise, all the arguments including argv[0] will be preserved,
-//config:         be they parsed or ignored by init.
-//config:         The original command-line used to launch init can then be
-//config:         retrieved in /proc/1/cmdline on Linux, for example.
+//config:       When launched as PID 1 and after parsing its arguments, init
+//config:       wipes all the arguments but argv[0] and rewrites argv[0] to
+//config:       contain only "init", so that its command line appears solely as
+//config:       "init" in tools such as ps.
+//config:       If this option is set to Y, init will keep its original behavior,
+//config:       otherwise, all the arguments including argv[0] will be preserved,
+//config:       be they parsed or ignored by init.
+//config:       The original command-line used to launch init can then be
+//config:       retrieved in /proc/1/cmdline on Linux, for example.
 
 //applet:IF_INIT(APPLET(init, BB_DIR_SBIN, BB_SUID_DROP))
 //applet:IF_LINUXRC(APPLET_ODDNAME(linuxrc, init, BB_DIR_ROOT, BB_SUID_DROP, linuxrc))