[BusyBox] freeramdisk fix
Erik Andersen
andersen at lineo.com
Sun Jun 4 05:14:46 UTC 2000
On Fri Jun 02, 2000 at 01:13:20PM -0400, Pavel Roskin wrote:
> Hello!
>
> This patch
> - eliminates the need to have a buffer and strcpy to it
> - makes freeramdisk complain if it's given more than one argument (or
> should we use for loop and change help?)
>
> Regards,
> Pavel Roskin
>
> ============================
> diff -u -r1.1 freeramdisk.c
> --- freeramdisk.c 2000/05/17 20:57:41 1.1
> +++ freeramdisk.c 2000/06/02 17:01:30
> @@ -43,21 +43,17 @@
> extern int
> freeramdisk_main(int argc, char **argv)
> {
> - char rname[256] = "/dev/ram";
> int f;
>
> - if (argc < 2 || ( argv[1] && *argv[1] == '-')) {
> + if (argc != 2 || *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\n", rname, strerror(errno));
> + if ((f = open(argv[1], O_RDWR)) == -1) {
> + fatalError( "freeramdisk: cannot open %s: %s\n", argv[1], strerror(errno));
> }
> if (ioctl(f, BLKFLSBUF) < 0) {
> - fatalError( "freeramdisk: failed ioctl on %s: %s\n", rname, strerror(errno));
> + fatalError( "freeramdisk: failed ioctl on %s: %s\n", argv[1], strerror(errno));
> }
> /* Don't bother closing. Exit does
> * that, so we can save a few bytes */
> ============================
Cool. Applied, and no we I think for this app adding a
for loop would be overkill.
-Erik
--
Erik B. Andersen email: andersen at lineo.com
--This message was written using 73% post-consumer electrons--
More information about the busybox
mailing list