summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>2007-08-13 17:36:15 +0200
committerGeoff Levand <geoffrey.levand@am.sony.com>2007-08-13 18:51:39 -0700
commit534bc6324381dd1c94d06db180f4b61e47018b9f (patch)
treec1381a249156cbf66bed9f889392283eeeb985bd
parent26ad9a4d111154028ce8aaffbb3216cb6b9f7fa1 (diff)
downloadps3-utils-534bc6324381dd1c94d06db180f4b61e47018b9f.tar.gz
Print the flash device name or the boot loader file name instead of the command
name where appropriate. Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
-rw-r--r--ps3-flash-util.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/ps3-flash-util.c b/ps3-flash-util.c
index daab943..e36ddf2 100644
--- a/ps3-flash-util.c
+++ b/ps3-flash-util.c
@@ -337,12 +337,12 @@ int main(int argc, char *argv[])
/* read and check header*/
file = fopen(flash_dev, "r+");
if (file == NULL) {
- perror(argv[0]);
+ perror(flash_dev);
ret = 2;
goto end;
}
if (fread(hdr_buf, 0x200, 2, file) < 2) {
- perror(argv[0]);
+ perror(flash_dev);
ret = 3;
goto end;
}
@@ -353,7 +353,7 @@ int main(int argc, char *argv[])
goto end;
}
if (fseek(file, 0, SEEK_END) != 0) {
- perror(argv[0]);
+ perror(flash_dev);
ret = 6;
goto end;
}
@@ -370,7 +370,7 @@ int main(int argc, char *argv[])
show_header(&hdr);
} else if (b_show == 2) {
if (show_clock_diff(&hdr, file)) {
- perror(argv[0]);
+ perror(flash_dev);
ret = 15;
goto end;
}
@@ -390,7 +390,7 @@ int main(int argc, char *argv[])
if (n_file >= 1) {
ldrfile = fopen(argv[n_file], "r");
if (ldrfile == NULL) {
- perror(argv[0]);
+ perror(argv[n_file]);
ret = 9;
goto end;
}
@@ -411,7 +411,7 @@ int main(int argc, char *argv[])
write_be32(hdr_buf + 0x200, n_flag);
if ((fseek(file, 0x200, SEEK_SET) != 0) ||
(fwrite(hdr_buf + 0x200, 4, 1, file) < 1)) {
- perror(argv[0]);
+ perror(flash_dev);
ret = 11;
goto end;
}
@@ -423,7 +423,7 @@ int main(int argc, char *argv[])
write_be32(hdr_buf + 0x20, n_format);
if ((fseek(file, 0x20, SEEK_SET) != 0) ||
(fwrite(hdr_buf + 0x20, 4, 1, file) < 1)) {
- perror(argv[0]);
+ perror(flash_dev);
ret = 12;
goto end;
}
@@ -434,14 +434,14 @@ int main(int argc, char *argv[])
if (n_file != 0) {
if ((fseek(file, hdr.offset2 * 0x200, SEEK_SET) != 0) ||
(fwrite(ldr_buf, ldr_size, 1, file) < 1)) {
- perror(argv[0]);
+ perror(flash_dev);
ret = 13;
goto end;
}
write_be32(hdr_buf + 0x24, ldr_size);
if ((fseek(file, 0x24, SEEK_SET) != 0) ||
(fwrite(hdr_buf + 0x24, 4, 1, file) < 1)) {
- perror(argv[0]);
+ perror(flash_dev);
ret = 14;
goto end;
}