diff -ur busybox-0.60.5/Config.h busybox-0.60.5.save/Config.h
--- busybox-0.60.5/Config.h     2003-11-29 03:09:05.000000000 -0500
+++ busybox-0.60.5.save/Config.h        2003-11-29 01:59:53.000000000 -0500
@@ -81,13 +81,13 @@
//#define BB_MKTEMP
//#define BB_MODPROBE
#define BB_MORE
-#define BB_MOUNT
+//#define BB_MOUNT
//#define BB_MSH
#define BB_MT
#define BB_MV
//#define BB_NC
//#define BB_NSLOOKUP
-#define BB_PIDOF
+//#define BB_PIDOF
#define BB_PING
//#define BB_PIVOT_ROOT
#define BB_POWEROFF
@@ -383,7 +383,7 @@
#define BB_FEATURE_GREP_CONTEXT
//
// Support for the EGREP applet (alias to the grep applet)
-#define BB_FEATURE_GREP_EGREP_ALIAS
+//#define BB_FEATURE_GREP_EGREP_ALIAS
//
// Tell tftp what commands that should be supported.
#define BB_FEATURE_TFTP_PUT
diff -ur busybox-0.60.5/applets.h busybox-0.60.5.save/applets.h
--- busybox-0.60.5/applets.h    2003-11-29 03:09:05.000000000 -0500
+++ busybox-0.60.5.save/applets.h       2003-11-29 02:56:38.000000000 -0500
@@ -44,19 +44,19 @@


#ifdef BB_TEST
-       APPLET_NOUSAGE("[", test_main, _BB_DIR_USR_BIN)
+       APPLET_NOUSAGE("[", test_main, _BB_DIR_BIN)
#endif
#ifdef BB_ADJTIMEX
       APPLET(adjtimex, adjtimex_main, _BB_DIR_SBIN)
#endif
#ifdef BB_AR
-       APPLET(ar, ar_main, _BB_DIR_USR_BIN)
+       APPLET(ar, ar_main, _BB_DIR_BIN)
#endif
#ifdef BB_ASH
       APPLET_NOUSAGE("ash", ash_main, _BB_DIR_BIN)
#endif
#ifdef BB_BASENAME
-       APPLET(basename, basename_main, _BB_DIR_USR_BIN)
+       APPLET(basename, basename_main, _BB_DIR_BIN)
#endif
       APPLET_NOUSAGE("busybox", busybox_main, _BB_DIR_BIN)
#ifdef BB_CAT
@@ -72,16 +72,16 @@
       APPLET(chown, chown_main, _BB_DIR_BIN)
#endif
#ifdef BB_CHROOT
-       APPLET(chroot, chroot_main, _BB_DIR_USR_SBIN)
+       APPLET(chroot, chroot_main, _BB_DIR_BIN)
#endif
#ifdef BB_CHVT
-       APPLET(chvt, chvt_main, _BB_DIR_USR_BIN)
+       APPLET(chvt, chvt_main, _BB_DIR_BIN)
#endif
#ifdef BB_CLEAR
-       APPLET(clear, clear_main, _BB_DIR_USR_BIN)
+       APPLET(clear, clear_main, _BB_DIR_BIN)
#endif
#ifdef BB_CMP
-       APPLET(cmp, cmp_main, _BB_DIR_USR_BIN)
+       APPLET(cmp, cmp_main, _BB_DIR_BIN)
#endif
#ifdef BB_CP
       APPLET(cp, cp_main, _BB_DIR_BIN)
@@ -90,40 +90,40 @@
       APPLET(cpio, cpio_main, _BB_DIR_BIN)
#endif
#ifdef BB_CUT
-       APPLET(cut, cut_main, _BB_DIR_USR_BIN)
+       APPLET(cut, cut_main, _BB_DIR_BIN)
#endif
#ifdef BB_DATE
       APPLET(date, date_main, _BB_DIR_BIN)
#endif
#ifdef BB_DC
-       APPLET(dc, dc_main, _BB_DIR_USR_BIN)
+       APPLET(dc, dc_main, _BB_DIR_BIN)
#endif
#ifdef BB_DD
       APPLET(dd, dd_main, _BB_DIR_BIN)
