minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-08 19:47:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

mkenvimage: correct and clarify comments and error messages

Browse Source 
Also, don't split error messages over several lines as per a coding style
exception making them easier to grep.

Signed-off-by: David Wagner <david.wagner@free-electrons.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
David Wagner 2012-01-13 13:27:34 +00:00 committed by Anatolij Gustschin
parent 0c18569606
commit 8a1b8fc786
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tools/mkenvimage.c
View File

@ -45,12 +45,9 @@
static void usage(const char *exec_name) static void usage(const char *exec_name)
{ {
fprintf(stderr, "%s [-h] [-r] [-b] [-p <byte>] " fprintf(stderr, "%s [-h] [-r] [-b] [-p <byte>] -s <environment partition size> -o <output> <input file>\n"
"-s <environment partition size> -o <output> <input file>\n"
"\n" "\n"
"This tool takes a key=value input file (same as would a " "This tool takes a key=value input file (same as would a `printenv' show) and generates the corresponding environment image, ready to be flashed.\n"
"`printenv' show) and generates the corresponding environment "
"image, ready to be flashed.\n"
"\n" "\n"
"\tThe input file is in format:\n" "\tThe input file is in format:\n"
"\t\tkey1=value1\n" "\t\tkey1=value1\n"
@ -58,8 +55,7 @@ static void usage(const char *exec_name)
"\t\t...\n" "\t\t...\n"
"\t-r : the environment has multiple copies in flash\n" "\t-r : the environment has multiple copies in flash\n"
"\t-b : the target is big endian (default is little endian)\n" "\t-b : the target is big endian (default is little endian)\n"
"\t-p <byte> : fill the image with <byte> bytes instead of " "\t-p <byte> : fill the image with <byte> bytes instead of 0xff bytes\n"
"0xff bytes\n"
"\t-V : print version information and exit\n" "\t-V : print version information and exit\n"
"\n" "\n"
"If the input file is \"-\", data is read from standard input\n", "If the input file is \"-\", data is read from standard input\n",
@ -100,8 +96,7 @@ int main(int argc, char **argv)
case 'o': case 'o':
bin_filename = strdup(optarg); bin_filename = strdup(optarg);
if (!bin_filename) { if (!bin_filename) {
fprintf(stderr, "Can't strdup() the output " fprintf(stderr, "Can't strdup() the output filename\n");
"filename\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
break; break;
@ -134,22 +129,21 @@ int main(int argc, char **argv)
/* Check datasize and allocate the data */ /* Check datasize and allocate the data */
if (datasize == 0) { if (datasize == 0) {
fprintf(stderr, fprintf(stderr, "Please specify the size of the environment partition.\n");
"Please specify the size of the environment "
"partition.\n");
usage(prg); usage(prg);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
dataptr = malloc(datasize * sizeof(*dataptr)); dataptr = malloc(datasize * sizeof(*dataptr));
if (!dataptr) { if (!dataptr) {
fprintf(stderr, "Can't alloc dataptr.\n"); fprintf(stderr, "Can't alloc %d bytes for dataptr.\n",
datasize);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
/* /*
* envptr points to the beginning of the actual environment (after the * envptr points to the beginning of the actual environment (after the
* crc and possible `redundant' bit * crc and possible `redundant' byte
*/ */
envsize = datasize - (CRC_SIZE + redundant); envsize = datasize - (CRC_SIZE + redundant);
envptr = dataptr + CRC_SIZE + redundant; envptr = dataptr + CRC_SIZE + redundant;
@ -185,8 +179,8 @@ int main(int argc, char **argv)
/* ... and check it */ /* ... and check it */
ret = fstat(txt_fd, &txt_file_stat); ret = fstat(txt_fd, &txt_file_stat);
if (ret == -1) { if (ret == -1) {
fprintf(stderr, "Can't stat() on \"%s\": " fprintf(stderr, "Can't stat() on \"%s\": %s\n",
"%s\n", txt_filename, strerror(errno)); txt_filename, strerror(errno));
return EXIT_FAILURE; return EXIT_FAILURE;
} }
@ -200,13 +194,9 @@ int main(int argc, char **argv)
} }
ret = close(txt_fd); ret = close(txt_fd);
} }
/* /* The +1 is for the additionnal ending \0. See below. */
* The right test to do is "=>" (not ">") because of the additional if (filesize + 1 > envsize) {
* ending \0. See below. fprintf(stderr, "The input file is larger than the environment partition size\n");
*/
if (filesize >= envsize) {
fprintf(stderr, "The input file is larger than the "
"environment partition size\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
@ -255,8 +245,7 @@ int main(int argc, char **argv)
* check the env size again to make sure we have room for two \0 * check the env size again to make sure we have room for two \0
*/ */
if (ep >= envsize) { if (ep >= envsize) {
fprintf(stderr, "The environment file is too large for " fprintf(stderr, "The environment file is too large for the target environment storage\n");
"the target environment storage\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
envptr[ep] = '\0'; envptr[ep] = '\0';