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 9276a6c403df94ef3a2c0055899a8619b70cb4e7..2293d3ee63ec422e2e655d9728a2757aa9401db4 100644 (file)
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -1,69 +1,34 @@
 /* vi: set sw=4 ts=4: */
 /*
- * freeramdisk implementation for busybox
+ * freeramdisk and fdflush implementations for busybox
  *
  * Copyright (C) 2000 and written by Emanuele Caratti <wiz@iol.it>
- * Adjusted a bit by Erik Andersen <andersee@debian.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Adjusted a bit by Erik Andersen <andersen@codepoet.org>
+ * Unified with fdflush by Tito Ragusa <farmatito@tiscali.it>
  *
+ * 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 <errno.h>
-#include <stdlib.h>
 #include "busybox.h"
 
+/* From <linux/fd.h> */
+#define FDFLUSH  _IO(2,0x4b)
 
-/* From linux/fs.h */
-#define BLKFLSBUF  _IO(0x12,97)        /* flush buffer cache */
-
-extern int
-freeramdisk_main(int argc, char **argv)
+int freeramdisk_main(int argc, char **argv)
 {
        int result;
-       FILE *f;
+       int fd;
 
-       if (argc != 2) {
-               bb_show_usage();
-       }
+       if (argc != 2) bb_show_usage();
 
-       f = bb_xfopen(argv[1], "r+");
-       
-       result = ioctl(fileno(f), BLKFLSBUF);
-#ifdef CONFIG_FEATURE_CLEAN_UP
-       fclose(f);
-#endif
-       if (result < 0) {
-               bb_perror_msg_and_die("failed ioctl on %s", argv[1]);
-       }
+       fd = xopen(argv[1], O_RDWR);
 
-       /* Don't bother closing.  Exit does
-        * that, so we can save a few bytes */
-       return EXIT_SUCCESS;
-}
+       // Act like freeramdisk, fdflush, or both depending on configuration.
+       result = ioctl(fd, (ENABLE_FREERAMDISK && applet_name[1]=='r')
+                       || !ENABLE_FDFLUSH ? BLKFLSBUF : FDFLUSH);
 
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+       if (ENABLE_FEATURE_CLEAN_UP) close(fd);
 
+       if (result) bb_perror_msg_and_die("%s", argv[1]);
+       return EXIT_SUCCESS;
+}