#endif
#ifdef BB_DEALLOCVT
-       APPLET(deallocvt, deallocvt_main, _BB_DIR_USR_BIN)
+       APPLET(deallocvt, deallocvt_main, _BB_DIR_BIN)
#endif
#ifdef BB_DF
       APPLET(df, df_main, _BB_DIR_BIN)
#endif
#ifdef BB_DIRNAME
-       APPLET(dirname, dirname_main, _BB_DIR_USR_BIN)
+       APPLET(dirname, dirname_main, _BB_DIR_BIN)
#endif
#ifdef BB_DMESG
       APPLET(dmesg, dmesg_main, _BB_DIR_BIN)
#endif
#ifdef BB_DOS2UNIX
-       APPLET(dos2unix, dos2unix_main, _BB_DIR_USR_BIN)
+       APPLET(dos2unix, dos2unix_main, _BB_DIR_BIN)
#endif
#ifdef BB_DPKG
-       APPLET(dpkg, dpkg_main, _BB_DIR_USR_BIN)
+       APPLET(dpkg, dpkg_main, _BB_DIR_BIN)
#endif
#ifdef BB_DPKG_DEB
-       APPLET_ODDNAME("dpkg-deb", dpkg_deb_main, _BB_DIR_USR_BIN, dpkg_deb)
+       APPLET_ODDNAME("dpkg-deb", dpkg_deb_main, _BB_DIR_BIN, dpkg_deb)
#endif
#ifdef BB_DU
-       APPLET(du, du_main, _BB_DIR_USR_BIN)
+       APPLET(du, du_main, _BB_DIR_BIN)
#endif
#ifdef BB_DUMPKMAP
       APPLET(dumpkmap, dumpkmap_main, _BB_DIR_BIN)
@@ -138,10 +138,10 @@
       APPLET_NOUSAGE("egrep", grep_main, _BB_DIR_BIN)
#endif
#ifdef BB_ENV
-       APPLET(env, env_main, _BB_DIR_USR_BIN)
+       APPLET(env, env_main, _BB_DIR_BIN)
#endif
#ifdef BB_EXPR
-       APPLET(expr, expr_main, _BB_DIR_USR_BIN)
+       APPLET(expr, expr_main, _BB_DIR_BIN)
#endif
#ifdef BB_TRUE_FALSE
       APPLET(false, false_main, _BB_DIR_BIN)
@@ -153,10 +153,10 @@
       APPLET(fdflush, fdflush_main, _BB_DIR_BIN)
#endif
#ifdef BB_FIND
-       APPLET(find, find_main, _BB_DIR_USR_BIN)
+       APPLET(find, find_main, _BB_DIR_BIN)
#endif
#ifdef BB_FREE
-       APPLET(free, free_main, _BB_DIR_USR_BIN)
+       APPLET(free, free_main, _BB_DIR_BIN)
#endif
#ifdef BB_FREERAMDISK
       APPLET(freeramdisk, freeramdisk_main, _BB_DIR_SBIN)
@@ -180,10 +180,10 @@
       APPLET(halt, halt_main, _BB_DIR_SBIN)
#endif
#ifdef BB_HEAD
-       APPLET(head, head_main, _BB_DIR_USR_BIN)
+       APPLET(head, head_main, _BB_DIR_BIN)
#endif
#ifdef BB_HOSTID
-       APPLET(hostid, hostid_main, _BB_DIR_USR_BIN)
+       APPLET(hostid, hostid_main, _BB_DIR_BIN)
#endif
#ifdef BB_HOSTNAME
       APPLET(hostname, hostname_main, _BB_DIR_BIN)
@@ -192,7 +192,7 @@
       APPLET_NOUSAGE("hush", hush_main, _BB_DIR_BIN)
#endif
#ifdef BB_ID
-       APPLET(id, id_main, _BB_DIR_USR_BIN)
+       APPLET(id, id_main, _BB_DIR_BIN)
#endif
#ifdef BB_IFCONFIG
       APPLET(ifconfig, ifconfig_main, _BB_DIR_SBIN)
@@ -207,7 +207,7 @@
       APPLET(kill, kill_main, _BB_DIR_BIN)
