projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uncuddle brackets
[oweals/busybox.git]
/
miscutils
/
mt.c
diff --git
a/miscutils/mt.c
b/miscutils/mt.c
index da01eb23fd9c1aaae5f616c3722c810a20c44370..368fc66b9f586653960fb6435e1762fb01d1ba16 100644
(file)
--- a/
miscutils/mt.c
+++ b/
miscutils/mt.c
@@
-35,7
+35,7
@@
static const struct mt_opcodes opcodes[] = {
{"ras3", MTRAS3},
{"reset", MTRESET},
{"retension", MTRETEN},
{"ras3", MTRAS3},
{"reset", MTRESET},
{"retension", MTRETEN},
- {"rew", MTREW},
+ {"rew
ind
", MTREW},
{"seek", MTSEEK},
{"setblk", MTSETBLK},
{"setdensity", MTSETDENSITY},
{"seek", MTSEEK},
{"setblk", MTSETBLK},
{"setdensity", MTSETDENSITY},
@@
-50,21
+50,21
@@
static const struct mt_opcodes opcodes[] = {
{0, 0}
};
{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;
{
const char *file = "/dev/tape";
const struct mt_opcodes *code = opcodes;
struct mtop op;
struct mtpos position;
int fd, mode;
-
+
if (argc < 2) {
if (argc < 2) {
- show_usage();
+
bb_
show_usage();
}
if (strcmp(argv[1], "-f") == 0) {
if (argc < 4) {
}
if (strcmp(argv[1], "-f") == 0) {
if (argc < 4) {
- show_usage();
+
bb_
show_usage();
}
file = argv[2];
argv += 2;
}
file = argv[2];
argv += 2;
@@
-78,7
+78,7
@@
extern int mt_main(int argc, char **argv)
}
if (code->name == 0) {
}
if (code->name == 0) {
- error_msg("unrecognized opcode %s.", argv[1]);
+
bb_
error_msg("unrecognized opcode %s.", argv[1]);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-101,19
+101,18
@@
extern int mt_main(int argc, char **argv)
break;
}
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)
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)
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;
}
break;
}