Merge lp:~smoser/ubuntu/oneiric/busybox/debian-merge-1.18.4 into lp:ubuntu/oneiric/busybox

[Scott Moser]

[Clint Byrum (clint-fewbar)]

Scott, this looks great!

It would appear you used merge-changelog to do the changelog. Apparently there are some entries out out of order, so merge-changelog moved a giant block of changes above version 20040623-2 that used to be below it. It also removed the erroneous, duplicate 0.52-2 entry.

I went ahead and restored the changelogs below the new entries to their original state.

Otherwise it looks good for sponsorship. Uploaded.

=== modified file '.pc/applets-fallback.patch/Config.in'
--- .pc/applets-fallback.patch/Config.in	2010-08-03 06:42:39 +0000
+++ .pc/applets-fallback.patch/Config.in	2011-05-27 16:11:32 +0000
@@ -47,6 +47,17 @@
 	  compiler other than gcc.
 	  If you do use gcc, this option may needlessly increase code size.
 
+config PLATFORM_LINUX
+	bool "Enable Linux-specific applets and features"
+	default y
+	help
+	  For the most part, busybox requires only POSIX compatibility
+	  from the target system, but some applets and features use
+	  Linux-specific interfaces.
+
+	  Answering 'N' here will disable such applets and hide the
+	  corresponding configuration options.
+
 choice
 	prompt "Buffer allocation policy"
 	default FEATURE_BUFFERS_USE_MALLOC
@@ -112,6 +123,14 @@
 	  busybox at runtime to create hard links or symlinks for all the
 	  applets that are compiled into busybox.
 
+config INSTALL_NO_USR
+	bool "Don't use /usr"
+	default n
+	help
+	  Disable use of /usr. busybox --install and "make install"
+	  will install applets only to /bin and /sbin,
+	  never to /usr/bin or /usr/sbin.
+
 config LOCALE_SUPPORT
 	bool "Enable locale support (system needs locale for this to work)"
 	default n
@@ -264,15 +283,6 @@
 	  Don't enable this unless you have a really good reason to clean
 	  things up manually.
 
-config FEATURE_UTMP
-	bool "Support utmp file"
-	default y
-	help
-	  The file /var/run/utmp is used to track who is currently logged in.
-	  With this option on, certain applets (getty, login, telnetd etc)
-	  will create and delete entries there.
-	  "who" applet requires this option.
-
 config FEATURE_WTMP
 	bool "Support wtmp file"
 	default y
@@ -284,6 +294,15 @@
 	  will append new entries there.
 	  "last" applet requires this option.
 
+config FEATURE_UTMP
+	bool "Support utmp file"
+	default y
+	help
+	  The file /var/run/utmp is used to track who is currently logged in.
+	  With this option on, certain applets (getty, login, telnetd etc)
+	  will create and delete entries there.
+	  "who" applet requires this option.
+
 config FEATURE_PIDFILE
 	bool "Support writing pidfiles"
 	default y
@@ -296,14 +315,19 @@
 	default y
 	help
 	  With this option you can install the busybox binary belonging
-	  to root with the suid bit set, and it will automatically drop
-	  priviledges for applets that don't need root access.
+	  to root with the suid bit set, enabling some applets to perform
+	  root-level operations even when run by ordinary users
+	  (for example, mounting of user mounts in fstab needs this).
+
+	  Busybox will automatically drop priviledges for applets
+	  that don't need root access.
 
 	  If you are really paranoid and don't want to do this, build two
 	  busybox binaries with different applets in them (and the appropriate
 	  symlinks pointing to each binary), and only set the suid bit on the
-	  one that needs it. The applets currently marked to need the suid bit
-	  are:
+	  one that needs it.
+
+	  The applets currently marked to need the suid bit are:
 
 	  crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su,
 	  traceroute, vlock.
@@ -353,6 +377,7 @@
 config SELINUX
 	bool "Support NSA Security Enhanced Linux"
 	default n
+	depends on PLATFORM_LINUX
 	help
 	  Enable support for SELinux in applets ls, ps, and id. Also provide
 	  the option of compiling in SELinux applets.
@@ -639,20 +664,13 @@
 
 endmenu
 
-menu 'Installation Options'
-
-config INSTALL_NO_USR
-	bool "Don't use /usr"
-	default n
-	help
-	  Disable use of /usr. Don't activate this option if you don't know
-	  that you really want this behaviour.
+menu 'Installation Options ("make install" behavior)'
 
 choice
-	prompt "Applets links"
+	prompt "What kind of applet links to install"
 	default INSTALL_APPLET_SYMLINKS
 	help
-	  Choose how you install applets links.
+	  Choose what kind of links to applets are created by "make install".
 
 config INSTALL_APPLET_SYMLINKS
 	bool "as soft-links"
@@ -676,8 +694,9 @@
 	bool "not installed"
 	depends on FEATURE_INSTALLER || FEATURE_SH_STANDALONE || FEATURE_PREFER_APPLETS
 	help
-	  Do not install applet links. Useful when using the -install feature
-	  or a standalone shell for rescue purposes.
+	  Do not install applet links. Useful when you plan to use
+	  busybox --install for installing links, or plan to use
+	  a standalone shell and thus don't need applet links.
 
 endchoice
 
@@ -701,8 +720,8 @@
 config INSTALL_SH_APPLET_SCRIPT_WRAPPER
 	bool "as script wrapper"
 	help
-	  Install /bin/sh applet as script wrapper that call the busybox
-	  binary.
+	  Install /bin/sh applet as script wrapper that calls
+	  the busybox binary.
 
 endchoice
 
 
=== modified file '.pc/applets-fallback.patch/coreutils/chroot.c'
--- .pc/applets-fallback.patch/coreutils/chroot.c	2010-10-22 11:37:59 +0000
+++ .pc/applets-fallback.patch/coreutils/chroot.c	2011-05-27 16:11:32 +0000
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <[e-mail]>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
=== modified file '.pc/applets-fallback.patch/include/libbb.h'
--- .pc/applets-fallback.patch/include/libbb.h	2010-08-03 06:42:39 +0000
+++ .pc/applets-fallback.patch/include/libbb.h	2011-05-27 16:11:32 +0000
@@ -3,9 +3,9 @@
  * Busybox main internal header file
  *
  * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
- * Permission has been granted to redistribute this code under the GPL.
+ * Permission has been granted to redistribute this code under GPL.
  *
- * Licensed under the GPL version 2, see the file LICENSE in this tarball.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 #ifndef LIBBB_H
 #define LIBBB_H 1
@@ -37,20 +37,18 @@
 #include <termios.h>
 #include <time.h>
 #include <unistd.h>
-/* Try to pull in PATH_MAX */
-#include <limits.h>
 #include <sys/param.h>
 #ifdef HAVE_MNTENT_H
-#include <mntent.h>
+# include <mntent.h>
 #endif
 #ifdef HAVE_SYS_STATFS_H
-#include <sys/statfs.h>
+# include <sys/statfs.h>
 #endif
 #if ENABLE_SELINUX
-#include <selinux/selinux.h>
-#include <selinux/context.h>
-#include <selinux/flask.h>
-#include <selinux/av_permissions.h>
+# include <selinux/selinux.h>
+# include <selinux/context.h>
+# include <selinux/flask.h>
+# include <selinux/av_permissions.h>
 #endif
 #if ENABLE_LOCALE_SUPPORT
 # include <locale.h>
@@ -70,7 +68,7 @@
 #  include <shadow.h>
 # endif
 #endif
-#if defined __FreeBSD__
+#if defined __FreeBSD__ || defined __OpenBSD__
 # include <netinet/in.h>
 # include <arpa/inet.h>
 #elif defined __APPLE__
@@ -190,7 +188,7 @@
 /* While sizeof(off_t) == sizeof(int), off_t is typedef'ed to long anyway.
  * gcc will throw warnings on printf("%d", off_t). Crap... */
 typedef unsigned long uoff_t;
-#  define XATOOFF(a) xatoi_u(a)
+#  define XATOOFF(a) xatoi_positive(a)
 #  define BB_STRTOOFF bb_strtou
 #  define STRTOOFF strtol
 #  define OFF_FMT "l"
@@ -222,11 +220,11 @@
 
 /* Macros for min/max.  */
 #ifndef MIN
-#define	MIN(a,b) (((a)<(b))?(a):(b))
+#define MIN(a,b) (((a)<(b))?(a):(b))
 #endif
 
 #ifndef MAX
-#define	MAX(a,b) (((a)>(b))?(a):(b))
+#define MAX(a,b) (((a)>(b))?(a):(b))
 #endif
 
 /* buffer allocation schemes */
@@ -254,6 +252,11 @@
 #define errno (*bb_errno)
 #endif
 
+#if !(ULONG_MAX > 0xffffffff)
+/* Only 32-bit CPUs need this, 64-bit ones use inlined version */
+uint64_t bb_bswap_64(uint64_t x) FAST_FUNC;
+#endif
+
 unsigned long long monotonic_ns(void) FAST_FUNC;
 unsigned long long monotonic_us(void) FAST_FUNC;
 unsigned long long monotonic_ms(void) FAST_FUNC;
@@ -321,6 +324,7 @@
 /* this helper yells "short read!" if param is not -1 */
 extern void complain_copyfd_and_die(off_t sz) NORETURN FAST_FUNC;
 extern char bb_process_escape_sequence(const char **ptr) FAST_FUNC;
+char* strcpy_and_process_escape_sequences(char *dst, const char *src) FAST_FUNC;
 /* xxxx_strip version can modify its parameter:
  * "/"        -> "/"
  * "abc"      -> "abc"
@@ -411,15 +415,18 @@
 void bb_unsetenv_and_free(char *key) FAST_FUNC;
 void xunlink(const char *pathname) FAST_FUNC;
 void xstat(const char *pathname, struct stat *buf) FAST_FUNC;
+void xfstat(int fd, struct stat *buf, const char *errmsg) FAST_FUNC;
 int xopen(const char *pathname, int flags) FAST_FUNC;
 int xopen_nonblocking(const char *pathname) FAST_FUNC;
 int xopen3(const char *pathname, int flags, int mode) FAST_FUNC;
 int open_or_warn(const char *pathname, int flags) FAST_FUNC;
 int open3_or_warn(const char *pathname, int flags, int mode) FAST_FUNC;
 int open_or_warn_stdin(const char *pathname) FAST_FUNC;
+int xopen_stdin(const char *pathname) FAST_FUNC;
 void xrename(const char *oldpath, const char *newpath) FAST_FUNC;
 int rename_or_warn(const char *oldpath, const char *newpath) FAST_FUNC;
 off_t xlseek(int fd, off_t offset, int whence) FAST_FUNC;
+int xmkstemp(char *template) FAST_FUNC;
 off_t fdlength(int fd) FAST_FUNC;
 
 uoff_t FAST_FUNC get_volume_size_in_bytes(int fd,
@@ -739,7 +746,7 @@
 char *utoa_to_buf(unsigned n, char *buf, unsigned buflen) FAST_FUNC;
 char *itoa_to_buf(int n, char *buf, unsigned buflen) FAST_FUNC;
 /* Intelligent formatters of bignums */
-void smart_ulltoa4(unsigned long long ul, char buf[5], const char *scale) FAST_FUNC;
+void smart_ulltoa4(unsigned long long ul, char buf[4], const char *scale) FAST_FUNC;
 void smart_ulltoa5(unsigned long long ul, char buf[5], const char *scale) FAST_FUNC;
 /* If block_size == 0, display size without fractional part,
  * else display (size * block_size) with one decimal digit.
@@ -765,11 +772,16 @@
 };
 #include "xatonum.h"
 /* Specialized: */
+
 /* Using xatoi() instead of naive atoi() is not always convenient -
  * in many places people want *non-negative* values, but store them
  * in signed int. Therefore we need this one:
- * dies if input is not in [0, INT_MAX] range. Also will reject '-0' etc */
-int xatoi_u(const char *numstr) FAST_FUNC;
+ * dies if input is not in [0, INT_MAX] range. Also will reject '-0' etc.
+ * It should really be named xatoi_nonnegative (since it allows 0),
+ * but that would be too long.
+ */
+int xatoi_positive(const char *numstr) FAST_FUNC;
+
 /* Useful for reading port numbers */
 uint16_t xatou16(const char *numstr) FAST_FUNC;
 
@@ -874,9 +886,9 @@
 struct nofork_save_area {
 	jmp_buf die_jmp;
 	const char *applet_name;
-	int xfunc_error_retval;
 	uint32_t option_mask32;
 	int die_sleep;
+	uint8_t xfunc_error_retval;
 	smallint saved;
 };
 void save_nofork_data(struct nofork_save_area *save) FAST_FUNC;
@@ -987,7 +999,7 @@
 extern const char *msg_eol;
 extern smallint logmode;
 extern int die_sleep;
-extern int xfunc_error_retval;
+extern uint8_t xfunc_error_retval;
 extern jmp_buf die_jmp;
 extern void xfunc_die(void) NORETURN FAST_FUNC;
 extern void bb_show_usage(void) NORETURN FAST_FUNC;
@@ -1381,6 +1393,29 @@
 enum { COMM_LEN = 16 };
 # endif
 #endif
+
+struct smaprec {
+	unsigned long mapped_rw;
+	unsigned long mapped_ro;
+	unsigned long shared_clean;
+	unsigned long shared_dirty;
+	unsigned long private_clean;
+	unsigned long private_dirty;
+	unsigned long stack;
+	unsigned long smap_pss, smap_swap;
+	unsigned long smap_size;
+	unsigned long smap_start;
+	char smap_mode[5];
+	char *smap_name;
+};
+
+#if !ENABLE_PMAP
+#define procps_read_smaps(pid, total, cb, data) \
+	procps_read_smaps(pid, total)
+#endif
+int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
+		      void (*cb)(struct smaprec *, void *), void *data);
+
 typedef struct procps_status_t {
 	DIR *dir;
 	IF_FEATURE_SHOW_THREADS(DIR *task_dir;)
@@ -1409,13 +1444,7 @@
 #endif
 	unsigned tty_major,tty_minor;
 #if ENABLE_FEATURE_TOPMEM
-	unsigned long mapped_rw;
-	unsigned long mapped_ro;
-	unsigned long shared_clean;
-	unsigned long shared_dirty;
-	unsigned long private_clean;
-	unsigned long private_dirty;
-	unsigned long stack;
+	struct smaprec smaps;
 #endif
 	char state[4];
 	/* basename of executable in exec(2), read from /proc/N/stat
@@ -1474,57 +1503,50 @@
 void read_cmdline(char *buf, int size, unsigned pid, const char *comm) FAST_FUNC;
 pid_t *find_pid_by_name(const char* procName) FAST_FUNC;
 pid_t *pidlist_reverse(pid_t *pidList) FAST_FUNC;
+int starts_with_cpu(const char *str) FAST_FUNC;
+unsigned get_cpu_count(void) FAST_FUNC;
 
 
 extern const char bb_uuenc_tbl_base64[];
 extern const char bb_uuenc_tbl_std[];
 void bb_uuencode(char *store, const void *s, int length, const char *tbl) FAST_FUNC;
+enum {
+	BASE64_FLAG_UU_STOP = 0x100,
+	/* Sign-extends to a value which never matches fgetc result: */
+	BASE64_FLAG_NO_STOP_CHAR = 0x80,
+};
+void FAST_FUNC read_base64(FILE *src_stream, FILE *dst_stream, int flags);
 
-typedef struct sha1_ctx_t {
-	uint32_t hash[8];    /* 5, +3 elements for sha256 */
-	uint64_t total64;
-	uint8_t wbuffer[64]; /* NB: always correctly aligned for uint64_t */
-	void (*process_block)(struct sha1_ctx_t*) FAST_FUNC;
-} sha1_ctx_t;
-void sha1_begin(sha1_ctx_t *ctx) FAST_FUNC;
-void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx) FAST_FUNC;
-void sha1_end(void *resbuf, sha1_ctx_t *ctx) FAST_FUNC;
-typedef struct sha1_ctx_t sha256_ctx_t;
-void sha256_begin(sha256_ctx_t *ctx) FAST_FUNC;
-#define sha256_hash sha1_hash
-#define sha256_end sha1_end
+typedef struct md5_ctx_t {
+	uint8_t wbuffer[64]; /* always correctly aligned for uint64_t */
+	void (*process_block)(struct md5_ctx_t*) FAST_FUNC;
+	uint64_t total64;    /* must be directly before hash[] */
+	uint32_t hash[8];    /* 4 elements for md5, 5 for sha1, 8 for sha256 */
+} md5_ctx_t;
+typedef struct md5_ctx_t sha1_ctx_t;
+typedef struct md5_ctx_t sha256_ctx_t;
 typedef struct sha512_ctx_t {
+	uint64_t total64[2];  /* must be directly before hash[] */
 	uint64_t hash[8];
-	uint64_t total64[2];
-	uint8_t wbuffer[128]; /* NB: always correctly aligned for uint64_t */
+	uint8_t wbuffer[128]; /* always correctly aligned for uint64_t */
 } sha512_ctx_t;
+void md5_begin(md5_ctx_t *ctx) FAST_FUNC;
+void md5_hash(md5_ctx_t *ctx, const void *data, size_t length) FAST_FUNC;
+void md5_end(md5_ctx_t *ctx, void *resbuf) FAST_FUNC;
+void sha1_begin(sha1_ctx_t *ctx) FAST_FUNC;
+#define sha1_hash md5_hash
+void sha1_end(sha1_ctx_t *ctx, void *resbuf) FAST_FUNC;
+void sha256_begin(sha256_ctx_t *ctx) FAST_FUNC;
+#define sha256_hash md5_hash
+#define sha256_end  sha1_end
 void sha512_begin(sha512_ctx_t *ctx) FAST_FUNC;
-void sha512_hash(const void *buffer, size_t len, sha512_ctx_t *ctx) FAST_FUNC;
-void sha512_end(void *resbuf, sha512_ctx_t *ctx) FAST_FUNC;
-#if 1
-typedef struct md5_ctx_t {
-	uint32_t A;
-	uint32_t B;
-	uint32_t C;
-	uint32_t D;
-	uint64_t total;
-	uint32_t buflen;
-	char buffer[128];
-} md5_ctx_t;
-#else
-/* libbb/md5prime.c uses a bit different one: */
-typedef struct md5_ctx_t {
-	uint32_t state[4];	/* state (ABCD) */
-	uint32_t count[2];	/* number of bits, modulo 2^64 (lsb first) */
-	unsigned char buffer[64];	/* input buffer */
-} md5_ctx_t;
-#endif
-void md5_begin(md5_ctx_t *ctx) FAST_FUNC;
-void md5_hash(const void *data, size_t length, md5_ctx_t *ctx) FAST_FUNC;
-void md5_end(void *resbuf, md5_ctx_t *ctx) FAST_FUNC;
-
-
+void sha512_hash(sha512_ctx_t *ctx, const void *buffer, size_t len) FAST_FUNC;
+void sha512_end(sha512_ctx_t *ctx, void *resbuf) FAST_FUNC;
+
+extern uint32_t *global_crc32_table;
 uint32_t *crc32_filltable(uint32_t *tbl256, int endian) FAST_FUNC;
+uint32_t crc32_block_endian1(uint32_t val, const void *buf, unsigned len, uint32_t *crc_table) FAST_FUNC;
+uint32_t crc32_block_endian0(uint32_t val, const void *buf, unsigned len, uint32_t *crc_table) FAST_FUNC;
 
 typedef struct masks_labels_t {
 	const char *labels;
@@ -1547,12 +1569,22 @@
 			off_t totalsize) FAST_FUNC;
 
 extern const char *applet_name;
+
+/* Some older linkers don't perform string merging, we used to have common strings
+ * as global arrays to do it by hand. But:
+ * (1) newer linkers do it themselves,
+ * (2) however, they DONT merge string constants with global arrays,
+ * even if the value is the same (!). Thus global arrays actually
+ * increased size a bit: for example, "/etc/passwd" string from libc
+ * wasn't merged with bb_path_passwd_file[] array!
+ * Therefore now we use #defines.
+ */
 /* "BusyBox vN.N.N (timestamp or extra_version)" */
 extern const char bb_banner[];
 extern const char bb_msg_memory_exhausted[];
 extern const char bb_msg_invalid_date[];
-extern const char bb_msg_read_error[];
-extern const char bb_msg_write_error[];
+#define bb_msg_read_error "read error"
+#define bb_msg_write_error "write error"
 extern const char bb_msg_unknown[];
 extern const char bb_msg_can_not_create_raw_socket[];
 extern const char bb_msg_perm_denied_are_you_root[];
@@ -1562,18 +1594,23 @@
 extern const char bb_msg_standard_input[];
 extern const char bb_msg_standard_output[];
 
-extern const char bb_str_default[];
 /* NB: (bb_hexdigits_upcase[i] | 0x20) -> lowercase hex digit */
 extern const char bb_hexdigits_upcase[];
 
-extern const char bb_path_mtab_file[];
-extern const char bb_path_passwd_file[];
-extern const char bb_path_shadow_file[];
-extern const char bb_path_gshadow_file[];
-extern const char bb_path_group_file[];
-extern const char bb_path_motd_file[];
 extern const char bb_path_wtmp_file[];
-extern const char bb_dev_null[];
+
+/* Busybox mount uses either /proc/mounts or /etc/mtab to
+ * get the list of currently mounted filesystems */
+#define bb_path_mtab_file IF_FEATURE_MTAB_SUPPORT("/etc/mtab")IF_NOT_FEATURE_MTAB_SUPPORT("/proc/mounts")
+
+#define bb_path_passwd_file "/etc/passwd"
+#define bb_path_shadow_file "/etc/shadow"
+#define bb_path_gshadow_file "/etc/gshadow"
+#define bb_path_group_file "/etc/group"
+
+#define bb_path_motd_file "/etc/motd"
+
+#define bb_dev_null "/dev/null"
 extern const char bb_busybox_exec_path[];
 /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,
  * but I want to save a few bytes here */
@@ -1613,46 +1650,47 @@
 /* "sh" */
 #define DEFAULT_SHELL_SHORT_NAME   (bb_default_login_shell+6)
 
-#if ENABLE_FEATURE_DEVFS
+/* The following devices are the same on all systems.  */
+#define CURRENT_TTY "/dev/tty"
+#define DEV_CONSOLE "/dev/console"
+
+#if defined(__FreeBSD_kernel__)
+# define CURRENT_VC CURRENT_TTY
+# define VC_1 "/dev/ttyv0"
+# define VC_2 "/dev/ttyv1"
+# define VC_3 "/dev/ttyv2"
+# define VC_4 "/dev/ttyv3"
+# define VC_5 "/dev/ttyv4"
+# define VC_FORMAT "/dev/ttyv%d"
+#elif defined(__GNU__)
+# define CURRENT_VC CURRENT_TTY
+# define VC_1 "/dev/tty1"
+# define VC_2 "/dev/tty2"
+# define VC_3 "/dev/tty3"
+# define VC_4 "/dev/tty4"
+# define VC_5 "/dev/tty5"
+# define VC_FORMAT "/dev/tty%d"
+#elif ENABLE_FEATURE_DEVFS
+/*Linux, obsolete devfs names */
 # define CURRENT_VC "/dev/vc/0"
 # define VC_1 "/dev/vc/1"
 # define VC_2 "/dev/vc/2"
 # define VC_3 "/dev/vc/3"
 # define VC_4 "/dev/vc/4"
 # define VC_5 "/dev/vc/5"