#endif
#ifdef BB_KILLALL
-       APPLET(killall, kill_main, _BB_DIR_USR_BIN)
+       APPLET(killall, kill_main, _BB_DIR_BIN)
#endif
#ifdef BB_KLOGD
       APPLET(klogd, klogd_main, _BB_DIR_SBIN)
@@ -216,7 +216,7 @@
       APPLET(lash, lash_main, _BB_DIR_BIN)
#endif
#ifdef BB_LENGTH
-       APPLET(length, length_main, _BB_DIR_USR_BIN)
+       APPLET(length, length_main, _BB_DIR_BIN)
#endif
#ifdef BB_FEATURE_LINUXRC
       APPLET_NOUSAGE("linuxrc", init_main, _BB_DIR_ROOT)
@@ -225,19 +225,19 @@
       APPLET(ln, ln_main, _BB_DIR_BIN)
#endif
#ifdef BB_LOADACM
-       APPLET(loadacm, loadacm_main, _BB_DIR_USR_BIN)
+       APPLET(loadacm, loadacm_main, _BB_DIR_BIN)
#endif
#ifdef BB_LOADFONT
-       APPLET(loadfont, loadfont_main, _BB_DIR_USR_BIN)
+       APPLET(loadfont, loadfont_main, _BB_DIR_BIN)
#endif
#ifdef BB_LOADKMAP
-       APPLET(loadkmap, loadkmap_main, _BB_DIR_SBIN)
+       APPLET(loadkmap, loadkmap_main, _BB_DIR_BIN)
#endif
#ifdef BB_LOGGER
-       APPLET(logger, logger_main, _BB_DIR_USR_BIN)
+       APPLET(logger, logger_main, _BB_DIR_BIN)
#endif
#ifdef BB_LOGNAME
-       APPLET(logname, logname_main, _BB_DIR_USR_BIN)
+       APPLET(logname, logname_main, _BB_DIR_BIN)
#endif
#ifdef BB_LOGREAD
       APPLET(logread, logread_main, _BB_DIR_SBIN)
@@ -255,13 +255,13 @@
       APPLET(makedevs, makedevs_main, _BB_DIR_SBIN)
#endif
#ifdef BB_MD5SUM
-       APPLET(md5sum, md5sum_main, _BB_DIR_USR_BIN)
+       APPLET(md5sum, md5sum_main, _BB_DIR_BIN)
#endif
#ifdef BB_MKDIR
       APPLET(mkdir, mkdir_main, _BB_DIR_BIN)
#endif
#ifdef BB_MKFIFO
-       APPLET(mkfifo, mkfifo_main, _BB_DIR_USR_BIN)
+       APPLET(mkfifo, mkfifo_main, _BB_DIR_BIN)
#endif
#ifdef BB_MKFS_MINIX
       APPLET_ODDNAME("mkfs.minix", mkfs_minix_main, _BB_DIR_SBIN, mkfs_minix)
@@ -294,10 +294,10 @@
       APPLET(mv, mv_main, _BB_DIR_BIN)
#endif
#ifdef BB_NC
-       APPLET(nc, nc_main, _BB_DIR_USR_BIN)
+       APPLET(nc, nc_main, _BB_DIR_BIN)
#endif
#ifdef BB_NSLOOKUP
-       APPLET(nslookup, nslookup_main, _BB_DIR_USR_BIN)
+       APPLET(nslookup, nslookup_main, _BB_DIR_BIN)
#endif
#ifdef BB_PIDOF
       APPLET(pidof, pidof_main, _BB_DIR_BIN)
@@ -312,7 +312,7 @@
       APPLET(poweroff, poweroff_main, _BB_DIR_SBIN)
#endif
#ifdef BB_PRINTF
-       APPLET(printf, printf_main, _BB_DIR_USR_BIN)
+       APPLET(printf, printf_main, _BB_DIR_BIN)
#endif
#ifdef BB_PS
       APPLET(ps, ps_main, _BB_DIR_BIN)
@@ -321,19 +321,19 @@
       APPLET(pwd, pwd_main, _BB_DIR_BIN)
