Tito unified fdflush and freeramdisk. I tweaked the result a bit.
This commit is contained in:
parent
2f135fc6bf
commit
0b22c1c962
@ -106,7 +106,7 @@ USE_EXPR(APPLET(expr, expr_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
|
||||
USE_FAKEIDENTD(APPLET(fakeidentd, fakeidentd_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
|
||||
USE_FALSE(APPLET(false, false_main, _BB_DIR_BIN, _BB_SUID_NEVER))
|
||||
USE_FBSET(APPLET(fbset, fbset_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
|
||||
USE_FDFLUSH(APPLET(fdflush, fdflush_main, _BB_DIR_BIN, _BB_SUID_NEVER))
|
||||
USE_FDFLUSH(APPLET(fdflush, freeramdisk_main, _BB_DIR_BIN, _BB_SUID_NEVER))
|
||||
USE_FDFORMAT(APPLET(fdformat, fdformat_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
|
||||
USE_FDISK(APPLET(fdisk, fdisk_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
|
||||
USE_FEATURE_GREP_FGREP_ALIAS(APPLET_NOUSAGE("fgrep", grep_main, _BB_DIR_BIN, _BB_SUID_NEVER))
|
||||
|
@ -13,7 +13,7 @@ srcdir=$(top_srcdir)/util-linux
|
||||
UTILLINUX-y:=
|
||||
UTILLINUX-$(CONFIG_DMESG) +=dmesg.o
|
||||
UTILLINUX-$(CONFIG_FBSET) +=fbset.o
|
||||
UTILLINUX-$(CONFIG_FDFLUSH) +=fdflush.o
|
||||
UTILLINUX-$(CONFIG_FDFLUSH) +=freeramdisk.o
|
||||
UTILLINUX-$(CONFIG_FDFORMAT) +=fdformat.o
|
||||
UTILLINUX-$(CONFIG_FDISK) +=fdisk.o
|
||||
UTILLINUX-$(CONFIG_FREERAMDISK) +=freeramdisk.o
|
||||
|
@ -1,54 +0,0 @@
|
||||
/* vi: set sw=4 ts=4: */
|
||||
/*
|
||||
* Mini fdflush implementation for busybox
|
||||
*
|
||||
* Copyright (C) 1995, 1996 by Bruce Perens <bruce@perens.com>.
|
||||
* Copyright (C) 2003 by Erik Andersen <andersen@codeoet.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
|
||||
*
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include "busybox.h"
|
||||
|
||||
/* From <linux/fd.h> */
|
||||
#define FDFLUSH _IO(2,0x4b)
|
||||
|
||||
int fdflush_main(int argc, char **argv)
|
||||
{
|
||||
int fd, result;
|
||||
|
||||
if (argc != 2)
|
||||
bb_show_usage();
|
||||
|
||||
fd = bb_xopen(argv[1], 0);
|
||||
|
||||
result = ioctl(fd, FDFLUSH, 0);
|
||||
|
||||
if (ENABLE_FEATURE_CLEAN_UP) close(fd);
|
||||
|
||||
if (result) {
|
||||
bb_perror_nomsg_and_die();
|
||||
}
|
||||
|
||||
/* Don't bother closing. Exit does
|
||||
* that, so we can save a few bytes */
|
||||
return EXIT_SUCCESS;
|
||||
}
|
@ -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 <wiz@iol.it>
|
||||
* Adjusted a bit by Erik Andersen <andersen@codepoet.org>
|
||||
* Unified with fdflush by Tito Ragusa <farmatito@tiscali.it>
|
||||
*
|
||||
* 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 <stdio.h>
|
||||
@ -30,40 +18,21 @@
|
||||
#include <unistd.h>
|
||||
#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:
|
||||
*/
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user