X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=applets%2Fbusybox.c;h=8f27dfb8eace2121ff20e40235f1624423cf8b4c;hb=d0fa0a12f1ce40a9e0d73674ad2f5e4a294cdbb5;hp=36cf0a05cc5ac16f00181c3d536e6764265971ee;hpb=fb002d0df02ce53e8bcc03fe6e451b250b4d519e;p=oweals%2Fbusybox.git

diff --git a/applets/busybox.c b/applets/busybox.c
index 36cf0a05c..8f27dfb8e 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -1,363 +1,173 @@
 /* vi: set sw=4 ts=4: */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
 
-#ifndef BB_INIT
-#undef BB_FEATURE_LINUXRC
-#endif
+#undef APPLET
+#undef APPLET_NOUSAGE
+#undef PROTOTYPES
+#include "applets.h"
+
+#define bb_need_full_version
+#define BB_DECLARE_EXTERN
+#include "messages.c"
 
 static int been_there_done_that = 0;
 
-/* It has been alledged that doing such things can
- * help reduce binary size when staticly linking,
- * of course with glibc, this is unlikely as long
- * as we use things like printf -- perhaps a printf
- * replacement may be in order 
+
+const char *applet_name;
+
+#ifdef BB_FEATURE_INSTALLER
+/* 
+ * directory table
+ *		this should be consistent w/ the enum, busybox.h::Location,
+ *		or else...
  */
-#if 0
-void exit(int status) __attribute__ ((noreturn));
-void exit(int status)
-{
-	_exit(status);
+static char* install_dir[] = {
+	"/",
+	"/bin",
+	"/sbin",
+	"/usr/bin",
+	"/usr/sbin",
 };
-void abort(void) __attribute__ ((__noreturn__));
-void abort(void)
+
+/* abstract link() */
+typedef int (*__link_f)(const char *, const char *);
+
+/* 
+ * Where in the filesystem is this busybox?
+ * [return]
+ *		malloc'd string w/ full pathname of busybox's location
+ *		NULL on failure
+ */
+static char *busybox_fullpath()
 {
-	_exit(0);
-};
-int atexit(void (*__func) (void))
+	pid_t pid;
+	char path[256];
+	char proc[256];
+	int len;
+
+	pid = getpid();
+	sprintf(proc, "/proc/%d/exe", pid);
+	len = readlink(proc, path, 256);
+	if (len != -1) {
+		path[len] = 0;
+	} else {
+		error_msg("%s: %s\n", proc, strerror(errno));
+		return NULL;
+	}
+	return strdup(path);
+}
+
+/* create (sym)links for each applet */
+static void install_links(const char *busybox, int use_symbolic_links)
 {
-	_exit(0);
-};
-void *__libc_stack_end;
-#endif
+	__link_f Link = link;
 
+	char command[256];
+	int i;
+	int rc;
 