#endif
#ifdef BB_RDATE
-       APPLET(rdate, rdate_main, _BB_DIR_USR_BIN)
+       APPLET(rdate, rdate_main, _BB_DIR_BIN)
#endif
#ifdef BB_READLINK
-       APPLET(readlink, readlink_main, _BB_DIR_USR_BIN)
+       APPLET(readlink, readlink_main, _BB_DIR_BIN)
#endif
#ifdef BB_REBOOT
       APPLET(reboot, reboot_main, _BB_DIR_SBIN)
#endif
#ifdef BB_RENICE
-       APPLET(renice, renice_main, _BB_DIR_USR_BIN)
+       APPLET(renice, renice_main, _BB_DIR_BIN)
#endif
#ifdef BB_RESET
-       APPLET(reset, reset_main, _BB_DIR_USR_BIN)
+       APPLET(reset, reset_main, _BB_DIR_BIN)
#endif
#ifdef BB_RM
       APPLET(rm, rm_main, _BB_DIR_BIN)
@@ -345,16 +345,17 @@
       APPLET(rmmod, rmmod_main, _BB_DIR_SBIN)
#endif
#ifdef BB_ROUTE
+       APPLET(route, route_main, _BB_DIR_BIN)
       APPLET(route, route_main, _BB_DIR_SBIN)
#endif
#ifdef BB_RPM2CPIO
-       APPLET(rpm2cpio, rpm2cpio_main, _BB_DIR_USR_BIN)
+       APPLET(rpm2cpio, rpm2cpio_main, _BB_DIR_BIN)
#endif
#ifdef BB_SED
       APPLET(sed, sed_main, _BB_DIR_BIN)
#endif
#ifdef BB_SETKEYCODES
-       APPLET(setkeycodes, setkeycodes_main, _BB_DIR_USR_BIN)
+       APPLET(setkeycodes, setkeycodes_main, _BB_DIR_BIN)
#endif
#if defined(BB_FEATURE_SH_IS_ASH) && defined(BB_ASH)
       APPLET_NOUSAGE("sh", ash_main, _BB_DIR_BIN)
@@ -370,12 +371,13 @@
       APPLET(sleep, sleep_main, _BB_DIR_BIN)
#endif
#ifdef BB_SORT
-       APPLET(sort, sort_main, _BB_DIR_USR_BIN)
+       APPLET(sort, sort_main, _BB_DIR_BIN)
#endif
#ifdef BB_STTY
       APPLET(stty, stty_main, _BB_DIR_BIN)
#endif
#ifdef BB_SWAPONOFF
+       APPLET(swapoff, swap_on_off_main, _BB_DIR_BIN)
       APPLET(swapoff, swap_on_off_main, _BB_DIR_SBIN)
#endif
#ifdef BB_SWAPONOFF
@@ -388,43 +390,43 @@
       APPLET(syslogd, syslogd_main, _BB_DIR_SBIN)
#endif
#ifdef BB_TAIL
-       APPLET(tail, tail_main, _BB_DIR_USR_BIN)
+       APPLET(tail, tail_main, _BB_DIR_BIN)
#endif
#ifdef BB_TAR
       APPLET(tar, tar_main, _BB_DIR_BIN)
#endif
#ifdef BB_TEE
-       APPLET(tee, tee_main, _BB_DIR_USR_BIN)
+       APPLET(tee, tee_main, _BB_DIR_BIN)
#endif
#ifdef BB_TELNET
-       APPLET(telnet, telnet_main, _BB_DIR_USR_BIN)
+       APPLET(telnet, telnet_main, _BB_DIR_BIN)
#endif
#ifdef BB_TEST
-       APPLET(test, test_main, _BB_DIR_USR_BIN)
+       APPLET(test, test_main, _BB_DIR_BIN)
#endif
#ifdef BB_TFTP
-       APPLET(tftp, tftp_main, _BB_DIR_USR_BIN)
+       APPLET(tftp, tftp_main, _BB_DIR_BIN)
#endif
#ifdef BB_TIME
-       APPLET(time, time_main, _BB_DIR_USR_BIN)
+       APPLET(time, time_main, _BB_DIR_BIN)
#endif
#ifdef BB_TOP
-       APPLET(top, top_main, _BB_DIR_USR_BIN)
+       APPLET(top, top_main, _BB_DIR_BIN)
#endif
#ifdef BB_TOUCH
       APPLET(touch, touch_main, _BB_DIR_BIN)
