From b610615be9aedfac07d1e01f12575707fa3a227c Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Mon, 19 Jun 2000 17:25:40 +0000 Subject: 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 --- busybox.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'busybox.c') diff --git a/busybox.c b/busybox.c index be9aa3e83..191dee13f 100644 --- a/busybox.c +++ b/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)); } /* -- cgit v1.2.3