X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=mt.c;h=250856f05c29e1ea21b4a470af95ee389cfa6182;hb=a2a978ae23e267c24eb7b11662afdcc9ea47e789;hp=583674b18afcea1f4d6e92d5b9de95023bd68aac;hpb=3e856ce428cabaf6c8d99a2374a1f9a4a05db5f0;p=oweals%2Fbusybox.git

diff --git a/mt.c b/mt.c
index 583674b18..250856f05 100644
--- a/mt.c
+++ b/mt.c
@@ -1,8 +1,10 @@
 /* vi: set sw=4 ts=4: */
-#include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/mtio.h>
 #include <sys/fcntl.h>
+#include "busybox.h"
 
 struct mt_opcodes {
 	char *name;
@@ -56,12 +58,12 @@ extern int mt_main(int argc, char **argv)
 	int fd;
 	
 	if (argc < 2) {
-		usage(mt_usage);
+		show_usage();
 	}
 
 	if (strcmp(argv[1], "-f") == 0) {
 		if (argc < 4) {
-			usage(mt_usage);
+			show_usage();
 		}
 		file = argv[2];
 		argv += 2;
@@ -75,7 +77,7 @@ extern int mt_main(int argc, char **argv)
 	}
 
 	if (code->name == 0) {
-		errorMsg("unrecognized opcode %s.\n", argv[1]);
+		error_msg("unrecognized opcode %s.", argv[1]);
 		return EXIT_FAILURE;
 	}
 
@@ -85,15 +87,11 @@ extern int mt_main(int argc, char **argv)
 	else
 		op.mt_count = 1;		/* One, not zero, right? */
 
-	if ((fd = open(file, O_RDONLY, 0)) < 0) {
-		perror(file);
-		return EXIT_FAILURE;
-	}
+	if ((fd = open(file, O_RDONLY, 0)) < 0)
+		perror_msg_and_die("%s", file);
 
-	if (ioctl(fd, MTIOCTOP, &op) != 0) {
-		perror(file);
-		return EXIT_FAILURE;
-	}
+	if (ioctl(fd, MTIOCTOP, &op) != 0)
+		perror_msg_and_die("%s", file);
 
 	return EXIT_SUCCESS;
 }