sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

nand command: check for <dev> directly after option parsing 

Allo subcommands need at least one nonopt arg, so check for
it right after parsing the options and drop the check in the
MARKBAD command.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2013-02-25 12:54:15 +01:00
parent 938f748103
commit 68bd6e9309
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
commands/nand.c
View File

@ -58,6 +58,9 @@ static int do_nand(int argc, char *argv[])
}
}
if (optind >= argc)
return COMMAND_ERROR_USAGE;
if (command == NAND_ADD) {
while (optind < argc) {
if (dev_add_bb_dev(basename(argv[optind]), NULL))
@ -75,25 +78,23 @@ static int do_nand(int argc, char *argv[])
}
if (command == NAND_MARKBAD) {
if (optind < argc) {
int ret = 0, fd;
int ret = 0, fd;
printf("marking block at 0x%08llx on %s as bad\n",
badblock, argv[optind]);
printf("marking block at 0x%08llx on %s as bad\n",
badblock, argv[optind]);
fd = open(argv[optind], O_RDWR);
if (fd < 0) {
perror("open");
return 1;
}
ret = ioctl(fd, MEMSETBADBLOCK, &badblock);
if (ret)
perror("ioctl");
close(fd);
return ret;
fd = open(argv[optind], O_RDWR);
if (fd < 0) {
perror("open");
return 1;
}
ret = ioctl(fd, MEMSETBADBLOCK, &badblock);
if (ret)
perror("ioctl");
close(fd);
return ret;
}
return 0;