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

be more careful about cleaning up

Browse Source
This commit is contained in:
Eric Andersen 2003-03-07 18:09:06 +00:00
parent 3719e9e790
commit 77831c11d1
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util-linux/fdflush.c
View File

@ -32,16 +32,23 @@
extern int fdflush_main(int argc, char **argv) extern int fdflush_main(int argc, char **argv)
{ {
int fd; int fd, result;
if (argc <= 1) if (argc <= 1)
show_usage(); show_usage();
if ((fd = open(*(++argv), 0)) < 0) if ((fd = open(*(++argv), 0)) < 0)
goto die_the_death; goto die_the_death;
if (ioctl(fd, FDFLUSH, 0)) result = ioctl(fd, FDFLUSH, 0);
#ifdef CONFIG_FEATURE_CLEAN_UP
close(fd);
#endif
if (result) {
goto die_the_death; goto die_the_death;
}
/* Don't bother closing. Exit does
* that, so we can save a few bytes */
return EXIT_SUCCESS; return EXIT_SUCCESS;
die_the_death: die_the_death:

11
util-linux/freeramdisk.c
View File

@ -37,20 +37,25 @@
extern int extern int
freeramdisk_main(int argc, char **argv) freeramdisk_main(int argc, char **argv)
{ {
int result;
FILE *f; FILE *f;
if (argc != 2 || *argv[1] == '-') { if (argc != 2) {
show_usage(); show_usage();
} }
f = xfopen(argv[1], "r+"); f = xfopen(argv[1], "r+");
if (ioctl(fileno(f), BLKFLSBUF) < 0) { result = ioctl(fileno(f), BLKFLSBUF);
#ifdef CONFIG_FEATURE_CLEAN_UP
fclose(f);
#endif
if (result < 0) {
perror_msg_and_die("failed ioctl on %s", argv[1]); perror_msg_and_die("failed ioctl on %s", argv[1]);
} }
/* Don't bother closing. Exit does /* Don't bother closing. Exit does
* that, so we can save a few bytes */ * that, so we can save a few bytes */
/* close(f); */
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }