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

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;
+			exit(((*(a->main)) (argc, argv)));
-
-			status = ((*(a->main)) (argc, argv));
-			if (status < 0) {
-				fprintf(stderr, "%s: %s\n", a->name, strerror(errno));
-			}
-			fprintf(stderr, "\n");
-			exit(status);
 		}
 		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));
 }
 
 /*

archival/gunzip.c

@@ -746,7 +746,7 @@ int gunzip_main(int argc, char **argv)
 			exit(FALSE);
 		}
 	}
-	exit(exit_code);
+	return(exit_code);
 }
 
 

archival/gzip.c

@@ -282,8 +282,6 @@ extern int save_orig_name;		/* set if original name must be saved */
 #define WARN(msg) {if (!quiet) fprintf msg ; \
 		   if (exit_code == OK) exit_code = WARNING;}
 
-#define do_exit(c) exit(c)
-
 
 	/* in zip.c: */
 extern int zip (int in, int out);
@@ -1883,13 +1881,13 @@ int gzip_main(int argc, char **argv)
 		inFileNum = open(ifname, O_RDONLY);
 		if (inFileNum < 0) {
 			perror(ifname);
-			do_exit(WARNING);
+			exit(WARNING);
 		}
 		/* Get the time stamp on the input file. */
 		result = stat(ifname, &statBuf);
 		if (result < 0) {
 			perror(ifname);
-			do_exit(WARNING);
+			exit(WARNING);
 		}
 		time_stamp = statBuf.st_ctime;
 		ifile_size = statBuf.st_size;
@@ -1923,7 +1921,7 @@ int gzip_main(int argc, char **argv)
 #endif
 		if (outFileNum < 0) {
 			perror(ofname);
-			do_exit(WARNING);
+			exit(WARNING);
 		}
 		SET_BINARY_MODE(outFileNum);
 		/* Set permissions on the file */
@@ -1948,7 +1946,7 @@ int gzip_main(int argc, char **argv)
 		}
 	}
 
-	do_exit(exit_code);
+	return(exit_code);
 }
 
 /* trees.c -- output deflated data using Huffman coding

basename.c

@@ -60,6 +60,6 @@ extern int basename_main(int argc, char **argv)
 			s[m-n] = '\0';
 	}
 	printf("%s\n", s);
-	exit(TRUE);
+	return(TRUE);
 }
 

busybox.c

@@ -374,18 +374,11 @@ int main(int argc, char **argv)
 
 	while (a->name != 0) {
 		if (strcmp(name, a->name) == 0) {
-			int status;
+			exit(((*(a->main)) (argc, argv)));
-
-			status = ((*(a->main)) (argc, argv));
-			if (status < 0) {
-				fprintf(stderr, "%s: %s\n", a->name, strerror(errno));
-			}
-			fprintf(stderr, "\n");
-			exit(status);
 		}
 		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));
 }
 
 /*

cat.c

@@ -61,7 +61,7 @@ extern int cat_main(int argc, char **argv)
 		}
 		print_file(file);
 	}
-	exit(TRUE);
+	return(TRUE);
 }
 
 /*

chmod_chown_chgrp.c

@@ -101,8 +101,8 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 int chmod_chown_chgrp_main(int argc, char **argv)
 {
 	int recursiveFlag = FALSE;
-	char *groupName;
+	char *groupName=NULL;
-	char *p;
+	char *p=NULL;
 	const char *appUsage;
 
 	whichApp = (strcmp(*argv, "chown") == 0)? 

chvt.c

@@ -33,7 +33,7 @@ int chvt_main(int argc, char **argv)
 		perror("VT_WAITACTIVE");
 		exit(FALSE);
 	}
-	exit(TRUE);
+	return(TRUE);
 }
 
 

clear.c

@@ -29,5 +29,5 @@
 extern int clear_main(int argc, char **argv)
 {
 	printf("\033[H\033[J");
-	exit(TRUE);
+	return(TRUE);
 }

console-tools/chvt.c

@@ -33,7 +33,7 @@ int chvt_main(int argc, char **argv)
 		perror("VT_WAITACTIVE");
 		exit(FALSE);
 	}
-	exit(TRUE);
+	return(TRUE);
 }
 
 

console-tools/clear.c

@@ -29,5 +29,5 @@
 extern int clear_main(int argc, char **argv)
 {
 	printf("\033[H\033[J");
-	exit(TRUE);
+	return(TRUE);
 }

console-tools/deallocvt.c

@@ -34,7 +34,7 @@ int deallocvt_main(int argc, char *argv[])
 		/* deallocate all unused consoles */
 		if (ioctl(fd, VT_DISALLOCATE, 0)) {
 			perror("VT_DISALLOCATE");
-			exit(1);
+			exit( FALSE);
 		}
 	} else
 		for (i = 1; i < argc; i++) {
@@ -48,8 +48,8 @@ int deallocvt_main(int argc, char *argv[])
 				perror("VT_DISALLOCATE");
 				fprintf(stderr, "%s: could not deallocate console %d\n",
 						progname, num);
-				exit(1);
+				exit( FALSE);
 			}
 		}
-	exit(0);
+	return( TRUE);
 }

console-tools/loadacm.c

@@ -140,10 +140,9 @@ int screen_map_load(int fd, FILE * fp)
 			perror("PIO_SCRNMAP ioctl"), exit(1);
 		else
 			return 0;
-	} else {
-		fprintf(stderr, "Error parsing symbolic map\n");
-		exit(1);
 	}
+	fprintf(stderr, "Error parsing symbolic map\n");
+	return(1);
 }
 
 

console-tools/loadkmap.c

@@ -94,5 +94,5 @@ int loadkmap_main(int argc, char **argv)
 	/* Don't bother to close files.  Exit does that 
 	 * automagically, so we can save a few bytes */
 	/* close(fd); */
-	exit(TRUE);
+	return(TRUE);
 }

console-tools/setkeycodes.c

@@ -72,5 +72,5 @@ setkeycodes_main(int argc, char** argv)
 	argc -= 2;
 	argv += 2;
     }
-    exit( TRUE);
+    return( TRUE);
 }

coreutils/basename.c

@@ -60,6 +60,6 @@ extern int basename_main(int argc, char **argv)
 			s[m-n] = '\0';
 	}
 	printf("%s\n", s);
-	exit(TRUE);
+	return(TRUE);
 }
 

coreutils/cat.c

@@ -61,7 +61,7 @@ extern int cat_main(int argc, char **argv)
 		}
 		print_file(file);
 	}
-	exit(TRUE);
+	return(TRUE);
 }
 
 /*

coreutils/cut.c

@@ -307,7 +307,7 @@ int cut_main(int argc, char **argv)
 		cut();
 	}
 
-	exit(exit_status);
+	return(exit_status);
 }
 
 /* cut - extract columns from a file or stdin. 	Author: Michael J. Holme

coreutils/date.c

@@ -273,6 +273,5 @@ int date_main(int argc, char **argv)
 	strftime(t_buff, 200, date_fmt, &tm_time);
 	printf("%s\n", t_buff);
 
-	exit(TRUE);
+	return(TRUE);
-
 }

coreutils/df.c

@@ -108,7 +108,7 @@ extern int df_main(int argc, char **argv)
 		endmntent(mountTable);
 	}
 
-	exit(TRUE);
+	return(TRUE);
 }
 
 /*

coreutils/dirname.c

@@ -45,5 +45,5 @@ extern int dirname_main(int argc, char **argv)
 	if (s && *s)
 		*s = '\0';
 	printf("%s\n", (s)? *argv : ".");
-	exit(TRUE);
+	return(TRUE);
 }

coreutils/du.c

@@ -181,10 +181,10 @@ int du_main(int argc, char **argv)
 		}
 	}
 
-	exit(0);
+	return(0);
 }
 
-/* $Id: du.c,v 1.19 2000/05/10 05:05:45 erik Exp $ */
+/* $Id: du.c,v 1.20 2000/06/19 17:25:39 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"

coreutils/echo.c

@@ -96,7 +96,7 @@ echo_main(int argc, char** argv)
 	if (! nflag)
 		putchar('\n');
 	fflush(stdout);
-	exit( 0);
+	return( 0);
 }
 
 /*-

coreutils/head.c

@@ -109,7 +109,7 @@ int head_main(int argc, char **argv)
 			}
 		}
 	}
-	exit(0);
+	return(0);
 }
 
-/* $Id: head.c,v 1.10 2000/05/12 19:41:47 erik Exp $ */
+/* $Id: head.c,v 1.11 2000/06/19 17:25:39 andersen Exp $ */

