From 0b22c1c962ff57e68035413d7790dd2b137a2aeb Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Tue, 14 Mar 2006 02:40:51 +0000 Subject: Tito unified fdflush and freeramdisk. I tweaked the result a bit. --- util-linux/freeramdisk.c | 49 +++++++++--------------------------------------- 1 file changed, 9 insertions(+), 40 deletions(-) (limited to 'util-linux/freeramdisk.c') diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c index cfea35bea..b5449750a 100644 --- a/util-linux/freeramdisk.c +++ b/util-linux/freeramdisk.c @@ -1,24 +1,12 @@ /* vi: set sw=4 ts=4: */ /* - * freeramdisk implementation for busybox + * freeramdisk and fdflush implementations for busybox * * Copyright (C) 2000 and written by Emanuele Caratti * Adjusted a bit by Erik Andersen + * Unified with fdflush by Tito Ragusa * - * 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 - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -30,40 +18,21 @@ #include #include "busybox.h" - -/* From linux/fs.h */ -#define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ - -extern int -freeramdisk_main(int argc, char **argv) +extern int freeramdisk_main(int argc, char **argv) { int result; int fd; - if (argc != 2) { - bb_show_usage(); - } + if (argc != 2) bb_show_usage(); fd = bb_xopen(argv[1], O_RDWR); - result = ioctl(fd, BLKFLSBUF); + // 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)); if (ENABLE_FEATURE_CLEAN_UP) close(fd); - if (result < 0) { - bb_perror_msg_and_die("failed ioctl on %s", argv[1]); - } - - /* Don't bother closing. Exit does - * that, so we can save a few bytes */ + if (result) bb_perror_msg_and_die("%s", argv[1]); return EXIT_SUCCESS; } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ - -- cgit v1.2.3