2dbeaa95c
Denis Vlasenko
2006-09-23
Subject
hexdump: deindent, almost fits into 80 columns now
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
util-linux/hexdump.c+32 -34
| @@ -33,11 +33,11 @@ static void bb_dump_addfile(char *name) | |
| } | |
| static const char * const add_strings[] = { | |
| - | "\"%07.7_ax \" 16/1 \"%03o \" \"\\n\"", /* b */ |
| - | "\"%07.7_ax \" 16/1 \"%3_c \" \"\\n\"", /* c */ |
| - | "\"%07.7_ax \" 8/2 \" %05u \" \"\\n\"", /* d */ |
| - | "\"%07.7_ax \" 8/2 \" %06o \" \"\\n\"", /* o */ |
| - | "\"%07.7_ax \" 8/2 \" %04x \" \"\\n\"", /* x */ |
| + | "\"%07.7_ax \" 16/1 \"%03o \" \"\\n\"", /* b */ |
| + | "\"%07.7_ax \" 16/1 \"%3_c \" \"\\n\"", /* c */ |
| + | "\"%07.7_ax \" 8/2 \" %05u \" \"\\n\"", /* d */ |
| + | "\"%07.7_ax \" 8/2 \" %06o \" \"\\n\"", /* o */ |
| + | "\"%07.7_ax \" 8/2 \" %04x \" \"\\n\"", /* x */ |
| }; | |
| static const char add_first[] = "\"%07.7_Ax\n\""; | |
| @@ -53,7 +53,6 @@ static const struct suffix_mult suffixes[] = { | |
| int hexdump_main(int argc, char **argv) | |
| { | |
| - | // register FS *tfs; |
| const char *p; | |
| int ch; | |
| @@ -61,34 +60,33 @@ int hexdump_main(int argc, char **argv) | |
| bb_dump_length = -1; | |
| while ((ch = getopt(argc, argv, hexdump_opts)) > 0) { | |
| - | if ((p = strchr(hexdump_opts, ch)) != NULL) { |
| - | if ((p - hexdump_opts) < 5) { |
| - | bb_dump_add(add_first); |
| - | bb_dump_add(add_strings[(int)(p - hexdump_opts)]); |
| - | } else if (ch == 'C') { |
| - | bb_dump_add("\"%08.8_Ax\n\""); |
| - | bb_dump_add("\"%08.8_ax \" 8/1 \"%02x \" \" \" 8/1 \"%02x \" "); |
| - | bb_dump_add("\" |\" 16/1 \"%_p\" \"|\\n\""); |
| - | } else { |
| - | /* Sae a little bit of space below by omitting the 'else's. */ |
| - | if (ch == 'e') { |
| - | bb_dump_add(optarg); |
| - | } /* else */ |
| - | if (ch == 'f') { |
| - | bb_dump_addfile(optarg); |
| - | } /* else */ |
| - | if (ch == 'n') { |
| - | bb_dump_length = bb_xgetularg10_bnd(optarg, 0, INT_MAX); |
| - | } /* else */ |
| - | if (ch == 's') { |
| - | bb_dump_skip = bb_xgetularg_bnd_sfx(optarg, 10, 0, LONG_MAX, suffixes); |
| - | } /* else */ |
| - | if (ch == 'v') { |
| - | bb_dump_vflag = ALL; |
| - | } |
| - | } |
| - | } else { |
| + | p = strchr(hexdump_opts, ch) |
| + | if (!p) |
| bb_show_usage(); | |
| + | if ((p - hexdump_opts) < 5) { |
| + | bb_dump_add(add_first); |
| + | bb_dump_add(add_strings[(int)(p - hexdump_opts)]); |
| + | } else if (ch == 'C') { |
| + | bb_dump_add("\"%08.8_Ax\n\""); |
| + | bb_dump_add("\"%08.8_ax \" 8/1 \"%02x \" \" \" 8/1 \"%02x \" "); |
| + | bb_dump_add("\" |\" 16/1 \"%_p\" \"|\\n\""); |
| + | } else { |
| + | /* Save a little bit of space below by omitting the 'else's. */ |
| + | if (ch == 'e') { |
| + | bb_dump_add(optarg); |
| + | } /* else */ |
| + | if (ch == 'f') { |
| + | bb_dump_addfile(optarg); |
| + | } /* else */ |
| + | if (ch == 'n') { |
| + | bb_dump_length = bb_xgetularg10_bnd(optarg, 0, INT_MAX); |
| + | } /* else */ |
| + | if (ch == 's') { |
| + | bb_dump_skip = bb_xgetularg_bnd_sfx(optarg, 10, 0, LONG_MAX, suffixes); |
| + | } /* else */ |
| + | if (ch == 'v') { |
| + | bb_dump_vflag = ALL; |
| + | } |
| } | |
| } | |
| @@ -99,5 +97,5 @@ int hexdump_main(int argc, char **argv) | |
| argv += optind; | |
| - | return(bb_dump_dump(argv)); |
| + | return bb_dump_dump(argv); |
| } | |