-static const struct Applet applets[] = {
+	if (use_symbolic_links) Link = symlink;
 
-#ifdef BB_BASENAME				//usr/bin/basename
-	{"basename", basename_main},
-#endif
-#ifdef BB_BUSYBOX				//bin
-	{"busybox", busybox_main},
-#endif
-#ifdef BB_BLOCK_DEVICE			//sbin
-	{"block_device", block_device_main},
-#endif
-#ifdef BB_CAT					//bin
-	{"cat", cat_main},
-#endif
-#ifdef BB_CHMOD_CHOWN_CHGRP		//bin
-	{"chmod", chmod_chown_chgrp_main},
-	{"chown", chmod_chown_chgrp_main},
-	{"chgrp", chmod_chown_chgrp_main},
-#endif
-#ifdef BB_CHROOT				//sbin
-	{"chroot", chroot_main},
-#endif
-#ifdef BB_CLEAR					//usr/bin
-	{"clear", clear_main},
-#endif
-#ifdef BB_CHVT					//usr/bin
-	{"chvt", chvt_main},
-#endif
-#ifdef BB_CP_MV					//bin
-	{"cp", cp_mv_main},
-	{"mv", cp_mv_main},
-#endif
-#ifdef BB_DATE					//bin
-	{"date", date_main},
-#endif
-#ifdef BB_DD					//bin
-	{"dd", dd_main},
-#endif
-#ifdef BB_DF					//bin
-	{"df", df_main},
-#endif
-#ifdef BB_DIRNAME				//usr/bin
-	{"dirname", dirname_main},
-#endif
-#ifdef BB_DMESG					//bin
-	{"dmesg", dmesg_main},
-#endif
-#ifdef BB_DU					//bin
-	{"du", du_main},
-#endif
-#ifdef BB_DUTMP					//usr/sbin
-	{"dutmp", dutmp_main},
-#endif
-#ifdef BB_FBSET					//usr/sbin
-	{"fbset", fbset_main},
-#endif
-#ifdef BB_FDFLUSH				//bin
-	{"fdflush", fdflush_main},
-#endif
-#ifdef BB_FIND					//usr/bin
-	{"find", find_main},
-#endif
-#ifdef BB_FREE					//usr/bin
-	{"free", free_main},
-#endif
-#ifdef BB_FREERAMDISK			//sbin
-	{"freeramdisk", freeramdisk_main},
-#endif
-#ifdef BB_DEALLOCVT				//usr/bin
-	{"deallocvt", deallocvt_main},
-#endif
-#ifdef BB_FSCK_MINIX			//sbin
-	{"fsck.minix", fsck_minix_main},
-#endif
-#ifdef BB_MKFS_MINIX			//sbin
-	{"mkfs.minix", mkfs_minix_main},
-#endif
-#ifdef BB_GREP					//bin
-	{"grep", grep_main},
-#endif
-#ifdef BB_HALT					//sbin
-	{"halt", halt_main},
-#endif
-#ifdef BB_HEAD					//bin
-	{"head", head_main},
-#endif
-#ifdef BB_HOSTID				//usr/bin
-	{"hostid", hostid_main},
-#endif
-#ifdef BB_HOSTNAME				//bin
-	{"hostname", hostname_main},
-#endif
-#ifdef BB_INIT					//sbin
-	{"init", init_main},
-#endif
-#ifdef BB_INSMOD				//sbin
-	{"insmod", insmod_main},
-#endif
-#ifdef BB_FEATURE_LINUXRC		//
-	{"linuxrc", init_main},
-#endif
-#ifdef BB_KILL					//bin
-	{"kill", kill_main},
-#endif
-#ifdef BB_LENGTH				//usr/bin
-	{"length", length_main},
-#endif
-#ifdef BB_LN					//bin
-	{"ln", ln_main},
-#endif
-#ifdef BB_LOADACM				//usr/bin
-	{"loadacm", loadacm_main},
-#endif
-#ifdef BB_LOADFONT				//usr/bin
-	{"loadfont", loadfont_main},
-#endif
-#ifdef BB_LOADKMAP				//sbin
-	{"loadkmap", loadkmap_main},
-#endif
-#ifdef BB_LS					//bin
-	{"ls", ls_main},
-#endif
-#ifdef BB_LSMOD					//sbin
-	{"lsmod", lsmod_main},
-#endif
-#ifdef BB_MAKEDEVS				//sbin
-	{"makedevs", makedevs_main},
-#endif
-#ifdef BB_MATH					//usr/bin
-	{"math", math_main},
-#endif
-#ifdef BB_MKDIR					//bin
-	{"mkdir", mkdir_main},
-#endif
-#ifdef BB_MKFIFO				//usr/bin
-	{"mkfifo", mkfifo_main},
-#endif
-#ifdef BB_MKNOD					//bin
-	{"mknod", mknod_main},
-#endif
-#ifdef BB_MKSWAP				//sbin
-	{"mkswap", mkswap_main},
-#endif
-#ifdef BB_MNC					//usr/bin
-	{"mnc", mnc_main},
-#endif
-#ifdef BB_MORE					//bin
-	{"more", more_main},
-#endif
-#ifdef BB_MOUNT					//bin
-	{"mount", mount_main},
-#endif
-#ifdef BB_MT					//bin
-	{"mt", mt_main},
-#endif
-#ifdef BB_NSLOOKUP				//usr/bin
-	{"nslookup", nslookup_main},
-#endif
-#ifdef BB_PING					//bin
-	{"ping", ping_main},
-#endif
-#ifdef BB_POWEROFF				//sbin
-	{"poweroff", poweroff_main},
-#endif
-#ifdef BB_PRINTF				//usr/bin
-	{"printf", printf_main},
-#endif
-#ifdef BB_PS					//bin
-	{"ps", ps_main},
-#endif
-#ifdef BB_PWD					//bin
-	{"pwd", pwd_main},
-#endif
-#ifdef BB_REBOOT				//sbin
-	{"reboot", reboot_main},
-#endif
-#ifdef BB_RM					//bin
-	{"rm", rm_main},
-#endif
-#ifdef BB_RMDIR					//bin
-	{"rmdir", rmdir_main},
-#endif
-#ifdef BB_RMMOD					//sbin
-	{"rmmod", rmmod_main},
-#endif
-#ifdef BB_SFDISK				//sbin
-	{"fdisk", sfdisk_main},
-	{"sfdisk", sfdisk_main},
-#endif
-#ifdef BB_SED					//bin
-	{"sed", sed_main},
-#endif
-#ifdef BB_SLEEP					//bin
-	{"sleep", sleep_main},
-#endif
-#ifdef BB_SORT					//bin
-	{"sort", sort_main},
-#endif
-#ifdef BB_SYNC					//bin
-	{"sync", sync_main},
-#endif
-#ifdef BB_SYSLOGD				//sbin
-	{"syslogd", syslogd_main},
-#endif
-#ifdef BB_LOGGER				//usr/bin
-	{"logger", logger_main},
-#endif
-#ifdef BB_LOGNAME				//usr/bin
-	{"logname", logname_main},
-#endif
-#ifdef BB_SWAPONOFF				//sbin
-	{"swapon", swap_on_off_main},
-	{"swapoff", swap_on_off_main},
-#endif
-#ifdef BB_TAIL					//usr/bin
-	{"tail", tail_main},
-#endif
-#ifdef BB_TAR					//bin
-	{"tar", tar_main},
-#endif
-#ifdef BB_TELNET				//usr/bin
-	{"telnet", telnet_main},
-#endif
-#ifdef BB_TEE					//bin
-	{"tee", tee_main},
-#endif
-#ifdef BB_TOUCH					//usr/bin
-	{"touch", touch_main},
-#endif
-#ifdef BB_TR					//usr/bin
-	{"tr", tr_main},
-#endif
-#ifdef BB_TRUE_FALSE			//bin
-	{"true", true_main},
-	{"false", false_main},
-#endif
-#ifdef BB_TTY					//usr/bin
-	{"tty", tty_main},
-#endif
-#ifdef BB_UMOUNT				//bin
-	{"umount", umount_main},
-#endif
-#ifdef BB_UNAME					//bin
-	{"uname", uname_main},
-#endif
-#ifdef BB_UPTIME				//usr/bin
-	{"uptime", uptime_main},
-#endif
-#ifdef BB_UNIQ					//bin
-	{"uniq", uniq_main},
-#endif
-#ifdef BB_UPDATE				//sbin
-	{"update", update_main},
-#endif
-#ifdef BB_WC					//usr/bin
-	{"wc", wc_main},
-#endif
-#ifdef BB_WHOAMI				//usr/bin
-	{"whoami", whoami_main},
-#endif
-#ifdef BB_YES					//usr/bin
-	{"yes", yes_main},
-#endif
-#ifdef BB_GUNZIP				//bin
-	{"zcat", gunzip_main},
-	{"gunzip", gunzip_main},
-#endif
-#ifdef BB_GZIP					//bin
-	{"gzip", gzip_main},
-#endif
-	{0}
-};
+	for (i = 0; applets[i].name != NULL; i++) {
+		sprintf ( command, "%s/%s", 
+				install_dir[applets[i].location], 
+				applets[i].name);
+		rc = Link(busybox, command);
 
+		if (rc) {
+			error_msg("%s: %s\n", command, strerror(errno));
+		}
+	}
+}
 
+#endif /* BB_FEATURE_INSTALLER */
 
 int main(int argc, char **argv)
 {
-	char				*s		= argv[0];
-	char				*name	= argv[0];
-	const struct Applet	*a		= applets;
+	struct BB_applet search_applet, *applet;
+	const char				*s;
+	applet_name = "busybox";
+
+#ifdef BB_FEATURE_INSTALLER	
+	/* 
+	 * This style of argument parsing doesn't scale well 
+	 * in the event that busybox starts wanting more --options.
+	 * If someone has a cleaner approach, by all means implement it.
+	 */
+	if (argc > 1 && (strcmp(argv[1], "--install") == 0)) {
+		int use_symbolic_links = 0;
+		int rc = 0;
+		char *busybox;
+
+		/* to use symlinks, or not to use symlinks... */
+		if (argc > 2) {
+			if ((strcmp(argv[2], "-s") == 0)) { 
+				use_symbolic_links = 1; 
+			}
+		}
 
-	while (*s != '\0') {
-		if (*s++ == '/')
-			name = s;
+		/* link */
+		busybox = busybox_fullpath();
+		if (busybox) {
+			install_links(busybox, use_symbolic_links);
+			free(busybox);
+		} else {
+			rc = 1;
+		}
+		return rc;
 	}
+#endif /* BB_FEATURE_INSTALLER */
 
-	*argv = name;
+	for (s = applet_name = argv[0]; *s != '\0';) {
+		if (*s++ == '/')
+			applet_name = s;
+	}
 
-	while (a->name != 0) {
-		if (strcmp(name, a->name) == 0) {
-			int status;
+#ifdef BB_SH
+	/* Add in a special case hack -- whenever **argv == '-'
+	 * (i.e. '-su' or '-sh') always invoke the shell */
+	if (**argv == '-' && *(*argv+1)!= '-') {
+		exit(((*(shell_main)) (argc, argv)));
+	}
+#endif
 
-			status = ((*(a->main)) (argc, argv));
-			if (status < 0) {
-				fprintf(stderr, "%s: %s\n", a->name, strerror(errno));
-			}
-			fprintf(stderr, "\n");
-			exit(status);
-		}
-		a++;
+	/* Do a binary search to find the applet entry given the name. */
+	search_applet.name = applet_name;
+	applet = bsearch(&search_applet, applets, NUM_APPLETS,
+			sizeof(struct BB_applet), applet_name_compare);
+	if (applet != NULL) {
+		if (applet->usage && argv[1] && strcmp(argv[1], "--help") == 0)
+			usage(applet->usage); 
+		exit((*(applet->main)) (argc, argv));
 	}
-	exit(busybox_main(argc, argv));
+
+	return(busybox_main(argc, argv));
 }
 
 
 int busybox_main(int argc, char **argv)
 {
 	int col = 0;
+	int ps_index;
+	char *index, *index2;
 
 	argc--;
-	argv++;
 
+	/* If we've already been here once, exit now */
 	if (been_there_done_that == 1 || argc < 1) {
-		const struct Applet *a = applets;
+		const struct BB_applet *a = applets;
 
-		fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n",
-				BB_VER, BB_BT);
-		fprintf(stderr, "Usage: busybox [function] [arguments]...\n");
-		fprintf(stderr, "   or: [function] [arguments]...\n\n");
-		fprintf(stderr,
-				"\tMost people will create a link to busybox for each\n"
-				"\tfunction name, and busybox will act like whatever you invoke it as.\n");
-		fprintf(stderr, "\nCurrently defined functions:\n");
+		fprintf(stderr, "%s\n\n"
+				"Usage: busybox [function] [arguments]...\n"
+				"   or: [function] [arguments]...\n\n"
+				"\tBusyBox is a multi-call binary that combines many common Unix\n"
+				"\tutilities into a single executable.  Most people will create a\n"
+				"\tlink to busybox for each function they wish to use, and BusyBox\n"
+				"\twill act like whatever it was invoked as.\n" 
+				"\nCurrently defined functions:\n", full_version);
 
 		while (a->name != 0) {
 			col +=
@@ -370,11 +180,32 @@ int busybox_main(int argc, char **argv)
 		}
 		fprintf(stderr, "\n\n");
 		exit(-1);
-	} else {
-		/* If we've already been here once, exit now */
-		been_there_done_that = 1;
-		return (main(argc, argv));
 	}
+
+	/* Flag that we've been here already */
+	been_there_done_that = 1;
+	
+	/* We do not want the word "busybox" to show up in ps, so we move
+	 * everything in argv around to fake ps into showing what we want it to
+	 * show.  Since we are only shrinking the string, we don't need to move 
+	 * __environ or any of that tedious stuff... */
+	ps_index = 0;
+	index=*argv;
+	index2=argv[argc];
+	index2+=strlen(argv[argc]);
+	while(ps_index < argc) { 
+		argv[ps_index]=index;
+		memmove(index, argv[ps_index+1], strlen(argv[ps_index+1])+1);
+		index+=(strlen(index));
+		*index='\0';
+		index++;
+		ps_index++;
+	}
+	while(index<=index2)
+		*index++='\0';
+	argv[ps_index]=NULL;
+
+	return (main(argc, argv));
 }
 
 /*