coreutils/hostid.c

@@ -26,5 +26,5 @@
 extern int hostid_main(int argc, char **argv)
 {
 	printf("%lx\n", gethostid());
-	exit(TRUE);
+	return(TRUE);
 }

coreutils/id.c

@@ -89,7 +89,7 @@ extern int id_main(int argc, char **argv)
 			   my_getpwnam(user), user, my_getgrnam(group), group);
 	
 
-	exit(0);
+	return(0);
 }
 
 

coreutils/ln.c

@@ -136,7 +136,7 @@ extern int ln_main(int argc, char **argv)
 			exit FALSE;
 		}
 	}
-	exit TRUE;
+	return( TRUE);
 }
 
 /*

coreutils/logname.c

@@ -42,5 +42,5 @@ extern int logname_main(int argc, char **argv)
 		exit(TRUE);
 	}
 	fprintf(stderr, "no login name\n");
-	exit(FALSE);
+	return(FALSE);
 }

coreutils/mkdir.c

@@ -112,5 +112,5 @@ extern int mkdir_main(int argc, char **argv)
 		argc--;
 		argv++;
 	}
-	exit TRUE;
+	return( TRUE);
 }

coreutils/mkfifo.c

@@ -65,7 +65,6 @@ extern int mkfifo_main(int argc, char **argv)
 	if (mkfifo(*argv, mode) < 0) {
 		perror("mkfifo");
 		exit(255);
-	} else {
-		exit(TRUE);
 	}
+	return(TRUE);
 }

coreutils/mknod.c

@@ -98,6 +98,6 @@ int mknod_main(int argc, char **argv)
 
 	if (mknod(argv[0], mode, dev) != 0)
 		fatalError("%s: %s\n", argv[0], strerror(errno));
-	exit (TRUE);
+	return (TRUE);
 }
 

coreutils/pwd.c

@@ -34,5 +34,5 @@ extern int pwd_main(int argc, char **argv)
 		fatalError("pwd: %s\n", strerror(errno));
 
 	printf("%s\n", buf);
-	exit(TRUE);
+	return(TRUE);
 }

coreutils/rm.c

@@ -112,5 +112,5 @@ extern int rm_main(int argc, char **argv)
 			}
 		}
 	}
-	exit(TRUE);
+	return(TRUE);
 }

coreutils/rmdir.c

@@ -44,5 +44,5 @@ extern int rmdir_main(int argc, char **argv)
 			exit(FALSE);
 		}
 	}
-	exit(TRUE);
+	return(TRUE);
 }

coreutils/sleep.c

@@ -39,6 +39,6 @@ extern int sleep_main(int argc, char **argv)
 	if (sleep(atoi(*(++argv))) != 0) {
 		perror("sleep");
 		exit(FALSE);
-	} else
+	}
-		exit(TRUE);
+	return(TRUE);
 }

coreutils/sort.c

@@ -301,7 +301,7 @@ int sort_main(int argc, char **argv)
 		list_release(&list);
 	}
 
-	exit(0);
+	return(0);
 }
 
-/* $Id: sort.c,v 1.16 2000/05/12 19:41:47 erik Exp $ */
+/* $Id: sort.c,v 1.17 2000/06/19 17:25:40 andersen Exp $ */

coreutils/sync.c

@@ -33,5 +33,5 @@ extern int sync_main(int argc, char **argv)
 #endif
 				);
 	}
