Convert utility.c into libbb.a. It is now a whole pile of .c

files.  Clean up the resulting damage and fix up the makefile.
 -Erik

47 files changed, 3901 insertions, 2254 deletions

diff --git a/Makefile b/Makefile
index 8af079062..5f5c80e6d 100644
--- a/Makefile
+++ b/Makefile
@@ -200,7 +200,7 @@ endif
 # And option 4:
 -include applet_source_list
 
-OBJECTS   = $(APPLET_SOURCES:.c=.o) busybox.o messages.o usage.o utility.o
+OBJECTS   = $(APPLET_SOURCES:.c=.o) busybox.o messages.o usage.o applets.o mtab_file.o
 CFLAGS    += $(CROSS_CFLAGS)
 CFLAGS    += -DBB_VER='"$(VERSION)"'
 CFLAGS    += -DBB_BT='"$(BUILDTIME)"'
@@ -220,6 +220,21 @@ ifneq ($(strip $(USE_SYSTEM_PWD_GRP)),true)
 else
     CFLAGS    += -DUSE_SYSTEM_PWD_GRP
 endif
+    
+LIBBB	  = libbb
+LIBBB_DIR = $(BB_SRC_DIR:=/)$(LIBBB)
+LIBBB_LIB = libbb.a
+LIBBB_CSRC= ask_confirmation.c check_wildcard_match.c chomp.c copy_file.c \
+copy_file_chunk.c create_path.c device_open.c error_msg.c \
+find_mount_point.c find_pid_by_name.c find_root_device.c full_read.c \
+full_write.c get_console.c get_last_path_component.c get_line_from_file.c \
+human_readable.c inode_hash.c isdirectory.c kernel_version.c loop.c \
+mode_string.c parse_mode.c parse_number.c print_file.c process_escape_sequence.c \
+pwd_grp_wrappers.c recursive_action.c safe_read.c safe_strncpy.c syscalls.c \
+syslog_msg_with_name.c time_string.c trim.c vdprintf.c wfopen.c xfuncs.c \
+xregcomp.c 
+LIBBB_OBJS=$(patsubst %.c,$(LIBBB)/%.o, $(LIBBB_CSRC))
+LIBBB_CFLAGS = -I$(LIBBB_DIR)
 
 # Put user-supplied flags at the end, where they
 # have a chance of winning.
@@ -288,8 +303,8 @@ docs/busybox/busyboxdocumentation.html: docs/busybox.sgml
 	(cd docs/busybox.lineo.com; sgmltools -b html ../busybox.sgml)
 
 
-busybox: $(PWD_LIB) $(OBJECTS) 
-	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBRARIES) $(PWD_LIB)
+busybox: $(PWD_LIB) $(LIBBB_LIB) $(OBJECTS) 
+	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBRARIES) $(PWD_LIB) $(LIBBB_LIB)
 	$(STRIP)
 
 # Without VPATH, rule expands to "/bin/sh busybox.mkll Config.h applets.h"
@@ -307,14 +322,21 @@ $(PWD_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile
 	- mkdir -p $(PWD_GRP)
 	$(CC) $(CFLAGS) $(PWD_CFLAGS) -c $< -o $*.o
 
+$(LIBBB_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile
+	- mkdir -p $(LIBBB)
+	$(CC) $(CFLAGS) $(LIBBB_CFLAGS) -c $< -o $*.o
+
 libpwd.a: $(PWD_OBJS)
 	$(AR) $(ARFLAGS) $@ $^
 
+libbb.a: $(LIBBB_OBJS)
+	$(AR) $(ARFLAGS) $@ $^
+
 usage.o: usage.h
 
-utility.o: loop.h
+libbb/loop.o: libbb/loop.h
 
-loop.h: mk_loop_h.sh
+libbb/loop.h: mk_loop_h.sh
 	@ $(SHELL) $< > $@
 
 test tests:
@@ -330,8 +352,8 @@ clean:
 	- rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
 	    docs/busybox.pdf docs/busybox.lineo.com/busybox.html
 	- rm -f multibuild.log Config.h.orig
-	- rm -rf docs/busybox _install libpwd.a
-	- rm -f busybox.links loop.h *~ slist.mk core applet_source_list
+	- rm -rf docs/busybox _install libpwd.a libbb.a
+	- rm -f busybox.links libbb/loop.h *~ slist.mk core applet_source_list
 	- find -name \*.o -exec rm -f {} \;
 
 distclean: clean
diff --git a/applets.c b/applets.c
new file mode 100644
index 000000000..1e31e8925
--- /dev/null
+++ b/applets.c
@@ -0,0 +1,92 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "busybox.h"
+
+#define bb_need_full_version
+#define BB_DECLARE_EXTERN
+#include "messages.c"
+
+struct BB_applet *applet_using;
+
+extern void show_usage(void)
+{
+	const char *format_string;
+	const char *usage_string = usage_messages;
+	int i;
+
+	for (i = applet_using - applets; i > 0; ) {
+		if (!*usage_string++) {
+			--i;
+		}
+	}
+	format_string = "%s\n\nUsage: %s %s\n\n";
+	if(*usage_string == 0)
+		format_string = "%s\n\nNo help available.\n\n";
+	fprintf(stderr, format_string,
+			full_version, applet_using->name, usage_string);
+	exit(EXIT_FAILURE);
+}
+
+static int applet_name_compare(const void *x, const void *y)
+{
+	const char *name = x;
+	const struct BB_applet *applet = y;
+
+	return strcmp(name, applet->name);
+}
+
+extern size_t NUM_APPLETS;
+
+struct BB_applet *find_applet_by_name(const char *name)
+{
+	return bsearch(name, applets, NUM_APPLETS, sizeof(struct BB_applet),
+			applet_name_compare);
+}
+
+void run_applet_by_name(const char *name, int argc, char **argv)
+{
+	/* Do a binary search to find the applet entry given the name. */
+	if ((applet_using = find_applet_by_name(name)) != NULL) {
+		applet_name = applet_using->name;
+		if (argv[1] && strcmp(argv[1], "--help") == 0)
+			show_usage();
+		exit((*(applet_using->main)) (argc, argv));
+	}
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/applets/applets.c b/applets/applets.c
new file mode 100644
index 000000000..1e31e8925
--- /dev/null
+++ b/applets/applets.c
@@ -0,0 +1,92 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "busybox.h"
+
+#define bb_need_full_version
+#define BB_DECLARE_EXTERN
+#include "messages.c"
+
+struct BB_applet *applet_using;
+
+extern void show_usage(void)
+{
+	const char *format_string;
+	const char *usage_string = usage_messages;
+	int i;
+
+	for (i = applet_using - applets; i > 0; ) {
+		if (!*usage_string++) {
+			--i;
+		}
+	}
+	format_string = "%s\n\nUsage: %s %s\n\n";
+	if(*usage_string == 0)
+		format_string = "%s\n\nNo help available.\n\n";
+	fprintf(stderr, format_string,
+			full_version, applet_using->name, usage_string);
+	exit(EXIT_FAILURE);
+}
+
+static int applet_name_compare(const void *x, const void *y)
+{
+	const char *name = x;
+	const struct BB_applet *applet = y;
+
+	return strcmp(name, applet->name);
+}
+
+extern size_t NUM_APPLETS;
+
+struct BB_applet *find_applet_by_name(const char *name)
+{
+	return bsearch(name, applets, NUM_APPLETS, sizeof(struct BB_applet),
+			applet_name_compare);
+}
+
+void run_applet_by_name(const char *name, int argc, char **argv)
+{
+	/* Do a binary search to find the applet entry given the name. */
+	if ((applet_using = find_applet_by_name(name)) != NULL) {
+		applet_name = applet_using->name;
+		if (argv[1] && strcmp(argv[1], "--help") == 0)
+			show_usage();
+		exit((*(applet_using->main)) (argc, argv));
+	}
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/busybox.h b/busybox.h
index 194fd8220..9414234c7 100644
--- a/busybox.h
+++ b/busybox.h
@@ -44,31 +44,6 @@ typedef unsigned int socklen_t;
 #endif	
 
 
-/* Some useful definitions */
-#define FALSE   ((int) 0)
-#define TRUE    ((int) 1)
-#define SKIP	((int) 2)
-
-/* for mtab.c */
-#define MTAB_GETMOUNTPT '1'
-#define MTAB_GETDEVICE  '2'
-
-#define BUF_SIZE        8192
-#define EXPAND_ALLOC    1024
-
-static inline int is_decimal(ch) { return ((ch >= '0') && (ch <= '9')); }
-static inline int is_octal(ch)   { return ((ch >= '0') && (ch <= '7')); }
-
-/* Macros for min/max.  */
-#ifndef MIN
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-#endif
-
-#ifndef MAX
-#define	MAX(a,b) (((a)>(b))?(a):(b))
-#endif
-
-
 enum Location {
 	_BB_DIR_ROOT = 0,
 	_BB_DIR_BIN,
@@ -97,146 +72,14 @@ extern const struct BB_applet applets[];
 
 extern const char *applet_name;
 
-extern void show_usage(void) __attribute__ ((noreturn));
-extern void error_msg(const char *s, ...);
-extern void error_msg_and_die(const char *s, ...) __attribute__ ((noreturn));
-extern void perror_msg(const char *s, ...);
-extern void perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn));
-
-const char *mode_string(int mode);
-const char *time_string(time_t timeVal);
-int is_directory(const char *name, const int followLinks, struct stat *statBuf);
-int isDevice(const char *name);
-
-typedef struct ino_dev_hash_bucket_struct {
-  struct ino_dev_hash_bucket_struct *next;
-  ino_t ino;
-  dev_t dev;
-  char name[1];
-} ino_dev_hashtable_bucket_t;
-int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name);
-void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name);
-void reset_ino_dev_hashtable(void);
-
-int copy_file(const char *srcName, const char *destName,
-		 int setModes, int followLinks, int forceFlag);
-int copy_file_chunk(int srcFd, int dstFd, size_t remaining);
-char *buildName(const char *dirName, const char *fileName);
-int makeString(int argc, const char **argv, char *buf, int bufLen);
-char *getChunk(int size);
-char *chunkstrdup(const char *str);
-void freeChunks(void);
-ssize_t safe_read(int fd, void *buf, size_t count);
-int full_write(int fd, const char *buf, int len);
-int full_read(int fd, char *buf, int len);
-int recursive_action(const char *fileName, int recurse, int followLinks, int depthFirst,
-	  int (*fileAction) (const char *fileName, struct stat* statbuf, void* userData),
-	  int (*dirAction) (const char *fileName, struct stat* statbuf, void* userData),
-	  void* userData);
-
-extern int create_path (const char *name, int mode);
-extern int parse_mode( const char* s, mode_t* theMode);
-
-extern int get_kernel_revision(void);
-
-extern int get_console_fd(char* tty_name);
-extern struct mntent *find_mount_point(const char *name, const char *table);
-extern void write_mtab(char* blockDevice, char* directory, 
-	char* filesystemType, long flags, char* string_flags);
-extern void erase_mtab(const char * name);
-extern void mtab_read(void);
-extern char *mtab_first(void **iter);
-extern char *mtab_next(void **iter);
-extern char *mtab_getinfo(const char *match, const char which);
-extern int check_wildcard_match(const char* text, const char* pattern);
-extern long atoi_w_units (const char *cp);
-extern pid_t* find_pid_by_name( char* pidName);
-extern int find_real_root_device_name(char* name);
-extern char *get_line_from_file(FILE *file);
-extern void print_file(FILE *file);
-extern int print_file_by_name(char *filename);
-extern char process_escape_sequence(char **ptr);
-extern char *get_last_path_component(char *path);
-extern FILE *wfopen(const char *path, const char *mode);
-extern FILE *xfopen(const char *path, const char *mode);
-extern void chomp(char *s);
-extern void trim(char *s);
-extern struct BB_applet *find_applet_by_name(const char *name);
-void run_applet_by_name(const char *name, int argc, char **argv);
-
-#ifndef DMALLOC
-extern void *xmalloc (size_t size);
-extern void *xrealloc(void *old, size_t size);
-extern void *xcalloc(size_t nmemb, size_t size);
-extern char *xstrdup (const char *s);
-#endif
-extern char *xstrndup (const char *s, int n);
-extern char * safe_strncpy(char *dst, const char *src, size_t size);
-
-struct suffix_mult {
-	char *suffix;
-	int mult;
-};
-
-extern unsigned long parse_number(const char *numstr,
-		const struct suffix_mult *suffixes);
-
-
-/* These parse entries in /etc/passwd and /etc/group.  This is desirable
- * for BusyBox since we want to avoid using the glibc NSS stuff, which
- * increases target size and is often not needed embedded systems.  */
-extern long my_getpwnam(const char *name);
-extern long my_getgrnam(const char *name);
-extern void my_getpwuid(char *name, long uid);
-extern void my_getgrgid(char *group, long gid);
-extern long my_getpwnamegid(const char *name);
-
-extern int device_open(char *device, int mode);
-
-#if defined BB_FEATURE_MOUNT_LOOP
-extern int del_loop(const char *device);
-extern int set_loop(const char *device, const char *file, int offset, int *loopro);
-extern char *find_unused_loop_device (void);
-#endif
-
-
-#if (__GLIBC__ < 2) && (defined BB_SYSLOGD || defined BB_INIT)
-extern int vdprintf(int d, const char *format, va_list ap);
-#endif
-
-#if defined BB_NFSMOUNT
-int nfsmount(const char *spec, const char *node, int *flags,
-	     char **extra_opts, char **mount_opts, int running_bg);
-#endif
-
-#ifndef RB_POWER_OFF
-/* Stop system and switch power off if possible.  */
-#define RB_POWER_OFF   0x4321fedc
-#endif
-
-#if defined(BB_KLOGD) || defined(BB_LOGGER)
-void syslog_msg_with_name(const char *name, int facility, int pri, const char *msg);
-void syslog_msg(int facility, int pri, const char *msg);
+#ifdef BB_FEATURE_BUFFERS_GO_ON_STACK
+#define RESERVE_BB_BUFFER(buffer,len)           char buffer[len]
+#define RESERVE_BB_UBUFFER(buffer,len) unsigned char buffer[len]
+#else
+#define RESERVE_BB_BUFFER(buffer,len)           char *buffer=xmalloc(len)
+#define RESERVE_BB_UBUFFER(buffer,len) unsigned char *buffer=xmalloc(len)
 #endif
 
-/* Include our own copy of struct sysinfo to avoid binary compatability
- * problems with Linux 2.4, which changed things.  Grumble, grumble. */
-struct sysinfo {
-	long uptime;			/* Seconds since boot */
-	unsigned long loads[3];		/* 1, 5, and 15 minute load averages */
-	unsigned long totalram;		/* Total usable main memory size */
-	unsigned long freeram;		/* Available memory size */
-	unsigned long sharedram;	/* Amount of shared memory */
-	unsigned long bufferram;	/* Memory used by buffers */
-	unsigned long totalswap;	/* Total swap space size */
-	unsigned long freeswap;		/* swap space still available */
-	unsigned short procs;		/* Number of current processes */
-	unsigned long totalhigh;	/* Total high memory size */
-	unsigned long freehigh;		/* Available high memory size */
-	unsigned int mem_unit;		/* Memory unit size in bytes */
-	char _f[20-2*sizeof(long)-sizeof(int)];	/* Padding: libc5 uses this.. */
-};
-extern int sysinfo (struct sysinfo* info);
 
 /* Bit map related macros -- libc5 doens't provide these... sigh.  */
 #ifndef setbit
@@ -247,25 +90,15 @@ extern int sysinfo (struct sysinfo* info);
 #define isclr(a,i)      (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
 #endif
 
-#ifdef BB_FEATURE_HUMAN_READABLE
-const char *make_human_readable_str(unsigned long val, unsigned long hr);
+#ifndef RB_POWER_OFF
+/* Stop system and switch power off if possible.  */
+#define RB_POWER_OFF   0x4321fedc
 #endif
-enum {
-	KILOBYTE = 1024,
-	MEGABYTE = (KILOBYTE*1024),
-	GIGABYTE = (MEGABYTE*1024)
-};
 
-#ifdef BB_FEATURE_BUFFERS_GO_ON_STACK
-#define RESERVE_BB_BUFFER(buffer,len)           char buffer[len]
-#define RESERVE_BB_UBUFFER(buffer,len) unsigned char buffer[len]
-#else
-#define RESERVE_BB_BUFFER(buffer,len)           char *buffer=xmalloc(len)
-#define RESERVE_BB_UBUFFER(buffer,len) unsigned char *buffer=xmalloc(len)
-#endif
 
-#if defined(BB_FEATURE_RM_INTERACTIVE) && defined(BB_RM)
-int ask_confirmation(void);
-#endif
+/* Pull in the utility routines from libbb */
+#include "libbb/libbb.h"
+
+
 
 #endif /* _BB_INTERNAL_H_ */
diff --git a/include/busybox.h b/include/busybox.h
index 194fd8220..9414234c7 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -44,31 +44,6 @@ typedef unsigned int socklen_t;
 #endif	
 
 
-/* Some useful definitions */
-#define FALSE   ((int) 0)
-#define TRUE    ((int) 1)
-#define SKIP	((int) 2)
-
-/* for mtab.c */
-#define MTAB_GETMOUNTPT '1'
-#define MTAB_GETDEVICE  '2'
-
-#define BUF_SIZE        8192
-#define EXPAND_ALLOC    1024
-
-static inline int is_decimal(ch) { return ((ch >= '0') && (ch <= '9')); }
-static inline int is_octal(ch)   { return ((ch >= '0') && (ch <= '7')); }
-
-/* Macros for min/max.  */
-#ifndef MIN
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-#endif
-
-#ifndef MAX
-#define	MAX(a,b) (((a)>(b))?(a):(b))
-#endif
-
-
 enum Location {
 	_BB_DIR_ROOT = 0,
 	_BB_DIR_BIN,
@@ -97,146 +72,14 @@ extern const struct BB_applet applets[];
 
 extern const char *applet_name;
 
-extern void show_usage(void) __attribute__ ((noreturn));
-extern void error_msg(const char *s, ...);
-extern void error_msg_and_die(const char *s, ...) __attribute__ ((noreturn));
-extern void perror_msg(const char *s, ...);
-extern void perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn));
-
-const char *mode_string(int mode);
-const char *time_string(time_t timeVal);
-int is_directory(const char *name, const int followLinks, struct stat *statBuf);
-int isDevice(const char *name);
-
-typedef struct ino_dev_hash_bucket_struct {
-  struct ino_dev_hash_bucket_struct *next;
-  ino_t ino;
-  dev_t dev;
-  char name[1];
-} ino_dev_hashtable_bucket_t;
-int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name);
-void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name);
-void reset_ino_dev_hashtable(void);
-
-int copy_file(const char *srcName, const char *destName,
-		 int setModes, int followLinks, int forceFlag);
-int copy_file_chunk(int srcFd, int dstFd, size_t remaining);
-char *buildName(const char *dirName, const char *fileName);
-int makeString(int argc, const char **argv, char *buf, int bufLen);
-char *getChunk(int size);
-char *chunkstrdup(const char *str);
-void freeChunks(void);
-ssize_t safe_read(int fd, void *buf, size_t count);
-int full_write(int fd, const char *buf, int len);
-int full_read(int fd, char *buf, int len);
-int recursive_action(const char *fileName, int recurse, int followLinks, int depthFirst,
-	  int (*fileAction) (const char *fileName, struct stat* statbuf, void* userData),
-	  int (*dirAction) (const char *fileName, struct stat* statbuf, void* userData),
-	  void* userData);
-
-extern int create_path (const char *name, int mode);
-extern int parse_mode( const char* s, mode_t* theMode);
-
-extern int get_kernel_revision(void);
-
-extern int get_console_fd(char* tty_name);
-extern struct mntent *find_mount_point(const char *name, const char *table);
-extern void write_mtab(char* blockDevice, char* directory, 
-	char* filesystemType, long flags, char* string_flags);
-extern void erase_mtab(const char * name);
-extern void mtab_read(void);
-extern char *mtab_first(void **iter);
-extern char *mtab_next(void **iter);
-extern char *mtab_getinfo(const char *match, const char which);
-extern int check_wildcard_match(const char* text, const char* pattern);
-extern long atoi_w_units (const char *cp);
-extern pid_t* find_pid_by_name( char* pidName);
-extern int find_real_root_device_name(char* name);
-extern char *get_line_from_file(FILE *file);
-extern void print_file(FILE *file);
-extern int print_file_by_name(char *filename);
-extern char process_escape_sequence(char **ptr);
-extern char *get_last_path_component(char *path);
-extern FILE *wfopen(const char *path, const char *mode);
-extern FILE *xfopen(const char *path, const char *mode);
-extern void chomp(char *s);
-extern void trim(char *s);
-extern struct BB_applet *find_applet_by_name(const char *name);
-void run_applet_by_name(const char *name, int argc, char **argv);
-
-#ifndef DMALLOC
-extern void *xmalloc (size_t size);
-extern void *xrealloc(void *old, size_t size);
-extern void *xcalloc(size_t nmemb, size_t size);
-extern char *xstrdup (const char *s);
-#endif
-extern char *xstrndup (const char *s, int n);
-extern char * safe_strncpy(char *dst, const char *src, size_t size);
-
-struct suffix_mult {
-	char *suffix;
-	int mult;
-};
-
-extern unsigned long parse_number(const char *numstr,
-		const struct suffix_mult *suffixes);
-
-
-/* These parse entries in /etc/passwd and /etc/group.  This is desirable
- * for BusyBox since we want to avoid using the glibc NSS stuff, which
- * increases target size and is often not needed embedded systems.  */
-extern long my_getpwnam(const char *name);
-extern long my_getgrnam(const char *name);
-extern void my_getpwuid(char *name, long uid);
-extern void my_getgrgid(char *group, long gid);
-extern long my_getpwnamegid(const char *name);
-
-extern int device_open(char *device, int mode);
-
-#if defined BB_FEATURE_MOUNT_LOOP
-extern int del_loop(const char *device);
-extern int set_loop(const char *device, const char *file, int offset, int *loopro);
-extern char *find_unused_loop_device (void);
-#endif
-
-
-#if (__GLIBC__ < 2) && (defined BB_SYSLOGD || defined BB_INIT)
-extern int vdprintf(int d, const char *format, va_list ap);
-#endif
-
-#if defined BB_NFSMOUNT
-int nfsmount(const char *spec, const char *node, int *flags,
-	     char **extra_opts, char **mount_opts, int running_bg);
-#endif
-
-#ifndef RB_POWER_OFF
-/* Stop system and switch power off if possible.  */
-#define RB_POWER_OFF   0x4321fedc
-#endif
-
-#if defined(BB_KLOGD) || defined(BB_LOGGER)
-void syslog_msg_with_name(const char *name, int facility, int pri, const char *msg);
-void syslog_msg(int facility, int pri, const char *msg);
+#ifdef BB_FEATURE_BUFFERS_GO_ON_STACK
+#define RESERVE_BB_BUFFER(buffer,len)           char buffer[len]
+#define RESERVE_BB_UBUFFER(buffer,len) unsigned char buffer[len]
+#else
+#define RESERVE_BB_BUFFER(buffer,len)           char *buffer=xmalloc(len)
+#define RESERVE_BB_UBUFFER(buffer,len) unsigned char *buffer=xmalloc(len)
 #endif
 
