X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fod.c;h=9a888dd5f53b8451cfccdd6ed08624af8cc662f9;hb=eb1395147ae98e56b455d0f3f9406725fe189822;hp=114a746fa6133fcb9397bf1450642b072c8b38a3;hpb=6ca409e0e4c198fe3081346eebbae3f068fe605a;p=oweals%2Fbusybox.git diff --git a/coreutils/od.c b/coreutils/od.c index 114a746fa..9a888dd5f 100644 --- a/coreutils/od.c +++ b/coreutils/od.c @@ -4,28 +4,39 @@ * Based on code from util-linux v 2.11l * * Copyright (c) 1990 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. All rights reserved. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * * Original copyright notice is retained at the end of this file. */ +//config:config OD +//config: bool "od (11 kb)" +//config: default y +//config: help +//config: od is used to dump binary files in octal and other formats. +//applet:IF_OD(APPLET(od, BB_DIR_USR_BIN, BB_SUID_DROP)) + +//kbuild:lib-$(CONFIG_OD) += od.o + +//usage:#if !ENABLE_DESKTOP +//usage:#define od_trivial_usage +//usage: "[-aBbcDdeFfHhIiLlOovXx] [FILE]" +//usage:#define od_full_usage "\n\n" +//usage: "Print FILE (or stdin) unambiguously, as octal bytes by default" +//usage:#endif #include "libbb.h" #if ENABLE_DESKTOP /* This one provides -t (busybox's own build script needs it) */ #include "od_bloaty.c" #else -#include #include "dump.h" -#define isdecdigit(c) isdigit(c) -#define ishexdigit(c) (isxdigit)(c) - static void -odoffset(int argc, char ***argvp) +odoffset(dumper_t *dumper, int argc, char ***argvp) { char *num, *p; int base; @@ -52,18 +63,18 @@ odoffset(int argc, char ***argvp) if ((*p != '+') && (argc < 2 - || (!isdecdigit(p[0]) - && ((p[0] != 'x') || !ishexdigit(p[1]))))) + || (!isdigit(p[0]) + && ((p[0] != 'x') || !isxdigit(p[1]))))) return; base = 0; /* - * bb_dump_skip over leading '+', 'x[0-9a-fA-f]' or '0x', and + * skip over leading '+', 'x[0-9a-fA-f]' or '0x', and * set base. */ if (p[0] == '+') ++p; - if (p[0] == 'x' && ishexdigit(p[1])) { + if (p[0] == 'x' && isxdigit(p[1])) { ++p; base = 16; } else if (p[0] == '0' && p[1] == 'x') { @@ -71,11 +82,13 @@ odoffset(int argc, char ***argvp) base = 16; } - /* bb_dump_skip over the number */ + /* skip over the number */ if (base == 16) - for (num = p; ishexdigit(*p); ++p); + for (num = p; isxdigit(*p); ++p) + continue; else - for (num = p; isdecdigit(*p); ++p); + for (num = p; isdigit(*p); ++p) + continue; /* check for no number */ if (num == p) @@ -88,23 +101,23 @@ odoffset(int argc, char ***argvp) base = 10; } - bb_dump_skip = strtol(num, &end, base ? base : 8); + dumper->dump_skip = strtol(num, &end, base ? base : 8); /* if end isn't the same as p, we got a non-octal digit */ if (end != p) - bb_dump_skip = 0; + dumper->dump_skip = 0; else { if (*p) { if (*p == 'b') { - bb_dump_skip *= 512; + dumper->dump_skip *= 512; ++p; } else if (*p == 'B') { - bb_dump_skip *= 1024; + dumper->dump_skip *= 1024; ++p; } } if (*p) - bb_dump_skip = 0; + dumper->dump_skip = 0; else { ++*argvp; /* @@ -112,7 +125,7 @@ odoffset(int argc, char ***argvp) * the offset is changed as well. This isn't pretty, * but it's easy. */ -#define TYPE_OFFSET 7 +#define TYPE_OFFSET 7 { char x_or_d; if (base == 16) { @@ -121,9 +134,9 @@ odoffset(int argc, char ***argvp) } if (base == 10) { x_or_d = 'd'; - DO_X_OR_D: - bb_dump_fshead->nextfu->fmt[TYPE_OFFSET] - = bb_dump_fshead->nextfs->nextfu->fmt[TYPE_OFFSET] + DO_X_OR_D: + dumper->fshead->nextfu->fmt[TYPE_OFFSET] + = dumper->fshead->nextfs->nextfu->fmt[TYPE_OFFSET] = x_or_d; } } @@ -132,19 +145,19 @@ odoffset(int argc, char ***argvp) } static const char *const add_strings[] = { - "16/1 \"%3_u \" \"\\n\"", /* a */ - "8/2 \" %06o \" \"\\n\"", /* B, o */ - "16/1 \"%03o \" \"\\n\"", /* b */ - "16/1 \"%3_c \" \"\\n\"", /* c */ - "8/2 \" %05u \" \"\\n\"", /* d */ - "4/4 \" %010u \" \"\\n\"", /* D */ - "2/8 \" %21.14e \" \"\\n\"", /* e (undocumented in od), F */ - "4/4 \" %14.7e \" \"\\n\"", /* f */ - "4/4 \" %08x \" \"\\n\"", /* H, X */ - "8/2 \" %04x \" \"\\n\"", /* h, x */ - "4/4 \" %11d \" \"\\n\"", /* I, L, l */ - "8/2 \" %6d \" \"\\n\"", /* i */ - "4/4 \" %011o \" \"\\n\"", /* O */ + "16/1 \"%3_u \" \"\\n\"", /* a */ + "8/2 \" %06o \" \"\\n\"", /* B, o */ + "16/1 \"%03o \" \"\\n\"", /* b */ + "16/1 \"%3_c \" \"\\n\"", /* c */ + "8/2 \" %05u \" \"\\n\"", /* d */ + "4/4 \" %010u \" \"\\n\"", /* D */ + "2/8 \" %21.14e \" \"\\n\"", /* e (undocumented in od), F */ + "4/4 \" %14.7e \" \"\\n\"", /* f */ + "4/4 \" %08x \" \"\\n\"", /* H, X */ + "8/2 \" %04x \" \"\\n\"", /* h, x */ + "4/4 \" %11d \" \"\\n\"", /* I, L, l */ + "8/2 \" %6d \" \"\\n\"", /* i */ + "4/4 \" %011o \" \"\\n\"", /* O */ }; static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxv"; @@ -156,42 +169,41 @@ static const char od_o2si[] ALIGN1 = { 0xb, 1, 8, 9, }; -int od_main(int argc, char **argv); +int od_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int od_main(int argc, char **argv) { int ch; int first = 1; char *p; - bb_dump_vflag = FIRST; - bb_dump_length = -1; + dumper_t *dumper = alloc_dumper(); while ((ch = getopt(argc, argv, od_opts)) > 0) { if (ch == 'v') { - bb_dump_vflag = ALL; + dumper->dump_vflag = ALL; } else if (((p = strchr(od_opts, ch)) != NULL) && (*p != '\0')) { if (first) { first = 0; - bb_dump_add("\"%07.7_Ao\n\""); - bb_dump_add("\"%07.7_ao \""); + bb_dump_add(dumper, "\"%07.7_Ao\n\""); + bb_dump_add(dumper, "\"%07.7_ao \""); } else { - bb_dump_add("\" \""); + bb_dump_add(dumper, "\" \""); } - bb_dump_add(add_strings[(int)od_o2si[(p-od_opts)]]); - } else { /* P, p, s, w, or other unhandled */ + bb_dump_add(dumper, add_strings[(int)od_o2si[(p - od_opts)]]); + } else { /* P, p, s, w, or other unhandled */ bb_show_usage(); } } - if (!bb_dump_fshead) { - bb_dump_add("\"%07.7_Ao\n\""); - bb_dump_add("\"%07.7_ao \" 8/2 \"%06o \" \"\\n\""); + if (!dumper->fshead) { + bb_dump_add(dumper, "\"%07.7_Ao\n\""); + bb_dump_add(dumper, "\"%07.7_ao \" 8/2 \"%06o \" \"\\n\""); } argc -= optind; argv += optind; - odoffset(argc, &argv); + odoffset(dumper, argc, &argv); - return bb_dump_dump(argv); + return bb_dump_dump(dumper, argv); } #endif /* ENABLE_DESKTOP */ @@ -211,7 +223,7 @@ int od_main(int argc, char **argv) * may be used to endorse or promote products derived from this software * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ''AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE