X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=util-linux%2Ffreeramdisk.c;h=2293d3ee63ec422e2e655d9728a2757aa9401db4;hb=10d0d4eec7e3a292917f43f72afae20341d9ba11;hp=d373bcbf79f3d8a7e5725c5b295b6d028cf2d580;hpb=4f3f757d56fbf420ea5030dcf7ea971b3da3ab47;p=oweals%2Fbusybox.git

diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index d373bcbf7..2293d3ee6 100644
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -1,72 +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 <linux/fs.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-#include "internal.h"
-
+#include "busybox.h"
 
+/* From <linux/fd.h> */
+#define FDFLUSH  _IO(2,0x4b)
 
-static const char freeramdisk_usage[] =
-	"freeramdisk DEVICE\n\n"
-	"Free all memory used by the specified ramdisk.\n";
-
-extern int
-freeramdisk_main(int argc, char **argv)
+int freeramdisk_main(int argc, char **argv)
 {
-	char  rname[256] = "/dev/ram";
-	int   f;
+	int result;
+	int fd;
 
-	if (argc < 2 || ( argv[1] && *argv[1] == '-')) {
-		usage(freeramdisk_usage);
-	}
+	if (argc != 2) bb_show_usage();
 
-	if (argc >1)
-		strcpy(rname, argv[1]);
+	fd = xopen(argv[1], O_RDWR);
 
-	if ((f = open(rname, O_RDWR)) == -1) {
-		fatalError( "freeramdisk: cannot open %s: %s\n", rname, strerror(errno));
-	}
-	if (ioctl(f, BLKFLSBUF) < 0) {
-		fatalError( "freeramdisk: failed ioctl on %s: %s\n", rname, strerror(errno));
-	}
-	/* Don't bother closing.  Exit does
-	 * that, so we can save a few bytes */
-	/* close(f); */
-	exit(TRUE);
-}
+	// 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;
+}