-# if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__)
-/* Yes, this sucks, but both SH (including sh64) and H8 have a SCI(F) for their
-   respective serial ports .. as such, we can't use the common device paths for
-   these. -- PFM */
-#  define SC_0 "/dev/ttsc/0"
-#  define SC_1 "/dev/ttsc/1"
-#  define SC_FORMAT "/dev/ttsc/%d"
-# else
-#  define SC_0 "/dev/tts/0"
-#  define SC_1 "/dev/tts/1"
-#  define SC_FORMAT "/dev/tts/%d"
-# endif
 # define VC_FORMAT "/dev/vc/%d"
 # define LOOP_FORMAT "/dev/loop/%d"
 # define LOOP_NAMESIZE (sizeof("/dev/loop/") + sizeof(int)*3 + 1)
 # define LOOP_NAME "/dev/loop/"
 # define FB_0 "/dev/fb/0"
 #else
+/*Linux, normal names */
 # define CURRENT_VC "/dev/tty0"
 # define VC_1 "/dev/tty1"
 # define VC_2 "/dev/tty2"
 # define VC_3 "/dev/tty3"
 # define VC_4 "/dev/tty4"
 # define VC_5 "/dev/tty5"
-# if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__)
-#  define SC_0 "/dev/ttySC0"
-#  define SC_1 "/dev/ttySC1"
-#  define SC_FORMAT "/dev/ttySC%d"
-# else
-#  define SC_0 "/dev/ttyS0"
-#  define SC_1 "/dev/ttyS1"
-#  define SC_FORMAT "/dev/ttyS%d"
-# endif
 # define VC_FORMAT "/dev/tty%d"
 # define LOOP_FORMAT "/dev/loop%d"
 # define LOOP_NAMESIZE (sizeof("/dev/loop") + sizeof(int)*3 + 1)
@@ -1660,10 +1698,6 @@
 # define FB_0 "/dev/fb0"
 #endif
 
-/* The following devices are the same on devfs and non-devfs systems.  */
-#define CURRENT_TTY "/dev/tty"
-#define DEV_CONSOLE "/dev/console"
-
 
 #define ARRAY_SIZE(x) ((unsigned)(sizeof(x) / sizeof((x)[0])))
 
 
=== modified file '.pc/applets-fallback.patch/libbb/execable.c'
--- .pc/applets-fallback.patch/libbb/execable.c	2010-08-03 06:42:39 +0000
+++ .pc/applets-fallback.patch/libbb/execable.c	2011-05-27 16:11:32 +0000
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
 
=== modified file '.pc/applets-fallback.patch/libbb/messages.c'
--- .pc/applets-fallback.patch/libbb/messages.c	2010-08-03 06:42:39 +0000
+++ .pc/applets-fallback.patch/libbb/messages.c	2011-05-27 16:11:32 +0000
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 1999-2004 by Erik Andersen <[e-mail]>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
@@ -24,8 +24,6 @@
 
 const char bb_msg_memory_exhausted[] ALIGN1 = "memory exhausted";
 const char bb_msg_invalid_date[] ALIGN1 = "invalid date '%s'";
-const char bb_msg_write_error[] ALIGN1 = "write error";
-const char bb_msg_read_error[] ALIGN1 = "read error";
 const char bb_msg_unknown[] ALIGN1 = "(unknown)";
 const char bb_msg_can_not_create_raw_socket[] ALIGN1 = "can't create raw socket";
 const char bb_msg_perm_denied_are_you_root[] ALIGN1 = "permission denied (are you root?)";
@@ -35,15 +33,8 @@
 const char bb_msg_standard_input[] ALIGN1 = "standard input";
 const char bb_msg_standard_output[] ALIGN1 = "standard output";
 
-const char bb_str_default[] ALIGN1 = "default";
 const char bb_hexdigits_upcase[] ALIGN1 = "0123456789ABCDEF";
 
-const char bb_path_passwd_file[] ALIGN1 = "/etc/passwd";
-const char bb_path_shadow_file[] ALIGN1 = "/etc/shadow";
-const char bb_path_group_file[] ALIGN1 = "/etc/group";
-const char bb_path_gshadow_file[] ALIGN1 = "/etc/gshadow";
-const char bb_path_motd_file[] ALIGN1 = "/etc/motd";
-const char bb_dev_null[] ALIGN1 = "/dev/null";
 const char bb_busybox_exec_path[] ALIGN1 = CONFIG_BUSYBOX_EXEC_PATH;
 const char bb_default_login_shell[] ALIGN1 = LIBBB_DEFAULT_LOGIN_SHELL;
 /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,
 
=== modified file '.pc/applets-fallback.patch/shell/ash.c'
--- .pc/applets-fallback.patch/shell/ash.c	2010-08-03 06:42:39 +0000
+++ .pc/applets-fallback.patch/shell/ash.c	2011-05-27 16:11:32 +0000
@@ -13,7 +13,7 @@
  * Copyright (c) 1997-2005 Herbert Xu <[e-mail]>
  * was re-ported from NetBSD and debianized.
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /*
@@ -43,7 +43,9 @@
 #include <sys/times.h>
 
 #include "shell_common.h"
-#include "math.h"
+#if ENABLE_SH_MATH_SUPPORT
+# include "math.h"
+#endif
 #if ENABLE_ASH_RANDOM_SUPPORT
 # include "random.h"
 #else
@@ -70,6 +72,124 @@
 # error "Do not even bother, ash will not run on NOMMU machine"
 #endif
 
+//applet:IF_ASH(APPLET(ash, _BB_DIR_BIN, _BB_SUID_DROP))
+//applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, _BB_DIR_BIN, _BB_SUID_DROP, sh))
+//applet:IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, _BB_DIR_BIN, _BB_SUID_DROP, bash))
+
+//kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o
+//kbuild:lib-$(CONFIG_ASH_RANDOM_SUPPORT) += random.o
+
+//config:config ASH
+//config:	bool "ash"
+//config:	default y
+//config:	depends on !NOMMU
+//config:	help
+//config:	  Tha 'ash' shell adds about 60k in the default configuration and is
+//config:	  the most complete and most pedantically correct shell included with
+//config:	  busybox. This shell is actually a derivative of the Debian 'dash'
+//config:	  shell (by Herbert Xu), which was created by porting the 'ash' shell
+//config:	  (written by Kenneth Almquist) from NetBSD.
+//config:
+//config:config ASH_BASH_COMPAT
+//config:	bool "bash-compatible extensions"
+//config:	default y
+//config:	depends on ASH
+//config:	help
+//config:	  Enable bash-compatible extensions.
+//config:
+//config:config ASH_JOB_CONTROL
+//config:	bool "Job control"
+//config:	default y
+//config:	depends on ASH
+//config:	help
+//config:	  Enable job control in the ash shell.
+//config:
+//config:config ASH_ALIAS
+//config:	bool "alias support"
+//config:	default y
+//config:	depends on ASH
+//config:	help
+//config:	  Enable alias support in the ash shell.
+//config:
+//config:config ASH_GETOPTS
+//config:	bool "Builtin getopt to parse positional parameters"
+//config:	default y
+//config:	depends on ASH
+//config:	help
+//config:	  Enable getopts builtin in the ash shell.
+//config:
+//config:config ASH_BUILTIN_ECHO
+//config:	bool "Builtin version of 'echo'"
+//config:	default y
+//config:	depends on ASH
+//config:	help
+//config:	  Enable support for echo, builtin to ash.
+//config:
+//config:config ASH_BUILTIN_PRINTF
+//config:	bool "Builtin version of 'printf'"
+//config:	default y
+//config:	depends on ASH
+//config:	help
+//config:	  Enable support for printf, builtin to ash.
+//config:
+//config:config ASH_BUILTIN_TEST
+//config:	bool "Builtin version of 'test'"
+//config:	default y
+//config:	depends on ASH
+//config:	help
+//config:	  Enable support for test, builtin to ash.
+//config:
+//config:config ASH_CMDCMD
+//config:	bool "'command' command to override shell builtins"
+//config:	default y
+//config:	depends on ASH
+//config:	help
+//config:	  Enable support for the ash 'command' builtin, which allows
+//config:	  you to run the specified command with the specified arguments,
+//config:	  even when there is an ash builtin command with the same name.
+//config:
+//config:config ASH_MAIL
+//config:	bool "Check for new mail on interactive shells"
+//config:	default n
+//config:	depends on ASH
+//config:	help
+//config:	  Enable "check for new mail" in the ash shell.
+//config:
+//config:config ASH_OPTIMIZE_FOR_SIZE
+//config:	bool "Optimize for size instead of speed"
+//config:	default y
+//config:	depends on ASH
+//config:	help
+//config:	  Compile ash for reduced size at the price of speed.
+//config:
+//config:config ASH_RANDOM_SUPPORT
+//config:	bool "Pseudorandom generator and $RANDOM variable"
+//config:	default y
+//config:	depends on ASH
+//config:	help
+//config:	  Enable pseudorandom generator and dynamic variable "$RANDOM".
+//config:	  Each read of "$RANDOM" will generate a new pseudorandom value.
+//config:	  You can reset the generator by using a specified start value.
+//config:	  After "unset RANDOM" the generator will switch off and this
+//config:	  variable will no longer have special treatment.
+//config:
+//config:config ASH_EXPAND_PRMT
+//config:	bool "Expand prompt string"
+//config:	default y
+//config:	depends on ASH
+//config:	help
+//config:	  "PS#" may contain volatile content, such as backquote commands.
+//config:	  This option recreates the prompt string from the environment
+//config:	  variable each time it is displayed.
+//config:
+
+//usage:#define ash_trivial_usage NOUSAGE_STR
+//usage:#define ash_full_usage ""
+//usage:#define sh_trivial_usage NOUSAGE_STR
+//usage:#define sh_full_usage ""
+//usage:#define bash_trivial_usage NOUSAGE_STR
+//usage:#define bash_full_usage ""
+
 
 /* ============ Hash table sizes. Configurable. */
 
