projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not use the _syscall5 macro -- use syscall(2) instead
[oweals/busybox.git]
/
util-linux
/
fdflush.c
diff --git
a/util-linux/fdflush.c
b/util-linux/fdflush.c
index 6633e12128a922b8d488b5c71c13371fc813226b..c3fcf3325c3e1fc08293a2a71dd57d99f1e70b7e 100644
(file)
--- a/
util-linux/fdflush.c
+++ b/
util-linux/fdflush.c
@@
-2,8
+2,8
@@
/*
* Mini fdflush implementation for busybox
*
/*
* Mini fdflush implementation for busybox
*
- *
- * Copyright (C)
1995, 1996 by Bruce Perens <bruce@pixar.com>.
+ *
Copyright (C) 1995, 1996 by Bruce Perens <bruce@perens.com>.
+ * Copyright (C)
2003 by Erik Andersen <andersen@codeoet.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-21,36
+21,34
@@
*
*/
*
*/
-#include "busybox.h"
#include <stdio.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <stdio.h>
#include <sys/ioctl.h>
#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
/* From <linux/fd.h> */
#define FDFLUSH _IO(2,0x4b)
extern int fdflush_main(int argc, char **argv)
{
/* From <linux/fd.h> */
#define FDFLUSH _IO(2,0x4b)
extern int fdflush_main(int argc, char **argv)
{
- int value;
- int fd;
+ int fd, result;
- if (argc <= 1
|| **(++argv) == '-'
)
-
usage(fdflush_usage
);
+ if (argc <= 1)
+
bb_show_usage(
);
- fd = open(*argv, 0);
- if (fd < 0) {
- perror(*argv);
- exit(FALSE);
+ fd = bb_xopen(argv[1], 0);
+
+ result = ioctl(fd, FDFLUSH, 0);
+#ifdef CONFIG_FEATURE_CLEAN_UP
+ close(fd);
+#endif
+ if (result) {
+ bb_perror_nomsg_and_die();
}
}
- value = ioctl(fd, FDFLUSH, 0);
/* Don't bother closing. Exit does
* that, so we can save a few bytes */
/* Don't bother closing. Exit does
* that, so we can save a few bytes */
- /* close(fd); */
-
- if (value) {
- perror(*argv);
- exit(FALSE);
- }
- return(TRUE);
+ return EXIT_SUCCESS;
}
}