#include "busybox.h"
#include <stdio.h>
#include <string.h>
+#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
#include "messages.c"
static int been_there_done_that = 0;
-
-
const char *applet_name;
#ifdef BB_FEATURE_INSTALLER
int i;
int rc;
- if (use_symbolic_links) Link = symlink;
+ if (use_symbolic_links)
+ Link = symlink;
for (i = 0; applets[i].name != NULL; i++) {
sprintf ( command, "%s/%s",
- install_dir[applets[i].location],
- applets[i].name);
+ install_dir[applets[i].location], applets[i].name);
rc = Link(busybox, command);
if (rc) {
int main(int argc, char **argv)
{
- struct BB_applet search_applet, *applet;
- const char *s;
+ struct BB_applet *applet;
+ const char *s;
for (s = applet_name = argv[0]; *s != '\0';) {
if (*s++ == '/')
#endif
/* 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 = find_applet_by_name(applet_name)) != NULL) {
if (applet->usage && argv[1] && strcmp(argv[1], "--help") == 0)
- usage(applet->usage);
+ usage(applet->usage);
exit((*(applet->main)) (argc, argv));
}
- error_msg_and_die("applet not found\n");
+ error_msg_and_die("applet not found");
}
/* Fix up the argv pointers */
len = argv[1] - argv[0];
- memmove(argv, argv+1, sizeof(char *) * (argc + 1));
+ memmove(argv, argv + 1, sizeof(char *) * (argc + 1));
for (i = 0; i < argc; i++)
argv[i] -= len;