Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/miscutils/mt.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/miscutils/mt.c (modified) (5 diffs)

branches/2.2.5/mindi-busybox/miscutils/mt.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-#include "busybox.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+/*
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
+#include "libbb.h"
 #include <sys/mtio.h>
-#include <fcntl.h>
 
 struct mt_opcodes {
-    char *name;
+    const char *name;
     short value;
 };
@@ -51 +51 @@
 };
 
+int mt_main(int argc, char **argv);
 int mt_main(int argc, char **argv)
 {
@@ -79 +80 @@
 
     if (code->name == 0) {
-        bb_error_msg("unrecognized opcode %s.", argv[1]);
+        bb_error_msg("unrecognized opcode %s", argv[1]);
         return EXIT_FAILURE;
     }
@@ -85 +86 @@
     op.mt_op = code->value;
     if (argc >= 3)
-        op.mt_count = atoi(argv[2]);
+        op.mt_count = xatoi_u(argv[2]);
     else
         op.mt_count = 1;        /* One, not zero, right? */
@@ -102 +103 @@
     }
 
-    fd = bb_xopen3(file, mode, 0);
+    fd = xopen(file, mode);
 
     switch (code->value) {
         case MTTELL:
-            if (ioctl(fd, MTIOCPOS, &position) < 0)
-                bb_perror_msg_and_die("%s", file);
-            printf ("At block %d.\n", (int) position.mt_blkno);
+            ioctl_or_perror_and_die(fd, MTIOCPOS, &position, "%s", file);
+            printf("At block %d.\n", (int) position.mt_blkno);
             break;
 
         default:
-            if (ioctl(fd, MTIOCTOP, &op) != 0)
-                bb_perror_msg_and_die("%s", file);
+            ioctl_or_perror_and_die(fd, MTIOCTOP, &op, "%s", file);
             break;
     }