X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fmt.c;h=2720f7eab8057cd8434e076c87a006c78118f0f8;hb=eea561871b45a2335ab6a09f14dad627ffcdc1cd;hp=da01eb23fd9c1aaae5f616c3722c810a20c44370;hpb=73991ff9255f8db5e1f7ff4f9b01016b00e8b9e6;p=oweals%2Fbusybox.git

diff --git a/miscutils/mt.c b/miscutils/mt.c
index da01eb23f..2720f7eab 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -1,10 +1,14 @@
 /* vi: set sw=4 ts=4: */
+/*
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mtio.h>
-#include <sys/fcntl.h>
-#include "busybox.h"
+#include <fcntl.h>
 
 struct mt_opcodes {
 	char *name;
@@ -35,7 +39,7 @@ static const struct mt_opcodes opcodes[] = {
 	{"ras3", MTRAS3},
 	{"reset", MTRESET},
 	{"retension", MTRETEN},
-	{"rew", MTREW},
+	{"rewind", MTREW},
 	{"seek", MTSEEK},
 	{"setblk", MTSETBLK},
 	{"setdensity", MTSETDENSITY},
@@ -50,21 +54,21 @@ static const struct mt_opcodes opcodes[] = {
 	{0, 0}
 };
 
-extern int mt_main(int argc, char **argv)
+int mt_main(int argc, char **argv)
 {
 	const char *file = "/dev/tape";
 	const struct mt_opcodes *code = opcodes;
 	struct mtop op;
 	struct mtpos position;
 	int fd, mode;
-	
+
 	if (argc < 2) {
-		show_usage();
+		bb_show_usage();
 	}
 
 	if (strcmp(argv[1], "-f") == 0) {
 		if (argc < 4) {
-			show_usage();
+			bb_show_usage();
 		}
 		file = argv[2];
 		argv += 2;
@@ -78,7 +82,7 @@ extern int mt_main(int argc, char **argv)
 	}
 
 	if (code->name == 0) {
-		error_msg("unrecognized opcode %s.", argv[1]);
+		bb_error_msg("unrecognized opcode %s.", argv[1]);
 		return EXIT_FAILURE;
 	}
 
@@ -101,19 +105,18 @@ extern int mt_main(int argc, char **argv)
 			break;
 	}
 
-	if ((fd = open(file, mode, 0)) < 0)
-		perror_msg_and_die("%s", file);
+	fd = bb_xopen3(file, mode, 0);
 
 	switch (code->value) {
 		case MTTELL:
 			if (ioctl(fd, MTIOCPOS, &position) < 0)
-				perror_msg_and_die("%s", file);
+				bb_perror_msg_and_die("%s", file);
 			printf ("At block %d.\n", (int) position.mt_blkno);
 			break;
 
 		default:
 			if (ioctl(fd, MTIOCTOP, &op) != 0)
-				perror_msg_and_die("%s", file);
+				bb_perror_msg_and_die("%s", file);
 			break;
 	}