emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consolidate handling of some fopen failures.

Browse Source
This commit is contained in:
Matt Kraai 2000-09-27 02:43:35 +00:00
parent e0bcce09ba
commit bbaef66b3f
14 changed files with 32 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
console-tools/loadacm.c
View File

@ -330,10 +330,7 @@ void saveoldmap(int fd, char *omfil)
}
#endif
if ((fp = fopen(omfil, "w")) == NULL) {
perror(omfil);
exit(1);
}
fp = xfopen(omfil, "w");
#ifdef GIO_UNISCRNMAP
if (is_old_map) {
#endif

9
coreutils/wc.c
View File

@ -134,13 +134,10 @@ int wc_main(int argc, char **argv)
if (argv[optind] == NULL || strcmp(argv[optind], "-") == 0) {
wc_file(stdin, "");
exit(TRUE);
return EXIT_SUCCESS;
} else {
while (optind < argc) {
file = fopen(argv[optind], "r");
if (file == NULL) {
fatalError(argv[optind]);
}
file = xfopen(argv[optind], "r");
wc_file(file, argv[optind]);
num_files_counted++;
optind++;
@ -151,5 +148,5 @@ int wc_main(int argc, char **argv)
print_counts(total_lines, total_words, total_chars,
max_length, "total");
return 0 ;
return EXIT_SUCCESS;
}

4
editors/sed.c
View File

@ -472,9 +472,7 @@ static void load_cmd_file(char *filename)
char *line;
char *nextline;
cmdfile = fopen(filename, "r");
if (cmdfile == NULL)
fatalError(strerror(errno));
cmdfile = xfopen(filename, "r");
while ((line = get_line_from_file(cmdfile)) != NULL) {
/* if a line ends with '\' it needs the next line appended to it */

20
hostname.c
View File

@ -1,6 +1,6 @@
/* vi: set sw=4 ts=4: */
/*
* $Id: hostname.c,v 1.13 2000/09/25 21:45:57 andersen Exp $
* $Id: hostname.c,v 1.14 2000/09/27 02:43:35 kraai Exp $
* Mini hostname implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@ -46,18 +46,14 @@ void do_sethostname(char *s, int isfile)
exit(1);
}
} else {
if ((f = fopen(s, "r")) == NULL) {
perror(s);
f = xfopen(s, "r");
fgets(buf, 255, f);
fclose(f);
if (buf[strlen(buf) - 1] == '\n')
buf[strlen(buf) - 1] = 0;
if (sethostname(buf, strlen(buf)) < 0) {
perror("sethostname");
exit(1);
} else {
fgets(buf, 255, f);
fclose(f);
if (buf[strlen(buf) - 1] == '\n')
buf[strlen(buf) - 1] = 0;
if (sethostname(buf, strlen(buf)) < 0) {
perror("sethostname");
exit(1);
}
}
}
}

5
lash.c
View File

@ -1447,10 +1447,7 @@ int shell_main(int argc_l, char **argv_l)
fprintf(stdout, "Enter 'help' for a list of built-in commands.\n\n");
} else if (local_pending_command==NULL) {
//fprintf(stdout, "optind=%d argv[optind]='%s'\n", optind, argv[optind]);
input = fopen(argv[optind], "r");
if (!input) {
fatalError("%s: %s\n", argv[optind], strerror(errno));
}
input = xfopen(argv[optind], "r");
}
/* initialize the cwd -- this is never freed...*/

5
loadacm.c
View File

@ -330,10 +330,7 @@ void saveoldmap(int fd, char *omfil)
}
#endif
if ((fp = fopen(omfil, "w")) == NULL) {
perror(omfil);
exit(1);
}
fp = xfopen(omfil, "w");
#ifdef GIO_UNISCRNMAP
if (is_old_map) {
#endif

6
more.c
View File

@ -82,12 +82,8 @@ extern int more_main(int argc, char **argv)
if (argc == 0) {
file = stdin;
} else
file = fopen(*argv, "r");
file = xfopen(*argv, "r");
if (file == NULL) {
perror(*argv);
exit(FALSE);
}
fstat(fileno(file), &st);
#ifdef BB_FEATURE_USE_TERMIOS

20
networking/hostname.c
View File

@ -1,6 +1,6 @@
/* vi: set sw=4 ts=4: */
/*
* $Id: hostname.c,v 1.13 2000/09/25 21:45:57 andersen Exp $
* $Id: hostname.c,v 1.14 2000/09/27 02:43:35 kraai Exp $
* Mini hostname implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@ -46,18 +46,14 @@ void do_sethostname(char *s, int isfile)
exit(1);
}
} else {
if ((f = fopen(s, "r")) == NULL) {
perror(s);
f = xfopen(s, "r");
fgets(buf, 255, f);
fclose(f);
if (buf[strlen(buf) - 1] == '\n')
buf[strlen(buf) - 1] = 0;
if (sethostname(buf, strlen(buf)) < 0) {
perror("sethostname");
exit(1);
} else {
fgets(buf, 255, f);
fclose(f);
if (buf[strlen(buf) - 1] == '\n')
buf[strlen(buf) - 1] = 0;
if (sethostname(buf, strlen(buf)) < 0) {
perror("sethostname");
exit(1);
}
}
}
}

4
sed.c
View File

@ -472,9 +472,7 @@ static void load_cmd_file(char *filename)
char *line;
char *nextline;
cmdfile = fopen(filename, "r");
if (cmdfile == NULL)
fatalError(strerror(errno));
cmdfile = xfopen(filename, "r");
while ((line = get_line_from_file(cmdfile)) != NULL) {
/* if a line ends with '\' it needs the next line appended to it */

5
sh.c
View File

@ -1447,10 +1447,7 @@ int shell_main(int argc_l, char **argv_l)
fprintf(stdout, "Enter 'help' for a list of built-in commands.\n\n");
} else if (local_pending_command==NULL) {
//fprintf(stdout, "optind=%d argv[optind]='%s'\n", optind, argv[optind]);
input = fopen(argv[optind], "r");
if (!input) {
fatalError("%s: %s\n", argv[optind], strerror(errno));
}
input = xfopen(argv[optind], "r");
}
/* initialize the cwd -- this is never freed...*/

5
shell/lash.c
View File

@ -1447,10 +1447,7 @@ int shell_main(int argc_l, char **argv_l)
fprintf(stdout, "Enter 'help' for a list of built-in commands.\n\n");
} else if (local_pending_command==NULL) {
//fprintf(stdout, "optind=%d argv[optind]='%s'\n", optind, argv[optind]);
input = fopen(argv[optind], "r");
if (!input) {
fatalError("%s: %s\n", argv[optind], strerror(errno));
}
input = xfopen(argv[optind], "r");
}
/* initialize the cwd -- this is never freed...*/

6
util-linux/more.c
View File

@ -82,12 +82,8 @@ extern int more_main(int argc, char **argv)
if (argc == 0) {
file = stdin;
} else
file = fopen(*argv, "r");
file = xfopen(*argv, "r");
if (file == NULL) {
perror(*argv);
exit(FALSE);
}
fstat(fileno(file), &st);
#ifdef BB_FEATURE_USE_TERMIOS

2
utility.c
View File

@ -1718,7 +1718,7 @@ void xregcomp(regex_t *preg, const char *regex, int cflags)
}
#endif
#if defined BB_UNIQ
#if defined BB_HOSTNAME || defined BB_LOADACM || defined BB_MORE || defined BB_SED || defined BB_SH || defined BB_UNIQ || defined BB_WC
FILE *xfopen(const char *path, const char *mode)
{
FILE *fp;

9
wc.c
View File

@ -134,13 +134,10 @@ int wc_main(int argc, char **argv)
if (argv[optind] == NULL || strcmp(argv[optind], "-") == 0) {
wc_file(stdin, "");
exit(TRUE);
return EXIT_SUCCESS;
} else {
while (optind < argc) {
file = fopen(argv[optind], "r");
if (file == NULL) {
fatalError(argv[optind]);
}
file = xfopen(argv[optind], "r");
wc_file(file, argv[optind]);
num_files_counted++;
optind++;
@ -151,5 +148,5 @@ int wc_main(int argc, char **argv)
print_counts(total_lines, total_words, total_chars,
max_length, "total");
return 0 ;
return EXIT_SUCCESS;
}