-	exit(sync());
+	return(sync());
 }

coreutils/tail.c

@@ -400,7 +400,7 @@ extern int tail_main(int argc, char **argv)
 			exit_status |= tail_file(argv[i], n_units);
 	}
 
-	exit(exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
+	return(exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }
 
 

coreutils/tee.c

@@ -130,7 +130,7 @@ int tee_main(int argc, char **argv)
 	/* Don't bother to close files  Exit does that 
 	 * automagically, so we can save a few bytes */
 	/* free(FileList); */
-	exit(0);
+	return(0);
 }
 
-/* $Id: tee.c,v 1.10 2000/05/12 19:41:47 erik Exp $ */
+/* $Id: tee.c,v 1.11 2000/06/19 17:25:40 andersen Exp $ */

coreutils/test.c

@@ -235,7 +235,7 @@ test_main(int argc, char** argv)
 	if (*t_wp != NULL && *++t_wp != NULL)
 		syntax(*t_wp, "unknown operand");
 
-	exit( res);
+	return( res);
 }
 
 static void

coreutils/touch.c

@@ -81,5 +81,5 @@ extern int touch_main(int argc, char **argv)
 		argv++;
 	}
 
-	exit(TRUE);
+	return(TRUE);
 }

coreutils/tty.c

@@ -46,5 +46,5 @@ extern int tty_main(int argc, char **argv)
 		else
 			puts("not a tty");
 	}
-	exit(isatty(0) ? TRUE : FALSE);
+	return(isatty(0) ? TRUE : FALSE);
 }

coreutils/uname.c

@@ -156,7 +156,7 @@ int uname_main(int argc, char **argv)
 	print_element(PRINT_MACHINE, name.machine);
 	print_element(PRINT_PROCESSOR, processor);
 
-	exit(TRUE);
+	return(TRUE);
 }
 
 /* If the name element set in MASK is selected for printing in `toprint',

coreutils/uniq.c

@@ -184,7 +184,7 @@ int uniq_main(int argc, char **argv)
 	subject_last(&s);
 	subject_study(&s);
 
-	exit(0);
+	return(0);
 }
 
-/* $Id: uniq.c,v 1.10 2000/05/12 19:41:47 erik Exp $ */
+/* $Id: uniq.c,v 1.11 2000/06/19 17:25:40 andersen Exp $ */

coreutils/usleep.c

@@ -38,5 +38,5 @@ extern int usleep_main(int argc, char **argv)
 	}
 
 	usleep(atoi(*(++argv)));	/* return void */
-	exit(TRUE);
+	return(TRUE);
 }

coreutils/uudecode.c

@@ -346,5 +346,5 @@ int uudecode_main (int argc,
     }
     while (optind < argc);
   }
-  exit(exit_status);
+  return(exit_status);
 }

coreutils/uuencode.c

@@ -240,5 +240,5 @@ int uuencode_main (int argc,
     errorMsg("Write error\n");
     exit FALSE;
   }
-  exit TRUE;
+  return( TRUE);
 }

coreutils/wc.c

@@ -166,5 +166,5 @@ int wc_main(int argc, char **argv)
 		print_counts(total_lines, total_words, total_chars,
 					 max_length, "total");
 	}
-	exit(TRUE);
+	return(TRUE);
 }

coreutils/whoami.c

@@ -45,5 +45,5 @@ extern int whoami_main(int argc, char **argv)
 	}
 	fprintf(stderr, "%s: cannot find username for UID %u\n", argv[0],
 			(unsigned) uid);
-	exit(FALSE);
+	return(FALSE);
 }

cp_mv.c

@@ -90,7 +90,7 @@ static
 void name_too_long__exit (void)
 {
 	fprintf(stderr, name_too_long, dz);
-	exit FALSE;
+	exit(FALSE);
 }
 
 static void
@@ -333,10 +333,9 @@ extern int cp_mv_main(int argc, char **argv)
 		if (flags_memo)
 			*(baseDestName + baseDestLen) = '\0';
 	}
-// exit_true:
+	return( TRUE);
-	exit TRUE;
  exit_false:
-	exit FALSE;
+	return( FALSE);
 }
 
 /*

cut.c

@@ -307,7 +307,7 @@ int cut_main(int argc, char **argv)
 		cut();
 	}
 
-	exit(exit_status);
+	return(exit_status);
 }
 
 /* cut - extract columns from a file or stdin. 	Author: Michael J. Holme

date.c

@@ -273,6 +273,5 @@ int date_main(int argc, char **argv)
 	strftime(t_buff, 200, date_fmt, &tm_time);
 	printf("%s\n", t_buff);
 
-	exit(TRUE);
+	return(TRUE);
-
 }

deallocvt.c

@@ -34,7 +34,7 @@ int deallocvt_main(int argc, char *argv[])
 		/* deallocate all unused consoles */
 		if (ioctl(fd, VT_DISALLOCATE, 0)) {
 			perror("VT_DISALLOCATE");
-			exit(1);
+			exit( FALSE);
 		}
 	} else
 		for (i = 1; i < argc; i++) {
@@ -48,8 +48,8 @@ int deallocvt_main(int argc, char *argv[])
 				perror("VT_DISALLOCATE");
 				fprintf(stderr, "%s: could not deallocate console %d\n",
 						progname, num);
-				exit(1);
+				exit( FALSE);
 			}
 		}
-	exit(0);
+	return( TRUE);
 }

df.c

@@ -108,7 +108,7 @@ extern int df_main(int argc, char **argv)
 		endmntent(mountTable);
 	}
 
-	exit(TRUE);
+	return(TRUE);
 }
 
 /*

dirname.c

@@ -45,5 +45,5 @@ extern int dirname_main(int argc, char **argv)
 	if (s && *s)
 		*s = '\0';
 	printf("%s\n", (s)? *argv : ".");
-	exit(TRUE);
+	return(TRUE);
 }

dmesg.c

@@ -128,6 +128,5 @@ int dmesg_main(int argc, char **argv)
 	exit(FALSE);
   klogctl_error:
 	perror("klogctl");
-	exit(FALSE);
+	return(FALSE);
-
 }

du.c

@@ -181,10 +181,10 @@ int du_main(int argc, char **argv)
 		}
 	}
 
-	exit(0);
+	return(0);
 }
 
-/* $Id: du.c,v 1.19 2000/05/10 05:05:45 erik Exp $ */
+/* $Id: du.c,v 1.20 2000/06/19 17:25:39 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"

dutmp.c

@@ -56,5 +56,5 @@ extern int dutmp_main(int argc, char **argv)
 				(long)ut.ut_addr);
 	}
 
-	exit(TRUE);
+	return(TRUE);
 }

echo.c

@@ -96,7 +96,7 @@ echo_main(int argc, char** argv)
 	if (! nflag)
 		putchar('\n');
 	fflush(stdout);
-	exit( 0);
+	return( 0);
 }
 
 /*-

editors/sed.c

@@ -352,7 +352,7 @@ extern int sed_main(int argc, char **argv)
 			fclose(fp);
 		}
 	}
-	exit(TRUE);
+	return(TRUE);
 }
 
 

fbset.c

@@ -329,5 +329,5 @@ extern int fbset_main(int argc, char **argv)
 	/* Don't close the file, as exiting will take care of that */
 	/* close(fh); */
 
-	exit (TRUE);
+	return (TRUE);
 }

fdflush.c

@@ -56,5 +56,5 @@ extern int fdflush_main(int argc, char **argv)
 		perror(*argv);
 		exit(FALSE);
 	}
-	exit(TRUE);
+	return(TRUE);
 }

find.c

@@ -116,5 +116,5 @@ int find_main(int argc, char **argv)
 		exit(FALSE);
 	}
 
-	exit(TRUE);
+	return(TRUE);
 }

findutils/find.c

@@ -116,5 +116,5 @@ int find_main(int argc, char **argv)
 		exit(FALSE);
 	}
 
-	exit(TRUE);
+	return(TRUE);
 }

