X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fmt.c;h=e7995455291d733c077409642fee73300e78fa13;hb=0d6d88a2058d191c34d25a8709aca40311bb0c2e;hp=583674b18afcea1f4d6e92d5b9de95023bd68aac;hpb=3e856ce428cabaf6c8d99a2374a1f9a4a05db5f0;p=oweals%2Fbusybox.git

diff --git a/miscutils/mt.c b/miscutils/mt.c
index 583674b18..e79954552 100644
--- a/miscutils/mt.c
+++ b/miscutils/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;
@@ -33,7 +35,7 @@ static const struct mt_opcodes opcodes[] = {
 	{"ras3", MTRAS3},
 	{"reset", MTRESET},
 	{"retension", MTRETEN},
-	{"rew", MTREW},
+	{"rewind", MTREW},
 	{"seek", MTSEEK},
 	{"setblk", MTSETBLK},
 	{"setdensity", MTSETDENSITY},
@@ -53,15 +55,16 @@ extern int mt_main(int argc, char **argv)
 	const char *file = "/dev/tape";
 	const struct mt_opcodes *code = opcodes;
 	struct mtop op;
-	int fd;
+	struct mtpos position;
+	int fd, mode;
 	
 	if (argc < 2) {
-		usage(mt_usage);
+		bb_show_usage();
 	}
 
 	if (strcmp(argv[1], "-f") == 0) {
 		if (argc < 4) {
-			usage(mt_usage);
+			bb_show_usage();
 		}
 		file = argv[2];
 		argv += 2;
@@ -75,7 +78,7 @@ extern int mt_main(int argc, char **argv)
 	}
 
 	if (code->name == 0) {
-		errorMsg("unrecognized opcode %s.\n", argv[1]);
+		bb_error_msg("unrecognized opcode %s.", argv[1]);
 		return EXIT_FAILURE;
 	}
 
@@ -85,14 +88,33 @@ 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;
+	switch (code->value) {
+		case MTWEOF:
+		case MTERASE:
+		case MTWSM:
+		case MTSETDRVBUFFER:
+			mode = O_WRONLY;
+			break;
+
+		default:
+			mode = O_RDONLY;
+			break;
 	}
 
-	if (ioctl(fd, MTIOCTOP, &op) != 0) {
-		perror(file);
-		return EXIT_FAILURE;
+	if ((fd = open(file, mode, 0)) < 0)
+		bb_perror_msg_and_die("%s", file);
+
+	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);
+			break;
+
+		default:
+			if (ioctl(fd, MTIOCTOP, &op) != 0)
+				bb_perror_msg_and_die("%s", file);
+			break;
 	}
 
 	return EXIT_SUCCESS;