busybox/util-linux/hexdump_xxd.c
Denys Vlasenko 22542eca18 getopt32: remove opt_complementary
function                                             old     new   delta
vgetopt32                                           1318    1392     +74
runsvdir_main                                        703     713     +10
bb_make_directory                                    423     425      +2
collect_cpu                                          546     545      -1
opt_chars                                              3       -      -3
opt_complementary                                      4       -      -4
tftpd_main                                           567     562      -5
ntp_init                                             476     471      -5
zcip_main                                           1266    1256     -10
xxd_main                                             428     418     -10
whois_main                                           140     130     -10
who_main                                             463     453     -10
which_main                                           212     202     -10
wget_main                                           2535    2525     -10
watchdog_main                                        291     281     -10
watch_main                                           222     212     -10
vlock_main                                           399     389     -10
uuencode_main                                        332     322     -10
uudecode_main                                        316     306     -10
unlink_main                                           45      35     -10
udhcpd_main                                         1482    1472     -10
udhcpc_main                                         2762    2752     -10
tune2fs_main                                         290     280     -10
tunctl_main                                          366     356     -10
truncate_main                                        218     208     -10
tr_main                                              518     508     -10
time_main                                           1134    1124     -10
tftp_main                                            286     276     -10
telnetd_main                                        1873    1863     -10
tcpudpsvd_main                                      1785    1775     -10
taskset_main                                         521     511     -10
tar_main                                            1009     999     -10
tail_main                                           1644    1634     -10
syslogd_main                                        1967    1957     -10
switch_root_main                                     368     358     -10
svlogd_main                                         1454    1444     -10
sv                                                  1296    1286     -10
stat_main                                            104      94     -10
start_stop_daemon_main                              1028    1018     -10
split_main                                           542     532     -10
sort_main                                            796     786     -10
slattach_main                                        624     614     -10
shuf_main                                            504     494     -10
setsid_main                                           96      86     -10
setserial_main                                      1132    1122     -10
setfont_main                                         388     378     -10
setconsole_main                                       78      68     -10
sendmail_main                                       1209    1199     -10
sed_main                                             677     667     -10
script_main                                         1077    1067     -10
run_parts_main                                       325     315     -10
rtcwake_main                                         454     444     -10
rm_main                                              175     165     -10
reformime_main                                       119     109     -10
readlink_main                                        123     113     -10
rdate_main                                           246     236     -10
pwdx_main                                            189     179     -10
pstree_main                                          317     307     -10
pscan_main                                           663     653     -10
popmaildir_main                                      818     808     -10
pmap_main                                             80      70     -10
nc_main                                             1042    1032     -10
mv_main                                              558     548     -10
mountpoint_main                                      477     467     -10
mount_main                                          1264    1254     -10
modprobe_main                                        768     758     -10
modinfo_main                                         333     323     -10
mktemp_main                                          200     190     -10
mkswap_main                                          324     314     -10
mkfs_vfat_main                                      1489    1479     -10
microcom_main                                        715     705     -10
md5_sha1_sum_main                                    521     511     -10
man_main                                             867     857     -10
makedevs_main                                       1052    1042     -10
ls_main                                              563     553     -10
losetup_main                                         432     422     -10
loadfont_main                                         89      79     -10
ln_main                                              524     514     -10
link_main                                             75      65     -10
ipcalc_main                                          544     534     -10
iostat_main                                         2397    2387     -10
install_main                                         768     758     -10
id_main                                              480     470     -10
i2cset_main                                         1239    1229     -10
i2cget_main                                          380     370     -10
i2cdump_main                                        1482    1472     -10
i2cdetect_main                                       682     672     -10
hwclock_main                                         406     396     -10
httpd_main                                           741     731     -10
grep_main                                            837     827     -10
getty_main                                          1559    1549     -10
fuser_main                                           297     287     -10
ftpgetput_main                                       345     335     -10
ftpd_main                                           2232    2222     -10
fstrim_main                                          251     241     -10
fsfreeze_main                                         77      67     -10
fsck_minix_main                                     2921    2911     -10
flock_main                                           314     304     -10
flashcp_main                                         740     730     -10
flash_eraseall_main                                  833     823     -10
fdformat_main                                        532     522     -10
expand_main                                          680     670     -10
eject_main                                           335     325     -10
dumpleases_main                                      630     620     -10
du_main                                              314     304     -10
dos2unix_main                                        441     431     -10
diff_main                                           1350    1340     -10
df_main                                             1064    1054     -10
date_main                                           1095    1085     -10
cut_main                                             961     951     -10
cryptpw_main                                         228     218     -10
crontab_main                                         575     565     -10
crond_main                                          1149    1139     -10
cp_main                                              370     360     -10
common_traceroute_main                              3834    3824     -10
common_ping_main                                    1767    1757     -10
comm_main                                            239     229     -10
cmp_main                                             655     645     -10
chrt_main                                            379     369     -10
chpst_main                                           704     694     -10
chpasswd_main                                        308     298     -10
chown_main                                           171     161     -10
chmod_main                                           158     148     -10
cat_main                                             428     418     -10
bzip2_main                                           120     110     -10
blkdiscard_main                                      264     254     -10
base64_main                                          221     211     -10
arping_main                                         1665    1655     -10
ar_main                                              556     546     -10
adjtimex_main                                        406     396     -10
adduser_main                                         882     872     -10
addgroup_main                                        411     401     -10
acpid_main                                          1198    1188     -10
optstring                                             11       -     -11
opt_string                                            18       -     -18
OPT_STR                                               25       -     -25
ubi_tools_main                                      1288    1258     -30
ls_options                                            31       -     -31
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 3/129 up/down: 86/-1383)      Total: -1297 bytes
   text	   data	    bss	    dec	    hex	filename
 915428	    485	   6876	 922789	  e14a5	busybox_old
 914629	    485	   6872	 921986	  e1182	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2017-08-08 21:55:02 +02:00