#endif
#ifdef BB_TR
-       APPLET(tr, tr_main, _BB_DIR_USR_BIN)
+       APPLET(tr, tr_main, _BB_DIR_BIN)
#endif
#ifdef BB_TRACEROUTE
-       APPLET(traceroute, traceroute_main, _BB_DIR_USR_BIN)
+       APPLET(traceroute, traceroute_main, _BB_DIR_BIN)
#endif
#ifdef BB_TRUE_FALSE
       APPLET(true, true_main, _BB_DIR_BIN)
#endif
#ifdef BB_TTY
-       APPLET(tty, tty_main, _BB_DIR_USR_BIN)
+       APPLET(tty, tty_main, _BB_DIR_BIN)
#endif
#ifdef BB_UMOUNT
       APPLET(umount, umount_main, _BB_DIR_BIN)
@@ -433,25 +435,25 @@
       APPLET(uname, uname_main, _BB_DIR_BIN)
#endif
#ifdef BB_UNIQ
-       APPLET(uniq, uniq_main, _BB_DIR_USR_BIN)
+       APPLET(uniq, uniq_main, _BB_DIR_BIN)
#endif
#ifdef BB_UNIX2DOS
-       APPLET(unix2dos, dos2unix_main, _BB_DIR_USR_BIN)
+       APPLET(unix2dos, dos2unix_main, _BB_DIR_BIN)
#endif
#ifdef BB_UPDATE
       APPLET(update, update_main, _BB_DIR_SBIN)
#endif
#ifdef BB_UPTIME
-       APPLET(uptime, uptime_main, _BB_DIR_USR_BIN)
+       APPLET(uptime, uptime_main, _BB_DIR_BIN)
#endif
#ifdef BB_USLEEP
       APPLET(usleep, usleep_main, _BB_DIR_BIN)
#endif
#ifdef BB_UUDECODE
-       APPLET(uudecode, uudecode_main, _BB_DIR_USR_BIN)
+       APPLET(uudecode, uudecode_main, _BB_DIR_BIN)
#endif
#ifdef BB_UUENCODE
-       APPLET(uuencode, uuencode_main, _BB_DIR_USR_BIN)
+       APPLET(uuencode, uuencode_main, _BB_DIR_BIN)
#endif
#ifdef BB_VI
       APPLET(vi, vi_main, _BB_DIR_BIN)
@@ -460,25 +462,26 @@
       APPLET(watchdog, watchdog_main, _BB_DIR_SBIN)
#endif
#ifdef BB_WC
-       APPLET(wc, wc_main, _BB_DIR_USR_BIN)
+       APPLET(wc, wc_main, _BB_DIR_BIN)
#endif
#ifdef BB_WGET
-       APPLET(wget, wget_main, _BB_DIR_USR_BIN)
+       APPLET(wget, wget_main, _BB_DIR_BIN)
#endif
#ifdef BB_WHICH
-       APPLET(which, which_main, _BB_DIR_USR_BIN)
+       APPLET(which, which_main, _BB_DIR_BIN)
#endif
#ifdef BB_WHOAMI
-       APPLET(whoami, whoami_main, _BB_DIR_USR_BIN)
+       APPLET(whoami, whoami_main, _BB_DIR_BIN)
#endif
#ifdef BB_XARGS
-       APPLET(xargs, xargs_main, _BB_DIR_USR_BIN)
+       APPLET(xargs, xargs_main, _BB_DIR_BIN)
#endif
#ifdef BB_YES
-       APPLET(yes, yes_main, _BB_DIR_USR_BIN)
+       APPLET(yes, yes_main, _BB_DIR_BIN)
#endif
#ifdef BB_GUNZIP
       APPLET(zcat, gunzip_main, _BB_DIR_BIN)
+       APPLET(zcat, gunzip_main, _BB_DIR_USR_BIN)
#endif

#if !defined(PROTOTYPES) && !defined(MAKE_USAGE)

You are viewing proxied material from ftp.icm.edu.pl. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.