-/* Include our own copy of struct sysinfo to avoid binary compatability
- * problems with Linux 2.4, which changed things.  Grumble, grumble. */
-struct sysinfo {
-	long uptime;			/* Seconds since boot */
-	unsigned long loads[3];		/* 1, 5, and 15 minute load averages */
-	unsigned long totalram;		/* Total usable main memory size */
-	unsigned long freeram;		/* Available memory size */
-	unsigned long sharedram;	/* Amount of shared memory */
-	unsigned long bufferram;	/* Memory used by buffers */
-	unsigned long totalswap;	/* Total swap space size */
-	unsigned long freeswap;		/* swap space still available */
-	unsigned short procs;		/* Number of current processes */
-	unsigned long totalhigh;	/* Total high memory size */
-	unsigned long freehigh;		/* Available high memory size */
-	unsigned int mem_unit;		/* Memory unit size in bytes */
-	char _f[20-2*sizeof(long)-sizeof(int)];	/* Padding: libc5 uses this.. */
-};
-extern int sysinfo (struct sysinfo* info);
 
 /* Bit map related macros -- libc5 doens't provide these... sigh.  */
 #ifndef setbit
@@ -247,25 +90,15 @@ extern int sysinfo (struct sysinfo* info);
 #define isclr(a,i)      (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
 #endif
 
-#ifdef BB_FEATURE_HUMAN_READABLE
-const char *make_human_readable_str(unsigned long val, unsigned long hr);
+#ifndef RB_POWER_OFF
+/* Stop system and switch power off if possible.  */
+#define RB_POWER_OFF   0x4321fedc
 #endif
-enum {
-	KILOBYTE = 1024,
-	MEGABYTE = (KILOBYTE*1024),
-	GIGABYTE = (MEGABYTE*1024)
-};
 
-#ifdef BB_FEATURE_BUFFERS_GO_ON_STACK
-#define RESERVE_BB_BUFFER(buffer,len)           char buffer[len]
-#define RESERVE_BB_UBUFFER(buffer,len) unsigned char buffer[len]
-#else
-#define RESERVE_BB_BUFFER(buffer,len)           char *buffer=xmalloc(len)
-#define RESERVE_BB_UBUFFER(buffer,len) unsigned char *buffer=xmalloc(len)
-#endif
 
-#if defined(BB_FEATURE_RM_INTERACTIVE) && defined(BB_RM)
-int ask_confirmation(void);
-#endif
+/* Pull in the utility routines from libbb */
+#include "libbb/libbb.h"
+
+
 
 #endif /* _BB_INTERNAL_H_ */