@@ -835,7 +955,8 @@
 	for (p = arg->narg.text; *p; p++) {
 		switch ((unsigned char)*p) {
 		case CTLESC:
-			putc(*++p, fp);
+			p++;
+			putc(*p, fp);
 			break;
 		case CTLVAR:
 			putc('$', fp);
@@ -844,8 +965,10 @@
 			if (subtype == VSLENGTH)
 				putc('#', fp);
 
-			while (*p != '=')
-				putc(*p++, fp);
+			while (*p != '=') {
+				putc(*p, fp);
+				p++;
+			}
 
 			if (subtype & VSNUL)
 				putc(':', fp);
@@ -1864,37 +1987,35 @@
 # define optindval()    (voptind.var_text + 7)
 #endif
 
+#if ENABLE_ASH_GETOPTS
+static void FAST_FUNC
+getoptsreset(const char *value)
+{
+	shellparam.optind = number(value);
+	shellparam.optoff = -1;
+}
+#endif
 
+/* math.h has these, otherwise define our private copies */
+#if !ENABLE_SH_MATH_SUPPORT
 #define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
 #define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
-
-#if ENABLE_ASH_GETOPTS
-static void FAST_FUNC
-getoptsreset(const char *value)
-{
-	shellparam.optind = number(value);
-	shellparam.optoff = -1;
-}
-#endif
-
 /*
- * Return of a legal variable name (a letter or underscore followed by zero or
- * more letters, underscores, and digits).
+ * Return the pointer to the first char which is not part of a legal variable name
+ * (a letter or underscore followed by letters, underscores, and digits).
  */
-static char* FAST_FUNC
+static const char*
 endofname(const char *name)
 {
-	char *p;
-
-	p = (char *) name;
-	if (!is_name(*p))
-		return p;
-	while (*++p) {
-		if (!is_in_name(*p))
+	if (!is_name(*name))
+		return name;
+	while (*++name) {
+		if (!is_in_name(*name))
 			break;
 	}
-	return p;
+	return name;
 }
+#endif
 
 /*
  * Compares two strings up to the first = or '\0'.  The first
@@ -2077,9 +2198,10 @@
 static void
 setvar(const char *name, const char *val, int flags)
 {
-	char *p, *q;
+	const char *q;
+	char *p;
+	char *nameeq;
 	size_t namelen;
-	char *nameeq;
 	size_t vallen;
 
 	q = endofname(name);
@@ -2093,12 +2215,13 @@
 	} else {
 		vallen = strlen(val);
 	}
+
 	INT_OFF;
 	nameeq = ckmalloc(namelen + vallen + 2);
-	p = (char *)memcpy(nameeq, name, namelen) + namelen;
+	p = memcpy(nameeq, name, namelen) + namelen;
 	if (val) {
 		*p++ = '=';
-		p = (char *)memcpy(p, val, vallen) + vallen;
+		p = memcpy(p, val, vallen) + vallen;
 	}
 	*p = '\0';
 	setvareq(nameeq, flags | VNOSAVE);
@@ -2312,12 +2435,13 @@
 #endif
 
 static void
-setprompt(int whichprompt)
+setprompt_if(smallint do_set, int whichprompt)
 {
 	const char *prompt;
-#if ENABLE_ASH_EXPAND_PRMT
-	struct stackmark smark;
-#endif
+	IF_ASH_EXPAND_PRMT(struct stackmark smark;)
+
+	if (!do_set)
+		return;
 
 	needprompt = 0;
 
@@ -4515,6 +4639,7 @@
 			INT_ON;
 		}
 	}
+	may_have_traps = 0;
 }
 
 /* Lives far away from here, needed for forkchild */
@@ -4870,9 +4995,13 @@
 	 * revealed that it was a regular file, and the file has not been
 	 * replaced, return the file descriptor.
 	 */
-	if (fstat(fd, &finfo2) == 0 && !S_ISREG(finfo2.st_mode)
-	 && finfo.st_dev == finfo2.st_dev && finfo.st_ino == finfo2.st_ino)
+	if (fstat(fd, &finfo2) == 0
+	 && !S_ISREG(finfo2.st_mode)
+	 && finfo.st_dev == finfo2.st_dev
+	 && finfo.st_ino == finfo2.st_ino
+	) {
 		return fd;
+	}
 
 	/* The file has been replaced.  badness. */
 	close(fd);
@@ -5315,25 +5444,17 @@
 static arith_t
 ash_arith(const char *s)
 {
-	arith_eval_hooks_t math_hooks;
+	arith_state_t math_state;
 	arith_t result;
-	int errcode = 0;
 
-	math_hooks.lookupvar = lookupvar;
-	math_hooks.setvar    = setvar2;
-	math_hooks.endofname = endofname;
+	math_state.lookupvar = lookupvar;
+	math_state.setvar    = setvar2;
+	//math_state.endofname = endofname;
 
 	INT_OFF;
-	result = arith(s, &errcode, &math_hooks);
-	if (errcode < 0) {
-		if (errcode == -3)
-			ash_msg_and_raise_error("exponent less than 0");
-		if (errcode == -2)
-			ash_msg_and_raise_error("divide by zero");
-		if (errcode == -5)
-			ash_msg_and_raise_error("expression recursion loop detected");
-		raise_error_syntax(s);
-	}
+	result = arith(&math_state, s);
+	if (math_state.errmsg)
+		ash_msg_and_raise_error(math_state.errmsg);
 	INT_ON;
 
 	return result;
@@ -5391,13 +5512,18 @@
 /*
  * Our own itoa().
  */
+#if !ENABLE_SH_MATH_SUPPORT
+/* cvtnum() is used even if math support is off (to prepare $? values and such) */
+typedef long arith_t;
+# define ARITH_FMT "%ld"
+#endif
 static int
 cvtnum(arith_t num)
 {
 	int len;
 
 	expdest = makestrspace(32, expdest);
-	len = fmtstr(expdest, 32, arith_t_fmt, num);
+	len = fmtstr(expdest, 32, ARITH_FMT, num);
 	STADJUST(len, expdest);
 	return len;
 }
@@ -5568,7 +5694,7 @@
 		return;
 
 	if (ifsfirst.endoff > endoff) {
-		while (ifsfirst.next != NULL) {
+		while (ifsfirst.next) {
 			struct ifsregion *ifsp;
 			INT_OFF;
 			ifsp = ifsfirst.next->next;
@@ -5576,9 +5702,9 @@
 			ifsfirst.next = ifsp;
 			INT_ON;
 		}
-		if (ifsfirst.begoff > endoff)
+		if (ifsfirst.begoff > endoff) {
 			ifslastp = NULL;
-		else {
+		} else {
 			ifslastp = &ifsfirst;
 			ifsfirst.endoff = endoff;
 		}
@@ -5587,8 +5713,8 @@
 
 	ifslastp = &ifsfirst;
 	while (ifslastp->next && ifslastp->next->begoff < endoff)
-		ifslastp=ifslastp->next;
-	while (ifslastp->next != NULL) {
+		ifslastp = ifslastp->next;
+	while (ifslastp->next) {
 		struct ifsregion *ifsp;
 		INT_OFF;
 		ifsp = ifslastp->next->next;
@@ -5765,9 +5891,9 @@
 
 	if (quoted == 0)
 		recordregion(startloc, dest - (char *)stackblock(), 0);
-	TRACE(("evalbackq: size=%d: \"%.*s\"\n",
-		(dest - (char *)stackblock()) - startloc,
-		(dest - (char *)stackblock()) - startloc,
+	TRACE(("evalbackq: size:%d:'%.*s'\n",
+		(int)((dest - (char *)stackblock()) - startloc),
+		(int)((dest - (char *)stackblock()) - startloc),
 		stackblock() + startloc));
 }
 
@@ -5882,7 +6008,7 @@
 		flags &= ~EXP_TILDE;
  tilde:
 		q = p;
-		if (*q == CTLESC && (flags & EXP_QWORD))
+		if ((unsigned char)*q == CTLESC && (flags & EXP_QWORD))
 			q++;
 		if (*q == '~')
 			p = exptilde(p, q, flags);
@@ -5896,9 +6022,7 @@
 		c = p[length];
 		if (c) {
 			if (!(c & 0x80)
-#if ENABLE_SH_MATH_SUPPORT
-			 || c == CTLENDARI
-#endif
+			IF_SH_MATH_SUPPORT(|| c == CTLENDARI)
 			) {
 				/* c == '=' || c == ':' || c == CTLENDARI */
 				length++;
@@ -5945,8 +6069,8 @@
 			/* "$@" syntax adherence hack */
 			if (!inquotes
 			 && memcmp(p, dolatstr, 4) == 0
-			 && (  p[4] == CTLQUOTEMARK
-			    || (p[4] == CTLENDVAR && p[5] == CTLQUOTEMARK)
+			 && (  p[4] == (char)CTLQUOTEMARK
+			    || (p[4] == (char)CTLENDVAR && p[5] == (char)CTLQUOTEMARK)
 			    )
 			) {
 				p = evalvar(p + 1, flags, /* var_str_list: */ NULL) + 1;
@@ -5981,47 +6105,20 @@
 #endif
 		}
 	}
- breakloop:
-	;
+ breakloop: ;
 }
 
 static char *
-scanleft(char *startp, char *rmesc, char *rmescend UNUSED_PARAM, char *str, int quotes,
-	int zero)
+scanleft(char *startp, char *rmesc, char *rmescend UNUSED_PARAM,
+		char *pattern, int quotes, int zero)
 {
-// This commented out code was added by James Simmons <[e-mail]>
-// as part of a larger change when he added support for ${var/a/b}.
-// However, it broke # and % operators:
-//
-//var=ababcdcd
-//                 ok       bad
-//echo ${var#ab}   abcdcd   abcdcd
-//echo ${var##ab}  abcdcd   abcdcd
-//echo ${var#a*b}  abcdcd   ababcdcd  (!)
-//echo ${var##a*b} cdcd     cdcd
-//echo ${var#?}    babcdcd  ababcdcd  (!)
-//echo ${var##?}   babcdcd  babcdcd
-//echo ${var#*}    ababcdcd babcdcd   (!)
-//echo ${var##*}
-//echo ${var%cd}   ababcd   ababcd
-//echo ${var%%cd}  ababcd   abab      (!)
-//echo ${var%c*d}  ababcd   ababcd
-//echo ${var%%c*d} abab     ababcdcd  (!)
-//echo ${var%?}    ababcdc  ababcdc
-//echo ${var%%?}   ababcdc  ababcdcd  (!)
-//echo ${var%*}    ababcdcd ababcdcd
-//echo ${var%%*}
-//
-// Commenting it back out helped. Remove it completely if it really
-// is not needed.
-
-	char *loc, *loc2; //, *full;
+	char *loc, *loc2;
 	char c;
 
 	loc = startp;
 	loc2 = rmesc;
 	do {
-		int match; // = strlen(str);
+		int match;
 		const char *s = loc2;
 
 		c = *loc2;
@@ -6029,35 +6126,22 @@
 			*loc2 = '\0';
 			s = rmesc;
 		}
-		match = pmatch(str, s); // this line was deleted
+		match = pmatch(pattern, s);
 
-//		// chop off end if its '*'
-//		full = strrchr(str, '*');
-//		if (full && full != str)
-//			match--;
-//
-//		// If str starts with '*' replace with s.
-//		if ((*str == '*') && strlen(s) >= match) {
-//			full = xstrdup(s);
-//			strncpy(full+strlen(s)-match+1, str+1, match-1);
-//		} else
-//			full = xstrndup(str, match);
-//		match = strncmp(s, full, strlen(full));
-//		free(full);
-//
 		*loc2 = c;
-		if (match) // if (!match)
+		if (match)
 			return loc;
 		if (quotes && (unsigned char)*loc == CTLESC)
 			loc++;
 		loc++;
 		loc2++;
 	} while (c);
-	return 0;
+	return NULL;
 }
 
 static char *
-scanright(char *startp, char *rmesc, char *rmescend, char *pattern, int quotes, int match_at_start)
+scanright(char *startp, char *rmesc, char *rmescend,
+		char *pattern, int quotes, int match_at_start)
 {
 #if !ENABLE_ASH_OPTIMIZE_FOR_SIZE
 	int try2optimize = match_at_start;
@@ -6123,7 +6207,7 @@
 			}
 		}
 	}
-	return 0;
+	return NULL;
 }
 
 static void varunset(const char *, const char *, const char *, int) NORETURN;
@@ -6143,16 +6227,18 @@
 			msg = umsg;
 		}
 	}
-	ash_msg_and_raise_error("%.*s: %s%s", end - var - 1, var, msg, tail);
+	ash_msg_and_raise_error("%.*s: %s%s", (int)(end - var - 1), var, msg, tail);
 }
 
 #if ENABLE_ASH_BASH_COMPAT
 static char *
-parse_sub_pattern(char *arg, int inquotes)
+parse_sub_pattern(char *arg, int varflags)
 {
 	char *idx, *repl = NULL;
 	unsigned char c;
 
+	//char *org_arg = arg;
+	//bb_error_msg("arg:'%s' varflags:%x", arg, varflags);
 	idx = arg;
 	while (1) {
 		c = *arg;
@@ -6166,24 +6252,37 @@
 			}
 		}
 		*idx++ = c;
-		if (!inquotes && c == '\\' && arg[1] == '\\')
-			arg++; /* skip both \\, not just first one */
 		arg++;
+		/*
+		 * Example: v='ab\c'; echo ${v/\\b/_\\_\z_}
+		 * The result is a_\_z_c (not a\_\_z_c)!
+		 *
+		 * Enable debug prints in this function and you'll see:
+		 * ash: arg:'\\b/_\\_z_' varflags:d
+		 * ash: pattern:'\\b' repl:'_\_z_'
+		 * That is, \\b is interpreted as \\b, but \\_ as \_!
+		 * IOW: search pattern and replace string treat backslashes
+		 * differently! That is the reason why we check repl below:
+		 */
+		if (c == '\\' && *arg == '\\' && repl && !(varflags & VSQUOTE))
+			arg++; /* skip both '\', not just first one */
 	}
 	*idx = c; /* NUL */
+	//bb_error_msg("pattern:'%s' repl:'%s'", org_arg, repl);
 
 	return repl;
 }
 #endif /* ENABLE_ASH_BASH_COMPAT */
 
 static const char *
-subevalvar(char *p, char *str, int strloc, int subtype,
+subevalvar(char *p, char *varname, int strloc, int subtype,
 		int startloc, int varflags, int quotes, struct strlist *var_str_list)
 {
 	struct nodelist *saveargbackq = argbackq;
 	char *startp;
 	char *loc;
 	char *rmesc, *rmescend;
+	char *str;
 	IF_ASH_BASH_COMPAT(const char *repl = NULL;)
 	IF_ASH_BASH_COMPAT(int pos, len, orig_len;)
 	int saveherefd = herefd;
@@ -6191,6 +6290,9 @@
 	int zero;
 	char *(*scan)(char*, char*, char*, char*, int, int);
 
+	//bb_error_msg("subevalvar(p:'%s',varname:'%s',strloc:%d,subtype:%d,startloc:%d,varflags:%x,quotes:%d)",
+	//		p, varname, strloc, subtype, startloc, varflags, quotes);
+
 	herefd = -1;
 	argstr(p, (subtype != VSASSIGN && subtype != VSQUESTION) ? EXP_CASE : 0,
 			var_str_list);
@@ -6201,11 +6303,15 @@
 
 	switch (subtype) {
 	case VSASSIGN:
-		setvar(str, startp, 0);
+		setvar(varname, startp, 0);
 		amount = startp - expdest;
 		STADJUST(amount, expdest);
 		return startp;
 
+	case VSQUESTION:
+		varunset(p, varname, startp, varflags);
+		/* NOTREACHED */
+
 #if ENABLE_ASH_BASH_COMPAT
 	case VSSUBSTR:
 		loc = str = stackblock() + strloc;
@@ -6266,11 +6372,8 @@
 		STADJUST(amount, expdest);
 		return loc;
 #endif
+	}
 
-	case VSQUESTION:
-		varunset(p, str, startp, varflags);
-		/* NOTREACHED */
-	}
 	resetloc = expdest - (char *)stackblock();
 
 	/* We'll comeback here if we grow the stack while handling
@@ -6303,14 +6406,15 @@
 		char *idx, *end;
 
 		if (!repl) {
-			repl = parse_sub_pattern(str, varflags & VSQUOTE);
+			repl = parse_sub_pattern(str, varflags);
+			//bb_error_msg("repl:'%s'", repl);
 			if (!repl)
 				repl = nullstr;
 		}
 
 		/* If there's no pattern to match, return the expansion unmolested */
 		if (str[0] == '\0')
-			return 0;
+			return NULL;
 
 		len = 0;
 		idx = startp;
@@ -6318,6 +6422,7 @@
 		while (idx < end) {
  try_to_match:
 			loc = scanright(idx, rmesc, rmescend, str, quotes, 1);
+			//bb_error_msg("scanright('%s'):'%s'", str, loc);
 			if (!loc) {
 				/* No match, advance */
 				char *restart_detect = stackblock();
@@ -6356,6 +6461,7 @@
 				idx = loc;
 			}
 
+			//bb_error_msg("repl:'%s'", repl);
 			for (loc = (char*)repl; *loc; loc++) {
 				char *restart_detect = stackblock();
 				if (quotes && *loc == '\\') {
@@ -6369,12 +6475,9 @@
 			}
 
 			if (subtype == VSREPLACE) {
+				//bb_error_msg("tail:'%s', quotes:%x", idx, quotes);
 				while (*idx) {
 					char *restart_detect = stackblock();
-					if (quotes && *idx == '\\') {
-						STPUTC(CTLESC, expdest);
-						len++;
-					}
 					STPUTC(*idx, expdest);
 					if (stackblock() != restart_detect)
 						goto restart;
@@ -6391,6 +6494,7 @@
 		STPUTC('\0', expdest);
 		startp = (char *)stackblock() + startloc;
 		memmove(startp, (char *)stackblock() + workloc, len + 1);
+		//bb_error_msg("startp:'%s'", startp);
 		amount = expdest - (startp + len);
 		STADJUST(-amount, expdest);
 		return startp;
@@ -6620,8 +6724,8 @@
  vsplus:
 		if (varlen < 0) {
 			argstr(
-				p, flags | EXP_TILDE |
-					(quoted ? EXP_QWORD : EXP_WORD),
+				p,
+				flags | (quoted ? EXP_TILDE|EXP_QWORD : EXP_TILDE|EXP_WORD),
 				var_str_list
 			);
 			goto end;
@@ -6691,7 +6795,7 @@
 		 */
 		STPUTC('\0', expdest);
 		patloc = expdest - (char *)stackblock();
-		if (NULL == subevalvar(p, /* str: */ NULL, patloc, subtype,
+		if (NULL == subevalvar(p, /* varname: */ NULL, patloc, subtype,
 				startloc, varflags,
 //TODO: | EXP_REDIR too? All other such places do it too
 				/* quotes: */ flags & (EXP_FULL | EXP_CASE),
@@ -7526,7 +7630,7 @@
 		for (cmdp = *pp; cmdp; cmdp = cmdp->next) {
 			if (cmdp->cmdtype == CMDNORMAL
 			 || (cmdp->cmdtype == CMDBUILTIN
-			     &&	!IS_BUILTIN_REGULAR(cmdp->param.cmd)
+			     && !IS_BUILTIN_REGULAR(cmdp->param.cmd)
 			     && builtinloc > 0)
 			) {
 				cmdp->rehash = 1;
@@ -8117,7 +8221,7 @@
 
 /* Called to execute a trap.
  * Single callsite - at the end of evaltree().
- * If we return non-zero, exaltree raises EXEXIT exception.
+ * If we return non-zero, evaltree raises EXEXIT exception.
  *
  * Perhaps we should avoid entering new trap handlers
  * while we are executing a trap handler. [is it a TODO?]
@@ -8307,11 +8411,15 @@
 
  out:
 	exception_handler = savehandler;
+
  out1:
+	/* Order of checks below is important:
+	 * signal handlers trigger before exit caused by "set -e".
+	 */
+	if (pending_sig && dotrap())
+		goto exexit;
 	if (checkexit & exitstatus)
 		evalskip |= SKIPEVAL;
-	else if (pending_sig && dotrap())
-		goto exexit;
 
 	if (flags & EV_EXIT) {
  exexit:
@@ -8643,7 +8751,7 @@
 	while ((lvp = localvars) != NULL) {
 		localvars = lvp->next;
 		vp = lvp->vp;
-		TRACE(("poplocalvar %s\n", vp ? vp->text : "-"));
+		TRACE(("poplocalvar %s\n", vp ? vp->var_text : "-"));
 		if (vp == NULL) {       /* $- saved */
 			memcpy(optlist, lvp->text, sizeof(optlist));
 			free((char*)lvp->text);
@@ -9301,7 +9409,7 @@
 static int
 goodname(const char *p)
 {
-	return !*endofname(p);
+	return endofname(p)[0] == '\0';
 }
 
 
@@ -10932,7 +11040,6 @@
 	startlinno = g_parsefile->linno;
 	bqlist = NULL;
 	quotef = 0;
-	oldstyle = 0;
 	prevsyntax = 0;
 #if ENABLE_ASH_EXPAND_PRMT
 	pssyntax = (syntax == PSSYNTAX);
@@ -10948,160 +11055,156 @@
 	STARTSTACKSTR(out);
  loop:
 	/* For each line, until end of word */
-	{
-		CHECKEND();     /* set c to PEOF if at end of here document */
-		for (;;) {      /* until end of line or end of word */
-			CHECKSTRSPACE(4, out);  /* permit 4 calls to USTPUTC */
-			switch (SIT(c, syntax)) {
-			case CNL:       /* '\n' */
-				if (syntax == BASESYNTAX)
-					goto endword;   /* exit outer loop */
-				USTPUTC(c, out);
-				g_parsefile->linno++;
-				if (doprompt)
-					setprompt(2);
-				c = pgetc();
-				goto loop;              /* continue outer loop */
-			case CWORD:
-				USTPUTC(c, out);
-				break;
-			case CCTL:
-				if (eofmark == NULL || dblquote)
-					USTPUTC(CTLESC, out);
+	CHECKEND();     /* set c to PEOF if at end of here document */
+	for (;;) {      /* until end of line or end of word */
+		CHECKSTRSPACE(4, out);  /* permit 4 calls to USTPUTC */
+		switch (SIT(c, syntax)) {
+		case CNL:       /* '\n' */
+			if (syntax == BASESYNTAX)
+				goto endword;   /* exit outer loop */
+			USTPUTC(c, out);
+			g_parsefile->linno++;
+			setprompt_if(doprompt, 2);
+			c = pgetc();
+			goto loop;              /* continue outer loop */
+		case CWORD:
+			USTPUTC(c, out);
+			break;
+		case CCTL:
+			if (eofmark == NULL || dblquote)
+				USTPUTC(CTLESC, out);
 #if ENABLE_ASH_BASH_COMPAT
-				if (c == '\\' && bash_dollar_squote) {
-					c = decode_dollar_squote();
-					if (c & 0x100) {
-						USTPUTC('\\', out);
-						c = (unsigned char)c;
-					}
+			if (c == '\\' && bash_dollar_squote) {
+				c = decode_dollar_squote();
+				if (c & 0x100) {
+					USTPUTC('\\', out);
+					c = (unsigned char)c;
 				}
+			}
 #endif
-				USTPUTC(c, out);
-				break;
-			case CBACK:     /* backslash */
-				c = pgetc_without_PEOA();
-				if (c == PEOF) {
-					USTPUTC(CTLESC, out);
-					USTPUTC('\\', out);
-					pungetc();
-				} else if (c == '\n') {
-					if (doprompt)
-						setprompt(2);
-				} else {
+			USTPUTC(c, out);
+			break;
+		case CBACK:     /* backslash */
+			c = pgetc_without_PEOA();
+			if (c == PEOF) {
+				USTPUTC(CTLESC, out);
+				USTPUTC('\\', out);
+				pungetc();
+			} else if (c == '\n') {
+				setprompt_if(doprompt, 2);
+			} else {
 #if ENABLE_ASH_EXPAND_PRMT
-					if (c == '$' && pssyntax) {
-						USTPUTC(CTLESC, out);
-						USTPUTC('\\', out);
-					}
+				if (c == '$' && pssyntax) {
+					USTPUTC(CTLESC, out);
+					USTPUTC('\\', out);
+				}
 #endif
-					if (dblquote &&	c != '\\'
-					 && c != '`' &&	c != '$'
-					 && (c != '"' || eofmark != NULL)
-					) {
-						USTPUTC(CTLESC, out);
-						USTPUTC('\\', out);
-					}
-					if (SIT(c, SQSYNTAX) == CCTL)
-						USTPUTC(CTLESC, out);
-					USTPUTC(c, out);
-					quotef = 1;
+				/* Backslash is retained if we are in "str" and next char isn't special */
+				if (dblquote
+				 && c != '\\'
+				 && c != '`'
+				 && c != '$'
+				 && (c != '"' || eofmark != NULL)
+				) {
+					USTPUTC(CTLESC, out);
+					USTPUTC('\\', out);
 				}
-				break;
-			case CSQUOTE:
-				syntax = SQSYNTAX;
+				if (SIT(c, SQSYNTAX) == CCTL)
+					USTPUTC(CTLESC, out);
+				USTPUTC(c, out);
+				quotef = 1;
+			}
+			break;
+		case CSQUOTE:
+			syntax = SQSYNTAX;
  quotemark:
-				if (eofmark == NULL) {
-					USTPUTC(CTLQUOTEMARK, out);
+			if (eofmark == NULL) {
+				USTPUTC(CTLQUOTEMARK, out);
+			}
+			break;
+		case CDQUOTE:
+			syntax = DQSYNTAX;
+			dblquote = 1;
+			goto quotemark;
+		case CENDQUOTE:
+			IF_ASH_BASH_COMPAT(bash_dollar_squote = 0;)
+			if (eofmark != NULL && arinest == 0
+			 && varnest == 0
+			) {
+				USTPUTC(c, out);
+			} else {
+				if (dqvarnest == 0) {
+					syntax = BASESYNTAX;
+					dblquote = 0;
 				}
-				break;
-			case CDQUOTE:
-				syntax = DQSYNTAX;
-				dblquote = 1;
+				quotef = 1;
 				goto quotemark;
-			case CENDQUOTE:
-				IF_ASH_BASH_COMPAT(bash_dollar_squote = 0;)
-				if (eofmark != NULL && arinest == 0
-				 && varnest == 0
-				) {
-					USTPUTC(c, out);
-				} else {
-					if (dqvarnest == 0) {
-						syntax = BASESYNTAX;
-						dblquote = 0;
-					}
-					quotef = 1;
-					goto quotemark;
-				}
-				break;
-			case CVAR:      /* '$' */
-				PARSESUB();             /* parse substitution */
-				break;
-			case CENDVAR:   /* '}' */
-				if (varnest > 0) {
-					varnest--;
-					if (dqvarnest > 0) {
-						dqvarnest--;
-					}
-					USTPUTC(CTLENDVAR, out);
-				} else {
-					USTPUTC(c, out);
-				}
-				break;
+			}
+			break;
+		case CVAR:      /* '$' */
+			PARSESUB();             /* parse substitution */
+			break;
+		case CENDVAR:   /* '}' */
+			if (varnest > 0) {
+				varnest--;
+				if (dqvarnest > 0) {
+					dqvarnest--;
+				}
+				c = CTLENDVAR;
+			}
+			USTPUTC(c, out);
+			break;
 #if ENABLE_SH_MATH_SUPPORT
-			case CLP:       /* '(' in arithmetic */
-				parenlevel++;
+		case CLP:       /* '(' in arithmetic */
+			parenlevel++;
+			USTPUTC(c, out);
+			break;
+		case CRP:       /* ')' in arithmetic */
+			if (parenlevel > 0) {
+				parenlevel--;
+			} else {
+				if (pgetc() == ')') {
+					if (--arinest == 0) {
+						syntax = prevsyntax;
+						dblquote = (syntax == DQSYNTAX);
+						c = CTLENDARI;
+					}
+				} else {
+					/*
+					 * unbalanced parens
+					 * (don't 2nd guess - no error)
+					 */
+					pungetc();
+				}
+			}
+			USTPUTC(c, out);
+			break;
+#endif
+		case CBQUOTE:   /* '`' */
+			PARSEBACKQOLD();
+			break;
+		case CENDFILE:
+			goto endword;           /* exit outer loop */
+		case CIGN:
+			break;
+		default:
+			if (varnest == 0) {
+#if ENABLE_ASH_BASH_COMPAT
+				if (c == '&') {
+					if (pgetc() == '>')
+						c = 0x100 + '>'; /* flag &> */
+					pungetc();
+				}
+#endif
+				goto endword;   /* exit outer loop */
+			}
+			IF_ASH_ALIAS(if (c != PEOA))
 				USTPUTC(c, out);
-				break;
-			case CRP:       /* ')' in arithmetic */
-				if (parenlevel > 0) {
-					USTPUTC(c, out);
-					--parenlevel;
-				} else {
-					if (pgetc() == ')') {
-						if (--arinest == 0) {
-							USTPUTC(CTLENDARI, out);
-							syntax = prevsyntax;
-							dblquote = (syntax == DQSYNTAX);
-						} else
-							USTPUTC(')', out);
-					} else {
-						/*
-						 * unbalanced parens
-						 *  (don't 2nd guess - no error)
-						 */
-						pungetc();
-						USTPUTC(')', out);
-					}
-				}
-				break;
-#endif
-			case CBQUOTE:   /* '`' */
-				PARSEBACKQOLD();
-				break;
-			case CENDFILE:
-				goto endword;           /* exit outer loop */
-			case CIGN:
-				break;
-			default:
-				if (varnest == 0) {
-#if ENABLE_ASH_BASH_COMPAT
-					if (c == '&') {
-						if (pgetc() == '>')
-							c = 0x100 + '>'; /* flag &> */
-						pungetc();
-					}
-#endif
-					goto endword;   /* exit outer loop */
-				}
-				IF_ASH_ALIAS(if (c != PEOA))
-					USTPUTC(c, out);
-
-			}
-			c = pgetc_fast();
-		} /* for (;;) */
-	}
+		}
+		c = pgetc_fast();
+	} /* for (;;) */
  endword:
+
 #if ENABLE_SH_MATH_SUPPORT
 	if (syntax == ARISYNTAX)
 		raise_error_syntax("missing '))'");
@@ -11262,8 +11365,6 @@
 	unsigned char subtype;
 	int typeloc;
 	int flags;
-	char *p;
-	static const char types[] ALIGN1 = "}-+?=";
 
 	c = pgetc();
 	if (c > 255 /* PEOA or PEOF */
@@ -11276,7 +11377,8 @@
 #endif
 			USTPUTC('$', out);
 		pungetc();
-	} else if (c == '(') {  /* $(command) or $((arith)) */
+	} else if (c == '(') {
+		/* $(command) or $((arith)) */
 		if (pgetc() == '(') {
 #if ENABLE_SH_MATH_SUPPORT
 			PARSEARITH();
@@ -11288,6 +11390,7 @@
 			PARSEBACKQNEW();
 		}
 	} else {
+		/* $VAR, $<specialchar>, ${...}, or PEOA/PEOF */
 		USTPUTC(CTLVAR, out);
 		typeloc = out - (char *)stackblock();
 		USTPUTC(VSNORMAL, out);
@@ -11297,76 +11400,90 @@
 			if (c == '#') {
 				c = pgetc();
 				if (c == '}')
-					c = '#';
+					c = '#'; /* ${#} - same as $# */
 				else
-					subtype = VSLENGTH;
-			} else
+					subtype = VSLENGTH; /* ${#VAR} */
+			} else {
 				subtype = 0;
+			}
 		}
 		if (c <= 255 /* not PEOA or PEOF */ && is_name(c)) {
+			/* $[{[#]]NAME[}] */
 			do {
 				STPUTC(c, out);
 				c = pgetc();
 			} while (c <= 255 /* not PEOA or PEOF */ && is_in_name(c));
 		} else if (isdigit(c)) {
+			/* $[{[#]]NUM[}] */
 			do {
 				STPUTC(c, out);
 				c = pgetc();
 			} while (isdigit(c));
 		} else if (is_special(c)) {
+			/* $[{[#]]<specialchar>[}] */
 			USTPUTC(c, out);
 			c = pgetc();
 		} else {
  badsub:
 			raise_error_syntax("bad substitution");
 		}
-		if (c != '}' && subtype == VSLENGTH)
+		if (c != '}' && subtype == VSLENGTH) {
+			/* ${#VAR didn't end with } */
 			goto badsub;
+		}
 
 		STPUTC('=', out);
 		flags = 0;
 		if (subtype == 0) {
+			/* ${VAR...} but not $VAR or ${#VAR} */
+			/* c == first char after VAR */
 			switch (c) {
 			case ':':
 				c = pgetc();
 #if ENABLE_ASH_BASH_COMPAT
 				if (c == ':' || c == '$' || isdigit(c)) {
-					pungetc();
+//TODO: support more general format ${v:EXPR:EXPR},
+// where EXPR follows $(()) rules
 					subtype = VSSUBSTR;
-					break;
+					pungetc();
+					break; /* "goto do_pungetc" is bigger (!) */
 				}
 #endif
 				flags = VSNUL;
 				/*FALLTHROUGH*/
-			default:
-				p = strchr(types, c);
+			default: {
+				static const char types[] ALIGN1 = "}-+?=";
+				const char *p = strchr(types, c);
 				if (p == NULL)
 					goto badsub;
 				subtype = p - types + VSNORMAL;
 				break;
+			}
 			case '%':
 			case '#': {
 				int cc = c;
-				subtype = c == '#' ? VSTRIMLEFT : VSTRIMRIGHT;
+				subtype = (c == '#' ? VSTRIMLEFT : VSTRIMRIGHT);
 				c = pgetc();
-				if (c == cc)
-					subtype++;
-				else
-					pungetc();
+				if (c != cc)
+					goto do_pungetc;
+				subtype++;
 				break;
 			}
 #if ENABLE_ASH_BASH_COMPAT
 			case '/':
+				/* ${v/[/]pattern/repl} */
+//TODO: encode pattern and repl separately.
+// Currently ${v/$var_with_slash/repl} is horribly broken
 				subtype = VSREPLACE;
 				c = pgetc();
-				if (c == '/')
-					subtype++; /* VSREPLACEALL */
-				else
-					pungetc();
+				if (c != '/')
+					goto do_pungetc;
+				subtype++; /* VSREPLACEALL */
 				break;
 #endif
 			}
 		} else {
+ do_pungetc:
 			pungetc();
 		}
 		if (dblquote || arinest)
@@ -11423,16 +11540,14 @@
 		   treatment to some slashes, and then push the string and
 		   reread it as input, interpreting it normally.  */
 		char *pout;
-		int pc;
 		size_t psavelen;
 		char *pstr;
 
-
 		STARTSTACKSTR(pout);
 		for (;;) {
-			if (needprompt) {
-				setprompt(2);
-			}
+			int pc;
+
+			setprompt_if(needprompt, 2);
 			pc = pgetc();
 			switch (pc) {
 			case '`':
@@ -11442,8 +11557,7 @@
 				pc = pgetc();
 				if (pc == '\n') {
 					g_parsefile->linno++;
-					if (doprompt)
-						setprompt(2);
+					setprompt_if(doprompt, 2);
 					/*
 					 * If eating a newline, avoid putting
 					 * the newline into the new character
@@ -11606,9 +11720,7 @@
 		tokpushback = 0;
 		return lasttoken;
 	}
-	if (needprompt) {
-		setprompt(2);
-	}
+	setprompt_if(needprompt, 2);
 	startlinno = g_parsefile->linno;
 	for (;;) {                      /* until token or start of word found */
 		c = pgetc_fast();
@@ -11625,8 +11737,7 @@
 				break; /* return readtoken1(...) */
 			}
 			startlinno = ++g_parsefile->linno;
-			if (doprompt)
-				setprompt(2);
+			setprompt_if(doprompt, 2);
 		} else {
 			const char *p;
 
@@ -11672,9 +11783,7 @@
 		tokpushback = 0;
 		return lasttoken;
 	}
-	if (needprompt) {
-		setprompt(2);
-	}
+	setprompt_if(needprompt, 2);
 	startlinno = g_parsefile->linno;
 	for (;;) {      /* until token or start of word found */
 		c = pgetc_fast();
@@ -11690,8 +11799,7 @@
 		case '\\':
 			if (pgetc() == '\n') {
 				startlinno = ++g_parsefile->linno;
-				if (doprompt)
-					setprompt(2);
+				setprompt_if(doprompt, 2);
 				continue;
 			}
 			pungetc();
@@ -11817,8 +11925,7 @@
 
 	tokpushback = 0;
 	doprompt = interact;
-	if (doprompt)
-		setprompt(doprompt);
+	setprompt_if(doprompt, doprompt);
 	needprompt = 0;
 	t = readtoken();
 	if (t == TEOF)
@@ -11842,10 +11949,8 @@
 	heredoclist = NULL;
 
 	while (here) {
-		if (needprompt) {
-			setprompt(2);
-		}
-		readtoken1(pgetc(), here->here->type == NHERE? SQSYNTAX : DQSYNTAX,
+		setprompt_if(needprompt, 2);
+		readtoken1(pgetc(), here->here->type == NHERE ? SQSYNTAX : DQSYNTAX,
 				here->eofmark, here->striptabs);
 		n = stzalloc(sizeof(struct narg));
 		n->narg.type = NARG;
@@ -11936,7 +12041,6 @@
 			p = grabstackstr(concat);
 		}
 		evalstring(p, ~SKIPEVAL);
-
 	}
 	return exitstatus;
 }
@@ -12228,7 +12332,7 @@
 			}
 			if ((act & DO_NOFUNC)
 			 || !prefix(pathopt, "func")
-			) {	/* ignore unimplemented options */
+			) {     /* ignore unimplemented options */
 				continue;
 			}
 		}
@@ -12743,7 +12847,7 @@
 	/* bash re-enables SIGHUP which is SIG_IGNed on entry.
 	 * Try: "trap '' HUP; bash; echo RET" and type "kill -HUP $$"
 	 */
-        signal(SIGHUP, SIG_DFL);
+	signal(SIGHUP, SIG_DFL);
 
 	/* from var.c: */
 	{
@@ -12916,10 +13020,12 @@
 		if (e == EXERROR)
 			exitstatus = 2;
 		s = state;
-		if (e == EXEXIT || s == 0 || iflag == 0 || shlvl)
+		if (e == EXEXIT || s == 0 || iflag == 0 || shlvl) {
 			exitshell();
-		if (e == EXINT)
+		}
+		if (e == EXINT) {
 			outcslow('\n', stderr);
+		}
 
 		popstackmark(&smark);
 		FORCE_INT_ON; /* enable interrupts */
@@ -13012,6 +13118,7 @@
 		_mcleanup();
 	}
 #endif
+	TRACE(("End of main reached\n"));
 	exitshell();
 	/* NOTREACHED */
 }
 
=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-02-23 03:14:46 +0000
+++ .pc/applied-patches	2011-05-27 16:11:32 +0000
@@ -1,31 +1,10 @@
-doc-man-name.patch
 shell-ash-export-HOME.patch
 applets-fallback.patch
 version.patch
 init-console.patch
-strip.patch
 make_gen_build_files_skip_quilt.patch
-readlink-use-xmalloc_realpath.patch
-mark-Linux-specific-configuration-options.patch
-init-loginutils-termios-portability-fixes.patch
-init-halt-portability-improvements.patch
-init-make-the-initial-TERM-value-configurable.patch
-libbb.h-add-device-names-for-Hurd-and-FreeBSD.patch
-mkdir-fix-p-on-FreeBSD.patch
-libbb-conditionalize-AF_-usage-in-error-reporting.patch
-tcpsvd-udpsvd-conditionalize-usage-of-SO_ORIGINAL_DS.patch
-less-remove-misguided-dependency-on-PLATFORM_LINUX.patch
-bootchartd-mounting-tmpfs-is-Linux-specific.patch
-vlock-disable-linux-console-calls-on-other-systems.patch
-cttyhack-serial-console-detection-is-Linux-specific.patch
-klogd-make-it-work-on-non-linux-systems.patch
-stty-sort-out-preprocessor-conditionals.patch
-update-scripts-kconfig-_shipped.patch
-blockdev.patch
 u-mount-FreeBSD-support.patch
 swaponoff-FreeBSD-support.patch
-init-console-CRTSCTS.patch
-debian-changes-1:1.17.1-10
+dirname-basename-skip-doubledash.diff
 test-bin.patch
 static-sh-alias.patch
-grep-o-loop.patch
 
=== removed directory '.pc/blockdev.patch'
=== removed directory '.pc/blockdev.patch/util-linux'
=== removed file '.pc/blockdev.patch/util-linux/blockdev.c'
=== removed directory '.pc/bootchartd-mounting-tmpfs-is-Linux-specific.patch'
=== removed directory '.pc/bootchartd-mounting-tmpfs-is-Linux-specific.patch/init'
=== removed file '.pc/bootchartd-mounting-tmpfs-is-Linux-specific.patch/init/bootchartd.c'
--- .pc/bootchartd-mounting-tmpfs-is-Linux-specific.patch/init/bootchartd.c	2010-08-03 06:42:39 +0000
+++ .pc/bootchartd-mounting-tmpfs-is-Linux-specific.patch/init/bootchartd.c	1970-01-01 00:00:00 +0000
@@ -1,443 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- */
-
-//config:config BOOTCHARTD
-//config:	bool "bootchartd"
-//config:	default y
-//config:	depends on PLATFORM_LINUX
-//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:
-//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:
-//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.
-
-#include "libbb.h"
-/* After libbb.h, since it needs sys/types.h on some systems */
-#include <sys/utsname.h>
-#include <sys/mount.h>
-#ifndef MS_SILENT
-# define MS_SILENT      (1 << 15)
-#endif
-#ifndef MNT_DETACH
-# define MNT_DETACH 0x00000002
-#endif
-
-#define BC_VERSION_STR "0.8"
-
-/* For debugging, set to 0:
- * strace won't work with DO_SIGNAL_SYNC set to 1.
- */
-#define DO_SIGNAL_SYNC 1
-
-
-//$PWD/bootchartd.conf and /etc/bootchartd.conf:
-//supported options:
-//# Sampling period (in seconds)
-//SAMPLE_PERIOD=0.2
-//
-//not yet supported:
-//# tmpfs size
-//# (32 MB should suffice for ~20 minutes worth of log data, but YMMV)
-//TMPFS_SIZE=32m
-//
-//# Whether to enable and store BSD process accounting information.  The
-//# kernel needs to be configured to enable v3 accounting
-//# (CONFIG_BSD_PROCESS_ACCT_V3). accton from the GNU accounting utilities
-//# is also required.
-//PROCESS_ACCOUNTING="no"
-//
-//# Tarball for the various boot log files
-//BOOTLOG_DEST=/var/log/bootchart.tgz
-//
-//# Whether to automatically stop logging as the boot process completes.
-//# The logger will look for known processes that indicate bootup completion
-//# at a specific runlevel (e.g. gdm-binary, mingetty, etc.).
-//AUTO_STOP_LOGGER="yes"
-//
-//# Whether to automatically generate the boot chart once the boot logger
-//# completes.  The boot chart will be generated in $AUTO_RENDER_DIR.
-//# Note that the bootchart package must be installed.
-//AUTO_RENDER="no"
-//
-//# Image format to use for the auto-generated boot chart
-//# (choose between png, svg and eps).
-//AUTO_RENDER_FORMAT="png"
-//
-//# Output directory for auto-generated boot charts
-//AUTO_RENDER_DIR="/var/log"
-
-
-/* Globals */
-struct globals {
-	char jiffy_line[COMMON_BUFSIZE];
-} FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
-
-static void dump_file(FILE *fp, const char *filename)
-{
-	int fd = open(filename, O_RDONLY);
-	if (fd >= 0) {
-		fputs(G.jiffy_line, fp);
-		fflush(fp);
-		bb_copyfd_eof(fd, fileno(fp));
-		close(fd);
-		fputc('\n', fp);
-	}
-}
-
-static int dump_procs(FILE *fp, int look_for_login_process)
-{
-	struct dirent *entry;
-	DIR *dir = opendir("/proc");
-	int found_login_process = 0;
-
-	fputs(G.jiffy_line, fp);
-	while ((entry = readdir(dir)) != NULL) {
-		char name[sizeof("/proc/%u/cmdline") + sizeof(int)*3];
-		int stat_fd;
-		unsigned pid = bb_strtou(entry->d_name, NULL, 10);
-		if (errno)
-			continue;
-
-		/* Android's version reads /proc/PID/cmdline and extracts
-		 * non-truncated process name. Do we want to do that? */
-
-		sprintf(name, "/proc/%u/stat", pid);
-		stat_fd = open(name, O_RDONLY);
-		if (stat_fd >= 0) {
-			char *p;
-			char stat_line[4*1024];
-			int rd = safe_read(stat_fd, stat_line, sizeof(stat_line)-2);
-
-			close(stat_fd);
-			if (rd < 0)
-				continue;
-			stat_line[rd] = '\0';
-			p = strchrnul(stat_line, '\n');
-			*p++ = '\n';
-			*p = '\0';
-			fputs(stat_line, fp);
-			if (!look_for_login_process)
-				continue;
-			p = strchr(stat_line, '(');
-			if (!p)
-				continue;
-			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')
-			 || strstr(p, "getty")
-			) {
-				found_login_process = 1;
-			}
-		}
-	}
-	closedir(dir);
-	fputc('\n', fp);
-	return found_login_process;
-}
-
-static char *make_tempdir(void)
-{
-	char template[] = "/tmp/bootchart.XXXXXX";
-	char *tempdir = xstrdup(mkdtemp(template));
-	if (!tempdir) {
-		/* /tmp is not writable (happens when we are used as init).
-		 * Try to mount a tmpfs, them 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.
-		 */
-		static const char dirs[] = "/mnt\0""/tmp\0""/boot\0""/proc\0";
-		const char *try_dir = dirs;
-		while (mount("none", try_dir, "tmpfs", MS_SILENT, "size=16m") != 0) {
-			try_dir += strlen(try_dir) + 1;
-			if (!try_dir[0])
-				bb_perror_msg_and_die("can't %smount tmpfs", "");
-		}
-		//bb_error_msg("mounted tmpfs on %s", try_dir);
-		xchdir(try_dir);
-		if (umount2(try_dir, MNT_DETACH) != 0) {
-			bb_perror_msg_and_die("can't %smount tmpfs", "un");
-		}
-	} else {
-		xchdir(tempdir);
-	}
-	return tempdir;
-}
-
-static void do_logging(unsigned sample_period_us)
-{
-	//# Enable process accounting if configured
-	//if [ "$PROCESS_ACCOUNTING" = "yes" ]; then
-	//	[ -e kernel_pacct ] || : > kernel_pacct
-	//	accton kernel_pacct
-	//fi
-
-	FILE *proc_stat = xfopen("proc_stat.log", "w");
-	FILE *proc_diskstats = xfopen("proc_diskstats.log", "w");
-	//FILE *proc_netdev = xfopen("proc_netdev.log", "w");
-	FILE *proc_ps = xfopen("proc_ps.log", "w");
-	int look_for_login_process = (getppid() == 1);
-	unsigned count = 60*1000*1000 / sample_period_us; /* ~1 minute */
-
-	while (--count && !bb_got_signal) {
-		char *p;
-		int len = open_read_close("/proc/uptime", G.jiffy_line, sizeof(G.jiffy_line)-2);
-		if (len < 0)
-			goto wait_more;
-		/* /proc/uptime has format "NNNNNN.MM NNNNNNN.MM" */
-		/* we convert it to "NNNNNNMM\n" (using first value) */
-		G.jiffy_line[len] = '\0';
-		p = strchr(G.jiffy_line, '.');
-		if (!p)
-			goto wait_more;
-		while (isdigit(*++p))
-			p[-1] = *p;
-		p[-1] = '\n';
-		p[0] = '\0';
-
-		dump_file(proc_stat, "/proc/stat");
-		dump_file(proc_diskstats, "/proc/diskstats");
-		//dump_file(proc_netdev, "/proc/net/dev");
-		if (dump_procs(proc_ps, look_for_login_process)) {
-			/* dump_procs saw a getty or {g,k,x}dm
-			 * stop logging in 2 seconds:
-			 */
-			if (count > 2*1000*1000 / sample_period_us)
-				count = 2*1000*1000 / sample_period_us;
-		}
-		fflush_all();
- wait_more:
-		usleep(sample_period_us);
-	}
-
-	// [ -e kernel_pacct ] && accton off
-}
-
-static void finalize(char *tempdir, const char *prog)
-{
-	//# Stop process accounting if configured
-	//local pacct=
-	//[ -e kernel_pacct ] && pacct=kernel_pacct
-
-	FILE *header_fp = xfopen("header", "w");
-
-	if (prog)
-		fprintf(header_fp, "profile.process = %s\n", prog);
-
-	fputs("version = "BC_VERSION_STR"\n", header_fp);
-	if (ENABLE_FEATURE_BOOTCHARTD_BLOATED_HEADER) {
-		char *hostname;
-		char *kcmdline;
-		time_t t;
-		struct tm tm_time;
-		/* x2 for possible localized weekday/month names */
-		char date_buf[sizeof("Mon Jun 21 05:29:03 CEST 2010") * 2];
-		struct utsname unamebuf;
-
-		hostname = safe_gethostname();
-		time(&t);
-		localtime_r(&t, &tm_time);
-		strftime(date_buf, sizeof(date_buf), "%a %b %e %H:%M:%S %Z %Y", &tm_time);
-		fprintf(header_fp, "title = Boot chart for %s (%s)\n", hostname, date_buf);
-		if (ENABLE_FEATURE_CLEAN_UP)
-			free(hostname);
-
-		uname(&unamebuf); /* never fails */
-		/* same as uname -srvm */
-		fprintf(header_fp, "system.uname = %s %s %s %s\n",
-				unamebuf.sysname,
-				unamebuf.release,
-				unamebuf.version,
-				unamebuf.machine
-		);
-
-		//system.release = `cat /etc/DISTRO-release`
-		//system.cpu = `grep '^model name' /proc/cpuinfo | head -1` ($cpucount)
-
-		kcmdline = xmalloc_open_read_close("/proc/cmdline", NULL);
-		/* kcmdline includes trailing "\n" */
-		fprintf(header_fp, "system.kernel.options = %s", kcmdline);
-		if (ENABLE_FEATURE_CLEAN_UP)
-			free(kcmdline);
-	}
-	fclose(header_fp);
-
-	/* Package log files */
-	system("tar -zcf /var/log/bootchart.tgz header *.log"); // + $pacct
-	/* Clean up (if we are not in detached tmpfs) */
-	if (tempdir) {
-		unlink("header");
-		unlink("proc_stat.log");
-		unlink("proc_diskstats.log");
-		//unlink("proc_netdev.log");
-		unlink("proc_ps.log");
-		rmdir(tempdir);
-	}
-
-	/* shell-based bootchartd tries to run /usr/bin/bootchart if $AUTO_RENDER=yes:
-	 * /usr/bin/bootchart -o "$AUTO_RENDER_DIR" -f $AUTO_RENDER_FORMAT "$BOOTLOG_DEST"
-	 */
-}
-
-//usage:#define bootchartd_trivial_usage
-//usage:       "start [PROG ARGS]|stop|init"
-//usage:#define bootchartd_full_usage "\n\n"
-//usage:       "Create /var/log/bootchart.tgz with boot chart data\n"
-//usage:     "\nOptions:"
-//usage:     "\nstart: start background logging; with PROG, run PROG, then kill logging with USR1"
-//usage:     "\nstop: send USR1 to all bootchartd processes"
-//usage:     "\ninit: start background logging; stop when getty/xdm is seen (for init scripts)"
-//usage:     "\nUnder PID 1: as init, then exec $bootchart_init, /init, /sbin/init"
-
-int bootchartd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int bootchartd_main(int argc UNUSED_PARAM, char **argv)
-{
-	unsigned sample_period_us;
-	pid_t parent_pid, logger_pid;
-	smallint cmd;
-	enum {
-		CMD_STOP = 0,
-		CMD_START,
-		CMD_INIT,
-		CMD_PID1, /* used to mark pid 1 case */
-	};
-
-	INIT_G();
-
-	parent_pid = getpid();
-	if (argv[1]) {
-		cmd = index_in_strings("stop\0""start\0""init\0", argv[1]);
-		if (cmd < 0)
-			bb_show_usage();
-		if (cmd == CMD_STOP) {
-			pid_t *pidList = find_pid_by_name("bootchartd");
-			while (*pidList != 0) {
-				if (*pidList != parent_pid)
-					kill(*pidList, SIGUSR1);
-				pidList++;
-			}
-			return EXIT_SUCCESS;
-		}
-	} else {
-		if (parent_pid != 1)
-			bb_show_usage();
-		cmd = CMD_PID1;
-	}
-
-	/* Here we are in START, INIT or CMD_PID1 state */
-
-	/* Read config file: */
-	sample_period_us = 200 * 1000;
-	if (ENABLE_FEATURE_BOOTCHARTD_CONFIG_FILE) {
-		char* token[2];
-		parser_t *parser = config_open2("/etc/bootchartd.conf" + 5, fopen_for_read);
-		if (!parser)
-			parser = config_open2("/etc/bootchartd.conf", fopen_for_read);
-		while (config_read(parser, token, 2, 0, "#=", PARSE_NORMAL & ~PARSE_COLLAPSE)) {
-			if (strcmp(token[0], "SAMPLE_PERIOD") == 0 && token[1])
-				sample_period_us = atof(token[1]) * 1000000;
-		}
-		config_close(parser);
-	}
-	if ((int)sample_period_us <= 0)
-		sample_period_us = 1; /* prevent division by 0 */
-
-	/* Create logger child: */
-	logger_pid = fork_or_rexec(argv);
-
-	if (logger_pid == 0) { /* child */
-		char *tempdir;
-
-		bb_signals(0
-			+ (1 << SIGUSR1)
-			+ (1 << SIGUSR2)
-			+ (1 << SIGTERM)
-			+ (1 << SIGQUIT)
-			+ (1 << SIGINT)
-			+ (1 << SIGHUP)
-			, record_signo);
-
-		if (DO_SIGNAL_SYNC)
-			/* Inform parent that we are ready */
-			raise(SIGSTOP);
-
-		/* If we are started by kernel, PATH might be unset.
-		 * In order to find "tar", let's set some sane PATH:
-		 */
-		if (cmd == CMD_PID1 && !getenv("PATH"))
-			putenv((char*)bb_PATH_root_path);
-
-		tempdir = make_tempdir();
-		do_logging(sample_period_us);
-		finalize(tempdir, cmd == CMD_START ? argv[2] : NULL);
-		return EXIT_SUCCESS;
-	}
-
-	/* parent */
-
-	if (DO_SIGNAL_SYNC) {
-		/* Wait for logger child to set handlers, then unpause it.
-		 * Otherwise with short-lived PROG (e.g. "bootchartd start true")
-		 * we might send SIGUSR1 before logger sets its handler.
-		 */
-		waitpid(logger_pid, NULL, WUNTRACED);
-		kill(logger_pid, SIGCONT);
-	}
-
-	if (cmd == CMD_PID1) {
-		char *bootchart_init = getenv("bootchart_init");
-		if (bootchart_init)
-			execl(bootchart_init, bootchart_init, NULL);
-		execl("/init", "init", NULL);
-		execl("/sbin/init", "init", NULL);
-		bb_perror_msg_and_die("can't execute '%s'", "/sbin/init");
-	}
-
-	if (cmd == CMD_START && argv[2]) { /* "start PROG ARGS" */
-		pid_t pid = xvfork();
-		if (pid == 0) { /* child */
-			argv += 2;
-			execvp(argv[0], argv);
-			bb_perror_msg_and_die("can't execute '%s'", argv[0]);
-		}
-		/* parent */
-		waitpid(pid, NULL, 0);
-		kill(logger_pid, SIGUSR1);
-	}
-
-	return EXIT_SUCCESS;
-}
 
=== removed directory '.pc/cttyhack-serial-console-detection-is-Linux-specific.patch'
=== removed directory '.pc/cttyhack-serial-console-detection-is-Linux-specific.patch/shell'
=== removed file '.pc/cttyhack-serial-console-detection-is-Linux-specific.patch/shell/Config.src'
--- .pc/cttyhack-serial-console-detection-is-Linux-specific.patch/shell/Config.src	2010-08-03 06:42:39 +0000
+++ .pc/cttyhack-serial-console-detection-is-Linux-specific.patch/shell/Config.src	1970-01-01 00:00:00 +0000
@@ -1,402 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
-#
-
-menu "Shells"
-
-INSERT
-
-config ASH
-	bool "ash"
-	default y
-	depends on !NOMMU
-	help
-	  Tha 'ash' shell adds about 60k in the default configuration and is
-	  the most complete and most pedantically correct shell included with
-	  busybox. This shell is actually a derivative of the Debian 'dash'
-	  shell (by Herbert Xu), which was created by porting the 'ash' shell
-	  (written by Kenneth Almquist) from NetBSD.
-
-config ASH_BASH_COMPAT
-	bool "bash-compatible extensions"
-	default y
-	depends on ASH
-	help
-	  Enable bash-compatible extensions.
-
-config ASH_JOB_CONTROL
-	bool "Job control"
-	default y
-	depends on ASH
-	help
-	  Enable job control in the ash shell.
-
-config ASH_ALIAS
-	bool "alias support"
-	default y
-	depends on ASH
-	help
-	  Enable alias support in the ash shell.
-
-config ASH_GETOPTS
-	bool "Builtin getopt to parse positional parameters"
-	default y
-	depends on ASH
-	help
-	  Enable getopts builtin in the ash shell.
-
-config ASH_BUILTIN_ECHO
-	bool "Builtin version of 'echo'"
-	default y
-	depends on ASH
-	help
-	  Enable support for echo, builtin to ash.
-
-config ASH_BUILTIN_PRINTF
-	bool "Builtin version of 'printf'"
-	default y
-	depends on ASH
-	help
-	  Enable support for printf, builtin to ash.
-
-config ASH_BUILTIN_TEST
-	bool "Builtin version of 'test'"
-	default y
-	depends on ASH
-	help
-	  Enable support for test, builtin to ash.
-
-config ASH_CMDCMD
-	bool "'command' command to override shell builtins"
-	default y
-	depends on ASH
-	help
-	  Enable support for the ash 'command' builtin, which allows
-	  you to run the specified command with the specified arguments,
-	  even when there is an ash builtin command with the same name.
-
-config ASH_MAIL
-	bool "Check for new mail on interactive shells"
-	default n
-	depends on ASH
-	help
-	  Enable "check for new mail" in the ash shell.
-
-config ASH_OPTIMIZE_FOR_SIZE
-	bool "Optimize for size instead of speed"
-	default y
-	depends on ASH
-	help
-	  Compile ash for reduced size at the price of speed.
-
-config ASH_RANDOM_SUPPORT
-	bool "Pseudorandom generator and $RANDOM variable"
-	default y
-	depends on ASH
-	help
-	  Enable pseudorandom generator and dynamic variable "$RANDOM".
-	  Each read of "$RANDOM" will generate a new pseudorandom value.
-	  You can reset the generator by using a specified start value.
-	  After "unset RANDOM" the generator will switch off and this
-	  variable will no longer have special treatment.
-
-config ASH_EXPAND_PRMT
-	bool "Expand prompt string"
-	default y
-	depends on ASH
-	help
-	  "PS#" may contain volatile content, such as backquote commands.
-	  This option recreates the prompt string from the environment
-	  variable each time it is displayed.
-
-config HUSH
-	bool "hush"
-	default y
-	help
-	  hush is a small shell (22k). It handles the normal flow control
-	  constructs such as if/then/elif/else/fi, for/in/do/done, while loops,
-	  case/esac. Redirections, here documents, $((arithmetic))
-	  and functions are supported.
-
-	  It will compile and work on no-mmu systems.
-
-	  It does not handle select, aliases, brace expansion,
-	  tilde expansion, &>file and >&file redirection of stdout+stderr.
-
-config HUSH_BASH_COMPAT
-	bool "bash-compatible extensions"
-	default y
-	depends on HUSH
-	help
-	  Enable bash-compatible extensions.
-
-config HUSH_HELP
-	bool "help builtin"
-	default y
-	depends on HUSH
-	help
-	  Enable help builtin in hush. Code size + ~1 kbyte.
-
-config HUSH_INTERACTIVE
-	bool "Interactive mode"
-	default y
-	depends on HUSH
-	help
-	  Enable interactive mode (prompt and command editing).
-	  Without this, hush simply reads and executes commands
-	  from stdin just like a shell script from a file.
-	  No prompt, no PS1/PS2 magic shell variables.
-
-config HUSH_JOB
-	bool "Job control"
-	default y
-	depends on HUSH_INTERACTIVE
-	help
-	  Enable job control: Ctrl-Z backgrounds, Ctrl-C interrupts current
-	  command (not entire shell), fg/bg builtins work. Without this option,
-	  "cmd &" still works by simply spawning a process and immediately
-	  prompting for next command (or executing next command in a script),
-	  but no separate process group is formed.
-
-config HUSH_TICK
-	bool "Process substitution"
-	default y
-	depends on HUSH
-	help
-	  Enable process substitution `command` and $(command) in hush.
-
-config HUSH_IF
-	bool "Support if/then/elif/else/fi"
-	default y
-	depends on HUSH
-	help
-	  Enable if/then/elif/else/fi in hush.
-
-config HUSH_LOOPS
-	bool "Support for, while and until loops"
-	default y
-	depends on HUSH
-	help
-	  Enable for, while and until loops in hush.
-
-config HUSH_CASE
-	bool "Support case ... esac statement"
-	default y
-	depends on HUSH
-	help
-	  Enable case ... esac statement in hush. +400 bytes.
-
-config HUSH_FUNCTIONS
-	bool "Support funcname() { commands; } syntax"
-	default y
-	depends on HUSH
-	help
-	  Enable support for shell functions in hush. +800 bytes.
-
-config HUSH_LOCAL
-	bool "Support local builtin"
-	default y
-	depends on HUSH_FUNCTIONS
-	help
-	  Enable support for local variables in functions.
-
-config HUSH_EXPORT_N
-	bool "Support export '-n' option"
-	default y
-	depends on HUSH
-	help
-	  Enable support for export '-n' option in hush. It is a bash extension.
-
-config HUSH_RANDOM_SUPPORT
-	bool "Pseudorandom generator and $RANDOM variable"
-	default y
-	depends on HUSH
-	help
-	  Enable pseudorandom generator and dynamic variable "$RANDOM".
-	  Each read of "$RANDOM" will generate a new pseudorandom value.
-
-
-choice
-	prompt "Choose which shell is aliased to 'sh' name"
-	default FEATURE_SH_IS_ASH
-	help
-	  Choose which shell you want to be executed by 'sh' alias.
-	  The ash shell is the most bash compatible and full featured one.
-
-# note: cannot use "select ASH" here, it breaks "make allnoconfig"
-config FEATURE_SH_IS_ASH
-	depends on ASH
-	bool "ash"
-	depends on !NOMMU
-
-config FEATURE_SH_IS_HUSH
-	depends on HUSH
-	bool "hush"
-
-config FEATURE_SH_IS_NONE
-	bool "none"
-
-endchoice
-
-choice
-	prompt "Choose which shell is aliased to 'bash' name"
-	default FEATURE_BASH_IS_NONE
-	help
-	  Choose which shell you want to be executed by 'bash' alias.
-	  The ash shell is the most bash compatible and full featured one.
-
-	  Note that selecting this option does not switch on any bash
-	  compatibility code. It merely makes it possible to install
-	  /bin/bash (sym)link and run scripts which start with
-	  #!/bin/bash line.
-
-	  Many systems use it in scripts which use bash-specific features,
-	  even simple ones like $RANDOM. Without this option, busybox
-	  can't be used for running them because it won't recongnize
-	  "bash" as a supported applet name.
-
-config FEATURE_BASH_IS_ASH
-	depends on ASH
-	bool "ash"
-	depends on !NOMMU
-
-config FEATURE_BASH_IS_HUSH
-	depends on HUSH
-	bool "hush"
-
-config FEATURE_BASH_IS_NONE
-	bool "none"
-
-endchoice
-
-
-config LASH
-	bool "lash (deprecated: aliased to hush)"
-	default n
-	select HUSH
-	help
-	  lash is deprecated and will be removed, please migrate to hush.
-
-config MSH
-	bool "msh (deprecated: please use hush)"
-	default n
-	select HUSH
-	help
-	  msh is deprecated and will be removed, please migrate to hush.
-	  If there is a feature msh has but hush does not, please let us know.
-
-#	  The minix shell (adds just 30k) is quite complete and handles things
-#	  like for/do/done, case/esac and all the things you expect a Bourne
-#	  shell to do. It is not always pedantically correct about Bourne
-#	  shell grammar (try running the shell testscript "tests/sh.testcases"
-#	  on it and compare vs bash) but for most things it works quite well.
-#	  It uses only vfork, so it can be used on uClinux systems.
-
-
-config SH_MATH_SUPPORT
-	bool "POSIX math support"
-	default y
-	depends on ASH || HUSH
-	help
-	  Enable math support in the shell via $((...)) syntax.
-
-config SH_MATH_SUPPORT_64
-	bool "Extend POSIX math support to 64 bit"
-	default y
-	depends on SH_MATH_SUPPORT
-	help
-	  Enable 64-bit math support in the shell. This will make the shell
-	  slightly larger, but will allow computation with very large numbers.
-	  This is not in POSIX, so do not rely on this in portable code.
-
-config FEATURE_SH_EXTRA_QUIET
-	bool "Hide message on interactive shell startup"
-	default y
-	depends on HUSH || ASH
-	help
-	  Remove the busybox introduction when starting a shell.
-
-config FEATURE_SH_STANDALONE
-	bool "Standalone shell"
-	default n
-	depends on (HUSH || ASH) && FEATURE_PREFER_APPLETS
-	help
-	  This option causes busybox shells to use busybox applets
-	  in preference to executables in the PATH whenever possible. For
-	  example, entering the command 'ifconfig' into the shell would cause
-	  busybox to use the ifconfig busybox applet. Specifying the fully
-	  qualified executable name, such as '/sbin/ifconfig' will still
-	  execute the /sbin/ifconfig executable on the filesystem. This option
-	  is generally used when creating a statically linked version of busybox
-	  for use as a rescue shell, in the event that you screw up your system.
-
-	  This is implemented by re-execing /proc/self/exe (typically)
-	  with right parameters. Some selected applets ("NOFORK" applets)
-	  can even be executed without creating new process.
-	  Instead, busybox will call <applet>_main() internally.
-
-	  However, this causes problems in chroot jails without mounted /proc
-	  and with ps/top (command name can be shown as 'exe' for applets
-	  started this way).
-# untrue?
-#	  Note that this will *also* cause applets to take precedence
-#	  over shell builtins of the same name. So turning this on will
-#	  eliminate any performance gained by turning on the builtin "echo"
-#	  and "test" commands in ash.
-# untrue?
-#	  Note that when using this option, the shell will attempt to directly
-#	  run '/bin/busybox'. If you do not have the busybox binary sitting in
-#	  that exact location with that exact name, this option will not work at
-#	  all.
-
-config FEATURE_SH_NOFORK
-	bool "Run 'nofork' applets directly"
-	default n
-	depends on (HUSH || ASH) && FEATURE_PREFER_APPLETS
-	help
-	  This option causes busybox shells [currently only ash]
-	  to not execute typical fork/exec/wait sequence, but call <applet>_main
-	  directly, if possible. (Sometimes it is not possible: for example,
-	  this is not possible in pipes).
-
-	  This will be done only for some applets (those which are marked
-	  NOFORK in include/applets.h).
-
-	  This may significantly speed up some shell scripts.
-
-	  This feature is relatively new. Use with care.
-
-config CTTYHACK
-	bool "cttyhack"
-	default y
-	depends on PLATFORM_LINUX
-	help
-	  One common problem reported on the mailing list is "can't access tty;
-	  job control turned off" error message which typically appears when
-	  one tries to use shell with stdin/stdout opened to /dev/console.
-	  This device is special - it cannot be a controlling tty.
-
-	  Proper solution is to use correct device instead of /dev/console.
-
-	  cttyhack provides "quick and dirty" solution to this problem.
-	  It analyzes stdin with various ioctls, trying to determine whether
-	  it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line).
-	  If it detects one, it closes stdin/out/err and reopens that device.
-	  Then it executes given program. Opening the device will make
-	  that device a controlling tty. This may require cttyhack
-	  to be a session leader.
-
-	  Example for /etc/inittab (for busybox init):
-
-	  ::respawn:/bin/cttyhack /bin/sh
-
-	  Giving controlling tty to shell running with PID 1:
-
-	  $ exec cttyhack sh
-
-	  Starting an interactive shell from boot shell script:
-
-	  setsid cttyhack sh
-
-endmenu
 
=== removed file '.pc/cttyhack-serial-console-detection-is-Linux-specific.patch/shell/cttyhack.c'
--- .pc/cttyhack-serial-console-detection-is-Linux-specific.patch/shell/cttyhack.c	2010-08-03 06:42:39 +0000
+++ .pc/cttyhack-serial-console-detection-is-Linux-specific.patch/shell/cttyhack.c	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Licensed under GPLv2
- *
- * Copyright (c) 2007 Denys Vlasenko <[e-mail]>
- */
-#include "libbb.h"
-
-/* From <linux/vt.h> */
-struct vt_stat {
-	unsigned short v_active;        /* active vt */
-	unsigned short v_signal;        /* signal to send */
-	unsigned short v_state;         /* vt bitmask */
-};
-enum { VT_GETSTATE = 0x5603 }; /* get global vt state info */
-
-/* From <linux/serial.h> */
-struct serial_struct {
-	int	type;
-	int	line;
-	unsigned int	port;
-	int	irq;
-	int	flags;
-	int	xmit_fifo_size;
-	int	custom_divisor;
-	int	baud_base;
-	unsigned short	close_delay;
-	char	io_type;
-	char	reserved_char[1];
-	int	hub6;
-	unsigned short	closing_wait;   /* time to wait before closing */
-	unsigned short	closing_wait2;  /* no longer used... */
-	unsigned char	*iomem_base;
-	unsigned short	iomem_reg_shift;
-	unsigned int	port_high;
-	unsigned long	iomap_base;	/* cookie passed into ioremap */
-	int	reserved[1];
-};
-
-int cttyhack_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int cttyhack_main(int argc UNUSED_PARAM, char **argv)
-{
-	int fd;
-	char console[sizeof(int)*3 + 16];
-	union {
-		struct vt_stat vt;
-		struct serial_struct sr;
-		char paranoia[sizeof(struct serial_struct) * 3];
-	} u;
-
-	if (!*++argv) {
-		bb_show_usage();
-	}
-
-	strcpy(console, "/dev/tty");
-	fd = open(console, O_RDWR);
-	if (fd >= 0) {
-		/* We already have ctty, nothing to do */
-		close(fd);
-	} else {
-		/* We don't have ctty (or don't have "/dev/tty" node...) */
-		if (ioctl(0, TIOCGSERIAL, &u.sr) == 0) {
-			/* this is a serial console */
-			sprintf(console + 8, "S%d", u.sr.line);
-		} else if (ioctl(0, VT_GETSTATE, &u.vt) == 0) {
-			/* this is linux virtual tty */
-			sprintf(console + 8, "S%d" + 1, u.vt.v_active);
-		}
-		if (console[8]) {
-			fd = xopen(console, O_RDWR);
-			//bb_error_msg("switching to '%s'", console);
-			dup2(fd, 0);
-			dup2(fd, 1);
-			dup2(fd, 2);
-			while (fd > 2)
-				close(fd--);
-			/* Some other session may have it as ctty,
-			 * steal it from them:
-			 */
-			ioctl(0, TIOCSCTTY, 1);
-		}
-	}
-
-	BB_EXECVP_or_die(argv);
-}
 
=== removed directory '.pc/debian-changes-1:1.17.1-10'
=== removed directory '.pc/debian-changes-1:1.17.1-10/busybox-1.17.1'
=== removed file '.pc/debian-changes-1:1.17.1-10/busybox-1.17.1/.indent.pro'
=== added directory '.pc/dirname-basename-skip-doubledash.diff'
=== added directory '.pc/dirname-basename-skip-doubledash.diff/coreutils'
=== added file '.pc/dirname-basename-skip-doubledash.diff/coreutils/basename.c'
--- .pc/dirname-basename-skip-doubledash.diff/coreutils/basename.c	1970-01-01 00:00:00 +0000
+++ .pc/dirname-basename-skip-doubledash.diff/coreutils/basename.c	2011-05-27 16:11:32 +0000
@@ -0,0 +1,61 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Mini basename implementation for busybox
+ *
+ * Copyright (C) 1999-2004 by Erik Andersen <[e-mail]>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+
+/* Mar 16, 2003      Manuel Novoa III   ([e-mail])
+ *
+ * Changes:
+ * 1) Now checks for too many args.  Need at least one and at most two.
+ * 2) Don't check for options, as per SUSv3.
+ * 3) Save some space by using strcmp().  Calling strncmp() here was silly.
+ */
+
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/basename.html */
+
+//kbuild:lib-$(CONFIG_BASENAME) += basename.o
+
+//config:config BASENAME
+//config:	bool "basename"
+//config:	default y
+//config:	help
+//config:	  basename is used to strip the directory and suffix from filenames,
+//config:	  leaving just the filename itself. Enable this option if you wish
+//config:	  to enable the 'basename' utility.
+
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
+
+int basename_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int basename_main(int argc, char **argv)
+{
+	size_t m, n;
+	char *s;
+
+	if ((unsigned)(argc-2) >= 2) {
+		bb_show_usage();
+	}
+
+	/* It should strip slash: /abc/def/ -> def */
+	s = bb_get_last_path_component_strip(*++argv);
+
+	m = strlen(s);
+	if (*++argv) {
+		n = strlen(*argv);
+		if ((m > n) && (strcmp(s+m-n, *argv) == 0)) {
+			m -= n;
+			/*s[m] = '\0'; - redundant */
+		}
+	}
+
+	/* puts(s) will do, but we can do without stdio this way: */
+	s[m++] = '\n';
+	/* NB: != is correct here: */
+	return full_write(STDOUT_FILENO, s, m) != (ssize_t)m;
+}
 
=== added file '.pc/dirname-basename-skip-doubledash.diff/coreutils/dirname.c'
--- .pc/dirname-basename-skip-doubledash.diff/coreutils/dirname.c	1970-01-01 00:00:00 +0000
+++ .pc/dirname-basename-skip-doubledash.diff/coreutils/dirname.c	2011-05-27 16:11:32 +0000
@@ -0,0 +1,22 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Mini dirname implementation for busybox
+ *
+ * Copyright (C) 1999-2004 by Erik Andersen <[e-mail]>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/dirname.html */
+
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
+
+int dirname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int dirname_main(int argc UNUSED_PARAM, char **argv)
+{
+	puts(dirname(single_argv(argv)));
+	return fflush_all();
+}
 
=== removed directory '.pc/doc-man-name.patch'
=== removed file '.pc/doc-man-name.patch/Makefile.custom'
--- .pc/doc-man-name.patch/Makefile.custom	2010-08-03 06:42:39 +0000
+++ .pc/doc-man-name.patch/Makefile.custom	1970-01-01 00:00:00 +0000
@@ -1,177 +0,0 @@
-# ==========================================================================
-# Build system
-# ==========================================================================
-
-busybox.links: $(srctree)/applets/busybox.mkll $(objtree)/include/autoconf.h include/applets.h
-	$(Q)-$(SHELL) $^ >$@
-
-.PHONY: install
-ifeq ($(CONFIG_INSTALL_APPLET_SYMLINKS),y)
-INSTALL_OPTS:= --symlinks
-endif
-ifeq ($(CONFIG_INSTALL_APPLET_HARDLINKS),y)
-INSTALL_OPTS:= --hardlinks
-endif
-ifeq ($(CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS),y)
-ifeq ($(CONFIG_INSTALL_SH_APPLET_SYMLINK),y)
-INSTALL_OPTS:= --sw-sh-sym
-endif
-ifeq ($(CONFIG_INSTALL_SH_APPLET_HARDLINK),y)
-INSTALL_OPTS:= --sw-sh-hard
-endif
-ifeq ($(CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER),y)
-INSTALL_OPTS:= --scriptwrapper
-endif
-endif
-install: $(srctree)/applets/install.sh busybox busybox.links
-	$(Q)DO_INSTALL_LIBS="$(strip $(LIBBUSYBOX_SONAME) $(DO_INSTALL_LIBS))" \
-		$(SHELL) $< $(CONFIG_PREFIX) $(INSTALL_OPTS)
-ifeq ($(strip $(CONFIG_FEATURE_SUID)),y)
-	@echo
-	@echo
-	@echo --------------------------------------------------
-	@echo You will probably need to make your busybox binary
-	@echo setuid root to ensure all configured applets will
-	@echo work properly.
-	@echo --------------------------------------------------
-	@echo
-endif
-
-uninstall: busybox.links
-	rm -f $(CONFIG_PREFIX)/bin/busybox
-	for i in `cat busybox.links` ; do rm -f $(CONFIG_PREFIX)$$i; done
-ifneq ($(strip $(DO_INSTALL_LIBS)),n)
-	for i in $(LIBBUSYBOX_SONAME) $(DO_INSTALL_LIBS); do \
-		rm -f $(CONFIG_PREFIX)$$i; \
-	done
-endif
-
-# Not very elegant: copies testsuite to objdir...
-# (cp -pPR is POSIX-compliant (cp -dpR or cp -a would not be))
-.PHONY: check
-.PHONY: test
-check test: busybox busybox.links
-	test -d $(objtree)/testsuite || cp -pPR $(srctree)/testsuite $(objtree)
-	bindir=$(objtree) srcdir=$(srctree)/testsuite \
-	$(SHELL) -c "cd $(objtree)/testsuite && $(srctree)/testsuite/runtest $(if $(KBUILD_VERBOSE:0=),-v)"
-
-.PHONY: release
-release: distclean
-	cd ..; \
-	rm -r -f busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION); \
-	cp -pPR busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && { \
-	find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \
-		-name .svn \
-		-print \
-		-exec rm -r -f {} \; ; \
-	find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \
-		-name .git \
-		-print \
-		-exec rm -r -f {} \; ; \
-	find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \
-		-name .\#* \
-		-print \
-		-exec rm -f {} \; ; \
-	tar -czf busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION).tar.gz \
-		busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ ; }
-
-.PHONY: checkhelp
-checkhelp:
-	$(Q)$(srctree)/scripts/checkhelp.awk \
-		$(patsubst %,$(srctree)/%,$(wildcard $(patsubst %,%/Config.in,$(busybox-dirs) ./)))
-
-.PHONY: sizes
-sizes: busybox_unstripped
-	$(NM) --size-sort $(<)
-
-.PHONY: bloatcheck
-bloatcheck: busybox_old busybox_unstripped
-	@$(srctree)/scripts/bloat-o-meter busybox_old busybox_unstripped
-	@$(CROSS_COMPILE)size busybox_old busybox_unstripped
-
-.PHONY: baseline
-baseline: busybox_unstripped
-	@mv busybox_unstripped busybox_old
-
-.PHONY: objsizes
-objsizes: busybox_unstripped
-	$(srctree)/scripts/objsizes
-
-.PHONY: stksizes
-stksizes: busybox_unstripped
-	$(CROSS_COMPILE)objdump -d busybox_unstripped | $(srctree)/scripts/checkstack.pl $(ARCH) | uniq
-
-.PHONY: bigdata
-bigdata: busybox_unstripped
-	$(CROSS_COMPILE)nm --size-sort busybox_unstripped | grep -vi ' [trw] '
-
-# Documentation Targets
-.PHONY: doc
-doc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
-
-# FIXME: Doesn't belong here
-       cmd_doc =
- quiet_cmd_doc = $(Q)echo "  DOC     $(@F)"
-silent_cmd_doc =
-disp_doc       = $($(quiet)cmd_doc)
-
-# sed adds newlines after "Options:" etc,
-# this is needed in order to get good BusyBox.{1,txt,html}
-docs/busybox.pod: $(srctree)/docs/busybox_header.pod \
-		include/usage.h \
-		$(srctree)/docs/busybox_footer.pod \
-		applets/usage_pod
-	$(disp_doc)
-	$(Q)-mkdir -p docs
-	$(Q)-( \
-	    cat $(srctree)/docs/busybox_header.pod; \
-	    applets/usage_pod | sed 's/^[A-Za-z][A-Za-z ]*[a-z]:$$/&\n/'; \
-	    cat $(srctree)/docs/busybox_footer.pod; \
-	    ) > docs/busybox.pod
-
-docs/BusyBox.txt: docs/busybox.pod
-	$(disp_doc)
-	$(Q)-mkdir -p docs
-	$(Q)-pod2text $< > $@
-
-docs/BusyBox.1: docs/busybox.pod
-	$(disp_doc)
-	$(Q)-mkdir -p docs
-	$(Q)-pod2man --center=BusyBox --release="version $(KERNELVERSION)" $< > $@
-
-docs/BusyBox.html: docs/busybox.net/BusyBox.html
-	$(disp_doc)
-	$(Q)-mkdir -p docs
-	$(Q)-rm -f docs/BusyBox.html
-	$(Q)-cp docs/busybox.net/BusyBox.html docs/BusyBox.html
-
-docs/busybox.net/BusyBox.html: docs/busybox.pod
-	$(Q)-mkdir -p docs/busybox.net
-	$(Q)-pod2html --noindex $< > $@
-	$(Q)-rm -f pod2htm*
-
-# documentation, cross-reference
-# Modern distributions already ship synopsis packages (e.g. debian)
-# If you have an old distribution go to http://synopsis.fresco.org/
-syn_tgt = $(wildcard $(patsubst %,%/*.c,$(busybox-alldirs)))
-syn     = $(patsubst %.c, %.syn, $(syn_tgt))
-
-comma:= ,
-brace_open:= (
-brace_close:= )
-
-SYN_CPPFLAGS := $(strip $(CPPFLAGS) $(EXTRA_CPPFLAGS))
-SYN_CPPFLAGS := $(subst $(brace_open),\$(brace_open),$(SYN_CPPFLAGS))
-SYN_CPPFLAGS := $(subst $(brace_close),\$(brace_close),$(SYN_CPPFLAGS))
-#SYN_CPPFLAGS := $(subst ",\",$(SYN_CPPFLAGS))
-#")
-#SYN_CPPFLAGS := [$(patsubst %,'%'$(comma),$(SYN_CPPFLAGS))'']
-
-%.syn: %.c
-	synopsis -p C -l Comments.SSDFilter,Comments.Previous -Wp,preprocess=True,cppflags="'$(SYN_CPPFLAGS)'" -o $@ $<
-
-.PHONY: html
-html: $(syn)
-	synopsis -f HTML -Wf,title="'BusyBox Documentation'" -o $@ $^
-
--include $(srctree)/Makefile.local
 
=== removed directory '.pc/grep-o-loop.patch'
=== removed directory '.pc/grep-o-loop.patch/findutils'
=== removed file '.pc/grep-o-loop.patch/findutils/grep.c'
--- .pc/grep-o-loop.patch/findutils/grep.c	2010-10-13 11:03:32 +0000
+++ .pc/grep-o-loop.patch/findutils/grep.c	1970-01-01 00:00:00 +0000
@@ -1,771 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Mini grep implementation for busybox using libc regex.
- *
- * Copyright (C) 1999,2000,2001 by Lineo, inc. and Mark Whitley
- * Copyright (C) 1999,2000,2001 by Mark Whitley <[e-mail]>
- *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
- */
-/* BB_AUDIT SUSv3 defects - unsupported option -x "match whole line only". */
-/* BB_AUDIT GNU defects - always acts as -a.  */
-/* http://www.opengroup.org/onlinepubs/007904975/utilities/grep.html */
-/*
- * 2004,2006 (C) Vladimir Oleynik <[e-mail]> -
- * correction "-e pattern1 -e pattern2" logic and more optimizations.
- * precompiled regex
- *
- * (C) 2006 Jac Goudsmit added -o option
- */
-
-//applet:IF_GREP(APPLET(grep, _BB_DIR_BIN, _BB_SUID_DROP))
-//applet:IF_FEATURE_GREP_EGREP_ALIAS(APPLET_ODDNAME(egrep, grep, _BB_DIR_BIN, _BB_SUID_DROP, egrep))
-//applet:IF_FEATURE_GREP_FGREP_ALIAS(APPLET_ODDNAME(fgrep, grep, _BB_DIR_BIN, _BB_SUID_DROP, fgrep))
-
-//kbuild:lib-$(CONFIG_GREP) += grep.o
-
-//config:config GREP
-//config:	bool "grep"
-//config:	default y
-//config:	help
-//config:	  grep is used to search files for a specified pattern.
-//config:
-//config:config FEATURE_GREP_EGREP_ALIAS
-//config:	bool "Enable extended regular expressions (egrep & grep -E)"
-//config:	default y
-//config:	depends on GREP
-//config:	help
-//config:	  Enabled support for extended regular expressions. Extended
-//config:	  regular expressions allow for alternation (foo|bar), grouping,
-//config:	  and various repetition operators.
-//config:
-//config:config FEATURE_GREP_FGREP_ALIAS
-//config:	bool "Alias fgrep to grep -F"
-//config:	default y
-//config:	depends on GREP
-//config:	help
-//config:	  fgrep sees the search pattern as a normal string rather than
-//config:	  regular expressions.
-//config:	  grep -F always works, this just creates the fgrep alias.
-//config:
-//config:config FEATURE_GREP_CONTEXT
-//config:	bool "Enable before and after context flags (-A, -B and -C)"
-//config:	default y
-//config:	depends on GREP
-//config:	help
-//config:	  Print the specified number of leading (-B) and/or trailing (-A)
-//config:	  context surrounding our matching lines.
-//config:	  Print the specified number of context lines (-C).
-
-#include "libbb.h"
-#include "xregex.h"
-
-
-/* options */
-//usage:#define grep_trivial_usage
-//usage:       "[-HhnlLoqvsriw"
-//usage:       "F"
-//usage:	IF_FEATURE_GREP_EGREP_ALIAS("E")
-//usage:	IF_EXTRA_COMPAT("z")
-//usage:       "] [-m N] "
-//usage:	IF_FEATURE_GREP_CONTEXT("[-A/B/C N] ")
-//usage:       "PATTERN/-e PATTERN.../-f FILE [FILE]..."
-//usage:#define grep_full_usage "\n\n"
-//usage:       "Search for PATTERN in FILEs (or stdin)\n"
-//usage:     "\nOptions:"
-//usage:     "\n	-H	Add 'filename:' prefix"
-//usage:     "\n	-h	Do not add 'filename:' prefix"
-//usage:     "\n	-n	Add 'line_no:' prefix"
-//usage:     "\n	-l	Show only names of files that match"
-//usage:     "\n	-L	Show only names of files that don't match"
-//usage:     "\n	-c	Show only count of matching lines"
-//usage:     "\n	-o	Show only the matching part of line"
-//usage:     "\n	-q	Quiet. Return 0 if PATTERN is found, 1 otherwise"
-//usage:     "\n	-v	Select non-matching lines"
-//usage:     "\n	-s	Suppress open and read errors"
-//usage:     "\n	-r	Recurse"
-//usage:     "\n	-i	Ignore case"
-//usage:     "\n	-w	Match whole words only"
-//usage:     "\n	-F	PATTERN is a literal (not regexp)"
-//usage:	IF_FEATURE_GREP_EGREP_ALIAS(
-//usage:     "\n	-E	PATTERN is an extended regexp"
-//usage:	)
-//usage:	IF_EXTRA_COMPAT(
-//usage:     "\n	-z	Input is NUL terminated"
-//usage:	)
-//usage:     "\n	-m N	Match up to N times per file"
-//usage:	IF_FEATURE_GREP_CONTEXT(
-//usage:     "\n	-A N	Print N lines of trailing context"
-//usage:     "\n	-B N	Print N lines of leading context"
-//usage:     "\n	-C N	Same as '-A N -B N'"
-//usage:	)
-//usage:     "\n	-e PTRN	Pattern to match"
-//usage:     "\n	-f FILE	Read pattern from file"
-//usage:
-//usage:#define grep_example_usage
-//usage:       "$ grep root /etc/passwd\n"
-//usage:       "root:x:0:0:root:/root:/bin/bash\n"
-//usage:       "$ grep ^[rR]oo. /etc/passwd\n"
-//usage:       "root:x:0:0:root:/root:/bin/bash\n"
-//usage:
-//usage:#define egrep_trivial_usage NOUSAGE_STR
-//usage:#define egrep_full_usage ""
-//usage:#define fgrep_trivial_usage NOUSAGE_STR
-//usage:#define fgrep_full_usage ""
-
-#define OPTSTR_GREP \
-	"lnqvscFiHhe:f:Lorm:w" \
-	IF_FEATURE_GREP_CONTEXT("A:B:C:") \
-	IF_FEATURE_GREP_EGREP_ALIAS("E") \
-	IF_EXTRA_COMPAT("z") \
-	"aI"
-/* ignored: -a "assume all files to be text" */
-/* ignored: -I "assume binary files have no matches" */
-enum {
-	OPTBIT_l, /* list matched file names only */
-	OPTBIT_n, /* print line# */
-	OPTBIT_q, /* quiet - exit(EXIT_SUCCESS) of first match */
-	OPTBIT_v, /* invert the match, to select non-matching lines */
-	OPTBIT_s, /* suppress errors about file open errors */
-	OPTBIT_c, /* count matches per file (suppresses normal output) */
-	OPTBIT_F, /* literal match */
-	OPTBIT_i, /* case-insensitive */
-	OPTBIT_H, /* force filename display */
-	OPTBIT_h, /* inhibit filename display */
-	OPTBIT_e, /* -e PATTERN */
-	OPTBIT_f, /* -f FILE_WITH_PATTERNS */
-	OPTBIT_L, /* list unmatched file names only */
-	OPTBIT_o, /* show only matching parts of lines */
-	OPTBIT_r, /* recurse dirs */
-	OPTBIT_m, /* -m MAX_MATCHES */
-	OPTBIT_w, /* -w whole word match */
-	IF_FEATURE_GREP_CONTEXT(    OPTBIT_A ,) /* -A NUM: after-match context */
-	IF_FEATURE_GREP_CONTEXT(    OPTBIT_B ,) /* -B NUM: before-match context */
-	IF_FEATURE_GREP_CONTEXT(    OPTBIT_C ,) /* -C NUM: -A and -B combined */
-	IF_FEATURE_GREP_EGREP_ALIAS(OPTBIT_E ,) /* extended regexp */
-	IF_EXTRA_COMPAT(            OPTBIT_z ,) /* input is NUL terminated */
-	OPT_l = 1 << OPTBIT_l,
-	OPT_n = 1 << OPTBIT_n,
-	OPT_q = 1 << OPTBIT_q,
-	OPT_v = 1 << OPTBIT_v,
-	OPT_s = 1 << OPTBIT_s,
-	OPT_c = 1 << OPTBIT_c,
-	OPT_F = 1 << OPTBIT_F,
-	OPT_i = 1 << OPTBIT_i,
-	OPT_H = 1 << OPTBIT_H,
-	OPT_h = 1 << OPTBIT_h,
-	OPT_e = 1 << OPTBIT_e,
-	OPT_f = 1 << OPTBIT_f,
-	OPT_L = 1 << OPTBIT_L,
-	OPT_o = 1 << OPTBIT_o,
-	OPT_r = 1 << OPTBIT_r,
-	OPT_m = 1 << OPTBIT_m,
-	OPT_w = 1 << OPTBIT_w,
-	OPT_A = IF_FEATURE_GREP_CONTEXT(    (1 << OPTBIT_A)) + 0,
-	OPT_B = IF_FEATURE_GREP_CONTEXT(    (1 << OPTBIT_B)) + 0,
-	OPT_C = IF_FEATURE_GREP_CONTEXT(    (1 << OPTBIT_C)) + 0,
-	OPT_E = IF_FEATURE_GREP_EGREP_ALIAS((1 << OPTBIT_E)) + 0,
-	OPT_z = IF_EXTRA_COMPAT(            (1 << OPTBIT_z)) + 0,
-};
-
-#define PRINT_FILES_WITH_MATCHES    (option_mask32 & OPT_l)
-#define PRINT_LINE_NUM              (option_mask32 & OPT_n)
-#define BE_QUIET                    (option_mask32 & OPT_q)
-#define SUPPRESS_ERR_MSGS           (option_mask32 & OPT_s)
-#define PRINT_MATCH_COUNTS          (option_mask32 & OPT_c)
-#define FGREP_FLAG                  (option_mask32 & OPT_F)
-#define PRINT_FILES_WITHOUT_MATCHES (option_mask32 & OPT_L)
-#define NUL_DELIMITED               (option_mask32 & OPT_z)
-
-struct globals {
-	int max_matches;
-#if !ENABLE_EXTRA_COMPAT
-	int reflags;
-#else
-	RE_TRANSLATE_TYPE case_fold; /* RE_TRANSLATE_TYPE is [[un]signed] char* */
-#endif
-	smalluint invert_search;
-	smalluint print_filename;
-	smalluint open_errors;
-#if ENABLE_FEATURE_GREP_CONTEXT
-	smalluint did_print_line;
-	int lines_before;
-	int lines_after;
-	char **before_buf;
-	IF_EXTRA_COMPAT(size_t *before_buf_size;)
-	int last_line_printed;
-#endif
-	/* globals used internally */
-	llist_t *pattern_head;   /* growable list of patterns to match */
-	const char *cur_file;    /* the current file we are reading */
-} FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
-#define INIT_G() do { \
-	struct G_sizecheck { \
-		char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \
-	}; \
-} while (0)
-#define max_matches       (G.max_matches         )
-#if !ENABLE_EXTRA_COMPAT
-# define reflags          (G.reflags             )
-#else
-# define case_fold        (G.case_fold           )
-/* http://www.delorie.com/gnu/docs/regex/regex_46.html */
-# define reflags           re_syntax_options
-# undef REG_NOSUB
-# undef REG_EXTENDED
-# undef REG_ICASE
-# define REG_NOSUB    bug:is:here /* should not be used */
-/* Just RE_SYNTAX_EGREP is not enough, need to enable {n[,[m]]} too */
-# define REG_EXTENDED (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES)
-# define REG_ICASE    bug:is:here /* should not be used */
-#endif
-#define invert_search     (G.invert_search       )
-#define print_filename    (G.print_filename      )
-#define open_errors       (G.open_errors         )
-#define did_print_line    (G.did_print_line      )
-#define lines_before      (G.lines_before        )
-#define lines_after       (G.lines_after         )
-#define before_buf        (G.before_buf          )
-#define before_buf_size   (G.before_buf_size     )
-#define last_line_printed (G.last_line_printed   )
-#define pattern_head      (G.pattern_head        )
-#define cur_file          (G.cur_file            )
-
-
-typedef struct grep_list_data_t {
-	char *pattern;
-/* for GNU regex, matched_range must be persistent across grep_file() calls */
-#if !ENABLE_EXTRA_COMPAT
-	regex_t compiled_regex;
-	regmatch_t matched_range;
-#else
-	struct re_pattern_buffer compiled_regex;
-	struct re_registers matched_range;
-#endif
-#define ALLOCATED 1
-#define COMPILED 2
-	int flg_mem_alocated_compiled;
-} grep_list_data_t;
-
-#if !ENABLE_EXTRA_COMPAT
-#define print_line(line, line_len, linenum, decoration) \
-	print_line(line, linenum, decoration)
-#endif
-static void print_line(const char *line, size_t line_len, int linenum, char decoration)
-{
-#if ENABLE_FEATURE_GREP_CONTEXT
-	/* Happens when we go to next file, immediately hit match
-	 * and try to print prev context... from prev file! Don't do it */
-	if (linenum < 1)
-		return;
-	/* possibly print the little '--' separator */
-	if ((lines_before || lines_after) && did_print_line
-	 && last_line_printed != linenum - 1
-	) {
-		puts("--");
-	}
-	/* guard against printing "--" before first line of first file */
-	did_print_line = 1;
-	last_line_printed = linenum;
-#endif
-	if (print_filename)
-		printf("%s%c", cur_file, decoration);
-	if (PRINT_LINE_NUM)
-		printf("%i%c", linenum, decoration);
-	/* Emulate weird GNU grep behavior with -ov */
-	if ((option_mask32 & (OPT_v|OPT_o)) != (OPT_v|OPT_o)) {
-#if !ENABLE_EXTRA_COMPAT
-		puts(line);
-#else
-		fwrite(line, 1, line_len, stdout);
-		putchar(NUL_DELIMITED ? '\0' : '\n');
-#endif
-	}
-}
-
-#if ENABLE_EXTRA_COMPAT
-/* Unlike getline, this one removes trailing '\n' */
-static ssize_t FAST_FUNC bb_getline(char **line_ptr, size_t *line_alloc_len, FILE *file)
-{
-	ssize_t res_sz;
-	char *line;
-	int delim = (NUL_DELIMITED ? '\0' : '\n');
-
-	res_sz = getdelim(line_ptr, line_alloc_len, delim, file);
-	line = *line_ptr;
-
-	if (res_sz > 0) {
-		if (line[res_sz - 1] == delim)
-			line[--res_sz] = '\0';
-	} else {
-		free(line); /* uclibc allocates a buffer even on EOF. WTF? */
-	}
-	return res_sz;
-}
-#endif
-
-static int grep_file(FILE *file)
-{
-	smalluint found;
-	int linenum = 0;
-	int nmatches = 0;
-#if !ENABLE_EXTRA_COMPAT
-	char *line;
-#else
-	char *line = NULL;
-	ssize_t line_len;
-	size_t line_alloc_len;
-# define rm_so start[0]
-# define rm_eo end[0]
-#endif
-#if ENABLE_FEATURE_GREP_CONTEXT
-	int print_n_lines_after = 0;
-	int curpos = 0; /* track where we are in the circular 'before' buffer */
-	int idx = 0; /* used for iteration through the circular buffer */
-#else
-	enum { print_n_lines_after = 0 };
-#endif
-
-	while (
-#if !ENABLE_EXTRA_COMPAT
-		(line = xmalloc_fgetline(file)) != NULL
-#else
-		(line_len = bb_getline(&line, &line_alloc_len, file)) >= 0
-#endif
-	) {
-		llist_t *pattern_ptr = pattern_head;
-		grep_list_data_t *gl = gl; /* for gcc */
-
-		linenum++;
-		found = 0;
-		while (pattern_ptr) {
-			gl = (grep_list_data_t *)pattern_ptr->data;
-			if (FGREP_FLAG) {
-				found |= (((option_mask32 & OPT_i)
-					? strcasestr(line, gl->pattern)
-					: strstr(line, gl->pattern)
-					) != NULL);
-			} else {
-				if (!(gl->flg_mem_alocated_compiled & COMPILED)) {
-					gl->flg_mem_alocated_compiled |= COMPILED;
-#if !ENABLE_EXTRA_COMPAT
-					xregcomp(&gl->compiled_regex, gl->pattern, reflags);
-#else
-					memset(&gl->compiled_regex, 0, sizeof(gl->compiled_regex));
-					gl->compiled_regex.translate = case_fold; /* for -i */
-					if (re_compile_pattern(gl->pattern, strlen(gl->pattern), &gl->compiled_regex))
-						bb_error_msg_and_die("bad regex '%s'", gl->pattern);
-#endif
-				}
-#if !ENABLE_EXTRA_COMPAT
-				gl->matched_range.rm_so = 0;
-				gl->matched_range.rm_eo = 0;
-#endif
-				if (
-#if !ENABLE_EXTRA_COMPAT
-					regexec(&gl->compiled_regex, line, 1, &gl->matched_range, 0) == 0
-#else
-					re_search(&gl->compiled_regex, line, line_len,
-							/*start:*/ 0, /*range:*/ line_len,
-							&gl->matched_range) >= 0
-#endif
-				) {
-					if (!(option_mask32 & OPT_w))
-						found = 1;
-					else {
-						char c = ' ';
-						if (gl->matched_range.rm_so)
-							c = line[gl->matched_range.rm_so - 1];
-						if (!isalnum(c) && c != '_') {
-							c = line[gl->matched_range.rm_eo];
-							if (!c || (!isalnum(c) && c != '_'))
-								found = 1;
-						}
-					}
-				}
-			}
-			/* If it's non-inverted search, we can stop
-			 * at first match */
-			if (found && !invert_search)
-				goto do_found;
-			pattern_ptr = pattern_ptr->link;
-		} /* while (pattern_ptr) */
-
-		if (found ^ invert_search) {
- do_found:
-			/* keep track of matches */
-			nmatches++;
-
-			/* quiet/print (non)matching file names only? */
-			if (option_mask32 & (OPT_q|OPT_l|OPT_L)) {
-				free(line); /* we don't need line anymore */
-				if (BE_QUIET) {
-					/* manpage says about -q:
-					 * "exit immediately with zero status
-					 * if any match is found,
-					 * even if errors were detected" */
-					exit(EXIT_SUCCESS);
-				}
-				/* if we're just printing filenames, we stop after the first match */
-				if (PRINT_FILES_WITH_MATCHES) {
-					puts(cur_file);
-					/* fall through to "return 1" */
-				}
-				/* OPT_L aka PRINT_FILES_WITHOUT_MATCHES: return early */
-				return 1; /* one match */
-			}
-
-#if ENABLE_FEATURE_GREP_CONTEXT
-			/* Were we printing context and saw next (unwanted) match? */
-			if ((option_mask32 & OPT_m) && nmatches > max_matches)
-				break;
-#endif
-
-			/* print the matched line */
-			if (PRINT_MATCH_COUNTS == 0) {
-#if ENABLE_FEATURE_GREP_CONTEXT
-				int prevpos = (curpos == 0) ? lines_before - 1 : curpos - 1;
-
-				/* if we were told to print 'before' lines and there is at least
-				 * one line in the circular buffer, print them */
-				if (lines_before && before_buf[prevpos] != NULL) {
-					int first_buf_entry_line_num = linenum - lines_before;
-
-					/* advance to the first entry in the circular buffer, and
-					 * figure out the line number is of the first line in the
-					 * buffer */
-					idx = curpos;
-					while (before_buf[idx] == NULL) {
-						idx = (idx + 1) % lines_before;
-						first_buf_entry_line_num++;
-					}
-
-					/* now print each line in the buffer, clearing them as we go */
-					while (before_buf[idx] != NULL) {
-						print_line(before_buf[idx], before_buf_size[idx], first_buf_entry_line_num, '-');
-						free(before_buf[idx]);
-						before_buf[idx] = NULL;
-						idx = (idx + 1) % lines_before;
-						first_buf_entry_line_num++;
-					}
-				}
-
-				/* make a note that we need to print 'after' lines */
-				print_n_lines_after = lines_after;
-#endif
-				if (option_mask32 & OPT_o) {
-					if (FGREP_FLAG) {
-						/* -Fo just prints the pattern
-						 * (unless -v: -Fov doesnt print anything at all) */
-						if (found)
-							print_line(gl->pattern, strlen(gl->pattern), linenum, ':');
-					} else while (1) {
-						unsigned end = gl->matched_range.rm_eo;
-						char old = line[end];
-						line[end] = '\0';
-						print_line(line + gl->matched_range.rm_so,
-								end - gl->matched_range.rm_so,
-								linenum, ':');
-						if (old == '\0')
-							break;
-						line[end] = old;
-#if !ENABLE_EXTRA_COMPAT
-						if (regexec(&gl->compiled_regex, line + end,
-								1, &gl->matched_range, REG_NOTBOL) != 0)
-							break;
-						gl->matched_range.rm_so += end;
-						gl->matched_range.rm_eo += end;
-#else
-						if (re_search(&gl->compiled_regex, line, line_len,
-								end, line_len - end,
-								&gl->matched_range) < 0)
-							break;
-#endif
-					}
-				} else {
-					print_line(line, line_len, linenum, ':');
-				}
-			}
-		}
-#if ENABLE_FEATURE_GREP_CONTEXT
-		else { /* no match */
-			/* if we need to print some context lines after the last match, do so */
-			if (print_n_lines_after) {
-				print_line(line, strlen(line), linenum, '-');
-				print_n_lines_after--;
-			} else if (lines_before) {
-				/* Add the line to the circular 'before' buffer */
-				free(before_buf[curpos]);
-				before_buf[curpos] = line;
-				IF_EXTRA_COMPAT(before_buf_size[curpos] = line_len;)
-				curpos = (curpos + 1) % lines_before;
-				/* avoid free(line) - we took the line */
-				line = NULL;
-			}
-		}
-
-#endif /* ENABLE_FEATURE_GREP_CONTEXT */
-#if !ENABLE_EXTRA_COMPAT
-		free(line);
-#endif
-		/* Did we print all context after last requested match? */
-		if ((option_mask32 & OPT_m)
-		 && !print_n_lines_after
-		 && nmatches == max_matches
-		) {
-			break;
-		}
-	} /* while (read line) */
-
-	/* special-case file post-processing for options where we don't print line
-	 * matches, just filenames and possibly match counts */
-
-	/* grep -c: print [filename:]count, even if count is zero */
-	if (PRINT_MATCH_COUNTS) {
-		if (print_filename)
-			printf("%s:", cur_file);
-		printf("%d\n", nmatches);
-	}
-
-	/* grep -L: print just the filename */
-	if (PRINT_FILES_WITHOUT_MATCHES) {
-		/* nmatches is zero, no need to check it:
-		 * we return 1 early if we detected a match
-		 * and PRINT_FILES_WITHOUT_MATCHES is set */
-		puts(cur_file);
-	}
-
-	return nmatches;
-}
-
-#if ENABLE_FEATURE_CLEAN_UP
-#define new_grep_list_data(p, m) add_grep_list_data(p, m)
-static char *add_grep_list_data(char *pattern, int flg_used_mem)
-#else
-#define new_grep_list_data(p, m) add_grep_list_data(p)
-static char *add_grep_list_data(char *pattern)
-#endif
-{
-	grep_list_data_t *gl = xzalloc(sizeof(*gl));
-	gl->pattern = pattern;
-#if ENABLE_FEATURE_CLEAN_UP
-	gl->flg_mem_alocated_compiled = flg_used_mem;
-#else
-	/*gl->flg_mem_alocated_compiled = 0;*/
-#endif
-	return (char *)gl;
-}
-
-static void load_regexes_from_file(llist_t *fopt)
-{
-	char *line;
-	FILE *f;
-
-	while (fopt) {
-		llist_t *cur = fopt;
-		char *ffile = cur->data;
-
-		fopt = cur->link;
-		free(cur);
-		f = xfopen_stdin(ffile);
-		while ((line = xmalloc_fgetline(f)) != NULL) {
-			llist_add_to(&pattern_head,
-				new_grep_list_data(line, ALLOCATED));
-		}
-	}
-}
-
-static int FAST_FUNC file_action_grep(const char *filename,
-			struct stat *statbuf UNUSED_PARAM,
-			void* matched,
-			int depth UNUSED_PARAM)
-{
-	FILE *file = fopen_for_read(filename);
-	if (file == NULL) {
-		if (!SUPPRESS_ERR_MSGS)
-			bb_simple_perror_msg(filename);
-		open_errors = 1;
-		return 0;
-	}
-	cur_file = filename;
-	*(int*)matched += grep_file(file);
-	fclose(file);
-	return 1;
-}
-
-static int grep_dir(const char *dir)
-{
-	int matched = 0;
-	recursive_action(dir,
-		/* recurse=yes */ ACTION_RECURSE |
-		/* followLinks=no */
-		/* depthFirst=yes */ ACTION_DEPTHFIRST,
-		/* fileAction= */ file_action_grep,
-		/* dirAction= */ NULL,
-		/* userData= */ &matched,
-		/* depth= */ 0);
-	return matched;
-}
-
-int grep_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int grep_main(int argc UNUSED_PARAM, char **argv)
-{
-	FILE *file;
-	int matched;
-	llist_t *fopt = NULL;
-
-	/* do normal option parsing */
-#if ENABLE_FEATURE_GREP_CONTEXT
-	int Copt;
-
-	/* -H unsets -h; -C unsets -A,-B; -e,-f are lists;
-	 * -m,-A,-B,-C have numeric param */
-	opt_complementary = "H-h:C-AB:e::f::m+:A+:B+:C+";
-	getopt32(argv,
-		OPTSTR_GREP,
-		&pattern_head, &fopt, &max_matches,
-		&lines_after, &lines_before, &Copt);
-
-	if (option_mask32 & OPT_C) {
-		/* -C unsets prev -A and -B, but following -A or -B
-		   may override it */
-		if (!(option_mask32 & OPT_A)) /* not overridden */
-			lines_after = Copt;
-		if (!(option_mask32 & OPT_B)) /* not overridden */
-			lines_before = Copt;
-	}
-	/* sanity checks */
-	if (option_mask32 & (OPT_c|OPT_q|OPT_l|OPT_L)) {
-		option_mask32 &= ~OPT_n;
-		lines_before = 0;
-		lines_after = 0;
-	} else if (lines_before > 0) {
-		before_buf = xzalloc(lines_before * sizeof(before_buf[0]));
-		IF_EXTRA_COMPAT(before_buf_size = xzalloc(lines_before * sizeof(before_buf_size[0]));)
-	}
-#else
-	/* with auto sanity checks */
-	/* -H unsets -h; -c,-q or -l unset -n; -e,-f are lists; -m N */
-	opt_complementary = "H-h:c-n:q-n:l-n:e::f::m+";
-	getopt32(argv, OPTSTR_GREP,
-		&pattern_head, &fopt, &max_matches);
-#endif
-	invert_search = ((option_mask32 & OPT_v) != 0); /* 0 | 1 */
-
-	if (pattern_head != NULL) {
-		/* convert char **argv to grep_list_data_t */
-		llist_t *cur;
-
-		for (cur = pattern_head; cur; cur = cur->link)
-			cur->data = new_grep_list_data(cur->data, 0);
-	}
-	if (option_mask32 & OPT_f)
-		load_regexes_from_file(fopt);
-
-	if (ENABLE_FEATURE_GREP_FGREP_ALIAS && applet_name[0] == 'f')
-		option_mask32 |= OPT_F;
-
-#if !ENABLE_EXTRA_COMPAT
-	if (!(option_mask32 & (OPT_o | OPT_w)))
-		reflags = REG_NOSUB;
-#endif
-
-	if (ENABLE_FEATURE_GREP_EGREP_ALIAS
-	 && (applet_name[0] == 'e' || (option_mask32 & OPT_E))
-	) {
-		reflags |= REG_EXTENDED;
-	}
-#if ENABLE_EXTRA_COMPAT
-	else {
-		reflags = RE_SYNTAX_GREP;
-	}
-#endif
-
-	if (option_mask32 & OPT_i) {
-#if !ENABLE_EXTRA_COMPAT
-		reflags |= REG_ICASE;
-#else
-		int i;
-		case_fold = xmalloc(256);
-		for (i = 0; i < 256; i++)
-			case_fold[i] = (unsigned char)i;
-		for (i = 'a'; i <= 'z'; i++)
-			case_fold[i] = (unsigned char)(i - ('a' - 'A'));
-#endif
-	}
-
-	argv += optind;
-
-	/* if we didn't get a pattern from -e and no command file was specified,
-	 * first parameter should be the pattern. no pattern, no worky */
-	if (pattern_head == NULL) {
-		char *pattern;
-		if (*argv == NULL)
-			bb_show_usage();
-		pattern = new_grep_list_data(*argv++, 0);
-		llist_add_to(&pattern_head, pattern);
-	}
-
-	/* argv[0..(argc-1)] should be names of file to grep through. If
-	 * there is more than one file to grep, we will print the filenames. */
-	if (argv[0] && argv[1])
-		print_filename = 1;
-	/* -H / -h of course override */
-	if (option_mask32 & OPT_H)
-		print_filename = 1;
-	if (option_mask32 & OPT_h)
-		print_filename = 0;
-
-	/* If no files were specified, or '-' was specified, take input from
-	 * stdin. Otherwise, we grep through all the files specified. */
-	matched = 0;
-	do {
-		cur_file = *argv;
-		file = stdin;
-		if (!cur_file || LONE_DASH(cur_file)) {
-			cur_file = "(standard input)";
-		} else {
-			if (option_mask32 & OPT_r) {
-				struct stat st;
-				if (stat(cur_file, &st) == 0 && S_ISDIR(st.st_mode)) {
-					if (!(option_mask32 & OPT_h))
-						print_filename = 1;
-					matched += grep_dir(cur_file);
-					goto grep_done;
-				}
-			}
-			/* else: fopen(dir) will succeed, but reading won't */
-			file = fopen_for_read(cur_file);
-			if (file == NULL) {
-				if (!SUPPRESS_ERR_MSGS)
-					bb_simple_perror_msg(cur_file);
-				open_errors = 1;
-				continue;
-			}
-		}
-		matched += grep_file(file);
-		fclose_if_not_stdin(file);
- grep_done: ;
-	} while (*argv && *++argv);
-
-	/* destroy all the elments in the pattern list */
-	if (ENABLE_FEATURE_CLEAN_UP) {
-		while (pattern_head) {
-			llist_t *pattern_head_ptr = pattern_head;
-			grep_list_data_t *gl = (grep_list_data_t *)pattern_head_ptr->data;
-
-			pattern_head = pattern_head->link;
-			if (gl->flg_mem_alocated_compiled & ALLOCATED)
-				free(gl->pattern);
-			if (gl->flg_mem_alocated_compiled & COMPILED)
-				regfree(&gl->compiled_regex);
-			free(gl);
-			free(pattern_head_ptr);
-		}
-	}
-	/* 0 = success, 1 = failed, 2 = error */
-	if (open_errors)
-		return 2;
-	return !matched; /* invert return value: 0 = success, 1 = failed */
-}
 
=== removed directory '.pc/grep-o-loop.patch/testsuite'
=== removed file '.pc/grep-o-loop.patch/testsuite/grep.tests'
--- .pc/grep-o-loop.patch/testsuite/grep.tests	2010-10-13 11:03:32 +0000
+++ .pc/grep-o-loop.patch/testsuite/grep.tests	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-#!/bin/sh
-
-# Copyright 2005 by Rob Landley <[e-mail]>
-# Licensed under GPL v2, see file LICENSE for details.
-
-# AUDIT:
-
-. ./testing.sh
-
-# testing "test name" "options" "expected result" "file input" "stdin"
-#   file input will be file called "input"
-#   test can create a file "actual" instead of writing to stdout
-
-# Test exit status
-
-testing "grep (exit with error)" "grep nonexistent 2> /dev/null ; echo \$?" \
-	"1\n" "" ""
-testing "grep (exit success)" "grep grep $0 > /dev/null 2>&1 ; echo \$?" "0\n" \
-	"" ""
-# Test various data sources and destinations
-
-testing "grep (default to stdin)" "grep two" "two\n" "" \
-	"one\ntwo\nthree\nthree\nthree\n"
-testing "grep - (specify stdin)" "grep two -" "two\n" "" \
-	"one\ntwo\nthree\nthree\nthree\n"
-testing "grep input (specify file)" "grep two input" "two\n" \
-	"one\ntwo\nthree\nthree\nthree\n" ""
-
-# GNU grep 2.5.3 outputs a new line character after the located string
-# even if there is no new line character in the input
-testing "grep (no newline at EOL)" "grep bug input" "bug\n" "bug" ""
-
->empty
-testing "grep two files" "grep two input empty 2>/dev/null" \
-	"input:two\n" "one\ntwo\nthree\nthree\nthree\n" ""
-rm empty
-
-testing "grep - infile (specify stdin and file)" "grep two - input" \
-	"(standard input):two\ninput:two\n" "one\ntwo\nthree\n" \
-	"one\ntwo\ntoo\nthree\nthree\n"
-
-# Check if we see the correct return value if both stdin and non-existing file
-# are given.
-testing "grep - nofile (specify stdin and nonexisting file)" \
-	"grep two - nonexistent 2> /dev/null ; echo \$?" \
-	"(standard input):two\n(standard input):two\n2\n" \
-	"" "one\ntwo\ntwo\nthree\nthree\nthree\n"
-testing "grep -q - nofile (specify stdin and nonexisting file, no match)" \
-	"grep -q nomatch - nonexistent 2> /dev/null ; echo \$?" \
-	"2\n" "" "one\ntwo\ntwo\nthree\nthree\nthree\n"
-# SUSv3: If the -q option is specified, the exit status shall be zero
-#        if an input line is selected, even if an error was detected.
-testing "grep -q - nofile (specify stdin and nonexisting file, match)" \
-	"grep -q two - nonexistent ; echo \$?" \
-	"0\n" "" "one\ntwo\ntwo\nthree\nthree\nthree\n"
-
-# Test various command line options
-# -s no error messages
-testing "grep -s nofile (nonexisting file, no match)" \
-	"grep -s nomatch nonexistent ; echo \$?" "2\n" "" ""
-testing "grep -s nofile - (stdin and nonexisting file, match)" \
-	"grep -s domatch nonexistent - ; echo \$?" \
-	"(standard input):domatch\n2\n" "" "nomatch\ndomatch\nend\n"
-
-optional EXTRA_COMPAT
-testing "grep handles NUL in files" "grep -a foo input" "\0foo\n" "\0foo\n\n" ""
-testing "grep handles NUL on stdin" "grep -a foo" "\0foo\n" "" "\0foo\n\n"
-
-testing "grep matches NUL" "grep . input > /dev/null 2>&1 ; echo \$?" \
-	"0\n" "\0\n" ""
-SKIP=
-
-# -e regex
-testing "grep handles multiple regexps" "grep -e one -e two input ; echo \$?" \
-	"one\ntwo\n0\n" "one\ntwo\n" ""
-testing "grep -F handles multiple expessions" "grep -F -e one -e two input ; echo \$?" \
-	"one\ntwo\n0\n" "one\ntwo\n" ""
-testing "grep -F handles -i" "grep -F -i foo input ; echo \$?" \
-	"FOO\n0\n" "FOO\n" ""
-
-# -f file/-
-testing "grep can read regexps from stdin" "grep -f - input ; echo \$?" \
-	"two\nthree\n0\n" "tw\ntwo\nthree\n" "tw.\nthr\n"
-
-optional FEATURE_GREP_EGREP_ALIAS
-testing "grep -E supports extended regexps" "grep -E fo+" "foo\n" "" \
-	"b\ar\nfoo\nbaz"
-testing "grep is also egrep" "egrep foo" "foo\n" "" "foo\nbar\n"
-testing "egrep is not case insensitive" \
-	"egrep foo ; [ \$? -ne 0 ] && echo yes" "yes\n" "" "FOO\n"
-testing "grep -E -o prints all matches" \
-	"grep -E -o '([[:xdigit:]]{2}[:-]){5}[[:xdigit:]]{2}'" \
-	"00:19:3E:00:AA:5E\n00:1D:60:3D:3A:FB\n00:22:43:49:FB:AA\n" \
-	"" "00:19:3E:00:AA:5E 00:1D:60:3D:3A:FB 00:22:43:49:FB:AA\n"
-SKIP=
-
-testing "grep -o does not loop forever" \
-	'grep -o "[^/]*$"' \
-	"test\n" \
-	"" "/var/test\n"
-
-exit $FAILCOUNT
 
=== removed directory '.pc/init-console-CRTSCTS.patch'
=== removed directory '.pc/init-console-CRTSCTS.patch/init'
=== removed file '.pc/init-console-CRTSCTS.patch/init/init.c'
--- .pc/init-console-CRTSCTS.patch/init/init.c	2010-10-21 16:17:03 +0000
+++ .pc/init-console-CRTSCTS.patch/init/init.c	1970-01-01 00:00:00 +0000
@@ -1,1047 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Mini init implementation for busybox
- *
- * Copyright (C) 1995, 1996 by Bruce Perens <[e-mail]>.
- * Copyright (C) 1999-2004 by Erik Andersen <[e-mail]>
- * Adjusted by so many folks, it's impossible to keep track.
- *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- */
-
-#include "libbb.h"
-#include <syslog.h>
-#include <paths.h>
-#include <sys/resource.h>
-#ifdef __linux__
-#include <linux/vt.h>
-#endif
-#if ENABLE_FEATURE_UTMP
-# include <utmp.h> /* DEAD_PROCESS */
-#endif
-#include "reboot.h" /* reboot() constants */
-
-/* Used only for sanitizing purposes in set_sane_term() below. On systems where
- * the baud rate is stored in a separate field, we can safely disable them. */
-#ifndef CBAUD
-# define CBAUD 0
-# define CBAUDEX 0
-#endif
-
-/* Was a CONFIG_xxx option. A lot of people were building
- * not fully functional init by switching it on! */
-#define DEBUG_INIT 0
-
-#define COMMAND_SIZE      256
-#define CONSOLE_NAME_SIZE 32
-
-/* Default sysinit script. */
-#ifndef INIT_SCRIPT
-#define INIT_SCRIPT  "/etc/init.d/rcS"
-#endif
-
-/* Each type of actions can appear many times. They will be
- * handled in order. RESTART is an exception, only 1st is used.
- */
-/* Start these actions first and wait for completion */
-#define SYSINIT     0x01
-/* Start these after SYSINIT and wait for completion */
-#define WAIT        0x02
-/* Start these after WAIT and *dont* wait for completion */
-#define ONCE        0x04
-/*
- * NB: while SYSINIT/WAIT/ONCE are being processed,
- * SIGHUP ("reread /etc/inittab") will be processed only after
- * each group of actions. If new inittab adds, say, a SYSINIT action,
- * it will not be run, since init is already "past SYSINIT stage".
- */
-/* Start these after ONCE are started, restart on exit */
-#define RESPAWN     0x08
-/* Like RESPAWN, but wait for <Enter> to be pressed on tty */
-#define ASKFIRST    0x10
-/*
- * Start these on SIGINT, and wait for completion.
- * Then go back to respawning RESPAWN and ASKFIRST actions.
- * NB: kernel sends SIGINT to us if Ctrl-Alt-Del was pressed.
- */
-#define CTRLALTDEL  0x20
-/*
- * Start these before killing all processes in preparation for
- * running RESTART actions or doing low-level halt/reboot/poweroff
- * (initiated by SIGUSR1/SIGTERM/SIGUSR2).
- * Wait for completion before proceeding.
- */
-#define SHUTDOWN    0x40
-/*
- * exec() on SIGQUIT. SHUTDOWN actions are started and waited for,
- * then all processes are killed, then init exec's 1st RESTART action,
- * replacing itself by it. If no RESTART action specified,
- * SIGQUIT has no effect.
- */
-#define RESTART     0x80
-
-
-/* A linked list of init_actions, to be read from inittab */
-struct init_action {
-	struct init_action *next;
-	pid_t pid;
-	uint8_t action_type;
-	char terminal[CONSOLE_NAME_SIZE];
-	char command[COMMAND_SIZE];
-};
-
-static struct init_action *init_action_list = NULL;
-
-static const char *log_console = VC_5;
-
-enum {
-	L_LOG = 0x1,
-	L_CONSOLE = 0x2,
-};
-
-/* Print a message to the specified device.
- * "where" may be bitwise-or'd from L_LOG | L_CONSOLE
- * NB: careful, we can be called after vfork!
- */
-#define dbg_message(...) do { if (DEBUG_INIT) message(__VA_ARGS__); } while (0)
-static void message(int where, const char *fmt, ...)
-	__attribute__ ((format(printf, 2, 3)));
-static void message(int where, const char *fmt, ...)
-{
-	va_list arguments;
-	unsigned l;
-	char msg[128];
-
-	msg[0] = '\r';
-	va_start(arguments, fmt);
-	l = 1 + vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments);
-	if (l > sizeof(msg) - 1)
-		l = sizeof(msg) - 1;
-	va_end(arguments);
-
-#if ENABLE_FEATURE_INIT_SYSLOG
-	msg[l] = '\0';
-	if (where & L_LOG) {
-		/* Log the message to syslogd */
-		openlog(applet_name, 0, LOG_DAEMON);
-		/* don't print "\r" */
-		syslog(LOG_INFO, "%s", msg + 1);
-		closelog();
-	}
-	msg[l++] = '\n';
-	msg[l] = '\0';
-#else
-	{
-		static int log_fd = -1;
-
-		msg[l++] = '\n';
-		msg[l] = '\0';
-		/* Take full control of the log tty, and never close it.
-		 * It's mine, all mine!  Muhahahaha! */
-		if (log_fd < 0) {
-			if (!log_console) {
-				log_fd = STDERR_FILENO;
-			} else {
-				log_fd = device_open(log_console, O_WRONLY | O_NONBLOCK | O_NOCTTY);
-				if (log_fd < 0) {
-					bb_error_msg("can't log to %s", log_console);
-					where = L_CONSOLE;
-				} else {
-					close_on_exec_on(log_fd);
-				}
-			}
-		}
-		if (where & L_LOG) {
-			full_write(log_fd, msg, l);
-			if (log_fd == STDERR_FILENO)
-				return; /* don't print dup messages */
-		}
-	}
-#endif
-
-	if (where & L_CONSOLE) {
-		/* Send console messages to console so people will see them. */
-		full_write(STDERR_FILENO, msg, l);
-	}
-}
-
-static void console_init(void)
-{
-#ifdef VT_OPENQRY
-	int vtno;
-#endif
-	char *s;
-
-	s = getenv("CONSOLE");
-	if (!s)
-		s = getenv("console");
-	if (s) {
-		int fd = open(s, O_RDWR | O_NONBLOCK | O_NOCTTY);
-		if (fd >= 0) {
-			dup2(fd, STDIN_FILENO);
-			dup2(fd, STDOUT_FILENO);
-			xmove_fd(fd, STDERR_FILENO);
-		}
-		dbg_message(L_LOG, "console='%s'", s);
-	} else {
-		/* Make sure fd 0,1,2 are not closed
-		 * (so that they won't be used by future opens) */
-		bb_sanitize_stdio();
-// Users report problems
-//		/* Make sure init can't be blocked by writing to stderr */
-//		fcntl(STDERR_FILENO, F_SETFL, fcntl(STDERR_FILENO, F_GETFL) | O_NONBLOCK);
-	}
-
-	s = getenv("TERM");
-#ifdef VT_OPENQRY
-	if (ioctl(STDIN_FILENO, VT_OPENQRY, &vtno) != 0) {
-		/* Not a linux terminal, probably serial console.
-		 * Force the TERM setting to vt102
-		 * if TERM is set to linux (the default) */
-		if (!s || strcmp(s, "linux") == 0)
-			putenv((char*)"TERM=vt102");
-		if (!ENABLE_FEATURE_INIT_SYSLOG)
-			log_console = NULL;
-	} else
-#endif
-	if (!s)
-		putenv((char*)"TERM=" CONFIG_INIT_TERMINAL_TYPE);
-}
-
-/* Set terminal settings to reasonable defaults.
- * NB: careful, we can be called after vfork! */
-static void set_sane_term(void)
-{
-	struct termios tty;
-
-	tcgetattr(STDIN_FILENO, &tty);
-
-	/* set control chars */
-	tty.c_cc[VINTR] = 3;	/* C-c */
-	tty.c_cc[VQUIT] = 28;	/* C-\ */
-	tty.c_cc[VERASE] = 127;	/* C-? */
-	tty.c_cc[VKILL] = 21;	/* C-u */
-	tty.c_cc[VEOF] = 4;	/* C-d */
-	tty.c_cc[VSTART] = 17;	/* C-q */
-	tty.c_cc[VSTOP] = 19;	/* C-s */
-	tty.c_cc[VSUSP] = 26;	/* C-z */
-
-#ifdef __linux__
-	/* use line discipline 0 */
-	tty.c_line = 0;
-#endif
-
-	/* Make it be sane */
-	tty.c_cflag &= CBAUD | CBAUDEX | CSIZE | CSTOPB | PARENB | PARODD;
-	tty.c_cflag |= CREAD | HUPCL | CLOCAL;
-
-	/* input modes */
-	tty.c_iflag = ICRNL | IXON | IXOFF;
-
-	/* output modes */
-	tty.c_oflag = OPOST | ONLCR;
-
-	/* local modes */
-	tty.c_lflag =
-		ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHOCTL | ECHOKE | IEXTEN;
-
-	tcsetattr_stdin_TCSANOW(&tty);
-}
-
-/* Open the new terminal device.
- * NB: careful, we can be called after vfork! */
-static int open_stdio_to_tty(const char* tty_name)
-{
-	/* empty tty_name means "use init's tty", else... */
-	if (tty_name[0]) {
-		int fd;
-
-		close(STDIN_FILENO);
-		/* fd can be only < 0 or 0: */
-		fd = device_open(tty_name, O_RDWR);
-		if (fd) {
-			message(L_LOG | L_CONSOLE, "can't open %s: %s",
-				tty_name, strerror(errno));
-			return 0; /* failure */
-		}
-		dup2(STDIN_FILENO, STDOUT_FILENO);
-		dup2(STDIN_FILENO, STDERR_FILENO);
-	}
-	set_sane_term();
-	return 1; /* success */
-}
-
-static void reset_sighandlers_and_unblock_sigs(void)
-{
-	bb_signals(0
-		+ (1 << SIGUSR1)
-		+ (1 << SIGUSR2)
-		+ (1 << SIGTERM)
-		+ (1 << SIGQUIT)
-		+ (1 << SIGINT)
-		+ (1 << SIGHUP)
-		+ (1 << SIGTSTP)
-		+ (1 << SIGSTOP)
-		, SIG_DFL);
-	sigprocmask_allsigs(SIG_UNBLOCK);
-}
-
-/* Wrapper around exec:
- * Takes string (max COMMAND_SIZE chars).
- * If chars like '>' detected, execs '[-]/bin/sh -c "exec ......."'.
- * Otherwise splits words on whitespace, deals with leading dash,
- * and uses plain exec().
- * NB: careful, we can be called after vfork!
- */
-static void init_exec(const char *command)
-{
-	char *cmd[COMMAND_SIZE / 2];
-	char buf[COMMAND_SIZE + 6];  /* COMMAND_SIZE+strlen("exec ")+1 */
-	int dash = (command[0] == '-' /* maybe? && command[1] == '/' */);
-
-	/* See if any special /bin/sh requiring characters are present */
-	if (strpbrk(command, "~`!$^&*()=|\\{}[];\"'<>?") != NULL) {
-		strcpy(buf, "exec ");
-		strcpy(buf + 5, command + dash); /* excluding "-" */
-		/* NB: LIBBB_DEFAULT_LOGIN_SHELL define has leading dash */
-		cmd[0] = (char*)(LIBBB_DEFAULT_LOGIN_SHELL + !dash);
-		cmd[1] = (char*)"-c";
-		cmd[2] = buf;
-		cmd[3] = NULL;
-	} else {
-		/* Convert command (char*) into cmd (char**, one word per string) */
-		char *word, *next;
-		int i = 0;
-		next = strcpy(buf, command); /* including "-" */
-		while ((word = strsep(&next, " \t")) != NULL) {
-			if (*word != '\0') { /* not two spaces/tabs together? */
-				cmd[i] = word;
-				i++;
-			}
-		}
-		cmd[i] = NULL;
-	}
-	/* If we saw leading "-", it is interactive shell.
-	 * Try harder to give it a controlling tty.
-	 * And skip "-" in actual exec call. */
-	if (dash) {
-		/* _Attempt_ to make stdin a controlling tty. */
-		if (ENABLE_FEATURE_INIT_SCTTY)
-			ioctl(STDIN_FILENO, TIOCSCTTY, 0 /*only try, don't steal*/);
-	}
-	BB_EXECVP(cmd[0] + dash, cmd);
-	message(L_LOG | L_CONSOLE, "can't run '%s': %s", cmd[0], strerror(errno));
-	/* returns if execvp fails */
-}
-
-/* Used only by run_actions */
-static pid_t run(const struct init_action *a)
-{
-	pid_t pid;
-
-	/* Careful: don't be affected by a signal in vforked child */
-	sigprocmask_allsigs(SIG_BLOCK);
-	if (BB_MMU && (a->action_type & ASKFIRST))
-		pid = fork();
-	else
-		pid = vfork();
-	if (pid < 0)
-		message(L_LOG | L_CONSOLE, "can't fork");
-	if (pid) {
-		sigprocmask_allsigs(SIG_UNBLOCK);
-		return pid; /* Parent or error */
-	}
-
-	/* Child */
-
-	/* Reset signal handlers that were set by the parent process */
-	reset_sighandlers_and_unblock_sigs();
-
-	/* Create a new session and make ourself the process group leader */
-	setsid();
-
-	/* Open the new terminal device */
-	if (!open_stdio_to_tty(a->terminal))
-		_exit(EXIT_FAILURE);
-
-	/* NB: on NOMMU we can't wait for input in child, so
-	 * "askfirst" will work the same as "respawn". */
-	if (BB_MMU && (a->action_type & ASKFIRST)) {
-		static const char press_enter[] ALIGN1 =
-#ifdef CUSTOMIZED_BANNER
-#include CUSTOMIZED_BANNER
-#endif
-			"\nPlease press Enter to activate this console. ";
-		char c;
-		/*
-		 * Save memory by not exec-ing anything large (like a shell)
-		 * before the user wants it. This is critical if swap is not
-		 * enabled and the system has low memory. Generally this will
-		 * be run on the second virtual console, and the first will
-		 * be allowed to start a shell or whatever an init script
-		 * specifies.
-		 */
-		dbg_message(L_LOG, "waiting for enter to start '%s'"
-					"(pid %d, tty '%s')\n",
-				a->command, getpid(), a->terminal);
-		full_write(STDOUT_FILENO, press_enter, sizeof(press_enter) - 1);
-		while (safe_read(STDIN_FILENO, &c, 1) == 1 && c != '\n')
-			continue;
-	}
-
-	/*
-	 * When a file named /.init_enable_core exists, setrlimit is called
-	 * before processes are spawned to set core file size as unlimited.
-	 * This is for debugging only.  Don't use this is production, unless
-	 * you want core dumps lying about....
-	 */
-	if (ENABLE_FEATURE_INIT_COREDUMPS) {
-		if (access("/.init_enable_core", F_OK) == 0) {
-			struct rlimit limit;
-			limit.rlim_cur = RLIM_INFINITY;
-			limit.rlim_max = RLIM_INFINITY;
-			setrlimit(RLIMIT_CORE, &limit);
-		}
-	}
-
-	/* Log the process name and args */
-	message(L_LOG, "starting pid %d, tty '%s': '%s'",
-			  getpid(), a->terminal, a->command);
-
-	/* Now run it.  The new program will take over this PID,
-	 * so nothing further in init.c should be run. */
-	init_exec(a->command);
-	/* We're still here?  Some error happened. */
-	_exit(-1);
-}
-
-static struct init_action *mark_terminated(pid_t pid)
-{
-	struct init_action *a;
-
-	if (pid > 0) {
-		for (a = init_action_list; a; a = a->next) {
-			if (a->pid == pid) {
-				a->pid = 0;
-				return a;
-			}
-		}
-		update_utmp(pid, DEAD_PROCESS, /*tty_name:*/ NULL, /*username:*/ NULL, /*hostname:*/ NULL);
-	}
-	return NULL;
-}
-
-static void waitfor(pid_t pid)
-{
-	/* waitfor(run(x)): protect against failed fork inside run() */
-	if (pid <= 0)
-		return;
-
-	/* Wait for any child (prevent zombies from exiting orphaned processes)
-	 * but exit the loop only when specified one has exited. */
-	while (1) {
-		pid_t wpid = wait(NULL);
-		mark_terminated(wpid);
-		/* Unsafe. SIGTSTP handler might have wait'ed it already */
-		/*if (wpid == pid) break;*/
-		/* More reliable: */
-		if (kill(pid, 0))
-			break;
-	}
-}
-
-/* Run all commands of a particular type */
-static void run_actions(int action_type)
-{
-	struct init_action *a;
-
-	for (a = init_action_list; a; a = a->next) {
-		if (!(a->action_type & action_type))
-			continue;
-		if (a->terminal[0] && access(a->terminal, R_OK | W_OK))
-			continue;
-
-		if (a->action_type & (SYSINIT | WAIT | ONCE | CTRLALTDEL | SHUTDOWN)) {
-			pid_t pid = run(a);
-			if (a->action_type & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN))
-				waitfor(pid);
-		}
-		if (a->action_type & (RESPAWN | ASKFIRST)) {
-			/* Only run stuff with pid == 0. If pid != 0,
-			 * it is already running
-			 */
-			if (a->pid == 0)
-				a->pid = run(a);
-		}
-	}
-}
-
-static void new_init_action(uint8_t action_type, const char *command, const char *cons)
-{
-	struct init_action *a, **nextp;
-
-	/* Scenario:
-	 * old inittab:
-	 * ::shutdown:umount -a -r
-	 * ::shutdown:swapoff -a
-	 * new inittab:
-	 * ::shutdown:swapoff -a
-	 * ::shutdown:umount -a -r
-	 * On reload, we must ensure entries end up in correct order.
-	 * To achieve that, if we find a matching entry, we move it
-	 * to the end.
-	 */
-	nextp = &init_action_list;
-	while ((a = *nextp) != NULL) {
-		/* Don't enter action if it's already in the list,
-		 * This prevents losing running RESPAWNs.
-		 */
-		if (strcmp(a->command, command) == 0
-		 && strcmp(a->terminal, cons) == 0
-		) {
-			/* Remove from list */
-			*nextp = a->next;
-			/* Find the end of the list */
-			while (*nextp != NULL)
-				nextp = &(*nextp)->next;
-			a->next = NULL;
-			break;
-		}
-		nextp = &a->next;
-	}
-
-	if (!a)
-		a = xzalloc(sizeof(*a));
-	/* Append to the end of the list */
-	*nextp = a;
-	a->action_type = action_type;
-	safe_strncpy(a->command, command, sizeof(a->command));
-	safe_strncpy(a->terminal, cons, sizeof(a->terminal));
-	dbg_message(L_LOG | L_CONSOLE, "command='%s' action=%d tty='%s'\n",
-		a->command, a->action_type, a->terminal);
-}
-
-/* NOTE that if CONFIG_FEATURE_USE_INITTAB is NOT defined,
- * then parse_inittab() simply adds in some default
- * actions(i.e., runs INIT_SCRIPT and then starts a pair
- * of "askfirst" shells).  If CONFIG_FEATURE_USE_INITTAB
- * _is_ defined, but /etc/inittab is missing, this
- * results in the same set of default behaviors.
- */
-static void parse_inittab(void)
-{
-#if ENABLE_FEATURE_USE_INITTAB
-	char *token[4];
-	parser_t *parser = config_open2("/etc/inittab", fopen_for_read);
-
-	if (parser == NULL)
-#endif
-	{
-		/* No inittab file - set up some default behavior */
-		/* Reboot on Ctrl-Alt-Del */
-		new_init_action(CTRLALTDEL, "reboot", "");
-		/* Umount all filesystems on halt/reboot */
-		new_init_action(SHUTDOWN, "umount -a -r", "");
-		/* Swapoff on halt/reboot */
-		if (ENABLE_SWAPONOFF)
-			new_init_action(SHUTDOWN, "swapoff -a", "");
-		/* Prepare to restart init when a QUIT is received */
-		new_init_action(RESTART, "init", "");
-		/* Askfirst shell on tty1-4 */
-		new_init_action(ASKFIRST, bb_default_login_shell, "");
-//TODO: VC_1 instead of ""? "" is console -> ctty problems -> angry users
-		new_init_action(ASKFIRST, bb_default_login_shell, VC_2);
-		new_init_action(ASKFIRST, bb_default_login_shell, VC_3);
-		new_init_action(ASKFIRST, bb_default_login_shell, VC_4);
-		/* sysinit */
-		new_init_action(SYSINIT, INIT_SCRIPT, "");
-		return;
-	}
-
-#if ENABLE_FEATURE_USE_INITTAB
-	/* optional_tty:ignored_runlevel:action:command
-	 * Delims are not to be collapsed and need exactly 4 tokens
-	 */
-	while (config_read(parser, token, 4, 0, "#:",
-				PARSE_NORMAL & ~(PARSE_TRIM | PARSE_COLLAPSE))) {
-		/* order must correspond to SYSINIT..RESTART constants */
-		static const char actions[] ALIGN1 =
-			"sysinit\0""wait\0""once\0""respawn\0""askfirst\0"
-			"ctrlaltdel\0""shutdown\0""restart\0";
-		int action;
-		char *tty = token[0];
-
-		if (!token[3]) /* less than 4 tokens */
-			goto bad_entry;
-		action = index_in_strings(actions, token[2]);
-		if (action < 0 || !token[3][0]) /* token[3]: command */
-			goto bad_entry;
-		/* turn .*TTY -> /dev/TTY */
-		if (tty[0]) {
-			tty = concat_path_file("/dev/", skip_dev_pfx(tty));
-		}
-		new_init_action(1 << action, token[3], tty);
-		if (tty[0])
-			free(tty);
-		continue;
- bad_entry:
-		message(L_LOG | L_CONSOLE, "Bad inittab entry at line %d",
-				parser->lineno);
-	}
-	config_close(parser);
-#endif
-}
-
-static void pause_and_low_level_reboot(unsigned magic) NORETURN;
-static void pause_and_low_level_reboot(unsigned magic)
-{
-	pid_t pid;
-
-	/* Allow time for last message to reach serial console, etc */
-	sleep(1);
-
-	/* We have to fork here, since the kernel calls do_exit(EXIT_SUCCESS)
-	 * in linux/kernel/sys.c, which can cause the machine to panic when
-	 * the init process exits... */
-	pid = vfork();
-	if (pid == 0) { /* child */
-		reboot(magic);
-		_exit(EXIT_SUCCESS);
-	}
-	while (1)
-		sleep(1);
-}
-
-static void run_shutdown_and_kill_processes(void)
-{
-	/* Run everything to be run at "shutdown".  This is done _prior_
-	 * to killing everything, in case people wish to use scripts to
-	 * shut things down gracefully... */
-	run_actions(SHUTDOWN);
-
-	message(L_CONSOLE | L_LOG, "The system is going down NOW!");
-
-	/* Send signals to every process _except_ pid 1 */
-	kill(-1, SIGTERM);
-	message(L_CONSOLE | L_LOG, "Sent SIG%s to all processes", "TERM");
-	sync();
-	sleep(1);
-
-	kill(-1, SIGKILL);
-	message(L_CONSOLE, "Sent SIG%s to all processes", "KILL");
-	sync();
-	/*sleep(1); - callers take care about making a pause */
-}
-
-/* Signal handling by init:
- *
- * For process with PID==1, on entry kernel sets all signals to SIG_DFL
- * and unmasks all signals. However, for process with PID==1,
- * default action (SIG_DFL) on any signal is to ignore it,
- * even for special signals SIGKILL and SIGCONT.
- * Also, any signal can be caught or blocked.
- * (but SIGSTOP is still handled specially, at least in 2.6.20)
- *
- * We install two kinds of handlers, "immediate" and "delayed".
- *
- * Immediate handlers execute at any time, even while, say, sysinit
- * is running.
- *
- * Delayed handlers just set a flag variable. The variable is checked
- * in the main loop and acted upon.
- *
- * halt/poweroff/reboot and restart have immediate handlers.
- * They only traverse linked list of struct action's, never modify it,
- * this should be safe to do even in signal handler. Also they
- * never return.
- *
- * SIGSTOP and SIGTSTP have immediate handlers. They just wait
- * for SIGCONT to happen.
- *
- * SIGHUP has a delayed handler, because modifying linked list
- * of struct action's from a signal handler while it is manipulated
- * by the program may be disastrous.
- *
- * Ctrl-Alt-Del has a delayed handler. Not a must, but allowing
- * it to happen even somewhere inside "sysinit" would be a bit awkward.
- *
- * There is a tiny probability that SIGHUP and Ctrl-Alt-Del will collide
- * and only one will be remembered and acted upon.
- */
-
-/* The SIGUSR[12]/SIGTERM handler */
-static void halt_reboot_pwoff(int sig) NORETURN;
-static void halt_reboot_pwoff(int sig)
-{
-	const char *m;
-	unsigned rb;
-
-	/* We may call run() and it unmasks signals,
-	 * including the one masked inside this signal handler.
-	 * Testcase which would start multiple reboot scripts:
-	 *  while true; do reboot; done
-	 * Preventing it:
-	 */
-	reset_sighandlers_and_unblock_sigs();
-
-	run_shutdown_and_kill_processes();
-
-	m = "halt";
-	rb = RB_HALT_SYSTEM;
-	if (sig == SIGTERM) {
-		m = "reboot";
-		rb = RB_AUTOBOOT;
-	} else if (sig == SIGUSR2) {
-		m = "poweroff";
-		rb = RB_POWER_OFF;
-	}
-	message(L_CONSOLE, "Requesting system %s", m);
-	pause_and_low_level_reboot(rb);
-	/* not reached */
-}
-
-/* Handler for QUIT - exec "restart" action,
- * else (no such action defined) do nothing */
-static void restart_handler(int sig UNUSED_PARAM)
-{
-	struct init_action *a;
-
-	for (a = init_action_list; a; a = a->next) {
-		if (!(a->action_type & RESTART))
-			continue;
-
-		/* Starting from here, we won't return.
-		 * Thus don't need to worry about preserving errno
-		 * and such.
-		 */
-
-		reset_sighandlers_and_unblock_sigs();
-
-		run_shutdown_and_kill_processes();
-
-#ifdef RB_ENABLE_CAD
-		/* Allow Ctrl-Alt-Del to reboot the system.
-		 * This is how kernel sets it up for init, we follow suit.
-		 */
-		reboot(RB_ENABLE_CAD); /* misnomer */
-#endif
-
-		if (open_stdio_to_tty(a->terminal)) {
-			dbg_message(L_CONSOLE, "Trying to re-exec %s", a->command);
-			/* Theoretically should be safe.
-			 * But in practice, kernel bugs may leave
-			 * unkillable processes, and wait() may block forever.
-			 * Oh well. Hoping "new" init won't be too surprised
-			 * by having children it didn't create.
-			 */
-			//while (wait(NULL) > 0)
-			//	continue;
-			init_exec(a->command);
-		}
-		/* Open or exec failed */
-		pause_and_low_level_reboot(RB_HALT_SYSTEM);
-		/* not reached */
-	}
-}
-
-/* The SIGSTOP/SIGTSTP handler
- * NB: inside it, all signals except SIGCONT are masked
- * via appropriate setup in sigaction().
- */
-static void stop_handler(int sig UNUSED_PARAM)
-{
-	smallint saved_bb_got_signal;
-	int saved_errno;
-
-	saved_bb_got_signal = bb_got_signal;
-	saved_errno = errno;
-	signal(SIGCONT, record_signo);
-
-	while (1) {
-		pid_t wpid;
-
-		if (bb_got_signal == SIGCONT)
-			break;
-		/* NB: this can accidentally wait() for a process
-		 * which we waitfor() elsewhere! waitfor() must have
-		 * code which is resilient against this.
-		 */
-		wpid = wait_any_nohang(NULL);
-		mark_terminated(wpid);
-		sleep(1);
-	}
-
-	signal(SIGCONT, SIG_DFL);
-	errno = saved_errno;
-	bb_got_signal = saved_bb_got_signal;
-}
-
-#if ENABLE_FEATURE_USE_INITTAB
-static void reload_inittab(void)
-{
-	struct init_action *a, **nextp;
-
-	message(L_LOG, "reloading /etc/inittab");
-
-	/* Disable old entries */
-	for (a = init_action_list; a; a = a->next)
-		a->action_type = 0;
-
-	/* Append new entries, or modify existing entries
-	 * (incl. setting a->action_type) if cmd and device name
-	 * match new ones. End result: only entries with
-	 * a->action_type == 0 are stale.
-	 */
-	parse_inittab();
-
-#if ENABLE_FEATURE_KILL_REMOVED
-	/* Kill stale entries */
-	/* Be nice and send SIGTERM first */
-	for (a = init_action_list; a; a = a->next)
-		if (a->action_type == 0 && a->pid != 0)
-			kill(a->pid, SIGTERM);
-	if (CONFIG_FEATURE_KILL_DELAY) {
-		/* NB: parent will wait in NOMMU case */
-		if ((BB_MMU ? fork() : vfork()) == 0) { /* child */
-			sleep(CONFIG_FEATURE_KILL_DELAY);
-			for (a = init_action_list; a; a = a->next)
-				if (a->action_type == 0 && a->pid != 0)
-					kill(a->pid, SIGKILL);
-			_exit(EXIT_SUCCESS);
-		}
-	}
-#endif
-
-	/* Remove stale entries and SYSINIT entries.
-	 * We never rerun SYSINIT entries anyway,
-	 * removing them too saves a few bytes */
-	nextp = &init_action_list;
-	while ((a = *nextp) != NULL) {
-		if ((a->action_type & ~SYSINIT) == 0) {
-			*nextp = a->next;
-			free(a);
-		} else {
-			nextp = &a->next;
-		}
-	}
-
-	/* Not needed: */
-	/* run_actions(RESPAWN | ASKFIRST); */
-	/* - we return to main loop, which does this automagically */
-}
-#endif
-
-static int check_delayed_sigs(void)
-{
-	int sigs_seen = 0;
-
-	while (1) {
-		smallint sig = bb_got_signal;
-