- don't free user-supplied string (via -e)

[oweals/busybox.git] / util-linux / freeramdisk.c

diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index 5d110bc4b949c55a3a28fb4574fa261681d5869a..bde6afc0a7914d2ef808a7321f5f6644235c7e77 100644 (file)
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -9,14 +9,14 @@
  * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* From <linux/fd.h> */
 #define FDFLUSH  _IO(2,0x4b)
 
+int freeramdisk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int freeramdisk_main(int argc, char **argv)
 {
-       int result;
        int fd;
 
        if (argc != 2) bb_show_usage();
@@ -24,11 +24,10 @@ int freeramdisk_main(int argc, char **argv)
        fd = xopen(argv[1], O_RDWR);
 
        // Act like freeramdisk, fdflush, or both depending on configuration.
-       result = ioctl(fd, (ENABLE_FREERAMDISK && bb_applet_name[1]=='r')
-                       || !ENABLE_FDFLUSH ? BLKFLSBUF : FDFLUSH);
+       ioctl_or_perror_and_die(fd, (ENABLE_FREERAMDISK && applet_name[1]=='r')
+                       || !ENABLE_FDFLUSH ? BLKFLSBUF : FDFLUSH, NULL, "%s", argv[1]);
 
        if (ENABLE_FEATURE_CLEAN_UP) close(fd);
 
-       if (result) bb_perror_msg_and_die("%s", argv[1]);
        return EXIT_SUCCESS;
 }