diff --git a/include/libbb.h b/include/libbb.h
new file mode 100644
index 000000000..a85987d9e
--- /dev/null
+++ b/include/libbb.h
@@ -0,0 +1,209 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Busybox main internal header file
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+#ifndef	__LIBBB_H__
+#define	__LIBBB_H__    1
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#ifdef DMALLOC
+#include "dmalloc.h"
+#endif
+
+#include <features.h>
+/* Stupid libc doesn't have a reliable way for use to know 
+ * that libc5 is being used.   Assume this is good enough */ 
+#if ! defined __GLIBC__ && ! defined __UCLIBC__
+/* libc5 doesn't define socklen_t */
+typedef unsigned int socklen_t;
+#endif	
+
+/* Some useful definitions */
+#define FALSE   ((int) 0)
+#define TRUE    ((int) 1)
+#define SKIP	((int) 2)
+
+/* for mtab.c */
+#define MTAB_GETMOUNTPT '1'
+#define MTAB_GETDEVICE  '2'
+
+#define BUF_SIZE        8192
+#define EXPAND_ALLOC    1024
+
+static inline int is_decimal(ch) { return ((ch >= '0') && (ch <= '9')); }
+static inline int is_octal(ch)   { return ((ch >= '0') && (ch <= '7')); }
+
+/* Macros for min/max.  */
+#ifndef MIN
+#define	MIN(a,b) (((a)<(b))?(a):(b))
+#endif
+
+#ifndef MAX
+#define	MAX(a,b) (((a)>(b))?(a):(b))
+#endif
+
+
+
+extern void show_usage(void) __attribute__ ((noreturn));
+extern void error_msg(const char *s, ...);
+extern void error_msg_and_die(const char *s, ...) __attribute__ ((noreturn));
+extern void perror_msg(const char *s, ...);
+extern void perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn));
+
+const char *mode_string(int mode);
+const char *time_string(time_t timeVal);
+int is_directory(const char *name, const int followLinks, struct stat *statBuf);
+int isDevice(const char *name);
+
+typedef struct ino_dev_hash_bucket_struct {
+  struct ino_dev_hash_bucket_struct *next;
+  ino_t ino;
+  dev_t dev;
+  char name[1];
+} ino_dev_hashtable_bucket_t;
+int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name);
+void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name);
+void reset_ino_dev_hashtable(void);
+
+int copy_file(const char *srcName, const char *destName,
+		 int setModes, int followLinks, int forceFlag);
+int copy_file_chunk(int srcFd, int dstFd, size_t remaining);
+char *buildName(const char *dirName, const char *fileName);
+int makeString(int argc, const char **argv, char *buf, int bufLen);
+char *getChunk(int size);
+char *chunkstrdup(const char *str);
+void freeChunks(void);
+ssize_t safe_read(int fd, void *buf, size_t count);
+int full_write(int fd, const char *buf, int len);
+int full_read(int fd, char *buf, int len);
+int recursive_action(const char *fileName, int recurse, int followLinks, int depthFirst,
+	  int (*fileAction) (const char *fileName, struct stat* statbuf, void* userData),
+	  int (*dirAction) (const char *fileName, struct stat* statbuf, void* userData),
+	  void* userData);
+
+extern int create_path (const char *name, int mode);
+extern int parse_mode( const char* s, mode_t* theMode);
+
+extern int get_kernel_revision(void);
+
+extern int get_console_fd(char* tty_name);
+extern struct mntent *find_mount_point(const char *name, const char *table);
+extern void write_mtab(char* blockDevice, char* directory, 
+	char* filesystemType, long flags, char* string_flags);
+extern void erase_mtab(const char * name);
+extern void mtab_read(void);
+extern char *mtab_first(void **iter);
+extern char *mtab_next(void **iter);
+extern char *mtab_getinfo(const char *match, const char which);
+extern int check_wildcard_match(const char* text, const char* pattern);
+extern long atoi_w_units (const char *cp);
+extern pid_t* find_pid_by_name( char* pidName);
+extern int find_real_root_device_name(char* name);
+extern char *get_line_from_file(FILE *file);
+extern void print_file(FILE *file);
+extern int print_file_by_name(char *filename);
+extern char process_escape_sequence(char **ptr);
+extern char *get_last_path_component(char *path);
+extern FILE *wfopen(const char *path, const char *mode);
+extern FILE *xfopen(const char *path, const char *mode);
+extern void chomp(char *s);
+extern void trim(char *s);
+extern struct BB_applet *find_applet_by_name(const char *name);
+void run_applet_by_name(const char *name, int argc, char **argv);
+
+#ifndef DMALLOC
+extern void *xmalloc (size_t size);
+extern void *xrealloc(void *old, size_t size);
+extern void *xcalloc(size_t nmemb, size_t size);
+extern char *xstrdup (const char *s);
+#endif
+extern char *xstrndup (const char *s, int n);
+extern char * safe_strncpy(char *dst, const char *src, size_t size);
+
+struct suffix_mult {
+	char *suffix;
+	int mult;
+};
+
+extern unsigned long parse_number(const char *numstr,
+		const struct suffix_mult *suffixes);
+
+
+/* These parse entries in /etc/passwd and /etc/group.  This is desirable
+ * for BusyBox since we want to avoid using the glibc NSS stuff, which
+ * increases target size and is often not needed embedded systems.  */
+extern long my_getpwnam(const char *name);
+extern long my_getgrnam(const char *name);
+extern void my_getpwuid(char *name, long uid);
+extern void my_getgrgid(char *group, long gid);
+extern long my_getpwnamegid(const char *name);
+
+extern int device_open(char *device, int mode);
+
+extern int del_loop(const char *device);
+extern int set_loop(const char *device, const char *file, int offset, int *loopro);
+extern char *find_unused_loop_device (void);
+
+
+#if (__GLIBC__ < 2)
+extern int vdprintf(int d, const char *format, va_list ap);
+#endif
+
+int nfsmount(const char *spec, const char *node, int *flags,
+	     char **extra_opts, char **mount_opts, int running_bg);
+
+void syslog_msg_with_name(const char *name, int facility, int pri, const char *msg);
+void syslog_msg(int facility, int pri, const char *msg);
+
+/* Include our own copy of struct sysinfo to avoid binary compatability
+ * problems with Linux 2.4, which changed things.  Grumble, grumble. */
+struct sysinfo {
+	long uptime;			/* Seconds since boot */
+	unsigned long loads[3];		/* 1, 5, and 15 minute load averages */
+	unsigned long totalram;		/* Total usable main memory size */
+	unsigned long freeram;		/* Available memory size */
+	unsigned long sharedram;	/* Amount of shared memory */
+	unsigned long bufferram;	/* Memory used by buffers */
+	unsigned long totalswap;	/* Total swap space size */
+	unsigned long freeswap;		/* swap space still available */
+	unsigned short procs;		/* Number of current processes */
+	unsigned long totalhigh;	/* Total high memory size */
+	unsigned long freehigh;		/* Available high memory size */
+	unsigned int mem_unit;		/* Memory unit size in bytes */
+	char _f[20-2*sizeof(long)-sizeof(int)];	/* Padding: libc5 uses this.. */
+};
+extern int sysinfo (struct sysinfo* info);
+
+const char *make_human_readable_str(unsigned long val, unsigned long hr);
+enum {
+	KILOBYTE = 1024,
+	MEGABYTE = (KILOBYTE*1024),
+	GIGABYTE = (MEGABYTE*1024)
+};
+
+int ask_confirmation(void);
+
+#endif /* __LIBBB_H__ */
diff --git a/libbb/ask_confirmation.c b/libbb/ask_confirmation.c
new file mode 100644
index 000000000..f2922379c
--- /dev/null
+++ b/libbb/ask_confirmation.c
@@ -0,0 +1,53 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include "libbb.h"
+
+
+int ask_confirmation()
+{
+	int c = '\0';
+	int ret = 0;
+
+	while (c != '\n') {
+		c = getchar();
+		if ( c != '\n' ) {
+			ret = ((c=='y')||(c=='Y')) ? 1 : 0;
+		}
+	}
+	return ret;
+}
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/check_wildcard_match.c b/libbb/check_wildcard_match.c
new file mode 100644
index 000000000..7bd3c7998
--- /dev/null
+++ b/libbb/check_wildcard_match.c
@@ -0,0 +1,140 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include "libbb.h"
+
+
+/*
+ * Routine to see if a text string is matched by a wildcard pattern.
+ * Returns TRUE if the text is matched, or FALSE if it is not matched
+ * or if the pattern is invalid.
+ *  *		matches zero or more characters
+ *  ?		matches a single character
+ *  [abc]	matches 'a', 'b' or 'c'
+ *  \c		quotes character c
+ * Adapted from code written by Ingo Wilken, and
+ * then taken from sash, Copyright (c) 1999 by David I. Bell
+ * Permission is granted to use, distribute, or modify this source,
+ * provided that this copyright notice remains intact.
+ * Permission to distribute this code under the GPL has been granted.
+ */
+extern int check_wildcard_match(const char *text, const char *pattern)
+{
+	const char *retryPat;
+	const char *retryText;
+	int ch;
+	int found;
+	int len;
+
+	retryPat = NULL;
+	retryText = NULL;
+
+	while (*text || *pattern) {
+		ch = *pattern++;
+
+		switch (ch) {
+		case '*':
+			retryPat = pattern;
+			retryText = text;
+			break;
+
+		case '[':
+			found = FALSE;
+
+			while ((ch = *pattern++) != ']') {
+				if (ch == '\\')
+					ch = *pattern++;
+
+				if (ch == '\0')
+					return FALSE;
+
+				if (*text == ch)
+					found = TRUE;
+			}
+			len=strlen(text);
+			if (found == FALSE && len!=0) {
+				return FALSE;
+			}
+			if (found == TRUE) {
+				if (strlen(pattern)==0 && len==1) {
+					return TRUE;
+				}
+				if (len!=0) {
+					text++;
+					continue;
+				}
+			}
+
+			/* fall into next case */
+
+		case '?':
+			if (*text++ == '\0')
+				return FALSE;
+
+			break;
+
+		case '\\':
+			ch = *pattern++;
+
+			if (ch == '\0')
+				return FALSE;
+
+			/* fall into next case */
+
+		default:
+			if (*text == ch) {
+				if (*text)
+					text++;
+				break;
+			}
+
+			if (*text) {
+				pattern = retryPat;
+				text = ++retryText;
+				break;
+			}
+
+			return FALSE;
+		}
+
+		if (pattern == NULL)
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/chomp.c b/libbb/chomp.c
new file mode 100644
index 000000000..cbd3d04bc
--- /dev/null
+++ b/libbb/chomp.c
@@ -0,0 +1,51 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include "libbb.h"
+
+
+void chomp(char *s)
+{
+	size_t len = strlen(s);
+
+	if (len == 0)
+		return;
+
+	if (s[len-1] == '\n')
+		s[len-1] = '\0';
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
new file mode 100644
index 000000000..64b65b9fa
--- /dev/null
+++ b/libbb/copy_file.c
@@ -0,0 +1,180 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include <utime.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include "libbb.h"
+
+
+/*
+ * Copy one file to another, while possibly preserving its modes, times, and
+ * modes.  Returns TRUE if successful, or FALSE on a failure with an error
+ * message output.  (Failure is not indicated if attributes cannot be set.)
+ * -Erik Andersen
+ */
+int
+copy_file(const char *srcName, const char *destName,
+		 int setModes, int followLinks, int forceFlag)
+{
+	int rfd;
+	int wfd;
+	int status;
+	struct stat srcStatBuf;
+	struct stat dstStatBuf;
+	struct utimbuf times;
+
+	if (followLinks == TRUE)
+		status = stat(srcName, &srcStatBuf);
+	else
+		status = lstat(srcName, &srcStatBuf);
+
+	if (status < 0) {
+		perror_msg("%s", srcName);
+		return FALSE;
+	}
+
+	if (followLinks == TRUE)
+		status = stat(destName, &dstStatBuf);
+	else
+		status = lstat(destName, &dstStatBuf);
+
+	if (status < 0 || forceFlag==TRUE) {
+		unlink(destName);
+		dstStatBuf.st_ino = -1;
+		dstStatBuf.st_dev = -1;
+	}
+
+	if ((srcStatBuf.st_dev == dstStatBuf.st_dev) &&
+		(srcStatBuf.st_ino == dstStatBuf.st_ino)) {
+		error_msg("Copying file \"%s\" to itself", srcName);
+		return FALSE;
+	}
+
+	if (S_ISDIR(srcStatBuf.st_mode)) {
+		//fprintf(stderr, "copying directory %s to %s\n", srcName, destName);
+		/* Make sure the directory is writable */
+		status = mkdir(destName, 0777777 ^ umask(0));
+		if (status < 0 && errno != EEXIST) {
+			perror_msg("%s", destName);
+			return FALSE;
+		}
+	} else if (S_ISLNK(srcStatBuf.st_mode)) {
+		char link_val[BUFSIZ + 1];
+		int link_size;
+
+		//fprintf(stderr, "copying link %s to %s\n", srcName, destName);
+		/* Warning: This could possibly truncate silently, to BUFSIZ chars */
+		link_size = readlink(srcName, &link_val[0], BUFSIZ);
+		if (link_size < 0) {
+			perror_msg("%s", srcName);
+			return FALSE;
+		}
+		link_val[link_size] = '\0';
+		status = symlink(link_val, destName);
+		if (status < 0) {
+			perror_msg("%s", destName);
+			return FALSE;
+		}
+#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
+		if (setModes == TRUE) {
+			/* Try to set owner, but fail silently like GNU cp */
+			lchown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid);
+		}
+#endif
+		return TRUE;
+	} else if (S_ISFIFO(srcStatBuf.st_mode)) {
+		//fprintf(stderr, "copying fifo %s to %s\n", srcName, destName);
+		if (mkfifo(destName, 0644) < 0) {
+			perror_msg("%s", destName);
+			return FALSE;
+		}
+	} else if (S_ISBLK(srcStatBuf.st_mode) || S_ISCHR(srcStatBuf.st_mode)
+			   || S_ISSOCK(srcStatBuf.st_mode)) {
+		//fprintf(stderr, "copying soc, blk, or chr %s to %s\n", srcName, destName);
+		if (mknod(destName, srcStatBuf.st_mode, srcStatBuf.st_rdev) < 0) {
+			perror_msg("%s", destName);
+			return FALSE;
+		}
+	} else if (S_ISREG(srcStatBuf.st_mode)) {
+		//fprintf(stderr, "copying regular file %s to %s\n", srcName, destName);
+		rfd = open(srcName, O_RDONLY);
+		if (rfd < 0) {
+			perror_msg("%s", srcName);
+			return FALSE;
+		}
+
+	 	wfd = open(destName, O_WRONLY | O_CREAT | O_TRUNC,
+				 srcStatBuf.st_mode);
+		if (wfd < 0) {
+			perror_msg("%s", destName);
+			close(rfd);
+			return FALSE;
+		}
+
+		if (copy_file_chunk(rfd, wfd, srcStatBuf.st_size)==FALSE)
+			goto error_exit;	
+		
+		close(rfd);
+		if (close(wfd) < 0) {
+			return FALSE;
+		}
+	}
+
+	if (setModes == TRUE) {
+		/* This is fine, since symlinks never get here */
+		if (chown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0)
+			perror_msg_and_die("%s", destName);
+		if (chmod(destName, srcStatBuf.st_mode) < 0)
+			perror_msg_and_die("%s", destName);
+		times.actime = srcStatBuf.st_atime;
+		times.modtime = srcStatBuf.st_mtime;
+		if (utime(destName, &times) < 0)
+			perror_msg_and_die("%s", destName);
+	}
+
+	return TRUE;
+
+  error_exit:
+	perror_msg("%s", destName);
+	close(rfd);
+	close(wfd);
+
+	return FALSE;
+}
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/copy_file_chunk.c b/libbb/copy_file_chunk.c
new file mode 100644
index 000000000..3c657dd06
--- /dev/null
+++ b/libbb/copy_file_chunk.c
@@ -0,0 +1,60 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <sys/stat.h>
+#include "libbb.h"
+
+/*
+ * Copy chunksize bytes between two file descriptors
+ */
+int copy_file_chunk(int srcfd, int dstfd, size_t chunksize)
+{
+        size_t size;
+        char buffer[BUFSIZ]; /* BUFSIZ is declared in stdio.h */
+
+        while (chunksize > 0) {
+                if (chunksize > BUFSIZ)
+                        size = BUFSIZ;
+                else
+                        size = chunksize;
+                if (full_write(dstfd, buffer, full_read(srcfd, buffer, size)) < size)
+                        return(FALSE);
+                chunksize -= size;
+        }
+        return (TRUE);
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/create_path.c b/libbb/create_path.c
new file mode 100644
index 000000000..328afc351
--- /dev/null
+++ b/libbb/create_path.c
@@ -0,0 +1,71 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include "libbb.h"
+
+/*
+ * Attempt to create the directories along the specified path, except for
+ * the final component.  The mode is given for the final directory only,
+ * while all previous ones get default protections.  Errors are not reported
+ * here, as failures to restore files can be reported later.
+ */
+extern int create_path(const char *name, int mode)
+{
+	char *cp;
+	char *cpOld;
+	char buf[BUFSIZ + 1];
+	int retVal = 0;
+
+	strcpy(buf, name);
+	for (cp = buf; *cp == '/'; cp++);
+	cp = strchr(cp, '/');
+	while (cp) {
+		cpOld = cp;
+		cp = strchr(cp + 1, '/');
+		*cpOld = '\0';
+		retVal = mkdir(buf, cp ? 0777 : mode);
+		if (retVal != 0 && errno != EEXIST) {
+			perror_msg("%s", buf);
+			return FALSE;
+		}
+		*cpOld = '/';
+	}
+	return TRUE;
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/device_open.c b/libbb/device_open.c
new file mode 100644
index 000000000..8e97ce6c5
--- /dev/null
+++ b/libbb/device_open.c
@@ -0,0 +1,59 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include "libbb.h"
+
+
+/* try to open up the specified device */
+extern int device_open(char *device, int mode)
+{
+	int m, f, fd = -1;
+
+	m = mode | O_NONBLOCK;
+
+	/* Retry up to 5 times */
+	for (f = 0; f < 5; f++)
+		if ((fd = open(device, m, 0600)) >= 0)
+			break;
+	if (fd < 0)
+		return fd;
+	/* Reset original flags. */
+	if (m != mode)
+		fcntl(fd, F_SETFL, mode);
+	return fd;
+}
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/error_msg.c b/libbb/error_msg.c
new file mode 100644
index 000000000..7773d32a2
--- /dev/null
+++ b/libbb/error_msg.c
@@ -0,0 +1,100 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include "libbb.h"
+
+extern const char *applet_name;
+
+static void verror_msg(const char *s, va_list p)
+{
+	fflush(stdout);
+	fprintf(stderr, "%s: ", applet_name);
+	vfprintf(stderr, s, p);
+}
+
+extern void error_msg(const char *s, ...)
+{
+	va_list p;
+
+	va_start(p, s);
+	verror_msg(s, p);
+	va_end(p);
+	putc('\n', stderr);
+}
+
+extern void error_msg_and_die(const char *s, ...)
+{
+	va_list p;
+
+	va_start(p, s);
+	verror_msg(s, p);
+	va_end(p);
+	putc('\n', stderr);
+	exit(EXIT_FAILURE);
+}
+
+static void vperror_msg(const char *s, va_list p)
+{
+	int err=errno;
+	if(s == 0) s = "";
+	verror_msg(s, p);
+	if (*s) s = ": ";
+	fprintf(stderr, "%s%s\n", s, strerror(err));
+}
+
+extern void perror_msg(const char *s, ...)
+{
+	va_list p;
+
+	va_start(p, s);
+	vperror_msg(s, p);
+	va_end(p);
+}
+
+extern void perror_msg_and_die(const char *s, ...)
+{
+	va_list p;
+
+	va_start(p, s);
+	vperror_msg(s, p);
+	va_end(p);
+	exit(EXIT_FAILURE);
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/find_mount_point.c b/libbb/find_mount_point.c
new file mode 100644
index 000000000..27322f7f0
--- /dev/null
+++ b/libbb/find_mount_point.c
@@ -0,0 +1,80 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include "libbb.h"
+
+
+#include <mntent.h>
+/*
+ * Given a block device, find the mount table entry if that block device
+ * is mounted.
+ *
+ * Given any other file (or directory), find the mount table entry for its
+ * filesystem.
+ */
+extern struct mntent *find_mount_point(const char *name, const char *table)
+{
+	struct stat s;
+	dev_t mountDevice;
+	FILE *mountTable;
+	struct mntent *mountEntry;
+
+	if (stat(name, &s) != 0)
+		return 0;
+
+	if ((s.st_mode & S_IFMT) == S_IFBLK)
+		mountDevice = s.st_rdev;
+	else
+		mountDevice = s.st_dev;
+
+
+	if ((mountTable = setmntent(table, "r")) == 0)
+		return 0;
+
+	while ((mountEntry = getmntent(mountTable)) != 0) {
+		if (strcmp(name, mountEntry->mnt_dir) == 0
+			|| strcmp(name, mountEntry->mnt_fsname) == 0)	/* String match. */
+			break;
+		if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice)	/* Match the device. */
+			break;
+		if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice)	/* Match the directory's mount point. */
+			break;
+	}
+	endmntent(mountTable);
+	return mountEntry;
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/find_pid_by_name.c b/libbb/find_pid_by_name.c
new file mode 100644
index 000000000..a22ee1ff8
--- /dev/null
+++ b/libbb/find_pid_by_name.c
@@ -0,0 +1,168 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#include <dirent.h>
+#include <stdlib.h>
+#include "libbb.h"
+
+
+/* For Erik's nifty devps device driver */
+#ifdef BB_FEATURE_USE_DEVPS_PATCH
+#include <linux/devps.h> 
+
+/* find_pid_by_name()
+ *  
+ *  This finds the pid of the specified process,
+ *  by using the /dev/ps device driver.
+ *
+ *  Returns a list of all matching PIDs
+ */
+extern pid_t* find_pid_by_name( char* pidName)
+{
+	int fd, i, j;
+	char device[] = "/dev/ps";
+	pid_t num_pids;
+	pid_t* pid_array = NULL;
+	pid_t* pidList=NULL;
+
+	/* open device */ 
+	fd = open(device, O_RDONLY);
+	if (fd < 0)
+		perror_msg_and_die("open failed for `%s'", device);
+
+	/* Find out how many processes there are */
+	if (ioctl (fd, DEVPS_GET_NUM_PIDS, &num_pids)<0) 
+		perror_msg_and_die("\nDEVPS_GET_PID_LIST");
+	
+	/* Allocate some memory -- grab a few extras just in case 
+	 * some new processes start up while we wait. The kernel will
+	 * just ignore any extras if we give it too many, and will trunc.
+	 * the list if we give it too few.  */
+	pid_array = (pid_t*) xcalloc( num_pids+10, sizeof(pid_t));
+	pid_array[0] = num_pids+10;
+
+	/* Now grab the pid list */
+	if (ioctl (fd, DEVPS_GET_PID_LIST, pid_array)<0) 
+		perror_msg_and_die("\nDEVPS_GET_PID_LIST");
+
+	/* Now search for a match */
+	for (i=1, j=0; i<pid_array[0] ; i++) {
+		char* p;
+		struct pid_info info;
+
+	    info.pid = pid_array[i];
+	    if (ioctl (fd, DEVPS_GET_PID_INFO, &info)<0)
+			perror_msg_and_die("\nDEVPS_GET_PID_INFO");
+
+		/* Make sure we only match on the process name */
+		p=info.command_line+1;
+		while ((*p != 0) && !isspace(*(p)) && (*(p-1) != '\\')) { 
+			(p)++;
+		}
+		if (isspace(*(p)))
+				*p='\0';
+
+		if ((strstr(info.command_line, pidName) != NULL)
+				&& (strlen(pidName) == strlen(info.command_line))) {
+			pidList=xrealloc( pidList, sizeof(pid_t) * (j+2));
+			pidList[j++]=info.pid;
+		}
+	}
+	if (pidList)
+		pidList[j]=0;
+
+	/* Free memory */
+	free( pid_array);
+
+	/* close device */
+	if (close (fd) != 0) 
+		perror_msg_and_die("close failed for `%s'", device);
+
+	return pidList;
+}
+
+#else		/* BB_FEATURE_USE_DEVPS_PATCH */
+
+/* find_pid_by_name()
+ *  
+ *  This finds the pid of the specified process.
+ *  Currently, it's implemented by rummaging through 
+ *  the proc filesystem.
+ *
+ *  Returns a list of all matching PIDs
+ */
+extern pid_t* find_pid_by_name( char* pidName)
+{
+	DIR *dir;
+	struct dirent *next;
+	pid_t* pidList=NULL;
+	int i=0;
+
+	dir = opendir("/proc");
+	if (!dir)
+		perror_msg_and_die("Cannot open /proc");
+	
+	while ((next = readdir(dir)) != NULL) {
+		FILE *status;
+		char filename[256];
+		char buffer[256];
+
+		/* If it isn't a number, we don't want it */
+		if (!isdigit(*next->d_name))
+			continue;
+
+		sprintf(filename, "/proc/%s/cmdline", next->d_name);
+		status = fopen(filename, "r");
+		if (!status) {
+			continue;
+		}
+		fgets(buffer, 256, status);
+		fclose(status);
+
+		if (strstr(get_last_path_component(buffer), pidName) != NULL) {
+			pidList=xrealloc( pidList, sizeof(pid_t) * (i+2));
+			pidList[i++]=strtol(next->d_name, NULL, 0);
+		}
+	}
+
+	if (pidList)
+		pidList[i]=0;
+	return pidList;
+}
+#endif							/* BB_FEATURE_USE_DEVPS_PATCH */
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/find_root_device.c b/libbb/find_root_device.c
new file mode 100644
index 000000000..de765ce44
--- /dev/null
+++ b/libbb/find_root_device.c
@@ -0,0 +1,85 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <dirent.h>
+#include "libbb.h"
+
+
+
+extern int find_real_root_device_name(char* name)
+{
+	DIR *dir;
+	struct dirent *entry;
+	struct stat statBuf, rootStat;
+	char fileName[BUFSIZ];
+
+	if (stat("/", &rootStat) != 0) {
+		error_msg("could not stat '/'");
+		return( FALSE);
+	}
+
+	dir = opendir("/dev");
+	if (!dir) {
+		error_msg("could not open '/dev'");
+		return( FALSE);
+	}
+
+	while((entry = readdir(dir)) != NULL) {
+
+		/* Must skip ".." since that is "/", and so we 
+		 * would get a false positive on ".."  */
+		if (strcmp(entry->d_name, "..") == 0)
+			continue;
+
+		snprintf( fileName, strlen(name)+1, "/dev/%s", entry->d_name);
+
+		if (stat(fileName, &statBuf) != 0)
+			continue;
+		/* Some char devices have the same dev_t as block
+		 * devices, so make sure this is a block device */
+		if (! S_ISBLK(statBuf.st_mode))
+			continue;
+		if (statBuf.st_rdev == rootStat.st_rdev) {
+			strcpy(name, fileName); 
+			return ( TRUE);
+		}
+	}
+
+	return( FALSE);
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/full_read.c b/libbb/full_read.c
new file mode 100644
index 000000000..e9c4bbfc6
--- /dev/null
+++ b/libbb/full_read.c
@@ -0,0 +1,70 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include "libbb.h"
+
+
+/*
+ * Read all of the supplied buffer from a file.
+ * This does multiple reads as necessary.
+ * Returns the amount read, or -1 on an error.
+ * A short read is returned on an end of file.
+ */
+int full_read(int fd, char *buf, int len)
+{
+	int cc;
+	int total;
+
+	total = 0;
+
+	while (len > 0) {
+		cc = read(fd, buf, len);
+
+		if (cc < 0)
+			return -1;
+
+		if (cc == 0)
+			break;
+
+		buf += cc;
+		total += cc;
+		len -= cc;
+	}
+
+	return total;
+}
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/full_write.c b/libbb/full_write.c
new file mode 100644
index 000000000..dc9937fa3
--- /dev/null
+++ b/libbb/full_write.c
@@ -0,0 +1,66 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include "libbb.h"
+
+/*
+ * Write all of the supplied buffer out to a file.
+ * This does multiple writes as necessary.
+ * Returns the amount written, or -1 on an error.
+ */
+int full_write(int fd, const char *buf, int len)
+{
+	int cc;
+	int total;
+
+	total = 0;
+
+	while (len > 0) {
+		cc = write(fd, buf, len);
+
+		if (cc < 0)
+			return -1;
+
+		buf += cc;
+		total += cc;
+		len -= cc;
+	}
+
+	return total;
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/get_console.c b/libbb/get_console.c
new file mode 100644
index 000000000..4be9adc84
--- /dev/null
+++ b/libbb/get_console.c
@@ -0,0 +1,129 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include "libbb.h"
+
+
+
+
+
+/* From <linux/kd.h> */ 
+static const int KDGKBTYPE = 0x4B33;  /* get keyboard type */
+static const int KB_84 = 0x01;
+static const int KB_101 = 0x02;    /* this is what we always answer */
+
+int is_a_console(int fd)
+{
+	char arg;
+
+	arg = 0;
+	return (ioctl(fd, KDGKBTYPE, &arg) == 0
+			&& ((arg == KB_101) || (arg == KB_84)));
+}
+
+static int open_a_console(char *fnam)
+{
+	int fd;
+
+	/* try read-only */
+	fd = open(fnam, O_RDWR);
+
+	/* if failed, try read-only */
+	if (fd < 0 && errno == EACCES)
+		fd = open(fnam, O_RDONLY);
+
+	/* if failed, try write-only */
+	if (fd < 0 && errno == EACCES)
+		fd = open(fnam, O_WRONLY);
+
+	/* if failed, fail */
+	if (fd < 0)
+		return -1;
+
+	/* if not a console, fail */
+	if (!is_a_console(fd)) {
+		close(fd);
+		return -1;
+	}
+
+	/* success */
+	return fd;
+}
+
+/*
+ * Get an fd for use with kbd/console ioctls.
+ * We try several things because opening /dev/console will fail
+ * if someone else used X (which does a chown on /dev/console).
+ *
+ * if tty_name is non-NULL, try this one instead.
+ */
+
+int get_console_fd(char *tty_name)
+{
+	int fd;
+
+	if (tty_name) {
+		if (-1 == (fd = open_a_console(tty_name)))
+			return -1;
+		else
+			return fd;
+	}
+
+	fd = open_a_console("/dev/tty");
+	if (fd >= 0)
+		return fd;
+
+	fd = open_a_console("/dev/tty0");
+	if (fd >= 0)
+		return fd;
+
+	fd = open_a_console("/dev/console");
+	if (fd >= 0)
+		return fd;
+
+	for (fd = 0; fd < 3; fd++)
+		if (is_a_console(fd))
+			return fd;
+
+	error_msg("Couldnt get a file descriptor referring to the console");
+	return -1;					/* total failure */
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/get_last_path_component.c b/libbb/get_last_path_component.c
new file mode 100644
index 000000000..a322288a6
--- /dev/null
+++ b/libbb/get_last_path_component.c
@@ -0,0 +1,58 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "libbb.h"
+
+
+char *get_last_path_component(char *path)
+{
+	char *s=path+strlen(path)-1;
+
+	/* strip trailing slashes */
+	while (s != path && *s == '/') {
+		*s-- = '\0';
+	}
+
+	/* find last component */
+	s = strrchr(path, '/');
+	if (s == NULL || s[1] == '\0')
+		return path;
+	else
+		return s+1;
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
new file mode 100644
index 000000000..759481731
--- /dev/null
+++ b/libbb/get_line_from_file.c
@@ -0,0 +1,72 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include "libbb.h"
+
+
+
+/* get_line_from_file() - This function reads an entire line from a text file
+ * up to a newline. It returns a malloc'ed char * which must be stored and
+ * free'ed  by the caller. */
+extern char *get_line_from_file(FILE *file)
+{
+	static const int GROWBY = 80; /* how large we will grow strings by */
+
+	int ch;
+	int idx = 0;
+	char *linebuf = NULL;
+	int linebufsz = 0;
+
+	while (1) {
+		ch = fgetc(file);
+		if (ch == EOF)
+			break;
+		/* grow the line buffer as necessary */
+		while (idx > linebufsz-2)
+			linebuf = xrealloc(linebuf, linebufsz += GROWBY);
+		linebuf[idx++] = (char)ch;
+		if ((char)ch == '\n')
+			break;
+	}
+
+	if (idx == 0)
+		return NULL;
+
+	linebuf[idx] = 0;
+	return linebuf;
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/human_readable.c b/libbb/human_readable.c
new file mode 100644
index 000000000..ff2175175
--- /dev/null
+++ b/libbb/human_readable.c
@@ -0,0 +1,62 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include "libbb.h"
+
+
+
+const char *make_human_readable_str(unsigned long val, unsigned long hr)
+{
+	int i=0;
+	static char str[10] = "\0";
+	static const char strings[] = { 'k', 'M', 'G', 'T', 0 };
+	unsigned long divisor = 1;
+
+	if(val == 0)
+		return("0");
+	if(hr)
+		snprintf(str, 9, "%ld", val/hr);
+	else {
+		while(val >= divisor && i <= 4) {
+			divisor=divisor<<10, i++;
+		} 
+		divisor=divisor>>10, i--;
+		snprintf(str, 9, "%.1Lf%c", (long double)(val)/divisor, strings[i]);
+	}
+	return(str);
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/inode_hash.c b/libbb/inode_hash.c
new file mode 100644
index 000000000..db68025dd
--- /dev/null
+++ b/libbb/inode_hash.c
@@ -0,0 +1,105 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "libbb.h"
+
+#define HASH_SIZE	311		/* Should be prime */
+#define hash_inode(i)	((i) % HASH_SIZE)
+
+static ino_dev_hashtable_bucket_t *ino_dev_hashtable[HASH_SIZE];
+
+/*
+ * Return 1 if statbuf->st_ino && statbuf->st_dev are recorded in
+ * `ino_dev_hashtable', else return 0
+ *
+ * If NAME is a non-NULL pointer to a character pointer, and there is
+ * a match, then set *NAME to the value of the name slot in that
+ * bucket.
+ */
+int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name)
+{
+	ino_dev_hashtable_bucket_t *bucket;
+
+	bucket = ino_dev_hashtable[hash_inode(statbuf->st_ino)];
+	while (bucket != NULL) {
+	  if ((bucket->ino == statbuf->st_ino) &&
+		  (bucket->dev == statbuf->st_dev))
+	  {
+		if (name) *name = bucket->name;
+		return 1;
+	  }
+	  bucket = bucket->next;
+	}
+	return 0;
+}
+
+/* Add statbuf to statbuf hash table */
+void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name)
+{
+	int i;
+	size_t s;
+	ino_dev_hashtable_bucket_t *bucket;
+    
+	i = hash_inode(statbuf->st_ino);
+	s = name ? strlen(name) : 0;
+	bucket = xmalloc(sizeof(ino_dev_hashtable_bucket_t) + s);
+	bucket->ino = statbuf->st_ino;
+	bucket->dev = statbuf->st_dev;
+	if (name)
+		strcpy(bucket->name, name);
+	else
+		bucket->name[0] = '\0';
+	bucket->next = ino_dev_hashtable[i];
+	ino_dev_hashtable[i] = bucket;
+}
+
+/* Clear statbuf hash table */
+void reset_ino_dev_hashtable(void)
+{
+	int i;
+	ino_dev_hashtable_bucket_t *bucket;
+
+	for (i = 0; i < HASH_SIZE; i++) {
+		while (ino_dev_hashtable[i] != NULL) {
+			bucket = ino_dev_hashtable[i]->next;
+			free(ino_dev_hashtable[i]);
+			ino_dev_hashtable[i] = bucket;
+		}
+	}
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/isdirectory.c b/libbb/isdirectory.c
new file mode 100644
index 000000000..65f4fee00
--- /dev/null
+++ b/libbb/isdirectory.c
@@ -0,0 +1,71 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include "libbb.h"
+
+/*
+ * Return TRUE if a fileName is a directory.
+ * Nonexistant files return FALSE.
+ */
+int is_directory(const char *fileName, const int followLinks, struct stat *statBuf)
+{
+	int status;
+	int didMalloc = 0;
+
+	if (statBuf == NULL) {
+	    statBuf = (struct stat *)xmalloc(sizeof(struct stat));
+	    ++didMalloc;
+	}
+
+	if (followLinks == TRUE)
+		status = stat(fileName, statBuf);
+	else
+		status = lstat(fileName, statBuf);
+
+	if (status < 0 || !(S_ISDIR(statBuf->st_mode))) {
+	    status = FALSE;
+	}
+	else status = TRUE;
+
+	if (didMalloc) {
+	    free(statBuf);
+	    statBuf = NULL;
+	}
+	return status;
+}
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c
new file mode 100644
index 000000000..09cd582c4
--- /dev/null
+++ b/libbb/kernel_version.c
@@ -0,0 +1,66 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/utsname.h>		/* for uname(2) */
+
+#include "libbb.h"
+
+/* Returns kernel version encoded as major*65536 + minor*256 + patch,
+ * so, for example,  to check if the kernel is greater than 2.2.11:
+ *     if (get_kernel_revision() <= 2*65536+2*256+11) { <stuff> }
+ */
+extern int get_kernel_revision(void)
+{
+	struct utsname name;
+	char *s;
+	int i, r;
+
+	if (uname(&name) == -1) {
+		perror_msg("cannot get system information");
+		return (0);
+	}
+
+	s = name.release;
+	r = 0;
+	for (i=0 ; i<3 ; i++) {
+		r = r * 256 + atoi(strtok(s, "."));
+		s = NULL;
+	}
+	return r;
+}
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/libbb.h b/libbb/libbb.h
new file mode 100644
index 000000000..a85987d9e
--- /dev/null
+++ b/libbb/libbb.h
@@ -0,0 +1,209 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Busybox main internal header file
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+#ifndef	__LIBBB_H__
+#define	__LIBBB_H__    1
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#ifdef DMALLOC
+#include "dmalloc.h"
+#endif
+
+#include <features.h>
+/* Stupid libc doesn't have a reliable way for use to know 
+ * that libc5 is being used.   Assume this is good enough */ 
+#if ! defined __GLIBC__ && ! defined __UCLIBC__
+/* libc5 doesn't define socklen_t */
+typedef unsigned int socklen_t;
+#endif	
+
+/* Some useful definitions */
+#define FALSE   ((int) 0)
+#define TRUE    ((int) 1)
+#define SKIP	((int) 2)
+
+/* for mtab.c */
+#define MTAB_GETMOUNTPT '1'
+#define MTAB_GETDEVICE  '2'
+
+#define BUF_SIZE        8192
+#define EXPAND_ALLOC    1024
+
+static inline int is_decimal(ch) { return ((ch >= '0') && (ch <= '9')); }
+static inline int is_octal(ch)   { return ((ch >= '0') && (ch <= '7')); }
+
+/* Macros for min/max.  */
+#ifndef MIN
+#define	MIN(a,b) (((a)<(b))?(a):(b))
+#endif
+
+#ifndef MAX
+#define	MAX(a,b) (((a)>(b))?(a):(b))
+#endif
+
+
+
+extern void show_usage(void) __attribute__ ((noreturn));
+extern void error_msg(const char *s, ...);
+extern void error_msg_and_die(const char *s, ...) __attribute__ ((noreturn));
+extern void perror_msg(const char *s, ...);
+extern void perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn));
+
+const char *mode_string(int mode);
+const char *time_string(time_t timeVal);
+int is_directory(const char *name, const int followLinks, struct stat *statBuf);
+int isDevice(const char *name);
+
+typedef struct ino_dev_hash_bucket_struct {
+  struct ino_dev_hash_bucket_struct *next;
+  ino_t ino;
+  dev_t dev;
+  char name[1];
+} ino_dev_hashtable_bucket_t;
+int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name);
+void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name);
+void reset_ino_dev_hashtable(void);
+
+int copy_file(const char *srcName, const char *destName,
+		 int setModes, int followLinks, int forceFlag);
+int copy_file_chunk(int srcFd, int dstFd, size_t remaining);
+char *buildName(const char *dirName, const char *fileName);
+int makeString(int argc, const char **argv, char *buf, int bufLen);
+char *getChunk(int size);
+char *chunkstrdup(const char *str);
+void freeChunks(void);
+ssize_t safe_read(int fd, void *buf, size_t count);
+int full_write(int fd, const char *buf, int len);
+int full_read(int fd, char *buf, int len);
+int recursive_action(const char *fileName, int recurse, int followLinks, int depthFirst,
+	  int (*fileAction) (const char *fileName, struct stat* statbuf, void* userData),
+	  int (*dirAction) (const char *fileName, struct stat* statbuf, void* userData),
+	  void* userData);
+
+extern int create_path (const char *name, int mode);
+extern int parse_mode( const char* s, mode_t* theMode);
+
+extern int get_kernel_revision(void);
+
+extern int get_console_fd(char* tty_name);
+extern struct mntent *find_mount_point(const char *name, const char *table);
+extern void write_mtab(char* blockDevice, char* directory, 
+	char* filesystemType, long flags, char* string_flags);
+extern void erase_mtab(const char * name);
+extern void mtab_read(void);
+extern char *mtab_first(void **iter);
+extern char *mtab_next(void **iter);
+extern char *mtab_getinfo(const char *match, const char which);
+extern int check_wildcard_match(const char* text, const char* pattern);
+extern long atoi_w_units (const char *cp);
+extern pid_t* find_pid_by_name( char* pidName);
+extern int find_real_root_device_name(char* name);
+extern char *get_line_from_file(FILE *file);
+extern void print_file(FILE *file);
+extern int print_file_by_name(char *filename);
+extern char process_escape_sequence(char **ptr);
+extern char *get_last_path_component(char *path);
+extern FILE *wfopen(const char *path, const char *mode);
+extern FILE *xfopen(const char *path, const char *mode);
+extern void chomp(char *s);
+extern void trim(char *s);
+extern struct BB_applet *find_applet_by_name(const char *name);
+void run_applet_by_name(const char *name, int argc, char **argv);
+
+#ifndef DMALLOC
+extern void *xmalloc (size_t size);
+extern void *xrealloc(void *old, size_t size);
+extern void *xcalloc(size_t nmemb, size_t size);
+extern char *xstrdup (const char *s);
+#endif
+extern char *xstrndup (const char *s, int n);
+extern char * safe_strncpy(char *dst, const char *src, size_t size);
+
+struct suffix_mult {
+	char *suffix;
+	int mult;
+};
+
+extern unsigned long parse_number(const char *numstr,
+		const struct suffix_mult *suffixes);
+
+
+/* These parse entries in /etc/passwd and /etc/group.  This is desirable
+ * for BusyBox since we want to avoid using the glibc NSS stuff, which
+ * increases target size and is often not needed embedded systems.  */
+extern long my_getpwnam(const char *name);
+extern long my_getgrnam(const char *name);
+extern void my_getpwuid(char *name, long uid);
+extern void my_getgrgid(char *group, long gid);
+extern long my_getpwnamegid(const char *name);
+
+extern int device_open(char *device, int mode);
+
+extern int del_loop(const char *device);
+extern int set_loop(const char *device, const char *file, int offset, int *loopro);
+extern char *find_unused_loop_device (void);
+
+
+#if (__GLIBC__ < 2)
+extern int vdprintf(int d, const char *format, va_list ap);
+#endif
+
+int nfsmount(const char *spec, const char *node, int *flags,
+	     char **extra_opts, char **mount_opts, int running_bg);
+
+void syslog_msg_with_name(const char *name, int facility, int pri, const char *msg);
+void syslog_msg(int facility, int pri, const char *msg);
+
+/* Include our own copy of struct sysinfo to avoid binary compatability
+ * problems with Linux 2.4, which changed things.  Grumble, grumble. */
+struct sysinfo {
+	long uptime;			/* Seconds since boot */
+	unsigned long loads[3];		/* 1, 5, and 15 minute load averages */
+	unsigned long totalram;		/* Total usable main memory size */
+	unsigned long freeram;		/* Available memory size */
+	unsigned long sharedram;	/* Amount of shared memory */
+	unsigned long bufferram;	/* Memory used by buffers */
+	unsigned long totalswap;	/* Total swap space size */
+	unsigned long freeswap;		/* swap space still available */
+	unsigned short procs;		/* Number of current processes */
+	unsigned long totalhigh;	/* Total high memory size */
+	unsigned long freehigh;		/* Available high memory size */
+	unsigned int mem_unit;		/* Memory unit size in bytes */
+	char _f[20-2*sizeof(long)-sizeof(int)];	/* Padding: libc5 uses this.. */
+};
+extern int sysinfo (struct sysinfo* info);
+
+const char *make_human_readable_str(unsigned long val, unsigned long hr);
+enum {
+	KILOBYTE = 1024,
+	MEGABYTE = (KILOBYTE*1024),
+	GIGABYTE = (MEGABYTE*1024)
+};
+
+int ask_confirmation(void);
+
+#endif /* __LIBBB_H__ */
diff --git a/libbb/loop.c b/libbb/loop.c
new file mode 100644
index 000000000..4754b8da1
--- /dev/null
+++ b/libbb/loop.c
@@ -0,0 +1,128 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include "libbb.h"
+#include "loop.h" /* Pull in loop device support */
+
+extern int del_loop(const char *device)
+{
+	int fd;
+
+	if ((fd = open(device, O_RDONLY)) < 0) {
+		perror_msg("%s", device);
+		return (FALSE);
+	}
+	if (ioctl(fd, LOOP_CLR_FD, 0) < 0) {
+		perror_msg("ioctl: LOOP_CLR_FD");
+		return (FALSE);
+	}
+	close(fd);
+	return (TRUE);
+}
+
+extern int set_loop(const char *device, const char *file, int offset,
+					int *loopro)
+{
+	struct loop_info loopinfo;
+	int fd, ffd, mode;
+
+	mode = *loopro ? O_RDONLY : O_RDWR;
+	if ((ffd = open(file, mode)) < 0 && !*loopro
+		&& (errno != EROFS || (ffd = open(file, mode = O_RDONLY)) < 0)) {
+		perror_msg("%s", file);
+		return 1;
+	}
+	if ((fd = open(device, mode)) < 0) {
+		close(ffd);
+		perror_msg("%s", device);
+		return 1;
+	}
+	*loopro = (mode == O_RDONLY);
+
+	memset(&loopinfo, 0, sizeof(loopinfo));
+	safe_strncpy(loopinfo.lo_name, file, LO_NAME_SIZE);
+
+	loopinfo.lo_offset = offset;
+
+	loopinfo.lo_encrypt_key_size = 0;
+	if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
+		perror_msg("ioctl: LOOP_SET_FD");
+		close(fd);
+		close(ffd);
+		return 1;
+	}
+	if (ioctl(fd, LOOP_SET_STATUS, &loopinfo) < 0) {
+		(void) ioctl(fd, LOOP_CLR_FD, 0);
+		perror_msg("ioctl: LOOP_SET_STATUS");
+		close(fd);
+		close(ffd);
+		return 1;
+	}
+	close(fd);
+	close(ffd);
+	return 0;
+}
+
+extern char *find_unused_loop_device(void)
+{
+	char dev[20];
+	int i, fd;
+	struct stat statbuf;
+	struct loop_info loopinfo;
+
+	for (i = 0; i <= 7; i++) {
+		sprintf(dev, "/dev/loop%d", i);
+		if (stat(dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
+			if ((fd = open(dev, O_RDONLY)) >= 0) {
+				if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) != 0) {
+					if (errno == ENXIO) {	/* probably free */
+						close(fd);
+						return strdup(dev);
+					}
+				}
+				close(fd);
+			}
+		}
+	}
+	return NULL;
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/mode_string.c b/libbb/mode_string.c
new file mode 100644
index 000000000..0a3d6e6f0
--- /dev/null
+++ b/libbb/mode_string.c
@@ -0,0 +1,82 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include "libbb.h"
+
+
+
+#define TYPEINDEX(mode) (((mode) >> 12) & 0x0f)
+#define TYPECHAR(mode)  ("0pcCd?bB-?l?s???" [TYPEINDEX(mode)])
+
+/* The special bits. If set, display SMODE0/1 instead of MODE0/1 */
+static const mode_t SBIT[] = {
+	0, 0, S_ISUID,
+	0, 0, S_ISGID,
+	0, 0, S_ISVTX
+};
+
+/* The 9 mode bits to test */
+static const mode_t MBIT[] = {
+	S_IRUSR, S_IWUSR, S_IXUSR,
+	S_IRGRP, S_IWGRP, S_IXGRP,
+	S_IROTH, S_IWOTH, S_IXOTH
+};
+
+static const char MODE1[]  = "rwxrwxrwx";
+static const char MODE0[]  = "---------";
+static const char SMODE1[] = "..s..s..t";
+static const char SMODE0[] = "..S..S..T";
+
+/*
+ * Return the standard ls-like mode string from a file mode.
+ * This is static and so is overwritten on each call.
+ */
+const char *mode_string(int mode)
+{
+	static char buf[12];
+
+	int i;
+
+	buf[0] = TYPECHAR(mode);
+	for (i = 0; i < 9; i++) {
+		if (mode & SBIT[i])
+			buf[i + 1] = (mode & MBIT[i]) ? SMODE1[i] : SMODE0[i];
+		else
+			buf[i + 1] = (mode & MBIT[i]) ? MODE1[i] : MODE0[i];
+	}
+	return buf;
+}
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/parse_mode.c b/libbb/parse_mode.c
new file mode 100644
index 000000000..33a878122
--- /dev/null
+++ b/libbb/parse_mode.c
@@ -0,0 +1,138 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "libbb.h"
+
+
+/* This function parses the sort of string you might pass
+ * to chmod (i.e.  [ugoa]{+|-|=}[rwxst] ) and returns the
+ * correct mode described by the string. */
+extern int parse_mode(const char *s, mode_t * theMode)
+{
+	static const mode_t group_set[] = { 
+		S_ISUID | S_IRWXU,		/* u */
+		S_ISGID | S_IRWXG,		/* g */
+		S_IRWXO,				/* o */
+		S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO /* a */
+	};
+
+	static const mode_t mode_set[] = {
+		S_IRUSR | S_IRGRP | S_IROTH, /* r */
+		S_IWUSR | S_IWGRP | S_IWOTH, /* w */
+		S_IXUSR | S_IXGRP | S_IXOTH, /* x */
+		S_ISUID | S_ISGID,		/* s */
+		S_ISVTX					/* t */
+	};
+
+	static const char group_string[] = "ugoa";
+	static const char mode_string[] = "rwxst";
+
+	const char *p;
+
+	mode_t andMode =
+		S_ISVTX | S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO;
+	mode_t orMode = 0;
+	mode_t mode;
+	mode_t groups;
+	char type;
+	char c;
+
+	if (s==NULL) {
+		return (FALSE);
+	}
+
+	do {
+		mode = 0;
+		groups = 0;
+	NEXT_GROUP:
+		if ((c = *s++) == '\0') {
+			return -1;
+		}
+		for (p=group_string ; *p ; p++) {
+			if (*p == c) {
+				groups |= group_set[(int)(p-group_string)];
+				goto NEXT_GROUP;
+			}
+		}
+		switch (c) {
+			case '=':
+			case '+':
+			case '-':
+				type = c;
+				if (groups == 0) { /* The default is "all" */
+					groups |= S_ISUID | S_ISGID | S_ISVTX
+							| S_IRWXU | S_IRWXG | S_IRWXO;
+				}
+				break;
+			default:
+				if ((c < '0') || (c > '7') || (mode | groups)) {
+					return (FALSE);
+				} else {
+					*theMode = strtol(--s, NULL, 8);
+					return (TRUE);
+				}
+		}
+
+	NEXT_MODE:
+		if (((c = *s++) != '\0') && (c != ',')) {
+			for (p=mode_string ; *p ; p++) {
+				if (*p == c) {
+					mode |= mode_set[(int)(p-mode_string)];
+					goto NEXT_MODE;
+				}
+			}
+			break;				/* We're done so break out of loop.*/
+		}
+		switch (type) {
+			case '=':
+				andMode &= ~(groups); /* Now fall through. */
+			case '+':
+				orMode |= mode & groups;
+				break;
+			case '-':
+				andMode &= ~(mode & groups);
+				orMode &= ~(mode & groups);
+				break;
+		}
+	} while (c == ',');
+
+	*theMode &= andMode;
+	*theMode |= orMode;
+
+	return TRUE;
+}
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/parse_number.c b/libbb/parse_number.c
new file mode 100644
index 000000000..c90511dca
--- /dev/null
+++ b/libbb/parse_number.c
@@ -0,0 +1,74 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "libbb.h"
+
+
+unsigned long parse_number(const char *numstr,
+		const struct suffix_mult *suffixes)
+{
+	const struct suffix_mult *sm;
+	unsigned long int ret;
+	int len;
+	char *end;
+	
+	ret = strtoul(numstr, &end, 10);
+	if (numstr == end)
+		error_msg_and_die("invalid number `%s'", numstr);
+	while (end[0] != '\0') {
+		sm = suffixes;
+		while ( sm != 0 ) {
+			if(sm->suffix) {
+				len = strlen(sm->suffix);
+				if (strncmp(sm->suffix, end, len) == 0) {
+					ret *= sm->mult;
+					end += len;
+					break;
+				}
+			sm++;
+			
+			} else
+				sm = 0;
+		}
+		if (sm == 0)
+			error_msg_and_die("invalid number `%s'", numstr);
+	}
+	return ret;
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/print_file.c b/libbb/print_file.c
new file mode 100644
index 000000000..52a39774f
--- /dev/null
+++ b/libbb/print_file.c
@@ -0,0 +1,59 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include "libbb.h"
+
+
+extern void print_file(FILE *file)
+{
+	int c;
+
+	while ((c = getc(file)) != EOF)
+		putc(c, stdout);
+	fclose(file);
+	fflush(stdout);
+}
+
+extern int print_file_by_name(char *filename)
+{
+	FILE *file;
+	if ((file = wfopen(filename, "r")) == NULL)
+		return FALSE;
+	print_file(file);
+	return TRUE;
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/process_escape_sequence.c b/libbb/process_escape_sequence.c
new file mode 100644
index 000000000..ad2be94ee
--- /dev/null
+++ b/libbb/process_escape_sequence.c
@@ -0,0 +1,83 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <limits.h>
+#include "libbb.h"
+
+
+
+char process_escape_sequence(char **ptr)
+{
+       static const char charmap[] = {
+		   'a',  'b',  'f',  'n',  'r',  't',  'v',  '\\', 0,
+	       '\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '\\' };
+
+       const char *p;
+	   char *q;
+       int num_digits;
+       unsigned int n;
+
+       n = 0;
+	   q = *ptr;
+
+       for ( num_digits = 0 ; num_digits < 3 ; ++num_digits) {
+	       if ((*q < '0') || (*q > '7')) { /* not a digit? */
+		       break;
+	       }
+	       n = n * 8 + (*q++ - '0');
+       }
+
+       if (num_digits == 0) {	/* mnemonic escape sequence? */
+		   for (p=charmap ; *p ; p++) {
+			   if (*p == *q) {
+				   q++;
+				   break;
+			   }
+		   }
+		   n = *(p+(sizeof(charmap)/2));
+	   }
+
+	   /* doesn't hurt to fall through to here from mnemonic case */
+	   if (n > UCHAR_MAX) {	/* is octal code too big for a char? */
+		   n /= 8;			/* adjust value and */
+		   --q;				/* back up one char */
+	   }
+
+	   *ptr = q;
+	   return (char) n;
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/pwd_grp_wrappers.c b/libbb/pwd_grp_wrappers.c
new file mode 100644
index 000000000..e7b7e3820
--- /dev/null
+++ b/libbb/pwd_grp_wrappers.c
@@ -0,0 +1,109 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "../pwd_grp/pwd.h"
+#include "../pwd_grp/grp.h"
+#include "libbb.h"
+
+
+
+/* returns a uid given a username */
+long my_getpwnam(const char *name)
+{
+	struct passwd *myuser;
+
+	myuser  = getpwnam(name);
+	if (myuser==NULL)
+		error_msg_and_die("unknown user name: %s", name);
+
+	return myuser->pw_uid;
+}
+
+/* returns a gid given a group name */
+long my_getgrnam(const char *name)
+{
+	struct group *mygroup;
+
+	mygroup  = getgrnam(name);
+	if (mygroup==NULL)
+		error_msg_and_die("unknown group name: %s", name);
+
+	return (mygroup->gr_gid);
+}
+
+/* gets a username given a uid */
+void my_getpwuid(char *name, long uid)
+{
+	struct passwd *myuser;
+
+	myuser  = getpwuid(uid);
+	if (myuser==NULL)
+		sprintf(name, "%-8ld ", (long)uid);
+	else
+		strcpy(name, myuser->pw_name);
+}
+
+/* gets a groupname given a gid */
+void my_getgrgid(char *group, long gid)
+{
+	struct group *mygroup;
+
+	mygroup  = getgrgid(gid);
+	if (mygroup==NULL)
+		sprintf(group, "%-8ld ", (long)gid);
+	else
+		strcpy(group, mygroup->gr_name);
+}
+
+/* gets a gid given a user name */
+long my_getpwnamegid(const char *name)
+{
+	struct group *mygroup;
+	struct passwd *myuser;
+
+	myuser=getpwnam(name);
+	if (myuser==NULL)
+		error_msg_and_die("unknown user name: %s", name);
+
+	mygroup  = getgrgid(myuser->pw_gid);
+	if (mygroup==NULL)
+		error_msg_and_die("unknown gid %ld", (long)myuser->pw_gid);
+
+	return mygroup->gr_gid;
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c
new file mode 100644
index 000000000..6b93340be
--- /dev/null
+++ b/libbb/recursive_action.c
@@ -0,0 +1,160 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include "libbb.h"
+
+/* same conditions as recursive_action */
+#define bb_need_name_too_long
+#define BB_DECLARE_EXTERN
+#include "../messages.c"
+
+#undef DEBUG_RECURS_ACTION
+
+
+/*
+ * Walk down all the directories under the specified 
+ * location, and do something (something specified
+ * by the fileAction and dirAction function pointers).
+ *
+ * Unfortunately, while nftw(3) could replace this and reduce 
+ * code size a bit, nftw() wasn't supported before GNU libc 2.1, 
+ * and so isn't sufficiently portable to take over since glibc2.1
+ * is so stinking huge.
+ */
+int recursive_action(const char *fileName,
+					int recurse, int followLinks, int depthFirst,
+					int (*fileAction) (const char *fileName,
+									   struct stat * statbuf,
+									   void* userData),
+					int (*dirAction) (const char *fileName,
+									  struct stat * statbuf,
+									  void* userData),
+					void* userData)
+{
+	int status;
+	struct stat statbuf;
+	struct dirent *next;
+
+	if (followLinks == TRUE)
+		status = stat(fileName, &statbuf);
+	else
+		status = lstat(fileName, &statbuf);
+
+	if (status < 0) {
+#ifdef DEBUG_RECURS_ACTION
+		fprintf(stderr,
+				"status=%d followLinks=%d TRUE=%d\n",
+				status, followLinks, TRUE);
+#endif
+		perror_msg("%s", fileName);
+		return FALSE;
+	}
+
+	if ((followLinks == FALSE) && (S_ISLNK(statbuf.st_mode))) {
+		if (fileAction == NULL)
+			return TRUE;
+		else
+			return fileAction(fileName, &statbuf, userData);
+	}
+
+	if (recurse == FALSE) {
+		if (S_ISDIR(statbuf.st_mode)) {
+			if (dirAction != NULL)
+				return (dirAction(fileName, &statbuf, userData));
+			else
+				return TRUE;
+		}
+	}
+
+	if (S_ISDIR(statbuf.st_mode)) {
+		DIR *dir;
+
+		if (dirAction != NULL && depthFirst == FALSE) {
+			status = dirAction(fileName, &statbuf, userData);
+			if (status == FALSE) {
+				perror_msg("%s", fileName);
+				return FALSE;
+			} else if (status == SKIP)
+				return TRUE;
+		}
+		dir = opendir(fileName);
+		if (!dir) {
+			perror_msg("%s", fileName);
+			return FALSE;
+		}
+		status = TRUE;
+		while ((next = readdir(dir)) != NULL) {
+			char nextFile[PATH_MAX];
+
+			if ((strcmp(next->d_name, "..") == 0)
+					|| (strcmp(next->d_name, ".") == 0)) {
+				continue;
+			}
+			if (strlen(fileName) + strlen(next->d_name) + 1 > PATH_MAX) {
+				error_msg(name_too_long);
+				return FALSE;
+			}
+			memset(nextFile, 0, sizeof(nextFile));
+			if (fileName[strlen(fileName)-1] == '/')
+				sprintf(nextFile, "%s%s", fileName, next->d_name);
+			else
+				sprintf(nextFile, "%s/%s", fileName, next->d_name);
+			if (recursive_action(nextFile, TRUE, followLinks, depthFirst,
+						fileAction, dirAction, userData) == FALSE) {
+				status = FALSE;
+			}
+		}
+		closedir(dir);
+		if (dirAction != NULL && depthFirst == TRUE) {
+			if (dirAction(fileName, &statbuf, userData) == FALSE) {
+				perror_msg("%s", fileName);
+				return FALSE;
+			}
+		}
+		if (status == FALSE)
+			return FALSE;
+	} else {
+		if (fileAction == NULL)
+			return TRUE;
+		else
+			return fileAction(fileName, &statbuf, userData);
+	}
+	return TRUE;
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/safe_read.c b/libbb/safe_read.c
new file mode 100644
index 000000000..dbf4aa7e4
--- /dev/null
+++ b/libbb/safe_read.c
@@ -0,0 +1,54 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include "libbb.h"
+
+
+
+ssize_t safe_read(int fd, void *buf, size_t count)
+{
+	ssize_t n;
+
+	do {
+		n = read(fd, buf, count);
+	} while (n < 0 && errno == EINTR);
+
+	return n;
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/safe_strncpy.c b/libbb/safe_strncpy.c
new file mode 100644
index 000000000..55ec79802
--- /dev/null
+++ b/libbb/safe_strncpy.c
@@ -0,0 +1,48 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <string.h>
+#include "libbb.h"
+
+
+
+/* Like strncpy but make sure the resulting string is always 0 terminated. */  
+extern char * safe_strncpy(char *dst, const char *src, size_t size)
+{   
+	dst[size-1] = '\0';
+	return strncpy(dst, src, size-1);   
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/syscalls.c b/libbb/syscalls.c
new file mode 100644
index 000000000..021154602
--- /dev/null
+++ b/libbb/syscalls.c
@@ -0,0 +1,76 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include <sys/syscall.h>
+#include <linux/unistd.h>
+
+#include "libbb.h"
+
+
+_syscall1(int, sysinfo, struct sysinfo *, info);
+
+/* Include our own version of <sys/mount.h>, since libc5 doesn't
+ * know about umount2 */
+extern _syscall1(int, umount, const char *, special_file);
+extern _syscall5(int, mount, const char *, special_file, const char *, dir,
+		const char *, fstype, unsigned long int, rwflag, const void *, data);
+
+#ifndef __NR_umount2
+# warning This kernel does not support the umount2 syscall
+# warning The umount2 system call is being stubbed out...
+int umount2(const char * special_file, int flags)
+{
+	/* BusyBox was compiled against a kernel that did not support
+	 *  the umount2 system call.  To make this application work,
+	 *  you will need to recompile with a kernel supporting the
+	 *  umount2 system call.
+	 */
+	fprintf(stderr, "\n\nTo make this application work, you will need to recompile\n");
+	fprintf(stderr, "with a kernel supporting the umount2 system call. -Erik\n\n");
+	errno=ENOSYS;
+	return -1;
+}
+# else
+extern _syscall2(int, umount2, const char *, special_file, int, flags);
+#endif
+
+#ifndef __NR_query_module
+static const int __NR_query_module = 167;
+#endif
+_syscall5(int, query_module, const char *, name, int, which,
+		void *, buf, size_t, bufsize, size_t*, ret);
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/syslog_msg_with_name.c b/libbb/syslog_msg_with_name.c
new file mode 100644
index 000000000..d72755a37
--- /dev/null
+++ b/libbb/syslog_msg_with_name.c
@@ -0,0 +1,53 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <sys/syslog.h>
+#include "libbb.h"
+
+extern const char *applet_name;
+
+void syslog_msg_with_name(const char *name, int facility, int pri, const char *msg)
+{
+ 	openlog(name, 0, facility);
+	syslog(pri, "%s", msg);
+	closelog();
+}
+
+void syslog_msg(int facility, int pri, const char *msg)
+{
+ 	syslog_msg_with_name(applet_name, facility, pri, msg);
+}
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/time_string.c b/libbb/time_string.c
new file mode 100644
index 000000000..076529006
--- /dev/null
+++ b/libbb/time_string.c
@@ -0,0 +1,68 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <utime.h>
+#include "libbb.h"
+
+
+/*
+ * Return the standard ls-like time string from a time_t
+ * This is static and so is overwritten on each call.
+ */
+const char *time_string(time_t timeVal)
+{
+	time_t now;
+	char *str;
+	static char buf[26];
+
+	time(&now);
+
+	str = ctime(&timeVal);
+
+	strcpy(buf, &str[4]);
+	buf[12] = '\0';
+
+	if ((timeVal > now) || (timeVal < now - 365 * 24 * 60 * 60L)) {
+		strcpy(&buf[7], &str[20]);
+		buf[11] = '\0';
+	}
+
+	return buf;
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/trim.c b/libbb/trim.c
new file mode 100644
index 000000000..8a9b07a14
--- /dev/null
+++ b/libbb/trim.c
@@ -0,0 +1,52 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include "libbb.h"
+
+
+void trim(char *s)
+{
+	/* trim trailing whitespace */
+	while (isspace(s[strlen(s)-1]))
+		s[strlen(s)-1]='\0';
+
+	/* trim leading whitespace */
+	memmove(s, &s[strspn(s, " \n\r\t\v")], strlen(s));
+
+}
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/vdprintf.c b/libbb/vdprintf.c
new file mode 100644
index 000000000..a18291b3b
--- /dev/null
+++ b/libbb/vdprintf.c
@@ -0,0 +1,52 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include "libbb.h"
+
+
+
+#if (__GLIBC__ < 2)
+extern int vdprintf(int d, const char *format, va_list ap)
+{
+	char buf[BUF_SIZE];
+	int len;
+
+	len = vsprintf(buf, format, ap);
+	return write(d, buf, len);
+}
+#endif
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/wfopen.c b/libbb/wfopen.c
new file mode 100644
index 000000000..8b074d2f7
--- /dev/null
+++ b/libbb/wfopen.c
@@ -0,0 +1,50 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include "libbb.h"
+
+FILE *wfopen(const char *path, const char *mode)
+{
+	FILE *fp;
+	if ((fp = fopen(path, mode)) == NULL) {
+		perror_msg("%s", path);
+		errno = 0;
+	}
+	return fp;
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
new file mode 100644
index 000000000..e7f41aae2
--- /dev/null
+++ b/libbb/xfuncs.c
@@ -0,0 +1,107 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "libbb.h"
+
+/* same conditions as recursive_action */
+#define bb_need_memory_exhausted
+#define BB_DECLARE_EXTERN
+#include "../messages.c"
+
+
+#ifndef DMALLOC
+extern void *xmalloc(size_t size)
+{
+	void *ptr = malloc(size);
+
+	if (!ptr)
+		error_msg_and_die(memory_exhausted);
+	return ptr;
+}
+
+extern void *xrealloc(void *old, size_t size)
+{
+	void *ptr = realloc(old, size);
+	if (!ptr)
+		error_msg_and_die(memory_exhausted);
+	return ptr;
+}
+
+extern void *xcalloc(size_t nmemb, size_t size)
+{
+	void *ptr = calloc(nmemb, size);
+	if (!ptr)
+		error_msg_and_die(memory_exhausted);
+	return ptr;
+}
+
+extern char * xstrdup (const char *s) {
+	char *t;
+
+	if (s == NULL)
+		return NULL;
+
+	t = strdup (s);
+
+	if (t == NULL)
+		error_msg_and_die(memory_exhausted);
+
+	return t;
+}
+#endif
+
+extern char * xstrndup (const char *s, int n) {
+	char *t;
+
+	if (s == NULL)
+		error_msg_and_die("xstrndup bug");
+
+	t = xmalloc(++n);
+	
+	return safe_strncpy(t,s,n);
+}
+
+FILE *xfopen(const char *path, const char *mode)
+{
+	FILE *fp;
+	if ((fp = fopen(path, mode)) == NULL)
+		perror_msg_and_die("%s", path);
+	return fp;
+}
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/libbb/xregcomp.c b/libbb/xregcomp.c
new file mode 100644
index 000000000..6f5e2f0cb
--- /dev/null
+++ b/libbb/xregcomp.c
@@ -0,0 +1,53 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include "libbb.h"
+#include <regex.h>
+
+
+
+void xregcomp(regex_t *preg, const char *regex, int cflags)
+{
+	int ret;
+	if ((ret = regcomp(preg, regex, cflags)) != 0) {
+		int errmsgsz = regerror(ret, preg, NULL, 0);
+		char *errmsg = xmalloc(errmsgsz);
+		regerror(ret, preg, errmsg, errmsgsz);
+		error_msg_and_die("xregcomp: %s", errmsg);
+	}
+}
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/mtab_file.c b/mtab_file.c
new file mode 100644
index 000000000..3235e35d6
--- /dev/null
+++ b/mtab_file.c
@@ -0,0 +1,52 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks.  Tracking down who wrote what
+ * isn't something I'm going to worry about...  If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include "busybox.h"
+
+
+/* Busybox mount uses either /proc/mounts or /dev/mtab to 
+ * get the list of currently mounted filesystems */ 
+#if defined BB_MTAB
+const char mtab_file[] = "/etc/mtab";
+#else
+#  if defined BB_FEATURE_USE_DEVPS_PATCH
+      const char mtab_file[] = "/dev/mtab";
+#  else
+      const char mtab_file[] = "/proc/mounts";
+#  endif
+#endif
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
diff --git a/utility.c b/utility.c
deleted file mode 100644
index 8408a6cfa..000000000
--- a/utility.c
+++ /dev/null
@@ -1,1887 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * Copyright (C) tons of folks.  Tracking down who wrote what
- * isn't something I'm going to worry about...  If you wrote something
- * here, please feel free to acknowledge your work.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * 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.
- *
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <time.h>
-#include <utime.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>		/* for uname(2) */
-
-#include "busybox.h"
-#if defined (BB_CHMOD_CHOWN_CHGRP) \
- || defined (BB_CP_MV)		   \
- || defined (BB_FIND)		   \
- || defined (BB_INSMOD)		   \
- || defined (BB_LS)		   \
- || defined (BB_RM)		   \
- || defined (BB_TAR)
-/* same conditions as recursive_action */
-#define bb_need_name_too_long
-#endif
-#define bb_need_memory_exhausted
-#define bb_need_full_version
-#define BB_DECLARE_EXTERN
-#include "messages.c"
-
-#include "pwd_grp/pwd.h"
-#include "pwd_grp/grp.h"
-
-/* for the _syscall() macros */
-#include <sys/syscall.h>
-#include <linux/unistd.h>
-
-/* Busybox mount uses either /proc/mounts or /dev/mtab to 
- * get the list of currently mounted filesystems */ 
-#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF
-#  if defined BB_MTAB
-const char mtab_file[] = "/etc/mtab";
-#  else
-#      if defined BB_FEATURE_USE_DEVPS_PATCH
-const char mtab_file[] = "/dev/mtab";
-#    else
-const char mtab_file[] = "/proc/mounts";
-#    endif
-#  endif
-#endif
-
-#if defined(BB_KLOGD) || defined(BB_LOGGER)
-#include <syslog.h>
-#endif
-
-static struct BB_applet *applet_using;
-
-extern void show_usage(void)
-{
-	const char *format_string;
-	const char *usage_string = usage_messages;
-	int i;
-
-	for (i = applet_using - applets; i > 0; ) {
-		if (!*usage_string++) {
-			--i;
-		}
-	}
-	format_string = "%s\n\nUsage: %s %s\n\n";
-	if(*usage_string == 0)
-		format_string = "%s\n\nNo help available.\n\n";
-	fprintf(stderr, format_string,
-			full_version, applet_using->name, usage_string);
-	exit(EXIT_FAILURE);
-}
-
-
-static void verror_msg(const char *s, va_list p)
-{
-	fflush(stdout);
-	fprintf(stderr, "%s: ", applet_name);
-	vfprintf(stderr, s, p);
-}
-
-extern void error_msg(const char *s, ...)
-{
-	va_list p;
-
-	va_start(p, s);
-	verror_msg(s, p);
-	va_end(p);
-	putc('\n', stderr);
-}
-
-extern void error_msg_and_die(const char *s, ...)
-{
-	va_list p;
-
-	va_start(p, s);
-	verror_msg(s, p);
-	va_end(p);
-	putc('\n', stderr);
-	exit(EXIT_FAILURE);
-}
-
-static void vperror_msg(const char *s, va_list p)
-{
-	int err=errno;
-	if(s == 0) s = "";
-	verror_msg(s, p);
-	if (*s) s = ": ";
-	fprintf(stderr, "%s%s\n", s, strerror(err));
-}
-
-extern void perror_msg(const char *s, ...)
-{
-	va_list p;
-
-	va_start(p, s);
-	vperror_msg(s, p);
-	va_end(p);
-}
-
-extern void perror_msg_and_die(const char *s, ...)
-{
-	va_list p;
-
-	va_start(p, s);
-	vperror_msg(s, p);
-	va_end(p);
-	exit(EXIT_FAILURE);
-}
-
-#if defined BB_INIT || defined BB_MKSWAP || defined BB_MOUNT || defined BB_NFSMOUNT || defined BB_FEATURE_IFCONFIG_STATUS
-/* Returns kernel version encoded as major*65536 + minor*256 + patch,
- * so, for example,  to check if the kernel is greater than 2.2.11:
- *     if (get_kernel_revision() <= 2*65536+2*256+11) { <stuff> }
- */
-extern int get_kernel_revision(void)
-{
-	struct utsname name;
-	char *s;
-	int i, r;
-
-	if (uname(&name) == -1) {
-		perror_msg("cannot get system information");
-		return (0);
-	}
-
-	s = name.release;
-	r = 0;
-	for (i=0 ; i<3 ; i++) {
-		r = r * 256 + atoi(strtok(s, "."));
-		s = NULL;
-	}
-	return r;
-}
-#endif                                                 /* BB_INIT */
-
-
-
-#if defined BB_FREE || defined BB_INIT || defined BB_UNAME || defined BB_UPTIME
-_syscall1(int, sysinfo, struct sysinfo *, info);
-#endif                                                 /* BB_INIT */
-
-#if defined BB_MOUNT || defined BB_UMOUNT
-
-/* Include our own version of <sys/mount.h>, since libc5 doesn't
- * know about umount2 */
-extern _syscall1(int, umount, const char *, special_file);
-extern _syscall5(int, mount, const char *, special_file, const char *, dir,
-		const char *, fstype, unsigned long int, rwflag, const void *, data);
-#ifndef __NR_umount2
-# warning This kernel does not support the umount2 syscall
-# warning The umount2 system call is being stubbed out...
-	int umount2(const char * special_file, int flags)
-	{
-		/* BusyBox was compiled against a kernel that did not support
-		 *  the umount2 system call.  To make this application work,
-		 *  you will need to recompile with a kernel supporting the
-		 *  umount2 system call.
-		 */
-		fprintf(stderr, "\n\nTo make this application work, you will need to recompile\n");
-		fprintf(stderr, "with a kernel supporting the umount2 system call. -Erik\n\n");
-		errno=ENOSYS;
-		return -1;
-	}
-# else
-   extern _syscall2(int, umount2, const char *, special_file, int, flags);
-# endif
-#endif
-
-
-
-#if defined BB_FEATURE_NEW_MODULE_INTERFACE && ( defined BB_INSMOD || defined BB_LSMOD )
-#ifndef __NR_query_module
-static const int __NR_query_module = 167;
-#endif
-_syscall5(int, query_module, const char *, name, int, which,
-		void *, buf, size_t, bufsize, size_t*, ret);
-#endif
-
-
-#if defined (BB_CP_MV) || defined (BB_DU)
-
-#define HASH_SIZE	311		/* Should be prime */
-#define hash_inode(i)	((i) % HASH_SIZE)
-
-static ino_dev_hashtable_bucket_t *ino_dev_hashtable[HASH_SIZE];
-
-/*
- * Return 1 if statbuf->st_ino && statbuf->st_dev are recorded in
- * `ino_dev_hashtable', else return 0
- *
- * If NAME is a non-NULL pointer to a character pointer, and there is
- * a match, then set *NAME to the value of the name slot in that
- * bucket.
- */
-int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name)
-{
-	ino_dev_hashtable_bucket_t *bucket;
-
-	bucket = ino_dev_hashtable[hash_inode(statbuf->st_ino)];
-	while (bucket != NULL) {
-	  if ((bucket->ino == statbuf->st_ino) &&
-		  (bucket->dev == statbuf->st_dev))
-	  {
-		if (name) *name = bucket->name;
-		return 1;
-	  }
-	  bucket = bucket->next;
-	}
-	return 0;
-}
-
-/* Add statbuf to statbuf hash table */
-void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name)
-{
-	int i;
-	size_t s;
-	ino_dev_hashtable_bucket_t *bucket;
-    
-	i = hash_inode(statbuf->st_ino);
-	s = name ? strlen(name) : 0;
-	bucket = xmalloc(sizeof(ino_dev_hashtable_bucket_t) + s);
-	bucket->ino = statbuf->st_ino;
-	bucket->dev = statbuf->st_dev;
-	if (name)
-		strcpy(bucket->name, name);
-	else
-		bucket->name[0] = '\0';
-	bucket->next = ino_dev_hashtable[i];
-	ino_dev_hashtable[i] = bucket;
-}
-
-/* Clear statbuf hash table */
-void reset_ino_dev_hashtable(void)
-{
-	int i;
-	ino_dev_hashtable_bucket_t *bucket;
-
-	for (i = 0; i < HASH_SIZE; i++) {
-		while (ino_dev_hashtable[i] != NULL) {
-			bucket = ino_dev_hashtable[i]->next;
-			free(ino_dev_hashtable[i]);
-			ino_dev_hashtable[i] = bucket;
-		}
-	}
-}
-
-#endif /* BB_CP_MV || BB_DU */
-
-#if defined (BB_CP_MV) || defined (BB_DU) || defined (BB_LN) || defined (BB_DPKG_DEB)
-/*
- * Return TRUE if a fileName is a directory.
- * Nonexistant files return FALSE.
- */
-int is_directory(const char *fileName, const int followLinks, struct stat *statBuf)
-{
-	int status;
-	int didMalloc = 0;
-
-	if (statBuf == NULL) {
-	    statBuf = (struct stat *)xmalloc(sizeof(struct stat));
-	    ++didMalloc;
-	}
-
-	if (followLinks == TRUE)
-		status = stat(fileName, statBuf);
-	else
-		status = lstat(fileName, statBuf);
-
-	if (status < 0 || !(S_ISDIR(statBuf->st_mode))) {
-	    status = FALSE;
-	}
-	else status = TRUE;
-
-	if (didMalloc) {
-	    free(statBuf);
-	    statBuf = NULL;
-	}
-	return status;
-}
-#endif
-
-#if defined BB_AR || defined BB_CP_MV
-/*
- * Copy chunksize bytes between two file descriptors
- */
-int copy_file_chunk(int srcfd, int dstfd, size_t chunksize)
-{
-        size_t size;
-        char buffer[BUFSIZ]; /* BUFSIZ is declared in stdio.h */
-
-        while (chunksize > 0) {
-                if (chunksize > BUFSIZ)
-                        size = BUFSIZ;
-                else
-                        size = chunksize;
-                if (full_write(dstfd, buffer, full_read(srcfd, buffer, size)) < size)
-                        return(FALSE);
-                chunksize -= size;
-        }
-        return (TRUE);
-}
-#endif
-
-
-#if defined (BB_CP_MV) || defined BB_DPKG
-/*
- * Copy one file to another, while possibly preserving its modes, times, and
- * modes.  Returns TRUE if successful, or FALSE on a failure with an error
- * message output.  (Failure is not indicated if attributes cannot be set.)
- * -Erik Andersen
- */
-int
-copy_file(const char *srcName, const char *destName,
-		 int setModes, int followLinks, int forceFlag)
-{
-	int rfd;
-	int wfd;
-	int status;
-	struct stat srcStatBuf;
-	struct stat dstStatBuf;
-	struct utimbuf times;
-
-	if (followLinks == TRUE)
-		status = stat(srcName, &srcStatBuf);
-	else
-		status = lstat(srcName, &srcStatBuf);
-
-	if (status < 0) {
-		perror_msg("%s", srcName);
-		return FALSE;
-	}
-
-	if (followLinks == TRUE)
-		status = stat(destName, &dstStatBuf);
-	else
-		status = lstat(destName, &dstStatBuf);
-
-	if (status < 0 || forceFlag==TRUE) {
-		unlink(destName);
-		dstStatBuf.st_ino = -1;
-		dstStatBuf.st_dev = -1;
-	}
-
-	if ((srcStatBuf.st_dev == dstStatBuf.st_dev) &&
-		(srcStatBuf.st_ino == dstStatBuf.st_ino)) {
-		error_msg("Copying file \"%s\" to itself", srcName);
-		return FALSE;
-	}
-
-	if (S_ISDIR(srcStatBuf.st_mode)) {
-		//fprintf(stderr, "copying directory %s to %s\n", srcName, destName);
-		/* Make sure the directory is writable */
-		status = mkdir(destName, 0777777 ^ umask(0));
-		if (status < 0 && errno != EEXIST) {
-			perror_msg("%s", destName);
-			return FALSE;
-		}
-	} else if (S_ISLNK(srcStatBuf.st_mode)) {
-		char link_val[BUFSIZ + 1];
-		int link_size;
-
-		//fprintf(stderr, "copying link %s to %s\n", srcName, destName);
-		/* Warning: This could possibly truncate silently, to BUFSIZ chars */
-		link_size = readlink(srcName, &link_val[0], BUFSIZ);
-		if (link_size < 0) {
-			perror_msg("%s", srcName);
-			return FALSE;
-		}
-		link_val[link_size] = '\0';
-		status = symlink(link_val, destName);
-		if (status < 0) {
-			perror_msg("%s", destName);
-			return FALSE;
-		}
-#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
-		if (setModes == TRUE) {
-			/* Try to set owner, but fail silently like GNU cp */
-			lchown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid);
-		}
-#endif
-		return TRUE;
-	} else if (S_ISFIFO(srcStatBuf.st_mode)) {
-		//fprintf(stderr, "copying fifo %s to %s\n", srcName, destName);
-		if (mkfifo(destName, 0644) < 0) {
-			perror_msg("%s", destName);
-			return FALSE;
-		}
-	} else if (S_ISBLK(srcStatBuf.st_mode) || S_ISCHR(srcStatBuf.st_mode)
-			   || S_ISSOCK(srcStatBuf.st_mode)) {
-		//fprintf(stderr, "copying soc, blk, or chr %s to %s\n", srcName, destName);
-		if (mknod(destName, srcStatBuf.st_mode, srcStatBuf.st_rdev) < 0) {
-			perror_msg("%s", destName);
-			return FALSE;
-		}
-	} else if (S_ISREG(srcStatBuf.st_mode)) {
-		//fprintf(stderr, "copying regular file %s to %s\n", srcName, destName);
-		rfd = open(srcName, O_RDONLY);
-		if (rfd < 0) {
-			perror_msg("%s", srcName);
-			return FALSE;
-		}
-
-	 	wfd = open(destName, O_WRONLY | O_CREAT | O_TRUNC,
-				 srcStatBuf.st_mode);
-		if (wfd < 0) {
-			perror_msg("%s", destName);
-			close(rfd);
-			return FALSE;
-		}
-
-		if (copy_file_chunk(rfd, wfd, srcStatBuf.st_size)==FALSE)
-			goto error_exit;	
-		
-		close(rfd);
-		if (close(wfd) < 0) {
-			return FALSE;
-		}
-	}
-
-	if (setModes == TRUE) {
-		/* This is fine, since symlinks never get here */
-		if (chown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0)
-			perror_msg_and_die("%s", destName);
-		if (chmod(destName, srcStatBuf.st_mode) < 0)
-			perror_msg_and_die("%s", destName);
-		times.actime = srcStatBuf.st_atime;
-		times.modtime = srcStatBuf.st_mtime;
-		if (utime(destName, &times) < 0)
-			perror_msg_and_die("%s", destName);
-	}
-
-	return TRUE;
-
-  error_exit:
-	perror_msg("%s", destName);
-	close(rfd);
-	close(wfd);
-
-	return FALSE;
-}
-#endif							/* BB_CP_MV */
-
-
-
-#if defined BB_TAR || defined BB_LS ||defined BB_AR
-
-#define TYPEINDEX(mode) (((mode) >> 12) & 0x0f)
-#define TYPECHAR(mode)  ("0pcCd?bB-?l?s???" [TYPEINDEX(mode)])
-
-/* The special bits. If set, display SMODE0/1 instead of MODE0/1 */
-static const mode_t SBIT[] = {
-	0, 0, S_ISUID,
-	0, 0, S_ISGID,
-	0, 0, S_ISVTX
-};
-
-/* The 9 mode bits to test */
-static const mode_t MBIT[] = {
-	S_IRUSR, S_IWUSR, S_IXUSR,
-	S_IRGRP, S_IWGRP, S_IXGRP,
-	S_IROTH, S_IWOTH, S_IXOTH
-};
-
-static const char MODE1[]  = "rwxrwxrwx";
-static const char MODE0[]  = "---------";
-static const char SMODE1[] = "..s..s..t";
-static const char SMODE0[] = "..S..S..T";
-
-/*
- * Return the standard ls-like mode string from a file mode.
- * This is static and so is overwritten on each call.
- */
-const char *mode_string(int mode)
-{
-	static char buf[12];
-
-	int i;
-
-	buf[0] = TYPECHAR(mode);
-	for (i = 0; i < 9; i++) {
-		if (mode & SBIT[i])
-			buf[i + 1] = (mode & MBIT[i]) ? SMODE1[i] : SMODE0[i];
-		else
-			buf[i + 1] = (mode & MBIT[i]) ? MODE1[i] : MODE0[i];
-	}
-	return buf;
-}
-#endif							/* BB_TAR || BB_LS */
-
-
-#if defined BB_TAR || defined BB_AR
-/*
- * Return the standard ls-like time string from a time_t
- * This is static and so is overwritten on each call.
- */
-const char *time_string(time_t timeVal)
-{
-	time_t now;
-	char *str;
-	static char buf[26];
-
-	time(&now);
-
-	str = ctime(&timeVal);
-
-	strcpy(buf, &str[4]);
-	buf[12] = '\0';
-
-	if ((timeVal > now) || (timeVal < now - 365 * 24 * 60 * 60L)) {
-		strcpy(&buf[7], &str[20]);
-		buf[11] = '\0';
-	}
-
-	return buf;
-}
-#endif /* BB_TAR || BB_AR */
-
-#if defined BB_DD || defined BB_NC || defined BB_TAIL || defined BB_TAR || defined BB_AR || defined BB_CP_MV
-/*
- * Write all of the supplied buffer out to a file.
- * This does multiple writes as necessary.
- * Returns the amount written, or -1 on an error.
- */
-int full_write(int fd, const char *buf, int len)
-{
-	int cc;
-	int total;
-
-	total = 0;
-
-	while (len > 0) {
-		cc = write(fd, buf, len);
-
-		if (cc < 0)
-			return -1;
-
-		buf += cc;
-		total += cc;
-		len -= cc;
-	}
-
-	return total;
-}
-#endif
-
-#if defined BB_AR || defined BB_CP_MV || defined BB_SH || defined BB_TAR
-/*
- * Read all of the supplied buffer from a file.
- * This does multiple reads as necessary.
- * Returns the amount read, or -1 on an error.
- * A short read is returned on an end of file.
- */
-int full_read(int fd, char *buf, int len)
-{
-	int cc;
-	int total;
-
-	total = 0;
-
-	while (len > 0) {
-		cc = read(fd, buf, len);
-
-		if (cc < 0)
-			return -1;
-
-		if (cc == 0)
-			break;
-
-		buf += cc;
-		total += cc;
-		len -= cc;
-	}
-
-	return total;
-}
-#endif /* BB_TAR || BB_TAIL || BB_AR || BB_SH */
-
-
-#if defined (BB_CHMOD_CHOWN_CHGRP) \
- || defined (BB_CP_MV)			\
- || defined (BB_FIND)			\
- || defined (BB_INSMOD)			\
- || defined (BB_LS)				\
- || defined (BB_RM)				\
- || defined (BB_TAR)
-
-/*
- * Walk down all the directories under the specified 
- * location, and do something (something specified
- * by the fileAction and dirAction function pointers).
- *
- * Unfortunately, while nftw(3) could replace this and reduce 
- * code size a bit, nftw() wasn't supported before GNU libc 2.1, 
- * and so isn't sufficiently portable to take over since glibc2.1
- * is so stinking huge.
- */
-int recursive_action(const char *fileName,
-					int recurse, int followLinks, int depthFirst,
-					int (*fileAction) (const char *fileName,
-									   struct stat * statbuf,
-									   void* userData),
-					int (*dirAction) (const char *fileName,
-									  struct stat * statbuf,
-									  void* userData),
-					void* userData)
-{
-	int status;
-	struct stat statbuf;
-	struct dirent *next;
-
-	if (followLinks == TRUE)
-		status = stat(fileName, &statbuf);
-	else
-		status = lstat(fileName, &statbuf);
-
-	if (status < 0) {
-#ifdef BB_DEBUG_PRINT_SCAFFOLD
-		fprintf(stderr,
-				"status=%d followLinks=%d TRUE=%d\n",
-				status, followLinks, TRUE);
-#endif
-		perror_msg("%s", fileName);
-		return FALSE;
-	}
-
-	if ((followLinks == FALSE) && (S_ISLNK(statbuf.st_mode))) {
-		if (fileAction == NULL)
-			return TRUE;
-		else
-			return fileAction(fileName, &statbuf, userData);
-	}
-
-	if (recurse == FALSE) {
-		if (S_ISDIR(statbuf.st_mode)) {
-			if (dirAction != NULL)
-				return (dirAction(fileName, &statbuf, userData));
-			else
-				return TRUE;
-		}
-	}
-
-	if (S_ISDIR(statbuf.st_mode)) {
-		DIR *dir;
-
-		if (dirAction != NULL && depthFirst == FALSE) {
-			status = dirAction(fileName, &statbuf, userData);
-			if (status == FALSE) {
-				perror_msg("%s", fileName);
-				return FALSE;
-			} else if (status == SKIP)
-				return TRUE;
-		}
-		dir = opendir(fileName);
-		if (!dir) {
-			perror_msg("%s", fileName);
-			return FALSE;
-		}
-		status = TRUE;
-		while ((next = readdir(dir)) != NULL) {
-			char nextFile[PATH_MAX];
-
-			if ((strcmp(next->d_name, "..") == 0)
-					|| (strcmp(next->d_name, ".") == 0)) {
-				continue;
-			}
-			if (strlen(fileName) + strlen(next->d_name) + 1 > PATH_MAX) {
-				error_msg(name_too_long);
-				return FALSE;
-			}
-			memset(nextFile, 0, sizeof(nextFile));
-			if (fileName[strlen(fileName)-1] == '/')
-				sprintf(nextFile, "%s%s", fileName, next->d_name);
-			else
-				sprintf(nextFile, "%s/%s", fileName, next->d_name);
-			if (recursive_action(nextFile, TRUE, followLinks, depthFirst,
-						fileAction, dirAction, userData) == FALSE) {
-				status = FALSE;
-			}
-		}
-		closedir(dir);
-		if (dirAction != NULL && depthFirst == TRUE) {
-			if (dirAction(fileName, &statbuf, userData) == FALSE) {
-				perror_msg("%s", fileName);
-				return FALSE;
-			}
-		}
-		if (status == FALSE)
-			return FALSE;
-	} else {
-		if (fileAction == NULL)
-			return TRUE;
-		else
-			return fileAction(fileName, &statbuf, userData);
-	}
-	return TRUE;
-}
-
-#endif							/* BB_CHMOD_CHOWN_CHGRP || BB_CP_MV || BB_FIND || BB_LS || BB_INSMOD */
-
-
-
-#if defined (BB_TAR) || defined (BB_MKDIR)
-/*
- * Attempt to create the directories along the specified path, except for
- * the final component.  The mode is given for the final directory only,
- * while all previous ones get default protections.  Errors are not reported
- * here, as failures to restore files can be reported later.
- */
-extern int create_path(const char *name, int mode)
-{
-	char *cp;
-	char *cpOld;
-	char buf[BUFSIZ + 1];
-	int retVal = 0;
-
-	strcpy(buf, name);
-	for (cp = buf; *cp == '/'; cp++);
-	cp = strchr(cp, '/');
-	while (cp) {
-		cpOld = cp;
-		cp = strchr(cp + 1, '/');
-		*cpOld = '\0';
-		retVal = mkdir(buf, cp ? 0777 : mode);
-		if (retVal != 0 && errno != EEXIST) {
-			perror_msg("%s", buf);
-			return FALSE;
-		}
-		*cpOld = '/';
-	}
-	return TRUE;
-}
-#endif							/* BB_TAR || BB_MKDIR */
-
-
-
-#if defined (BB_CHMOD_CHOWN_CHGRP) || defined (BB_MKDIR) \
- || defined (BB_MKFIFO) || defined (BB_MKNOD) || defined (BB_AR)
-/* [ugoa]{+|-|=}[rwxst] */
-
-extern int parse_mode(const char *s, mode_t * theMode)
-{
-	static const mode_t group_set[] = { 
-		S_ISUID | S_IRWXU,		/* u */
-		S_ISGID | S_IRWXG,		/* g */
-		S_IRWXO,				/* o */
-		S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO /* a */
-	};
-
-	static const mode_t mode_set[] = {
-		S_IRUSR | S_IRGRP | S_IROTH, /* r */
-		S_IWUSR | S_IWGRP | S_IWOTH, /* w */
-		S_IXUSR | S_IXGRP | S_IXOTH, /* x */
-		S_ISUID | S_ISGID,		/* s */
-		S_ISVTX					/* t */
-	};
-
-	static const char group_string[] = "ugoa";
-	static const char mode_string[] = "rwxst";
-
-	const char *p;
-
-	mode_t andMode =
-		S_ISVTX | S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO;
-	mode_t orMode = 0;
-	mode_t mode;
-	mode_t groups;
-	char type;
-	char c;
-
-	if (s==NULL) {
-		return (FALSE);
-	}
-
-	do {
-		mode = 0;
-		groups = 0;
-	NEXT_GROUP:
-		if ((c = *s++) == '\0') {
-			return -1;
-		}
-		for (p=group_string ; *p ; p++) {
-			if (*p == c) {
-				groups |= group_set[(int)(p-group_string)];
-				goto NEXT_GROUP;
-			}
-		}
-		switch (c) {
-			case '=':
-			case '+':
-			case '-':
-				type = c;
-				if (groups == 0) { /* The default is "all" */
-					groups |= S_ISUID | S_ISGID | S_ISVTX
-							| S_IRWXU | S_IRWXG | S_IRWXO;
-				}
-				break;
-			default:
-				if ((c < '0') || (c > '7') || (mode | groups)) {
-					return (FALSE);
-				} else {
-					*theMode = strtol(--s, NULL, 8);
-					return (TRUE);
-				}
-		}
-
-	NEXT_MODE:
-		if (((c = *s++) != '\0') && (c != ',')) {
-			for (p=mode_string ; *p ; p++) {
-				if (*p == c) {
-					mode |= mode_set[(int)(p-mode_string)];
-					goto NEXT_MODE;
-				}
-			}
-			break;				/* We're done so break out of loop.*/
-		}
-		switch (type) {
-			case '=':
-				andMode &= ~(groups); /* Now fall through. */
-			case '+':
-				orMode |= mode & groups;
-				break;
-			case '-':
-				andMode &= ~(mode & groups);
-				orMode &= ~(mode & groups);
-				break;
-		}
-	} while (c == ',');
-
-	*theMode &= andMode;
-	*theMode |= orMode;
-
-	return TRUE;
-}
-
-#endif
-/* BB_CHMOD_CHOWN_CHGRP || BB_MKDIR || BB_MKFIFO || BB_MKNOD */
-
-
-
-
-
-#if defined BB_CHMOD_CHOWN_CHGRP || defined BB_PS || defined BB_LS \
- || defined BB_TAR || defined BB_ID || defined BB_LOGGER \
- || defined BB_LOGNAME || defined BB_WHOAMI || defined BB_SH
-
-#if defined BB_CHMOD_CHOWN_CHGRP || defined BB_ID
-/* returns a uid given a username */
-long my_getpwnam(const char *name)
-{
-	struct passwd *myuser;
-
-	myuser  = getpwnam(name);
-	if (myuser==NULL)
-		error_msg_and_die("unknown user name: %s", name);
-
-	return myuser->pw_uid;
-}
-
-/* returns a gid given a group name */
-long my_getgrnam(const char *name)
-{
-	struct group *mygroup;
-
-	mygroup  = getgrnam(name);
-	if (mygroup==NULL)
-		error_msg_and_die("unknown group name: %s", name);
-
-	return (mygroup->gr_gid);
-}
-#endif
-
-/* gets a username given a uid */
-void my_getpwuid(char *name, long uid)
-{
-	struct passwd *myuser;
-
-	myuser  = getpwuid(uid);
-	if (myuser==NULL)
-		sprintf(name, "%-8ld ", (long)uid);
-	else
-		strcpy(name, myuser->pw_name);
-}
-
-/* gets a groupname given a gid */
-void my_getgrgid(char *group, long gid)
-{
-	struct group *mygroup;
-
-	mygroup  = getgrgid(gid);
-	if (mygroup==NULL)
-		sprintf(group, "%-8ld ", (long)gid);
-	else
-		strcpy(group, mygroup->gr_name);
-}
-
-#if defined BB_ID
-/* gets a gid given a user name */
-long my_getpwnamegid(const char *name)
-{
-	struct group *mygroup;
-	struct passwd *myuser;
-
-	myuser=getpwnam(name);
-	if (myuser==NULL)
-		error_msg_and_die("unknown user name: %s", name);
-
-	mygroup  = getgrgid(myuser->pw_gid);
-	if (mygroup==NULL)
-		error_msg_and_die("unknown gid %ld", (long)myuser->pw_gid);
-
-	return mygroup->gr_gid;
-}
-#endif /* BB_ID */
-#endif
- /* BB_CHMOD_CHOWN_CHGRP || BB_PS || BB_LS || BB_TAR \
- || BB_ID || BB_LOGGER || BB_LOGNAME || BB_WHOAMI */
-
-
-#if (defined BB_CHVT) || (defined BB_DEALLOCVT) || (defined BB_SETKEYCODES)
-
-/* From <linux/kd.h> */ 
-static const int KDGKBTYPE = 0x4B33;  /* get keyboard type */
-static const int KB_84 = 0x01;
-static const int KB_101 = 0x02;    /* this is what we always answer */
-
-int is_a_console(int fd)
-{
-	char arg;
-
-	arg = 0;
-	return (ioctl(fd, KDGKBTYPE, &arg) == 0
-			&& ((arg == KB_101) || (arg == KB_84)));
-}
-
-static int open_a_console(char *fnam)
-{
-	int fd;
-
-	/* try read-only */
-	fd = open(fnam, O_RDWR);
-
-	/* if failed, try read-only */
-	if (fd < 0 && errno == EACCES)
-		fd = open(fnam, O_RDONLY);
-
-	/* if failed, try write-only */
-	if (fd < 0 && errno == EACCES)
-		fd = open(fnam, O_WRONLY);
-
-	/* if failed, fail */
-	if (fd < 0)
-		return -1;
-
-	/* if not a console, fail */
-	if (!is_a_console(fd)) {
-		close(fd);
-		return -1;
-	}
-
-	/* success */
-	return fd;
-}
-
-/*
- * Get an fd for use with kbd/console ioctls.
- * We try several things because opening /dev/console will fail
- * if someone else used X (which does a chown on /dev/console).
- *
- * if tty_name is non-NULL, try this one instead.
- */
-
-int get_console_fd(char *tty_name)
-{
-	int fd;
-
-	if (tty_name) {
-		if (-1 == (fd = open_a_console(tty_name)))
-			return -1;
-		else
-			return fd;
-	}
-
-	fd = open_a_console("/dev/tty");
-	if (fd >= 0)
-		return fd;
-
-	fd = open_a_console("/dev/tty0");
-	if (fd >= 0)
-		return fd;
-
-	fd = open_a_console("/dev/console");
-	if (fd >= 0)
-		return fd;
-
-	for (fd = 0; fd < 3; fd++)
-		if (is_a_console(fd))
-			return fd;
-
-	error_msg("Couldnt get a file descriptor referring to the console");
-	return -1;					/* total failure */
-}
-
-
-#endif							/* BB_CHVT || BB_DEALLOCVT || BB_SETKEYCODES */
-
-
-#if defined BB_FIND || defined BB_INSMOD
-/*
- * Routine to see if a text string is matched by a wildcard pattern.
- * Returns TRUE if the text is matched, or FALSE if it is not matched
- * or if the pattern is invalid.
- *  *		matches zero or more characters
- *  ?		matches a single character
- *  [abc]	matches 'a', 'b' or 'c'
- *  \c		quotes character c
- * Adapted from code written by Ingo Wilken, and
- * then taken from sash, Copyright (c) 1999 by David I. Bell
- * Permission is granted to use, distribute, or modify this source,
- * provided that this copyright notice remains intact.
- * Permission to distribute this code under the GPL has been granted.
- */
-extern int check_wildcard_match(const char *text, const char *pattern)
-{
-	const char *retryPat;
-	const char *retryText;
-	int ch;
-	int found;
-	int len;
-
-	retryPat = NULL;
-	retryText = NULL;
-
-	while (*text || *pattern) {
-		ch = *pattern++;
-
-		switch (ch) {
-		case '*':
-			retryPat = pattern;
-			retryText = text;
-			break;
-
-		case '[':
-			found = FALSE;
-
-			while ((ch = *pattern++) != ']') {
-				if (ch == '\\')
-					ch = *pattern++;
-
-				if (ch == '\0')
-					return FALSE;
-
-				if (*text == ch)
-					found = TRUE;
-			}
-			len=strlen(text);
-			if (found == FALSE && len!=0) {
-				return FALSE;
-			}
-			if (found == TRUE) {
-				if (strlen(pattern)==0 && len==1) {
-					return TRUE;
-				}
-				if (len!=0) {
-					text++;
-					continue;
-				}
-			}
-
-			/* fall into next case */
-
-		case '?':
-			if (*text++ == '\0')
-				return FALSE;
-
-			break;
-
-		case '\\':
-			ch = *pattern++;
-
-			if (ch == '\0')
-				return FALSE;
-
-			/* fall into next case */
-
-		default:
-			if (*text == ch) {
-				if (*text)
-					text++;
-				break;
-			}
-
-			if (*text) {
-				pattern = retryPat;
-				text = ++retryText;
-				break;
-			}
-
-			return FALSE;
-		}
-
-		if (pattern == NULL)
-			return FALSE;
-	}
-
-	return TRUE;
-}
-#endif                            /* BB_FIND || BB_INSMOD */
-
-
-
-
-#if defined BB_DF || defined BB_MTAB
-#include <mntent.h>
-/*
- * Given a block device, find the mount table entry if that block device
- * is mounted.
- *
- * Given any other file (or directory), find the mount table entry for its
- * filesystem.
- */
-extern struct mntent *find_mount_point(const char *name, const char *table)
-{
-	struct stat s;
-	dev_t mountDevice;
-	FILE *mountTable;
-	struct mntent *mountEntry;
-
-	if (stat(name, &s) != 0)
-		return 0;
-
-	if ((s.st_mode & S_IFMT) == S_IFBLK)
-		mountDevice = s.st_rdev;
-	else
-		mountDevice = s.st_dev;
-
-
-	if ((mountTable = setmntent(table, "r")) == 0)
-		return 0;
-
-	while ((mountEntry = getmntent(mountTable)) != 0) {
-		if (strcmp(name, mountEntry->mnt_dir) == 0
-			|| strcmp(name, mountEntry->mnt_fsname) == 0)	/* String match. */
-			break;
-		if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice)	/* Match the device. */
-			break;
-		if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice)	/* Match the directory's mount point. */
-			break;
-	}
-	endmntent(mountTable);
-	return mountEntry;
-}
-#endif							/* BB_DF || BB_MTAB */
-
-#if defined BB_INIT || defined BB_SYSLOGD 
-/* try to open up the specified device */
-extern int device_open(char *device, int mode)
-{
-	int m, f, fd = -1;
-
-	m = mode | O_NONBLOCK;
-
-	/* Retry up to 5 times */
-	for (f = 0; f < 5; f++)
-		if ((fd = open(device, m, 0600)) >= 0)
-			break;
-	if (fd < 0)
-		return fd;
-	/* Reset original flags. */
-	if (m != mode)
-		fcntl(fd, F_SETFL, mode);
-	return fd;
-}
-#endif							/* BB_INIT BB_SYSLOGD */
-
-
-#if defined BB_KILLALL || ( defined BB_FEATURE_LINUXRC && ( defined BB_HALT || defined BB_REBOOT || defined BB_POWEROFF ))
-#ifdef BB_FEATURE_USE_DEVPS_PATCH
-#include <linux/devps.h> /* For Erik's nifty devps device driver */
-#endif
-
-#if defined BB_FEATURE_USE_DEVPS_PATCH
-/* find_pid_by_name()
- *  
- *  This finds the pid of the specified process,
- *  by using the /dev/ps device driver.
- *
- *  Returns a list of all matching PIDs
- */
-extern pid_t* find_pid_by_name( char* pidName)
-{
-	int fd, i, j;
-	char device[] = "/dev/ps";
-	pid_t num_pids;
-	pid_t* pid_array = NULL;
-	pid_t* pidList=NULL;
-
-	/* open device */ 
-	fd = open(device, O_RDONLY);
-	if (fd < 0)
-		perror_msg_and_die("open failed for `%s'", device);
-
-	/* Find out how many processes there are */
-	if (ioctl (fd, DEVPS_GET_NUM_PIDS, &num_pids)<0) 
-		perror_msg_and_die("\nDEVPS_GET_PID_LIST");
-	
-	/* Allocate some memory -- grab a few extras just in case 
-	 * some new processes start up while we wait. The kernel will
-	 * just ignore any extras if we give it too many, and will trunc.
-	 * the list if we give it too few.  */
-	pid_array = (pid_t*) xcalloc( num_pids+10, sizeof(pid_t));
-	pid_array[0] = num_pids+10;
-
-	/* Now grab the pid list */
-	if (ioctl (fd, DEVPS_GET_PID_LIST, pid_array)<0) 
-		perror_msg_and_die("\nDEVPS_GET_PID_LIST");
-
-	/* Now search for a match */
-	for (i=1, j=0; i<pid_array[0] ; i++) {
-		char* p;
-		struct pid_info info;
-
-	    info.pid = pid_array[i];
-	    if (ioctl (fd, DEVPS_GET_PID_INFO, &info)<0)
-			perror_msg_and_die("\nDEVPS_GET_PID_INFO");
-
-		/* Make sure we only match on the process name */
-		p=info.command_line+1;
-		while ((*p != 0) && !isspace(*(p)) && (*(p-1) != '\\')) { 
-			(p)++;
-		}
-		if (isspace(*(p)))
-				*p='\0';
-
-		if ((strstr(info.command_line, pidName) != NULL)
-				&& (strlen(pidName) == strlen(info.command_line))) {
-			pidList=xrealloc( pidList, sizeof(pid_t) * (j+2));
-			pidList[j++]=info.pid;
-		}
-	}
-	if (pidList)
-		pidList[j]=0;
-
-	/* Free memory */
-	free( pid_array);
-
-	/* close device */
-	if (close (fd) != 0) 
-		perror_msg_and_die("close failed for `%s'", device);
-
-	return pidList;
-}
-#else		/* BB_FEATURE_USE_DEVPS_PATCH */
-
-/* find_pid_by_name()
- *  
- *  This finds the pid of the specified process.
- *  Currently, it's implemented by rummaging through 
- *  the proc filesystem.
- *
- *  Returns a list of all matching PIDs
- */
-extern pid_t* find_pid_by_name( char* pidName)
-{
-	DIR *dir;
-	struct dirent *next;
-	pid_t* pidList=NULL;
-	int i=0;
-
-	dir = opendir("/proc");
-	if (!dir)
-		perror_msg_and_die("Cannot open /proc");
-	
-	while ((next = readdir(dir)) != NULL) {
-		FILE *status;
-		char filename[256];
-		char buffer[256];
-
-		/* If it isn't a number, we don't want it */
-		if (!isdigit(*next->d_name))
-			continue;
-
-		sprintf(filename, "/proc/%s/cmdline", next->d_name);
-		status = fopen(filename, "r");
-		if (!status) {
-			continue;
-		}
-		fgets(buffer, 256, status);
-		fclose(status);
-
-		if (strstr(get_last_path_component(buffer), pidName) != NULL) {
-			pidList=xrealloc( pidList, sizeof(pid_t) * (i+2));
-			pidList[i++]=strtol(next->d_name, NULL, 0);
-		}
-	}
-
-	if (pidList)
-		pidList[i]=0;
-	return pidList;
-}
-#endif							/* BB_FEATURE_USE_DEVPS_PATCH */
-#endif							/* BB_KILLALL || ( BB_FEATURE_LINUXRC && ( BB_HALT || BB_REBOOT || BB_POWEROFF )) */
-
-#ifndef DMALLOC
-/* this should really be farmed out to libbusybox.a */
-extern void *xmalloc(size_t size)
-{
-	void *ptr = malloc(size);
-
-	if (!ptr)
-		error_msg_and_die(memory_exhausted);
-	return ptr;
-}
-
-extern void *xrealloc(void *old, size_t size)
-{
-	void *ptr = realloc(old, size);
-	if (!ptr)
-		error_msg_and_die(memory_exhausted);
-	return ptr;
-}
-
-extern void *xcalloc(size_t nmemb, size_t size)
-{
-	void *ptr = calloc(nmemb, size);
-	if (!ptr)
-		error_msg_and_die(memory_exhausted);
-	return ptr;
-}
-#endif
-
-#if defined BB_NFSMOUNT || defined BB_LS || defined BB_SH || \
-	defined BB_WGET || defined BB_DPKG_DEB || defined BB_TAR || \
-	defined BB_LN
-# ifndef DMALLOC
-extern char * xstrdup (const char *s) {
-	char *t;
-
-	if (s == NULL)
-		return NULL;
-
-	t = strdup (s);
-
-	if (t == NULL)
-		error_msg_and_die(memory_exhausted);
-
-	return t;
-}
-# endif
-#endif
-
-#if defined BB_NFSMOUNT
-extern char * xstrndup (const char *s, int n) {
-	char *t;
-
-	if (s == NULL)
-		error_msg_and_die("xstrndup bug");
-
-	t = xmalloc(++n);
-	
-	return safe_strncpy(t,s,n);
-}
-#endif
-
-#if defined BB_IFCONFIG || defined BB_ROUTE || defined BB_NFSMOUNT || \
-    defined BB_FEATURE_MOUNT_LOOP
-/* Like strncpy but make sure the resulting string is always 0 terminated. */  
-extern char * safe_strncpy(char *dst, const char *src, size_t size)
-{   
-	dst[size-1] = '\0';
-	return strncpy(dst, src, size-1);   
-}
-#endif
-
-#if (__GLIBC__ < 2) && (defined BB_SYSLOGD || defined BB_INIT)
-extern int vdprintf(int d, const char *format, va_list ap)
-{
-	char buf[BUF_SIZE];
-	int len;
-
-	len = vsprintf(buf, format, ap);
-	return write(d, buf, len);
-}
-#endif							/* BB_SYSLOGD */
-
-
-#if defined BB_FEATURE_MOUNT_LOOP
-#include <fcntl.h>
-#include "loop.h" /* Pull in loop device support */
-
-extern int del_loop(const char *device)
-{
-	int fd;
-
-	if ((fd = open(device, O_RDONLY)) < 0) {
-		perror_msg("%s", device);
-		return (FALSE);
-	}
-	if (ioctl(fd, LOOP_CLR_FD, 0) < 0) {
-		perror_msg("ioctl: LOOP_CLR_FD");
-		return (FALSE);
-	}
-	close(fd);
-	return (TRUE);
-}
-
-extern int set_loop(const char *device, const char *file, int offset,
-					int *loopro)
-{
-	struct loop_info loopinfo;
-	int fd, ffd, mode;
-
-	mode = *loopro ? O_RDONLY : O_RDWR;
-	if ((ffd = open(file, mode)) < 0 && !*loopro
-		&& (errno != EROFS || (ffd = open(file, mode = O_RDONLY)) < 0)) {
-		perror_msg("%s", file);
-		return 1;
-	}
-	if ((fd = open(device, mode)) < 0) {
-		close(ffd);
-		perror_msg("%s", device);
-		return 1;
-	}
-	*loopro = (mode == O_RDONLY);
-
-	memset(&loopinfo, 0, sizeof(loopinfo));
-	safe_strncpy(loopinfo.lo_name, file, LO_NAME_SIZE);
-
-	loopinfo.lo_offset = offset;
-
-	loopinfo.lo_encrypt_key_size = 0;
-	if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
-		perror_msg("ioctl: LOOP_SET_FD");
-		close(fd);
-		close(ffd);
-		return 1;
-	}
-	if (ioctl(fd, LOOP_SET_STATUS, &loopinfo) < 0) {
-		(void) ioctl(fd, LOOP_CLR_FD, 0);
-		perror_msg("ioctl: LOOP_SET_STATUS");
-		close(fd);
-		close(ffd);
-		return 1;
-	}
-	close(fd);
-	close(ffd);
-	return 0;
-}
-
-extern char *find_unused_loop_device(void)
-{
-	char dev[20];
-	int i, fd;
-	struct stat statbuf;
-	struct loop_info loopinfo;
-
-	for (i = 0; i <= 7; i++) {
-		sprintf(dev, "/dev/loop%d", i);
-		if (stat(dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
-			if ((fd = open(dev, O_RDONLY)) >= 0) {
-				if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) != 0) {
-					if (errno == ENXIO) {	/* probably free */
-						close(fd);
-						return strdup(dev);
-					}
-				}
-				close(fd);
-			}
-		}
-	}
-	return NULL;
-}
-#endif							/* BB_FEATURE_MOUNT_LOOP */
-
-#if defined BB_MOUNT || defined BB_DF || ( defined BB_UMOUNT && ! defined BB_MTAB)
-extern int find_real_root_device_name(char* name)
-{
-	DIR *dir;
-	struct dirent *entry;
-	struct stat statBuf, rootStat;
-	char fileName[BUFSIZ];
-
-	if (stat("/", &rootStat) != 0) {
-		error_msg("could not stat '/'");
-		return( FALSE);
-	}
-
-	dir = opendir("/dev");
-	if (!dir) {
-		error_msg("could not open '/dev'");
-		return( FALSE);
-	}
-
-	while((entry = readdir(dir)) != NULL) {
-
-		/* Must skip ".." since that is "/", and so we 
-		 * would get a false positive on ".."  */
-		if (strcmp(entry->d_name, "..") == 0)
-			continue;
-
-		snprintf( fileName, strlen(name)+1, "/dev/%s", entry->d_name);
-
-		if (stat(fileName, &statBuf) != 0)
-			continue;
-		/* Some char devices have the same dev_t as block
-		 * devices, so make sure this is a block device */
-		if (! S_ISBLK(statBuf.st_mode))
-			continue;
-		if (statBuf.st_rdev == rootStat.st_rdev) {
-			strcpy(name, fileName); 
-			return ( TRUE);
-		}
-	}
-
-	return( FALSE);
-}
-#endif
-
-
-/* get_line_from_file() - This function reads an entire line from a text file
- * up to a newline. It returns a malloc'ed char * which must be stored and
- * free'ed  by the caller. */
-extern char *get_line_from_file(FILE *file)
-{
-	static const int GROWBY = 80; /* how large we will grow strings by */
-
-	int ch;
-	int idx = 0;
-	char *linebuf = NULL;
-	int linebufsz = 0;
-
-	while (1) {
-		ch = fgetc(file);
-		if (ch == EOF)
-			break;
-		/* grow the line buffer as necessary */
-		while (idx > linebufsz-2)
-			linebuf = xrealloc(linebuf, linebufsz += GROWBY);
-		linebuf[idx++] = (char)ch;
-		if ((char)ch == '\n')
-			break;
-	}
-
-	if (idx == 0)
-		return NULL;
-
-	linebuf[idx] = 0;
-	return linebuf;
-}
-
-#if defined BB_CAT
-extern void print_file(FILE *file)
-{
-	int c;
-
-	while ((c = getc(file)) != EOF)
-		putc(c, stdout);
-	fclose(file);
-	fflush(stdout);
-}
-
-extern int print_file_by_name(char *filename)
-{
-	FILE *file;
-	if ((file = wfopen(filename, "r")) == NULL)
-		return FALSE;
-	print_file(file);
-	return TRUE;
-}
-#endif /* BB_CAT */
-
-#if defined BB_ECHO || defined BB_SH || defined BB_TR
-char process_escape_sequence(char **ptr)
-{
-       static const char charmap[] = {
-		   'a',  'b',  'f',  'n',  'r',  't',  'v',  '\\', 0,
-	       '\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '\\' };
-
-       const char *p;
-	   char *q;
-       int num_digits;
-       unsigned int n;
-
-       n = 0;
-	   q = *ptr;
-
-       for ( num_digits = 0 ; num_digits < 3 ; ++num_digits) {
-	       if ((*q < '0') || (*q > '7')) { /* not a digit? */
-		       break;
-	       }
-	       n = n * 8 + (*q++ - '0');
-       }
-
-       if (num_digits == 0) {	/* mnemonic escape sequence? */
-		   for (p=charmap ; *p ; p++) {
-			   if (*p == *q) {
-				   q++;
-				   break;
-			   }
-		   }
-		   n = *(p+(sizeof(charmap)/2));
-	   }
-
-	   /* doesn't hurt to fall through to here from mnemonic case */
-	   if (n > UCHAR_MAX) {	/* is octal code too big for a char? */
-		   n /= 8;			/* adjust value and */
-		   --q;				/* back up one char */
-	   }
-
-	   *ptr = q;
-	   return (char) n;
-}
-#endif
-
-#if defined BB_BASENAME || defined BB_LN || defined BB_SH || defined BB_INIT || \
-	! defined BB_FEATURE_USE_DEVPS_PATCH || defined BB_WGET
-char *get_last_path_component(char *path)
-{
-	char *s=path+strlen(path)-1;
-
-	/* strip trailing slashes */
-	while (s != path && *s == '/') {
-		*s-- = '\0';
-	}
-
-	/* find last component */
-	s = strrchr(path, '/');
-	if (s == NULL || s[1] == '\0')
-		return path;
-	else
-		return s+1;
-}
-#endif
-
-#if defined BB_GREP || defined BB_SED
-#include <regex.h>
-void xregcomp(regex_t *preg, const char *regex, int cflags)
-{
-	int ret;
-	if ((ret = regcomp(preg, regex, cflags)) != 0) {
-		int errmsgsz = regerror(ret, preg, NULL, 0);
-		char *errmsg = xmalloc(errmsgsz);
-		regerror(ret, preg, errmsg, errmsgsz);
-		error_msg_and_die("xregcomp: %s", errmsg);
-	}
-}
-#endif
-
-#if defined BB_CAT || defined BB_HEAD || defined BB_WC
-FILE *wfopen(const char *path, const char *mode)
-{
-	FILE *fp;
-	if ((fp = fopen(path, mode)) == NULL) {
-		perror_msg("%s", path);
-		errno = 0;
-	}
-	return fp;
-}
-#endif
-
-#if defined BB_HOSTNAME || defined BB_LOADACM || defined BB_MORE \
- || defined BB_SED || defined BB_SH || defined BB_TAR || defined BB_UNIQ \
- || defined BB_WC || defined BB_CMP || defined BB_SORT || defined BB_WGET \
- || defined BB_MOUNT || defined BB_ROUTE || defined BB_MKFS_MINIX
-FILE *xfopen(const char *path, const char *mode)
-{
-	FILE *fp;
-	if ((fp = fopen(path, mode)) == NULL)
-		perror_msg_and_die("%s", path);
-	return fp;
-}
-#endif
-
-static int applet_name_compare(const void *x, const void *y)
-{
-	const char *name = x;
-	const struct BB_applet *applet = y;
-
-	return strcmp(name, applet->name);
-}
-
-extern size_t NUM_APPLETS;
-
-struct BB_applet *find_applet_by_name(const char *name)
-{
-	return bsearch(name, applets, NUM_APPLETS, sizeof(struct BB_applet),
-			applet_name_compare);
-}
-
-void run_applet_by_name(const char *name, int argc, char **argv)
-{
-	/* Do a binary search to find the applet entry given the name. */
-	if ((applet_using = find_applet_by_name(name)) != NULL) {
-		applet_name = applet_using->name;
-		if (argv[1] && strcmp(argv[1], "--help") == 0)
-			show_usage();
-		exit((*(applet_using->main)) (argc, argv));
-	}
-}
-
-#if defined BB_DD || defined BB_TAIL || defined BB_STTY
-unsigned long parse_number(const char *numstr,
-		const struct suffix_mult *suffixes)
-{
-	const struct suffix_mult *sm;
-	unsigned long int ret;
-	int len;
-	char *end;
-	
-	ret = strtoul(numstr, &end, 10);
-	if (numstr == end)
-		error_msg_and_die("invalid number `%s'", numstr);
-	while (end[0] != '\0') {
-		sm = suffixes;
-		while ( sm != 0 ) {
-			if(sm->suffix) {
-				len = strlen(sm->suffix);
-				if (strncmp(sm->suffix, end, len) == 0) {
-					ret *= sm->mult;
-					end += len;
-					break;
-				}
-			sm++;
-			
-			} else
-				sm = 0;
-		}
-		if (sm == 0)
-			error_msg_and_die("invalid number `%s'", numstr);
-	}
-	return ret;
-}
-#endif
-
-#if defined BB_DD || defined BB_NC || defined BB_TAIL
-ssize_t safe_read(int fd, void *buf, size_t count)
-{
-	ssize_t n;
-
-	do {
-		n = read(fd, buf, count);
-	} while (n < 0 && errno == EINTR);
-
-	return n;
-}
-#endif
-
-#ifdef BB_FEATURE_HUMAN_READABLE
-const char *make_human_readable_str(unsigned long val, unsigned long hr)
-{
-	int i=0;
-	static char str[10] = "\0";
-	static const char strings[] = { 'k', 'M', 'G', 'T', 0 };
-	unsigned long divisor = 1;
-
-	if(val == 0)
-		return("0");
-	if(hr)
-		snprintf(str, 9, "%ld", val/hr);
-	else {
-		while(val >= divisor && i <= 4) {
-			divisor=divisor<<10, i++;
-		} 
-		divisor=divisor>>10, i--;
-		snprintf(str, 9, "%.1Lf%c", (long double)(val)/divisor, strings[i]);
-	}
-	return(str);
-}
-#endif
-
-#if defined(BB_GREP) || defined(BB_HOSTNAME) || defined(BB_SED) || defined(BB_TAR) || defined(BB_WGET) || defined(BB_XARGS) || defined(BB_SH)
-void chomp(char *s)
-{
-	size_t len = strlen(s);
-
-	if (len == 0)
-		return;
-
-	if (s[len-1] == '\n')
-		s[len-1] = '\0';
-}
-#endif
-
-#if defined(BB_KLOGD) || defined(BB_LOGGER)
-void syslog_msg_with_name(const char *name, int facility, int pri, const char *msg)
-{
- 	openlog(name, 0, facility);
-	syslog(pri, "%s", msg);
-	closelog();
-}
-
-void syslog_msg(int facility, int pri, const char *msg)
-{
- 	syslog_msg_with_name(applet_using->name, facility, pri, msg);
-}
-#endif
-
-#if defined(BB_SH)
-void trim(char *s)
-{
-	/* trim trailing whitespace */
-	while (isspace(s[strlen(s)-1]))
-		s[strlen(s)-1]='\0';
-
-	/* trim leading whitespace */
-	memmove(s, &s[strspn(s, " \n\r\t\v")], strlen(s));
-
-}
-#endif
-
-#ifdef BB_FEATURE_RM_INTERACTIVE
-	#if defined (BB_CP_MV) || defined (BB_RM)
-int ask_confirmation()
-{
-	int c = '\0';
-	int ret = 0;
-
-	while (c != '\n') {
-		c = getchar();
-		if ( c != '\n' ) {
-			ret = ((c=='y')||(c=='Y')) ? 1 : 0;
-		}
-	}
-	return ret;
-}
-	#endif
-#endif
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/