Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/util-linux/freeramdisk.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/util-linux/freeramdisk.c (modified) (1 diff)

branches/2.2.5/mindi-busybox/util-linux/freeramdisk.c

@@ -7 +7 @@
  * Unified with fdflush by Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
 /* From <linux/fd.h> */
 #define FDFLUSH  _IO(2,0x4b)
 
+int freeramdisk_main(int argc, char **argv);
 int freeramdisk_main(int argc, char **argv)
 {
-    int result;
     int fd;
 
     if (argc != 2) bb_show_usage();
 
-    fd = bb_xopen(argv[1], O_RDWR);
+    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;
 }