qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-26 02:44:04 +02:00
Code

enhance the new mtd -q option

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3200 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2006-02-09 08:47:48 +00:00
parent c1373a693c
commit d6e3704672
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
openwrt/package/mtd/mtd.c
View File

@ -331,7 +331,8 @@ void usage(void)
" erase erase all data on device\n" " erase erase all data on device\n"
" write <imagefile>|- write <imagefile> (use - for stdin) to device\n" " write <imagefile>|- write <imagefile> (use - for stdin) to device\n"
"Following options are available:\n" "Following options are available:\n"
" -q quiet mode\n" " -q quiet mode (once: no [w] on writing,\n"
" twice: no status messages)\n"
" -r reboot after successful command\n" " -r reboot after successful command\n"
" -f force write without trx checks\n" " -f force write without trx checks\n"
" -e <device> erase <device> before executing the command\n\n" " -e <device> erase <device> before executing the command\n\n"
@ -365,7 +366,7 @@ int main (int argc, char **argv)
boot = 1; boot = 1;
break; break;
case 'q': case 'q':
quiet = 1; quiet++;
break; break;
case 'e': case 'e':
i = 0; i = 0;
@ -409,7 +410,7 @@ int main (int argc, char **argv)
/* check trx file before erasing or writing anything */ /* check trx file before erasing or writing anything */
if (!image_check(imagefd, device)) { if (!image_check(imagefd, device)) {
if (!quiet && force) if ((quiet < 2) || !force)
fprintf(stderr, "TRX check failed!\n"); fprintf(stderr, "TRX check failed!\n");
if (!force) if (!force)
exit(1); exit(1);
@ -428,10 +429,10 @@ int main (int argc, char **argv)
i = 0; i = 0;
unlocked = 0; unlocked = 0;
while (erase[i] != NULL) { while (erase[i] != NULL) {
if (!quiet) if (quiet < 2)
fprintf(stderr, "Unlocking %s ...\n", erase[i]); fprintf(stderr, "Unlocking %s ...\n", erase[i]);
mtd_unlock(erase[i]); mtd_unlock(erase[i]);
if (!quiet) if (quiet < 2)
fprintf(stderr, "Erasing %s ...\n", erase[i]); fprintf(stderr, "Erasing %s ...\n", erase[i]);
mtd_erase(erase[i]); mtd_erase(erase[i]);
if (strcmp(erase[i], device) == 0) if (strcmp(erase[i], device) == 0)
@ -440,7 +441,7 @@ int main (int argc, char **argv)
} }
if (!unlocked) { if (!unlocked) {
if (!quiet) if (quiet < 2)
fprintf(stderr, "Unlocking %s ...\n", device); fprintf(stderr, "Unlocking %s ...\n", device);
mtd_unlock(device); mtd_unlock(device);
} }
@ -449,15 +450,15 @@ int main (int argc, char **argv)
case CMD_UNLOCK: case CMD_UNLOCK:
break; break;
case CMD_ERASE: case CMD_ERASE:
if (!quiet) if (quiet < 2)
fprintf(stderr, "Erasing %s ...\n", erase[i]); fprintf(stderr, "Erasing %s ...\n", device);
mtd_erase(device); mtd_erase(device);
break; break;
case CMD_WRITE: case CMD_WRITE:
if (!quiet) if (quiet < 2)
fprintf(stderr, "Writing from %s to %s ... ", imagefile, device); fprintf(stderr, "Writing from %s to %s ... ", imagefile, device);
mtd_write(imagefd, device, quiet); mtd_write(imagefd, device, quiet);
if (!quiet) if (quiet < 2)
fprintf(stderr, "\n"); fprintf(stderr, "\n");
break; break;
} }