findutils/grep.c

@@ -163,7 +163,7 @@ extern int grep_main(int argc, char **argv)
 			fclose(fp);
 		}
 	}
-	exit(match);
+	return(match);
 }
 
 

findutils/which.c

@@ -88,7 +88,7 @@ extern int which_main(int argc, char **argv)
 			exit (FALSE);
 		}
 	}
-	exit(TRUE);
+	return(TRUE);
 }
 
 /*

free.c

@@ -59,5 +59,5 @@ extern int free_main(int argc, char **argv)
 	printf("%6s%13ld%13ld%13ld\n", "Total:", info.totalram+info.totalswap,
 			(info.totalram-info.freeram)+(info.totalswap-info.freeswap),
 			info.freeram+info.freeswap);
-	exit(TRUE);
+	return(TRUE);
 }

freeramdisk.c

@@ -58,7 +58,7 @@ freeramdisk_main(int argc, char **argv)
 	/* Don't bother closing.  Exit does
 	 * that, so we can save a few bytes */
 	/* close(f); */
-	exit(TRUE);
+	return(TRUE);
 }
 
 /*

grep.c

@@ -163,7 +163,7 @@ extern int grep_main(int argc, char **argv)
 			fclose(fp);
 		}
 	}
-	exit(match);
+	return(match);
 }
 
 

gunzip.c

@@ -746,7 +746,7 @@ int gunzip_main(int argc, char **argv)
 			exit(FALSE);
 		}
 	}
-	exit(exit_code);
+	return(exit_code);
 }
 
 

gzip.c

@@ -282,8 +282,6 @@ extern int save_orig_name;		/* set if original name must be saved */
 #define WARN(msg) {if (!quiet) fprintf msg ; \
 		   if (exit_code == OK) exit_code = WARNING;}
 
-#define do_exit(c) exit(c)
-
 
 	/* in zip.c: */
 extern int zip (int in, int out);
@@ -1883,13 +1881,13 @@ int gzip_main(int argc, char **argv)
 		inFileNum = open(ifname, O_RDONLY);
 		if (inFileNum < 0) {
 			perror(ifname);
-			do_exit(WARNING);
+			exit(WARNING);
 		}
 		/* Get the time stamp on the input file. */
 		result = stat(ifname, &statBuf);
 		if (result < 0) {
 			perror(ifname);
-			do_exit(WARNING);
+			exit(WARNING);
 		}
 		time_stamp = statBuf.st_ctime;
 		ifile_size = statBuf.st_size;
@@ -1923,7 +1921,7 @@ int gzip_main(int argc, char **argv)
 #endif
 		if (outFileNum < 0) {
 			perror(ofname);
-			do_exit(WARNING);
+			exit(WARNING);
 		}
 		SET_BINARY_MODE(outFileNum);
 		/* Set permissions on the file */
@@ -1948,7 +1946,7 @@ int gzip_main(int argc, char **argv)
 		}
 	}
 
-	do_exit(exit_code);
+	return(exit_code);
 }
 
 /* trees.c -- output deflated data using Huffman coding

halt.c

@@ -28,8 +28,8 @@ extern int halt_main(int argc, char **argv)
 {
 #ifdef BB_FEATURE_LINUXRC
 	/* don't assume init's pid == 1 */
-	exit(kill(*(findPidByName("init")), SIGUSR1));
+	return(kill(*(findPidByName("init")), SIGUSR1));
 #else
-	exit(kill(1, SIGUSR1));
+	return(kill(1, SIGUSR1));
 #endif
 }

head.c

@@ -109,7 +109,7 @@ int head_main(int argc, char **argv)
 			}
 		}
 	}
-	exit(0);
+	return(0);
 }
 
-/* $Id: head.c,v 1.10 2000/05/12 19:41:47 erik Exp $ */
+/* $Id: head.c,v 1.11 2000/06/19 17:25:39 andersen Exp $ */

hostid.c

@@ -26,5 +26,5 @@
 extern int hostid_main(int argc, char **argv)
 {
 	printf("%lx\n", gethostid());
-	exit(TRUE);
+	return(TRUE);
 }