148 lines
4.3 KiB
C

/* vi: set sw=4 ts=4: */
/*
* xxd implementation for busybox
*
* Copyright (c) 2017 Denys Vlasenko <vda.linux@gmail.com>
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
//config:config XXD
//config: bool "xxd (8.9 kb)"
//config: default y
//config: help
//config: The xxd utility is used to display binary data in a readable
//config: way that is comparable to the output from most hex editors.
//applet:IF_XXD(APPLET_NOEXEC(xxd, xxd, BB_DIR_USR_BIN, BB_SUID_DROP, xxd))
//kbuild:lib-$(CONFIG_XXD) += hexdump_xxd.o
// $ xxd --version
// xxd V1.10 27oct98 by Juergen Weigert
// $ xxd --help
// Usage:
// xxd [options] [infile [outfile]]
// or
// xxd -r [-s [-]offset] [-c cols] [-ps] [infile [outfile]]
// Options:
// -a toggle autoskip: A single '*' replaces nul-lines. Default off.
// -b binary digit dump (incompatible with -ps,-i,-r). Default hex.
// -c cols format <cols> octets per line. Default 16 (-i: 12, -ps: 30).
// -E show characters in EBCDIC. Default ASCII.
// -e little-endian dump (incompatible with -ps,-i,-r).
// -g number of octets per group in normal output. Default 2 (-e: 4).
// -i output in C include file style.
// -l len stop after <len> octets.
// -o off add <off> to the displayed file position.
// -ps output in postscript plain hexdump style.
// -r reverse operation: convert (or patch) hexdump into binary.
// -r -s off revert with <off> added to file positions found in hexdump.
// -s [+][-]seek start at <seek> bytes abs. (or +: rel.) infile offset.
// -u use upper case hex letters.
//usage:#define xxd_trivial_usage
//usage: "[OPTIONS] [FILE]"
//usage:#define xxd_full_usage "\n\n"
//usage: "Hex dump FILE (or stdin)\n"
//usage: "\n -g N Bytes per group"
//usage: "\n -c N Bytes per line"
//usage: "\n -p Show only hex bytes, assumes -c30"
// exactly the same help text lines in hexdump and xxd:
//usage: "\n -l LENGTH Show only first LENGTH bytes"
//usage: "\n -s OFFSET Skip OFFSET bytes"
// TODO: implement -r (see hexdump -R)
#include "libbb.h"
#include "dump.h"
/* This is a NOEXEC applet. Be very careful! */
int xxd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int xxd_main(int argc UNUSED_PARAM, char **argv)
{
char buf[80];
dumper_t *dumper;
char *opt_l, *opt_s;
unsigned bytes = 2;
unsigned cols = 0;
unsigned opt;
dumper = alloc_dumper();
#define OPT_l (1 << 0)
#define OPT_s (1 << 1)
#define OPT_a (1 << 2)
#define OPT_p (1 << 3)
opt = getopt32(argv, "^" "l:s:apg:+c:+" "\0" "?1" /* 1 argument max */,
&opt_l, &opt_s, &bytes, &cols
);
argv += optind;
dumper->dump_vflag = ALL;
// if (opt & OPT_a)
// dumper->dump_vflag = SKIPNUL; ..does not exist
if (opt & OPT_l) {
dumper->dump_length = xstrtou_range(
opt_l,
/*base:*/ 0,
/*lo:*/ 0, /*hi:*/ INT_MAX
);
}
if (opt & OPT_s) {
dumper->dump_skip = xstrtoull_range(
opt_s,
/*base:*/ 0,
/*lo:*/ 0, /*hi:*/ OFF_T_MAX
);
//BUGGY for /proc/version (unseekable?)
}
if (opt & OPT_p) {
if (cols == 0)
cols = 30;
bytes = cols; /* -p ignores -gN */
} else {
if (cols == 0)
cols = 16;
bb_dump_add(dumper, "\"%08.8_ax: \""); // "address: "
}
if (bytes < 1 || bytes >= cols) {
sprintf(buf, "%u/1 \"%%02x\"", cols); // cols * "xx"
bb_dump_add(dumper, buf);
}
else if (bytes == 1) {
sprintf(buf, "%u/1 \"%%02x \"", cols); // cols * "xx "
bb_dump_add(dumper, buf);
}
else {
/* Format "print byte" with and without trailing space */
#define BS "/1 \"%02x \""
#define B "/1 \"%02x\""
unsigned i;
char *bigbuf = xmalloc(cols * (sizeof(BS)-1));
char *p = bigbuf;
for (i = 1; i <= cols; i++) {
if (i == cols || i % bytes)
p = stpcpy(p, B);
else
p = stpcpy(p, BS);
}
// for -g3, this results in B B BS B B BS... B = "xxxxxx xxxxxx .....xx"
// todo: can be more clever and use
// one 'bytes-1/1 "%02x"' format instead of many "B B B..." formats
//bb_error_msg("ADDED:'%s'", bigbuf);
bb_dump_add(dumper, bigbuf);
free(bigbuf);
}
if (!(opt & OPT_p)) {
sprintf(buf, "\" \"%u/1 \"%%_p\"\"\n\"", cols); // " ASCII\n"
bb_dump_add(dumper, buf);
} else {
bb_dump_add(dumper, "\"\n\"");
}
return bb_dump_dump(dumper, argv);
}