aboutsummaryrefslogtreecommitdiff
path: root/applets
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2000-06-19 17:25:40 +0000
committerEric Andersen <andersen@codepoet.org>2000-06-19 17:25:40 +0000
commitb610615be9aedfac07d1e01f12575707fa3a227c (patch)
treeb94c0d6a506d1ef77f79df246a26d504c84b7110 /applets
parentdbb3019d0de410960feac649a0b9320ae245cca1 (diff)
downloadbusybox-b610615be9aedfac07d1e01f12575707fa3a227c.tar.gz
Updates to a number of apps to remove warnings/compile errors under libc5.
Tested under both libc5 and libc6 and all seems well with these fixes. -Erik
Diffstat (limited to 'applets')
-rw-r--r--applets/busybox.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/applets/busybox.c b/applets/busybox.c
index be9aa3e83..191dee13f 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -374,18 +374,11 @@ int main(int argc, char **argv)
while (a->name != 0) {
if (strcmp(name, a->name) == 0) {
- int status;
-
- status = ((*(a->main)) (argc, argv));
- if (status < 0) {
- fprintf(stderr, "%s: %s\n", a->name, strerror(errno));
- }
- fprintf(stderr, "\n");
- exit(status);
+ exit(((*(a->main)) (argc, argv)));
}
a++;
}
- exit(busybox_main(argc, argv));
+ return(busybox_main(argc, argv));
}
@@ -419,11 +412,10 @@ 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));
}
+ /* If we've already been here once, exit now */
+ been_there_done_that = 1;
+ return (main(argc, argv));
}
/*