hostname.c

@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: hostname.c,v 1.9 2000/05/19 05:35:18 erik Exp $
+ * $Id: hostname.c,v 1.10 2000/06/19 17:25:39 andersen Exp $
  * Mini hostname implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -143,5 +143,5 @@ int hostname_main(int argc, char **argv)
 			printf("%s\n", buf);
 		}
 	}
-	exit(0);
+	return(0);
 }

id.c

@@ -89,7 +89,7 @@ extern int id_main(int argc, char **argv)
 			   my_getpwnam(user), user, my_getgrnam(group), group);
 	
 
-	exit(0);
+	return(0);
 }
 
 

init/halt.c

@@ -28,8 +28,8 @@ extern int halt_main(int argc, char **argv)
 {
 #ifdef BB_FEATURE_LINUXRC
 	/* don't assume init's pid == 1 */
-	exit(kill(*(findPidByName("init")), SIGUSR1));
+	return(kill(*(findPidByName("init")), SIGUSR1));
 #else
-	exit(kill(1, SIGUSR1));
+	return(kill(1, SIGUSR1));
 #endif
 }

init/poweroff.c

@@ -28,8 +28,8 @@ extern int poweroff_main(int argc, char **argv)
 {
 #ifdef BB_FEATURE_LINUXRC
 	/* don't assume init's pid == 1 */
-	exit(kill(*(findPidByName("init")), SIGUSR2));
+	return(kill(*(findPidByName("init")), SIGUSR2));
 #else
-	exit(kill(1, SIGUSR2));
+	return(kill(1, SIGUSR2));
 #endif
 }

init/reboot.c

@@ -28,9 +28,9 @@ extern int reboot_main(int argc, char **argv)
 {
 #ifdef BB_FEATURE_LINUXRC
 	/* don't assume init's pid == 1 */
-	exit(kill(*(findPidByName("init")), SIGINT));
+	return(kill(*(findPidByName("init")), SIGINT));
 #else
-	exit(kill(1, SIGINT));
+	return(kill(1, SIGINT));
 #endif
 }
 

internal.h

@@ -33,6 +33,7 @@
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <mntent.h>
+#include <asm/string.h>
 
 
 /* Some useful definitions */

lash.c

@@ -188,8 +188,7 @@ static int shell_exit(struct job *cmd, struct jobSet *junk)
 	if (!cmd->progs[0].argv[1] == 1)
 		exit TRUE;
 
-	else
+	return(atoi(cmd->progs[0].argv[1]));
-		exit(atoi(cmd->progs[0].argv[1]));
 }
 
 /* built-in 'fg' and 'bg' handler */

ln.c

@@ -136,7 +136,7 @@ extern int ln_main(int argc, char **argv)
 			exit FALSE;
 		}
 	}
-	exit TRUE;
+	return( TRUE);
 }
 
 /*

loadacm.c

@@ -140,10 +140,9 @@ int screen_map_load(int fd, FILE * fp)
 			perror("PIO_SCRNMAP ioctl"), exit(1);
 		else
 			return 0;
-	} else {
-		fprintf(stderr, "Error parsing symbolic map\n");
-		exit(1);
 	}
+	fprintf(stderr, "Error parsing symbolic map\n");
+	return(1);
 }
 
 

loadkmap.c

@@ -94,5 +94,5 @@ int loadkmap_main(int argc, char **argv)
 	/* Don't bother to close files.  Exit does that 
 	 * automagically, so we can save a few bytes */
 	/* close(fd); */
-	exit(TRUE);
+	return(TRUE);
 }

logger.c

@@ -118,7 +118,7 @@ extern int logger_main(int argc, char **argv)
 	int option = 0;
 	int fromStdinFlag = FALSE;
 	int stopLookingAtMeLikeThat = FALSE;
-	char *message, buf[1024], name[128];
+	char *message=NULL, buf[1024], name[128];
 
 	/* Fill out the name string early (may be overwritten later */
 	my_getpwuid(name, geteuid());
