fakeinetd: attempted ipv6-ization (and it's done)

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

diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index 1f010c721896a5ebca83af0f72d4b08134d6df1f..2293d3ee63ec422e2e655d9728a2757aa9401db4 100644 (file)
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -6,20 +6,11 @@
  * 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"
 
-/* From linux/fs.h */
-#define BLKFLSBUF  _IO(0x12,97)
 /* From <linux/fd.h> */
 #define FDFLUSH  _IO(2,0x4b)
 
@@ -30,10 +21,10 @@ int freeramdisk_main(int argc, char **argv)
 
        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, (ENABLE_FREERAMDISK && bb_applet_name[1]=='r')
+       result = ioctl(fd, (ENABLE_FREERAMDISK && applet_name[1]=='r')
                        || !ENABLE_FDFLUSH ? BLKFLSBUF : FDFLUSH);
 
        if (ENABLE_FEATURE_CLEAN_UP) close(fd);