tcpsvd: fix line buffering, add firewall query code

[oweals/busybox.git] / util-linux / freeramdisk.c

diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index b5449750abd6e914fcb8b60d1c3e08c817e0d7db..ae341b06641182eaeec94b6857fe1fe04bd80b7a 100644 (file)
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -6,30 +6,27 @@
  * Adjusted a bit by Erik Andersen <andersen@codepoet.org>
  * Unified with fdflush by Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include "busybox.h"
 
-extern int freeramdisk_main(int argc, char **argv)
+/* From <linux/fd.h> */
+#define FDFLUSH  _IO(2,0x4b)
+
+int freeramdisk_main(int argc, char **argv);
+int freeramdisk_main(int argc, char **argv)
 {
        int result;
        int fd;
 
        if (argc != 2) bb_show_usage();
 
-       fd = bb_xopen(argv[1], O_RDWR);
+       fd = xopen(argv[1], O_RDWR);
 
        // Act like freeramdisk, fdflush, or both depending on configuration.
-       result = ioctl(fd, (bb_applet_name[1]=='r' && ENABLE_FREERAMDISK)
-                       || !ENABLE_FDFLUSH ? _IO(0x12,97) : _IO(2,0x4b));
+       result = ioctl(fd, (ENABLE_FREERAMDISK && applet_name[1]=='r')
+                       || !ENABLE_FDFLUSH ? BLKFLSBUF : FDFLUSH);
 
        if (ENABLE_FEATURE_CLEAN_UP) close(fd);