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
This commit is contained in:
Eric Andersen
2000-06-19 17:25:40 +00:00
parent dbb3019d0d
commit b610615be9
142 changed files with 190 additions and 221 deletions

View File

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

View File

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

View File

@@ -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

View File

@@ -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);
}

View File

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

View File

@@ -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);
}

View File

@@ -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"

View File

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

View File

@@ -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 $ */

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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);
}

View File

@@ -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);
}

View File

@@ -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);
}

View File

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

View File

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

View File

@@ -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);
}

View File

@@ -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 $ */

View File

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

View File

@@ -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);
}

View File

@@ -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 $ */

View File

@@ -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

View File

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

View File

@@ -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);
}

View File

@@ -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',

View File

@@ -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 $ */

View File

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

View File

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

View File

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

View File

@@ -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);
}

View File

@@ -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);
}