diff options
| -rw-r--r-- | Changelog | 3 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | applets/busybox.c | 3 | ||||
| -rw-r--r-- | busybox.c | 3 | ||||
| -rw-r--r-- | busybox.def.h | 1 | ||||
| -rw-r--r-- | freeramdisk.c | 69 | ||||
| -rw-r--r-- | internal.h | 1 | ||||
| -rw-r--r-- | util-linux/freeramdisk.c | 69 | ||||
| -rw-r--r-- | utility.c | 2 |
9 files changed, 150 insertions, 3 deletions
@@ -1,5 +1,8 @@ 0.43 * Wrote basename. + * Added freeramdisk, which will free up all memory associated + with a ram disk. Contributed by Emanuele Caratti <wiz@iol.it> + and then adjusted a bit by me. * tar wouldn't create directory entries that don't end in '/', now it does (thanks to Avery Pennarun <apenwarr@worldvisions.ca>) * Several fixes from Pavel Roskin <pavel_roskin@geocities.com>: @@ -25,7 +25,7 @@ BUILDTIME := $(shell TZ=GMT date "+%Y%m%d-%H%M") # Set the following to `true' to make a debuggable build. # Leave this set to `false' for production use. # eg: `make DODEBUG=true tests' -DODEBUG = false +DODEBUG = true # If you want a static binary, turn this on. I can't think # of many situations where anybody would ever want it static, diff --git a/applets/busybox.c b/applets/busybox.c index a80a5678f..ccf80a75e 100644 --- a/applets/busybox.c +++ b/applets/busybox.c @@ -97,6 +97,9 @@ static const struct Applet applets[] = { #ifdef BB_FREE //usr/bin {"free", free_main}, #endif +#ifdef BB_FREERAMDISK //sbin + {"freeramdisk", freeramdisk_main}, +#endif #ifdef BB_DEALLOCVT //usr/bin {"deallocvt", deallocvt_main}, #endif @@ -97,6 +97,9 @@ static const struct Applet applets[] = { #ifdef BB_FREE //usr/bin {"free", free_main}, #endif +#ifdef BB_FREERAMDISK //sbin + {"freeramdisk", freeramdisk_main}, +#endif #ifdef BB_DEALLOCVT //usr/bin {"deallocvt", deallocvt_main}, #endif diff --git a/busybox.def.h b/busybox.def.h index d42be4422..3407b2cc0 100644 --- a/busybox.def.h +++ b/busybox.def.h @@ -25,6 +25,7 @@ //#define BB_FDFLUSH #define BB_FIND #define BB_FREE +#define BB_FREERAMDISK #define BB_FSCK_MINIX #define BB_GREP #define BB_GUNZIP diff --git a/freeramdisk.c b/freeramdisk.c new file mode 100644 index 000000000..426e13231 --- /dev/null +++ b/freeramdisk.c @@ -0,0 +1,69 @@ +/* vi: set sw=4 ts=4: */ +/* + * freeramdisk implementation 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 + * + */ + +#include <stdio.h> +#include <string.h> +#include <sys/mount.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <sys/ioctl.h> +#include <errno.h> +#include "internal.h" + + +static const char freeramdisk_usage[] = + "freeramdisk DEVICE\n\n" + "Frees all memory used by the specified ramdisk.\n"; + +extern int +freeramdisk_main(int argc, char **argv) +{ + char rname[256] = "/dev/ram"; + int f; + + if (argc >= 2 || ( argv[1] && *argv[1] == '-')) { + usage(freeramdisk_usage); + } + + if (argc >1) + strcpy(rname, argv[1]); + + if ((f = open(rname, O_RDWR)) == -1) { + fatalError( "freeramdisk: cannot open %s: %s", rname, strerror(errno)); + } + if (ioctl(f, BLKFLSBUF) < 0) { + fatalError( "freeramdisk: failed ioctl on %s: %s", rname, strerror(errno)); + } + close(f); + exit(TRUE); +} + +/* +Local Variables: +c-file-style: "linux" +c-basic-offset: 4 +tab-width: 4 +End: +*/ + diff --git a/internal.h b/internal.h index 4c7bd97ed..b2714131f 100644 --- a/internal.h +++ b/internal.h @@ -80,6 +80,7 @@ extern int fdflush_main(int argc, char **argv); extern int fsck_minix_main(int argc, char **argv); extern int find_main(int argc, char** argv); extern int free_main(int argc, char** argv); +extern int freeramdisk_main(int argc, char** argv); extern int grep_main(int argc, char** argv); extern int gunzip_main (int argc, char** argv); extern int gzip_main(int argc, char** argv); diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c new file mode 100644 index 000000000..426e13231 --- /dev/null +++ b/util-linux/freeramdisk.c @@ -0,0 +1,69 @@ +/* vi: set sw=4 ts=4: */ +/* + * freeramdisk implementation 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 + * + */ + +#include <stdio.h> +#include <string.h> +#include <sys/mount.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <sys/ioctl.h> +#include <errno.h> +#include "internal.h" + + +static const char freeramdisk_usage[] = + "freeramdisk DEVICE\n\n" + "Frees all memory used by the specified ramdisk.\n"; + +extern int +freeramdisk_main(int argc, char **argv) +{ + char rname[256] = "/dev/ram"; + int f; + + if (argc >= 2 || ( argv[1] && *argv[1] == '-')) { + usage(freeramdisk_usage); + } + + if (argc >1) + strcpy(rname, argv[1]); + + if ((f = open(rname, O_RDWR)) == -1) { + fatalError( "freeramdisk: cannot open %s: %s", rname, strerror(errno)); + } + if (ioctl(f, BLKFLSBUF) < 0) { + fatalError( "freeramdisk: failed ioctl on %s: %s", rname, strerror(errno)); + } + close(f); + exit(TRUE); +} + +/* +Local Variables: +c-file-style: "linux" +c-basic-offset: 4 +tab-width: 4 +End: +*/ + @@ -84,7 +84,6 @@ extern void errorMsg(char *s, ...) va_start(p, s); fflush(stdout); - fprintf(stderr, "\n"); vfprintf(stderr, s, p); fprintf(stderr, "\n"); va_end(p); @@ -96,7 +95,6 @@ extern void fatalError(char *s, ...) va_start(p, s); fflush(stdout); - fprintf(stderr, "\n"); vfprintf(stderr, s, p); fprintf(stderr, "\n"); va_end(p); |