aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2020-10-20 18:54:36 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2020-10-20 18:57:02 +0200
commitdac5b8314236338963877903cba3d7edfbfc9c58 (patch)
tree5e7ce92407b9079b4e49e728f28f8a7c6311999c /include
parent085f19cdffd653013b1483c08851ecc35cdd818e (diff)
downloadbusybox-w32-dac5b8314236338963877903cba3d7edfbfc9c58.tar.gz
busybox-w32-dac5b8314236338963877903cba3d7edfbfc9c58.tar.bz2
busybox-w32-dac5b8314236338963877903cba3d7edfbfc9c58.zip
xxd: fix printing of trailing spaces
function old new delta bb_dump_dump 1497 1523 +26 xxd_main 459 466 +7 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/0 up/down: 33/0) Total: 33 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
-rw-r--r--include/dump.h39
1 files changed, 2 insertions, 37 deletions
diff --git a/include/dump.h b/include/dump.h
index 4c237ef05..f4759c193 100644
--- a/include/dump.h
+++ b/include/dump.h
@@ -2,50 +2,15 @@
2 2
3PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN 3PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
4 4
5#define F_IGNORE 0x01 /* %_A */
6#define F_SETREP 0x02 /* rep count set, not default */
7#define F_ADDRESS 0x001 /* print offset */
8#define F_BPAD 0x002 /* blank pad */
9#define F_C 0x004 /* %_c */
10#define F_CHAR 0x008 /* %c */
11#define F_DBL 0x010 /* %[EefGf] */
12#define F_INT 0x020 /* %[di] */
13#define F_P 0x040 /* %_p */
14#define F_STR 0x080 /* %s */
15#define F_U 0x100 /* %_u */
16#define F_UINT 0x200 /* %[ouXx] */
17#define F_TEXT 0x400 /* no conversions */
18
19enum dump_vflag_t { ALL, DUP, FIRST, WAIT }; /* -v values */ 5enum dump_vflag_t { ALL, DUP, FIRST, WAIT }; /* -v values */
20 6
21typedef struct PR { 7typedef struct FS FS;
22 struct PR *nextpr; /* next print unit */
23 unsigned flags; /* flag values */
24 int bcnt; /* byte count */
25 char *cchar; /* conversion character */
26 char *fmt; /* printf format */
27 char *nospace; /* no whitespace version */
28} PR;
29
30typedef struct FU {
31 struct FU *nextfu; /* next format unit */
32 struct PR *nextpr; /* next print unit */
33 unsigned flags; /* flag values */
34 int reps; /* repetition count */
35 int bcnt; /* byte count */
36 char *fmt; /* format string */
37} FU;
38
39typedef struct FS { /* format strings */
40 struct FS *nextfs; /* linked list of format strings */
41 struct FU *nextfu; /* linked list of format units */
42 int bcnt;
43} FS;
44 8
45typedef struct dumper_t { 9typedef struct dumper_t {
46 off_t dump_skip; /* bytes to skip */ 10 off_t dump_skip; /* bytes to skip */
47 int dump_length; /* max bytes to read */ 11 int dump_length; /* max bytes to read */
48 smallint dump_vflag; /*enum dump_vflag_t*/ 12 smallint dump_vflag; /*enum dump_vflag_t*/
13 const char *eofstring;
49 FS *fshead; 14 FS *fshead;
50} dumper_t; 15} dumper_t;
51 16