@@ -175,5 +175,5 @@ extern int logger_main(int argc, char **argv)
 	syslog(pri, message);
 	closelog();
 
-	exit(TRUE);
+	return(TRUE);
 }

logname.c

@@ -42,5 +42,5 @@ extern int logname_main(int argc, char **argv)
 		exit(TRUE);
 	}
 	fprintf(stderr, "no login name\n");
-	exit(FALSE);
+	return(FALSE);
 }

lsmod.c

@@ -36,5 +36,5 @@ extern int lsmod_main(int argc, char **argv)
 	char *cmd[] = { "cat", "/proc/modules", "\0" };
 #endif
 
-	exit(cat_main(3, cmd));
+	return(cat_main(3, cmd));
 }

math.c

@@ -186,5 +186,5 @@ int math_main(int argc, char **argv)
 		}
 	}
 	stack_machine(0);
-	exit( TRUE);
+	return( TRUE);
 }

miscutils/dutmp.c

@@ -56,5 +56,5 @@ extern int dutmp_main(int argc, char **argv)
 				(long)ut.ut_addr);
 	}
 
-	exit(TRUE);
+	return(TRUE);
 }

miscutils/mktemp.c

@@ -39,5 +39,5 @@ extern int mktemp_main(int argc, char **argv)
 	if(mkstemp(argv[argc-1]) < 0)
 			exit(FALSE);
 	(void) puts(argv[argc-1]);
-	exit(TRUE);
+	return(TRUE);
 }

miscutils/mt.c

@@ -101,5 +101,5 @@ extern int mt_main(int argc, char **argv)
 		exit (FALSE);
 	}
 
-	exit (TRUE);
+	return (TRUE);
 }

mkdir.c

@@ -112,5 +112,5 @@ extern int mkdir_main(int argc, char **argv)
 		argc--;
 		argv++;
 	}
-	exit TRUE;
+	return( TRUE);
 }

mkfifo.c

@@ -65,7 +65,6 @@ extern int mkfifo_main(int argc, char **argv)
 	if (mkfifo(*argv, mode) < 0) {
 		perror("mkfifo");
 		exit(255);
-	} else {
-		exit(TRUE);
 	}
+	return(TRUE);
 }

mknod.c

@@ -98,6 +98,6 @@ int mknod_main(int argc, char **argv)
 
 	if (mknod(argv[0], mode, dev) != 0)
 		fatalError("%s: %s\n", argv[0], strerror(errno));
-	exit (TRUE);
+	return (TRUE);
 }
 

mkswap.c

@@ -469,5 +469,5 @@ the -f option to force it.\n", program_name, device_name);
 	 */
 	if (fsync(DEV))
 		die("fsync failed");
-	exit(TRUE);
+	return(TRUE);
 }

mktemp.c

@@ -39,5 +39,5 @@ extern int mktemp_main(int argc, char **argv)
 	if(mkstemp(argv[argc-1]) < 0)
 			exit(FALSE);
 	(void) puts(argv[argc-1]);
-	exit(TRUE);
+	return(TRUE);
 }

modutils/lsmod.c

@@ -36,5 +36,5 @@ extern int lsmod_main(int argc, char **argv)
 	char *cmd[] = { "cat", "/proc/modules", "\0" };
 #endif
 
-	exit(cat_main(3, cmd));
+	return(cat_main(3, cmd));
 }

modutils/rmmod.c

@@ -75,5 +75,5 @@ extern int rmmod_main(int argc, char **argv)
 		}
 		argv++;
 	}
-	exit(TRUE);
+	return(TRUE);
 }

more.c

@@ -221,5 +221,5 @@ extern int more_main(int argc, char **argv)
 #ifdef BB_FEATURE_USE_TERMIOS
 	gotsig(0);
 #endif
-	exit(TRUE);
+	return(TRUE);
 }

mt.c

@@ -101,5 +101,5 @@ extern int mt_main(int argc, char **argv)
 		exit (FALSE);
 	}
 
-	exit (TRUE);
+	return (TRUE);
 }