KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

improve mtd image check - don't check trx header if the target partition is not 'linux', don't display image check messages with -qq and -f, fixes #850

Browse source 
SVN-Revision: 5269
This commit is contained in:
Felix Fietkau 2006-10-23 14:52:04 +00:00
parent 367b01ad5c
commit 4f9190d1c8
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
package/mtd/src/mtd.c
View file

@ -62,6 +62,7 @@ struct trx_header {
char buf[BUFSIZE]; char buf[BUFSIZE];
int buflen; int buflen;
int quiet;
int int
image_check_bcom(int imagefd, const char *mtd) image_check_bcom(int imagefd, const char *mtd)
@ -70,6 +71,9 @@ image_check_bcom(int imagefd, const char *mtd)
struct mtd_info_user mtdInfo; struct mtd_info_user mtdInfo;
int fd; int fd;
if (strcmp(mtd, "linux") != 0)
return 1;
buflen = read(imagefd, buf, 32); buflen = read(imagefd, buf, 32);
if (buflen < 32) { if (buflen < 32) {
fprintf(stdout, "Could not get image header, file too small (%ld bytes)\n", buflen); fprintf(stdout, "Could not get image header, file too small (%ld bytes)\n", buflen);
@ -88,10 +92,11 @@ image_check_bcom(int imagefd, const char *mtd)
} }
if (trx->magic != TRX_MAGIC || trx->len < sizeof(struct trx_header)) { if (trx->magic != TRX_MAGIC || trx->len < sizeof(struct trx_header)) {
fprintf(stderr, "Bad trx header\n"); if (quiet < 2) {
fprintf(stderr, "If this is a firmware in bin format, like some of the\n" fprintf(stderr, "Bad trx header\n");
"original firmware files are, use following command to convert to trx:\n" fprintf(stderr, "If this is a firmware in bin format, like some of the\n"
"dd if=firmware.bin of=firmware.trx bs=32 skip=1\n"); "original firmware files are, you need to convert it to trx.\n");
}
return 0; return 0;
} }
@ -255,7 +260,7 @@ mtd_erase(const char *mtd)
} }
int int
mtd_write(int imagefd, const char *mtd, int quiet) mtd_write(int imagefd, const char *mtd)
{ {
int fd, i, result; int fd, i, result;
size_t r, w, e; size_t r, w, e;
@ -346,7 +351,7 @@ void usage(void)
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
int ch, i, boot, unlock, imagefd, force, quiet, unlocked; int ch, i, boot, unlock, imagefd, force, unlocked;
char *erase[MAX_ARGS], *device, *imagefile; char *erase[MAX_ARGS], *device, *imagefile;
enum { enum {
CMD_ERASE, CMD_ERASE,
@ -413,10 +418,10 @@ 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 < 2) || !force) if (!force) {
fprintf(stderr, "TRX check failed!\n"); fprintf(stderr, "Image check failed.\n");
if (!force)
exit(1); exit(1);
}
} else { } else {
if (!mtd_check(device)) { if (!mtd_check(device)) {
fprintf(stderr, "Can't open device for writing!\n"); fprintf(stderr, "Can't open device for writing!\n");
@ -460,7 +465,7 @@ int main (int argc, char **argv)
case CMD_WRITE: case CMD_WRITE:
if (quiet < 2) 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);
if (quiet < 2) if (quiet < 2)
fprintf(stderr, "\n"); fprintf(stderr, "\n");
break; break;