Mercurial > vim
annotate src/xxd/xxd.c @ 30118:53c1fab8081e v9.0.0395
patch 9.0.0395: clang warnings for function prototypes
Commit: https://github.com/vim/vim/commit/635bb4908577738c5658a95672259b8537d97d49
Author: Philip H <47042125+pheiduck@users.noreply.github.com>
Date: Tue Sep 6 16:31:26 2022 +0100
patch 9.0.0395: clang warnings for function prototypes
Problem: Clang warnings for function prototypes.
Solution: Remove incomplete function prototypes. (closes https://github.com/vim/vim/issues/11068)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 06 Sep 2022 17:45:05 +0200 |
parents | d45ee1f829ba |
children | 5a1113ece237 |
rev | line source |
---|---|
7 | 1 /* xxd: my hexdump facility. jw |
2 * | |
3 * 2.10.90 changed to word output | |
4 * 3.03.93 new indent style, dumb bug inserted and fixed. | |
5 * -c option, mls | |
6 * 26.04.94 better option parser, -ps, -l, -s added. | |
7 * 1.07.94 -r badly needs - as input file. Per default autoskip over | |
1197 | 8 * consecutive lines of zeroes, as unix od does. |
7 | 9 * -a shows them too. |
10 * -i dump as c-style #include "file.h" | |
11 * 1.11.95 if "xxd -i" knows the filename, an 'unsigned char filename_bits[]' | |
12 * array is written in correct c-syntax. | |
13 * -s improved, now defaults to absolute seek, relative requires a '+'. | |
14 * -r improved, now -r -s -0x... is supported. | |
15 * change/suppress leading '\0' bytes. | |
16 * -l n improved: stops exactly after n bytes. | |
17 * -r improved, better handling of partial lines with trailing garbage. | |
18 * -r improved, now -r -p works again! | |
19 * -r improved, less flushing, much faster now! (that was silly) | |
20 * 3.04.96 Per repeated request of a single person: autoskip defaults to off. | |
21 * 15.05.96 -v added. They want to know the version. | |
22 * -a fixed, to show last line inf file ends in all zeros. | |
23 * -u added: Print upper case hex-letters, as preferred by unix bc. | |
24 * -h added to usage message. Usage message extended. | |
25 * Now using outfile if specified even in normal mode, aehem. | |
26 * No longer mixing of ints and longs. May help doze people. | |
27 * Added binify ioctl for same reason. (Enough Doze stress for 1996!) | |
28 * 16.05.96 -p improved, removed occasional superfluous linefeed. | |
29 * 20.05.96 -l 0 fixed. tried to read anyway. | |
30 * 21.05.96 -i fixed. now honours -u, and prepends __ to numeric filenames. | |
31 * compile -DWIN32 for NT or W95. George V. Reilly, * -v improved :-) | |
32 * support --gnuish-longhorn-options | |
33 * 25.05.96 MAC support added: CodeWarrior already uses ``outline'' in Types.h | |
34 * which is included by MacHeaders (Axel Kielhorn). Renamed to | |
35 * xxdline(). | |
36 * 7.06.96 -i printed 'int' instead of 'char'. *blush* | |
37 * added Bram's OS2 ifdefs... | |
19195
2ef19eed524a
patch 8.2.0156: various typos in source files and tests
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
38 * 18.07.96 gcc -Wall @ SunOS4 is now silent. |
7 | 39 * Added osver for MSDOS/DJGPP/WIN32. |
40 * 29.08.96 Added size_t to strncmp() for Amiga. | |
41 * 24.03.97 Windows NT support (Phil Hanna). Clean exit for Amiga WB (Bram) | |
42 * 02.04.97 Added -E option, to have EBCDIC translation instead of ASCII | |
216 | 43 * (azc10@yahoo.com) |
7 | 44 * 22.05.97 added -g (group octets) option (jcook@namerica.kla.com). |
45 * 23.09.98 nasty -p -r misfeature fixed: slightly wrong output, when -c was | |
46 * missing or wrong. | |
47 * 26.09.98 Fixed: 'xxd -i infile outfile' did not truncate outfile. | |
48 * 27.10.98 Fixed: -g option parser required blank. | |
49 * option -b added: 01000101 binary output in normal format. | |
50 * 16.05.00 Added VAXC changes by Stephen P. Wall | |
1197 | 51 * 16.05.00 Improved MMS file and merge for VMS by Zoltan Arpadffy |
2752 | 52 * 2011 March Better error handling by Florian Zumbiehl. |
53 * 2011 April Formatting by Bram Moolenaar | |
6655 | 54 * 08.06.2013 Little-endian hexdump (-e) and offset (-o) by Vadim Vygonets. |
15693
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
55 * 11.01.2019 Add full 64/32 bit range to -o and output by Christer Jensen. |
20601
75ef263d09d6
patch 8.2.0854: xxd cannot show offset as a decimal number
Bram Moolenaar <Bram@vim.org>
parents:
19195
diff
changeset
|
56 * 04.02.2020 Add -d for decimal offsets by Aapo Rantalainen |
27118
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
57 * 14.01.2022 Disable extra newlines with -c0 -p by Erik Auerswald. |
29330
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
58 * 20.06.2022 Permit setting the variable names used by -i by David Gow |
7 | 59 * |
25076
5690cf66ee07
patch 8.2.3075: xxd always reports an old version string
Bram Moolenaar <Bram@vim.org>
parents:
20601
diff
changeset
|
60 * (c) 1990-1998 by Juergen Weigert (jnweiger@gmail.com) |
7 | 61 * |
6973 | 62 * I hereby grant permission to distribute and use xxd |
63 * under X11-MIT or GPL-2.0 (at the user's choice). | |
64 * | |
25076
5690cf66ee07
patch 8.2.3075: xxd always reports an old version string
Bram Moolenaar <Bram@vim.org>
parents:
20601
diff
changeset
|
65 * Contributions by Bram Moolenaar et al. |
7 | 66 */ |
714 | 67 |
68 /* Visual Studio 2005 has 'deprecated' many of the standard CRT functions */ | |
69 #if _MSC_VER >= 1400 | |
70 # define _CRT_SECURE_NO_DEPRECATE | |
71 # define _CRT_NONSTDC_NO_DEPRECATE | |
72 #endif | |
15963
2d8fa45b341d
patch 8.1.0987: unnecessary condition in #ifdef
Bram Moolenaar <Bram@vim.org>
parents:
15695
diff
changeset
|
73 #if !defined(CYGWIN) && defined(__CYGWIN__) |
1912 | 74 # define CYGWIN |
75 #endif | |
714 | 76 |
26859
b9ede1952107
patch 8.2.3958: build failure compiling xxd with "-std=c2x"
Bram Moolenaar <Bram@vim.org>
parents:
26366
diff
changeset
|
77 #if (defined(__linux__) && !defined(__ANDROID__)) || defined(__CYGWIN__) |
b9ede1952107
patch 8.2.3958: build failure compiling xxd with "-std=c2x"
Bram Moolenaar <Bram@vim.org>
parents:
26366
diff
changeset
|
78 # define _XOPEN_SOURCE 700 /* for fdopen() */ |
b9ede1952107
patch 8.2.3958: build failure compiling xxd with "-std=c2x"
Bram Moolenaar <Bram@vim.org>
parents:
26366
diff
changeset
|
79 #endif |
b9ede1952107
patch 8.2.3958: build failure compiling xxd with "-std=c2x"
Bram Moolenaar <Bram@vim.org>
parents:
26366
diff
changeset
|
80 |
7 | 81 #include <stdio.h> |
82 #ifdef VAXC | |
83 # include <file.h> | |
84 #else | |
85 # include <fcntl.h> | |
86 #endif | |
16606
7e733046db1d
patch 8.1.1306: Borland support is outdated and doesn't work
Bram Moolenaar <Bram@vim.org>
parents:
15963
diff
changeset
|
87 #if defined(WIN32) || defined(CYGWIN) |
7 | 88 # include <io.h> /* for setmode() */ |
89 #else | |
90 # ifdef UNIX | |
91 # include <unistd.h> | |
92 # endif | |
93 #endif | |
94 #include <stdlib.h> | |
95 #include <string.h> /* for strncmp() */ | |
96 #include <ctype.h> /* for isalnum() */ | |
15693
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
97 #include <limits.h> |
7 | 98 #if __MWERKS__ && !defined(BEBOX) |
99 # include <unix.h> /* for fdopen() on MAC */ | |
100 #endif | |
101 | |
102 | |
103 /* This corrects the problem of missing prototypes for certain functions | |
104 * in some GNU installations (e.g. SunOS 4.1.x). | |
105 * Darren Hiebert <darren@hmi.com> (sparc-sun-sunos4.1.3_U1/2.7.2.2) | |
106 */ | |
107 #if defined(__GNUC__) && defined(__STDC__) | |
108 # ifndef __USE_FIXED_PROTOTYPES__ | |
109 # define __USE_FIXED_PROTOTYPES__ | |
110 # endif | |
111 #endif | |
112 | |
113 #ifndef __USE_FIXED_PROTOTYPES__ | |
114 /* | |
115 * This is historic and works only if the compiler really has no prototypes: | |
116 * | |
117 * Include prototypes for Sun OS 4.x, when using an ANSI compiler. | |
118 * FILE is defined on OS 4.x, not on 5.x (Solaris). | |
119 * if __SVR4 is defined (some Solaris versions), don't include this. | |
120 */ | |
121 #if defined(sun) && defined(FILE) && !defined(__SVR4) && defined(__STDC__) | |
122 # define __P(a) a | |
123 /* excerpt from my sun_stdlib.h */ | |
124 extern int fprintf __P((FILE *, char *, ...)); | |
125 extern int fputs __P((char *, FILE *)); | |
126 extern int _flsbuf __P((unsigned char, FILE *)); | |
127 extern int _filbuf __P((FILE *)); | |
128 extern int fflush __P((FILE *)); | |
129 extern int fclose __P((FILE *)); | |
130 extern int fseek __P((FILE *, long, int)); | |
131 extern int rewind __P((FILE *)); | |
132 | |
133 extern void perror __P((char *)); | |
134 # endif | |
135 #endif | |
136 | |
27118
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
137 char version[] = "xxd 2022-01-14 by Juergen Weigert et al."; |
7 | 138 #ifdef WIN32 |
139 char osver[] = " (Win32)"; | |
140 #else | |
141 char osver[] = ""; | |
142 #endif | |
143 | |
9536
b2aada04d84e
commit https://github.com/vim/vim/commit/a06ecab7a5159e744448ace731036f0dc5f87dd4
Christian Brabandt <cb@256bit.org>
parents:
7837
diff
changeset
|
144 #if defined(WIN32) |
7 | 145 # define BIN_READ(yes) ((yes) ? "rb" : "rt") |
146 # define BIN_WRITE(yes) ((yes) ? "wb" : "wt") | |
147 # define BIN_CREAT(yes) ((yes) ? (O_CREAT|O_BINARY) : O_CREAT) | |
148 # define BIN_ASSIGN(fp, yes) setmode(fileno(fp), (yes) ? O_BINARY : O_TEXT) | |
602 | 149 # define PATH_SEP '\\' |
150 #elif defined(CYGWIN) | |
151 # define BIN_READ(yes) ((yes) ? "rb" : "rt") | |
152 # define BIN_WRITE(yes) ((yes) ? "wb" : "w") | |
153 # define BIN_CREAT(yes) ((yes) ? (O_CREAT|O_BINARY) : O_CREAT) | |
154 # define BIN_ASSIGN(fp, yes) ((yes) ? (void) setmode(fileno(fp), O_BINARY) : (void) (fp)) | |
155 # define PATH_SEP '/' | |
7 | 156 #else |
157 # ifdef VMS | |
158 # define BIN_READ(dummy) "r" | |
159 # define BIN_WRITE(dummy) "w" | |
160 # define BIN_CREAT(dummy) O_CREAT | |
161 # define BIN_ASSIGN(fp, dummy) fp | |
162 # define PATH_SEP ']' | |
163 # define FILE_SEP '.' | |
164 # else | |
165 # define BIN_READ(dummy) "r" | |
166 # define BIN_WRITE(dummy) "w" | |
167 # define BIN_CREAT(dummy) O_CREAT | |
168 # define BIN_ASSIGN(fp, dummy) fp | |
169 # define PATH_SEP '/' | |
170 # endif | |
171 #endif | |
172 | |
173 /* open has only to arguments on the Mac */ | |
174 #if __MWERKS__ | |
175 # define OPEN(name, mode, umask) open(name, mode) | |
176 #else | |
177 # define OPEN(name, mode, umask) open(name, mode, umask) | |
178 #endif | |
179 | |
180 #ifdef AMIGA | |
181 # define STRNCMP(s1, s2, l) strncmp(s1, s2, (size_t)l) | |
182 #else | |
183 # define STRNCMP(s1, s2, l) strncmp(s1, s2, l) | |
184 #endif | |
185 | |
186 #ifndef __P | |
16606
7e733046db1d
patch 8.1.1306: Borland support is outdated and doesn't work
Bram Moolenaar <Bram@vim.org>
parents:
15963
diff
changeset
|
187 # if defined(__STDC__) || defined(WIN32) |
7 | 188 # define __P(a) a |
189 # else | |
190 # define __P(a) () | |
191 # endif | |
192 #endif | |
193 | |
194 #define TRY_SEEK /* attempt to use lseek, or skip forward by reading */ | |
195 #define COLS 256 /* change here, if you ever need more columns */ | |
15693
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
196 #define LLEN ((2*(int)sizeof(unsigned long)) + 4 + (9*COLS-1) + COLS + 2) |
7 | 197 |
198 char hexxa[] = "0123456789abcdef0123456789ABCDEF", *hexx = hexxa; | |
199 | |
200 /* the different hextypes known by this program: */ | |
201 #define HEX_NORMAL 0 | |
202 #define HEX_POSTSCRIPT 1 | |
203 #define HEX_CINCLUDE 2 | |
204 #define HEX_BITS 3 /* not hex a dump, but bits: 01111001 */ | |
6655 | 205 #define HEX_LITTLEENDIAN 4 |
7 | 206 |
13567
4f2acb6a10b6
patch 8.0.1656: no option to have xxd produce upper case variable names
Christian Brabandt <cb@256bit.org>
parents:
13326
diff
changeset
|
207 #define CONDITIONAL_CAPITALIZE(c) (capitalize ? toupper((int)c) : c) |
4f2acb6a10b6
patch 8.0.1656: no option to have xxd produce upper case variable names
Christian Brabandt <cb@256bit.org>
parents:
13326
diff
changeset
|
208 |
2752 | 209 static char *pname; |
210 | |
211 static void | |
7837
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
212 exit_with_usage(void) |
7 | 213 { |
214 fprintf(stderr, "Usage:\n %s [options] [infile [outfile]]\n", pname); | |
215 fprintf(stderr, " or\n %s -r [-s [-]offset] [-c cols] [-ps] [infile [outfile]]\n", pname); | |
216 fprintf(stderr, "Options:\n"); | |
217 fprintf(stderr, " -a toggle autoskip: A single '*' replaces nul-lines. Default off.\n"); | |
2083
24eb7921b8f0
updated for version 7.2.367
Bram Moolenaar <bram@zimbu.org>
parents:
1912
diff
changeset
|
218 fprintf(stderr, " -b binary digit dump (incompatible with -ps,-i,-r). Default hex.\n"); |
13567
4f2acb6a10b6
patch 8.0.1656: no option to have xxd produce upper case variable names
Christian Brabandt <cb@256bit.org>
parents:
13326
diff
changeset
|
219 fprintf(stderr, " -C capitalize variable names in C include file style (-i).\n"); |
7 | 220 fprintf(stderr, " -c cols format <cols> octets per line. Default 16 (-i: 12, -ps: 30).\n"); |
221 fprintf(stderr, " -E show characters in EBCDIC. Default ASCII.\n"); | |
6655 | 222 fprintf(stderr, " -e little-endian dump (incompatible with -ps,-i,-r).\n"); |
25992
2294ed638906
patch 8.2.3529: xxd usage output is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
25980
diff
changeset
|
223 fprintf(stderr, " -g bytes number of octets per group in normal output. Default 2 (-e: 4).\n"); |
7 | 224 fprintf(stderr, " -h print this summary.\n"); |
225 fprintf(stderr, " -i output in C include file style.\n"); | |
226 fprintf(stderr, " -l len stop after <len> octets.\n"); | |
29330
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
227 fprintf(stderr, " -n name set the variable name used in C include output (-i).\n"); |
6655 | 228 fprintf(stderr, " -o off add <off> to the displayed file position.\n"); |
7 | 229 fprintf(stderr, " -ps output in postscript plain hexdump style.\n"); |
230 fprintf(stderr, " -r reverse operation: convert (or patch) hexdump into binary.\n"); | |
231 fprintf(stderr, " -r -s off revert with <off> added to file positions found in hexdump.\n"); | |
20601
75ef263d09d6
patch 8.2.0854: xxd cannot show offset as a decimal number
Bram Moolenaar <Bram@vim.org>
parents:
19195
diff
changeset
|
232 fprintf(stderr, " -d show offset in decimal instead of hex.\n"); |
7 | 233 fprintf(stderr, " -s %sseek start at <seek> bytes abs. %sinfile offset.\n", |
234 #ifdef TRY_SEEK | |
235 "[+][-]", "(or +: rel.) "); | |
236 #else | |
237 "", ""); | |
238 #endif | |
239 fprintf(stderr, " -u use upper case hex letters.\n"); | |
240 fprintf(stderr, " -v show version: \"%s%s\".\n", version, osver); | |
241 exit(1); | |
242 } | |
243 | |
2752 | 244 static void |
26040
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
245 perror_exit(int ret) |
2752 | 246 { |
247 fprintf(stderr, "%s: ", pname); | |
248 perror(NULL); | |
249 exit(ret); | |
250 } | |
251 | |
26040
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
252 static void |
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
253 error_exit(int ret, char *msg) |
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
254 { |
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
255 fprintf(stderr, "%s: %s\n", pname, msg); |
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
256 exit(ret); |
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
257 } |
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
258 |
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
259 static int |
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
260 getc_or_die(FILE *fpi) |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
261 { |
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
262 int c = getc(fpi); |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
263 if (c == EOF && ferror(fpi)) |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
264 perror_exit(2); |
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
265 return c; |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
266 } |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
267 |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
268 static void |
26282
71bdede8afd8
patch 8.2.3672: build failure with unsigned char
Bram Moolenaar <Bram@vim.org>
parents:
26278
diff
changeset
|
269 putc_or_die(int c, FILE *fpo) |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
270 { |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
271 if (putc(c, fpo) == EOF) |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
272 perror_exit(3); |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
273 } |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
274 |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
275 static void |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
276 fputs_or_die(char *s, FILE *fpo) |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
277 { |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
278 if (fputs(s, fpo) == EOF) |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
279 perror_exit(3); |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
280 } |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
281 |
26366
d227481dbe8e
patch 8.2.3714: some unused assignments and ugly code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26298
diff
changeset
|
282 /* Use a macro to allow for different arguments. */ |
d227481dbe8e
patch 8.2.3714: some unused assignments and ugly code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26298
diff
changeset
|
283 #define FPRINTF_OR_DIE(args) if (fprintf args < 0) perror_exit(3) |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
284 |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
285 static void |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
286 fclose_or_die(FILE *fpi, FILE *fpo) |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
287 { |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
288 if (fclose(fpo) != 0) |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
289 perror_exit(3); |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
290 if (fclose(fpi) != 0) |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
291 perror_exit(2); |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
292 } |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
293 |
7 | 294 /* |
26123
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
295 * If "c" is a hex digit, return the value. |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
296 * Otherwise return -1. |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
297 */ |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
298 static int |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
299 parse_hex_digit(int c) |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
300 { |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
301 return (c >= '0' && c <= '9') ? c - '0' |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
302 : (c >= 'a' && c <= 'f') ? c - 'a' + 10 |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
303 : (c >= 'A' && c <= 'F') ? c - 'A' + 10 |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
304 : -1; |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
305 } |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
306 |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
307 /* |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
308 * Ignore text on "fpi" until end-of-line or end-of-file. |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
309 * Return the '\n' or EOF character. |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
310 * When an error is encountered exit with an error message. |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
311 */ |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
312 static int |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
313 skip_to_eol(FILE *fpi, int c) |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
314 { |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
315 while (c != '\n' && c != EOF) |
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
316 c = getc_or_die(fpi); |
26123
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
317 return c; |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
318 } |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
319 |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
320 /* |
7 | 321 * Max. cols binary characters are decoded from the input stream per line. |
322 * Two adjacent garbage characters after evaluated data delimit valid data. | |
323 * Everything up to the next newline is discarded. | |
324 * | |
325 * The name is historic and came from 'undo type opt h'. | |
326 */ | |
2752 | 327 static int |
7837
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
328 huntype( |
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
329 FILE *fpi, |
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
330 FILE *fpo, |
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
331 int cols, |
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
332 int hextype, |
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
333 long base_off) |
7 | 334 { |
335 int c, ign_garb = 1, n1 = -1, n2 = 0, n3, p = cols; | |
336 long have_off = 0, want_off = 0; | |
337 | |
338 rewind(fpi); | |
339 | |
340 while ((c = getc(fpi)) != EOF) | |
341 { | |
342 if (c == '\r') /* Doze style input file? */ | |
343 continue; | |
344 | |
2083
24eb7921b8f0
updated for version 7.2.367
Bram Moolenaar <bram@zimbu.org>
parents:
1912
diff
changeset
|
345 /* Allow multiple spaces. This doesn't work when there is normal text |
24eb7921b8f0
updated for version 7.2.367
Bram Moolenaar <bram@zimbu.org>
parents:
1912
diff
changeset
|
346 * after the hex codes in the last line that looks like hex, thus only |
24eb7921b8f0
updated for version 7.2.367
Bram Moolenaar <bram@zimbu.org>
parents:
1912
diff
changeset
|
347 * use it for PostScript format. */ |
24eb7921b8f0
updated for version 7.2.367
Bram Moolenaar <bram@zimbu.org>
parents:
1912
diff
changeset
|
348 if (hextype == HEX_POSTSCRIPT && (c == ' ' || c == '\n' || c == '\t')) |
856 | 349 continue; |
809 | 350 |
7 | 351 n3 = n2; |
352 n2 = n1; | |
353 | |
26123
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
354 n1 = parse_hex_digit(c); |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
355 if (n1 == -1 && ign_garb) |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
356 continue; |
7 | 357 |
358 ign_garb = 0; | |
359 | |
26000
16aaed83522a
patch 8.2.3533: inefficient code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
25992
diff
changeset
|
360 if (!hextype && (p >= cols)) |
7 | 361 { |
26000
16aaed83522a
patch 8.2.3533: inefficient code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
25992
diff
changeset
|
362 if (n1 < 0) |
7 | 363 { |
26000
16aaed83522a
patch 8.2.3533: inefficient code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
25992
diff
changeset
|
364 p = 0; |
7 | 365 continue; |
366 } | |
26000
16aaed83522a
patch 8.2.3533: inefficient code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
25992
diff
changeset
|
367 want_off = (want_off << 4) | n1; |
16aaed83522a
patch 8.2.3533: inefficient code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
25992
diff
changeset
|
368 continue; |
7 | 369 } |
370 | |
371 if (base_off + want_off != have_off) | |
372 { | |
2752 | 373 if (fflush(fpo) != 0) |
26040
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
374 perror_exit(3); |
7 | 375 #ifdef TRY_SEEK |
26123
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
376 if (fseek(fpo, base_off + want_off - have_off, SEEK_CUR) >= 0) |
7 | 377 have_off = base_off + want_off; |
378 #endif | |
379 if (base_off + want_off < have_off) | |
26366
d227481dbe8e
patch 8.2.3714: some unused assignments and ugly code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26298
diff
changeset
|
380 error_exit(5, "Sorry, cannot seek backwards."); |
7 | 381 for (; have_off < base_off + want_off; have_off++) |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
382 putc_or_die(0, fpo); |
7 | 383 } |
384 | |
385 if (n2 >= 0 && n1 >= 0) | |
386 { | |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
387 putc_or_die((n2 << 4) | n1, fpo); |
7 | 388 have_off++; |
389 want_off++; | |
390 n1 = -1; | |
26000
16aaed83522a
patch 8.2.3533: inefficient code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
25992
diff
changeset
|
391 if (!hextype && (++p >= cols)) |
26123
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
392 /* skip the rest of the line as garbage */ |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
393 c = skip_to_eol(fpi, c); |
7 | 394 } |
26123
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
395 else if (n1 < 0 && n2 < 0 && n3 < 0) |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
396 /* already stumbled into garbage, skip line, wait and see */ |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
397 c = skip_to_eol(fpi, c); |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
398 |
26036
c8165ec9dcad
patch 8.2.3552: xxd revert does not handle end of line correctly
Bram Moolenaar <Bram@vim.org>
parents:
26000
diff
changeset
|
399 if (c == '\n') |
c8165ec9dcad
patch 8.2.3552: xxd revert does not handle end of line correctly
Bram Moolenaar <Bram@vim.org>
parents:
26000
diff
changeset
|
400 { |
7 | 401 if (!hextype) |
402 want_off = 0; | |
26036
c8165ec9dcad
patch 8.2.3552: xxd revert does not handle end of line correctly
Bram Moolenaar <Bram@vim.org>
parents:
26000
diff
changeset
|
403 p = cols; |
7 | 404 ign_garb = 1; |
405 } | |
406 } | |
2752 | 407 if (fflush(fpo) != 0) |
26040
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
408 perror_exit(3); |
7 | 409 #ifdef TRY_SEEK |
26123
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
410 fseek(fpo, 0L, SEEK_END); |
7 | 411 #endif |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
412 fclose_or_die(fpi, fpo); |
7 | 413 return 0; |
414 } | |
415 | |
416 /* | |
417 * Print line l. If nz is false, xxdline regards the line a line of | |
418 * zeroes. If there are three or more consecutive lines of zeroes, | |
419 * they are replaced by a single '*' character. | |
420 * | |
421 * If the output ends with more than two lines of zeroes, you | |
422 * should call xxdline again with l being the last line and nz | |
423 * negative. This ensures that the last line is shown even when | |
424 * it is all zeroes. | |
425 * | |
426 * If nz is always positive, lines are never suppressed. | |
427 */ | |
2752 | 428 static void |
7837
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
429 xxdline(FILE *fp, char *l, int nz) |
7 | 430 { |
431 static char z[LLEN+1]; | |
432 static int zero_seen = 0; | |
433 | |
434 if (!nz && zero_seen == 1) | |
435 strcpy(z, l); | |
436 | |
437 if (nz || !zero_seen++) | |
438 { | |
439 if (nz) | |
440 { | |
441 if (nz < 0) | |
442 zero_seen--; | |
443 if (zero_seen == 2) | |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
444 fputs_or_die(z, fp); |
7 | 445 if (zero_seen > 2) |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
446 fputs_or_die("*\n", fp); |
7 | 447 } |
448 if (nz >= 0 || zero_seen > 0) | |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
449 fputs_or_die(l, fp); |
7 | 450 if (nz) |
451 zero_seen = 0; | |
452 } | |
453 } | |
454 | |
455 /* This is an EBCDIC to ASCII conversion table */ | |
456 /* from a proposed BTL standard April 16, 1979 */ | |
457 static unsigned char etoa64[] = | |
458 { | |
459 0040,0240,0241,0242,0243,0244,0245,0246, | |
460 0247,0250,0325,0056,0074,0050,0053,0174, | |
461 0046,0251,0252,0253,0254,0255,0256,0257, | |
462 0260,0261,0041,0044,0052,0051,0073,0176, | |
463 0055,0057,0262,0263,0264,0265,0266,0267, | |
464 0270,0271,0313,0054,0045,0137,0076,0077, | |
465 0272,0273,0274,0275,0276,0277,0300,0301, | |
466 0302,0140,0072,0043,0100,0047,0075,0042, | |
467 0303,0141,0142,0143,0144,0145,0146,0147, | |
468 0150,0151,0304,0305,0306,0307,0310,0311, | |
469 0312,0152,0153,0154,0155,0156,0157,0160, | |
470 0161,0162,0136,0314,0315,0316,0317,0320, | |
471 0321,0345,0163,0164,0165,0166,0167,0170, | |
472 0171,0172,0322,0323,0324,0133,0326,0327, | |
473 0330,0331,0332,0333,0334,0335,0336,0337, | |
474 0340,0341,0342,0343,0344,0135,0346,0347, | |
475 0173,0101,0102,0103,0104,0105,0106,0107, | |
476 0110,0111,0350,0351,0352,0353,0354,0355, | |
477 0175,0112,0113,0114,0115,0116,0117,0120, | |
478 0121,0122,0356,0357,0360,0361,0362,0363, | |
479 0134,0237,0123,0124,0125,0126,0127,0130, | |
480 0131,0132,0364,0365,0366,0367,0370,0371, | |
481 0060,0061,0062,0063,0064,0065,0066,0067, | |
482 0070,0071,0372,0373,0374,0375,0376,0377 | |
483 }; | |
484 | |
2752 | 485 int |
7837
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
486 main(int argc, char *argv[]) |
7 | 487 { |
488 FILE *fp, *fpo; | |
489 int c, e, p = 0, relseek = 1, negseek = 0, revert = 0; | |
27118
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
490 int cols = 0, colsgiven = 0, nonzero = 0, autoskip = 0, hextype = HEX_NORMAL; |
20601
75ef263d09d6
patch 8.2.0854: xxd cannot show offset as a decimal number
Bram Moolenaar <Bram@vim.org>
parents:
19195
diff
changeset
|
491 int capitalize = 0, decimal_offset = 0; |
7 | 492 int ebcdic = 0; |
493 int octspergrp = -1; /* number of octets grouped in output */ | |
494 int grplen; /* total chars per octet group */ | |
15693
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
495 long length = -1, n = 0, seekoff = 0; |
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
496 unsigned long displayoff = 0; |
2770 | 497 static char l[LLEN+1]; /* static because it may be too big for stack */ |
2752 | 498 char *pp; |
29330
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
499 char *varname = NULL; |
15695
ac05f8fb4200
patch 8.1.0855: cannot build xxd with MSVC 10
Bram Moolenaar <Bram@vim.org>
parents:
15693
diff
changeset
|
500 int addrlen = 9; |
7 | 501 |
502 #ifdef AMIGA | |
503 /* This program doesn't work when started from the Workbench */ | |
504 if (argc == 0) | |
505 exit(1); | |
506 #endif | |
507 | |
508 pname = argv[0]; | |
509 for (pp = pname; *pp; ) | |
510 if (*pp++ == PATH_SEP) | |
511 pname = pp; | |
512 #ifdef FILE_SEP | |
513 for (pp = pname; *pp; pp++) | |
514 if (*pp == FILE_SEP) | |
515 { | |
516 *pp = '\0'; | |
517 break; | |
518 } | |
519 #endif | |
520 | |
521 while (argc >= 2) | |
522 { | |
523 pp = argv[1] + (!STRNCMP(argv[1], "--", 2) && argv[1][2]); | |
524 if (!STRNCMP(pp, "-a", 2)) autoskip = 1 - autoskip; | |
525 else if (!STRNCMP(pp, "-b", 2)) hextype = HEX_BITS; | |
6655 | 526 else if (!STRNCMP(pp, "-e", 2)) hextype = HEX_LITTLEENDIAN; |
7 | 527 else if (!STRNCMP(pp, "-u", 2)) hexx = hexxa + 16; |
528 else if (!STRNCMP(pp, "-p", 2)) hextype = HEX_POSTSCRIPT; | |
529 else if (!STRNCMP(pp, "-i", 2)) hextype = HEX_CINCLUDE; | |
13567
4f2acb6a10b6
patch 8.0.1656: no option to have xxd produce upper case variable names
Christian Brabandt <cb@256bit.org>
parents:
13326
diff
changeset
|
530 else if (!STRNCMP(pp, "-C", 2)) capitalize = 1; |
20601
75ef263d09d6
patch 8.2.0854: xxd cannot show offset as a decimal number
Bram Moolenaar <Bram@vim.org>
parents:
19195
diff
changeset
|
531 else if (!STRNCMP(pp, "-d", 2)) decimal_offset = 1; |
7 | 532 else if (!STRNCMP(pp, "-r", 2)) revert++; |
533 else if (!STRNCMP(pp, "-E", 2)) ebcdic++; | |
534 else if (!STRNCMP(pp, "-v", 2)) | |
535 { | |
536 fprintf(stderr, "%s%s\n", version, osver); | |
537 exit(0); | |
538 } | |
539 else if (!STRNCMP(pp, "-c", 2)) | |
540 { | |
15627
11879b89bb69
patch 8.1.0821: xxd "usage" output and other arguments not tested
Bram Moolenaar <Bram@vim.org>
parents:
13571
diff
changeset
|
541 if (pp[2] && !STRNCMP("apitalize", pp + 2, 9)) |
11879b89bb69
patch 8.1.0821: xxd "usage" output and other arguments not tested
Bram Moolenaar <Bram@vim.org>
parents:
13571
diff
changeset
|
542 capitalize = 1; |
11879b89bb69
patch 8.1.0821: xxd "usage" output and other arguments not tested
Bram Moolenaar <Bram@vim.org>
parents:
13571
diff
changeset
|
543 else if (pp[2] && STRNCMP("ols", pp + 2, 3)) |
27118
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
544 { |
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
545 colsgiven = 1; |
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
546 cols = (int)strtol(pp + 2, NULL, 0); |
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
547 } |
7 | 548 else |
549 { | |
550 if (!argv[2]) | |
2752 | 551 exit_with_usage(); |
27118
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
552 colsgiven = 1; |
7 | 553 cols = (int)strtol(argv[2], NULL, 0); |
554 argv++; | |
555 argc--; | |
556 } | |
557 } | |
558 else if (!STRNCMP(pp, "-g", 2)) | |
559 { | |
15627
11879b89bb69
patch 8.1.0821: xxd "usage" output and other arguments not tested
Bram Moolenaar <Bram@vim.org>
parents:
13571
diff
changeset
|
560 if (pp[2] && STRNCMP("roup", pp + 2, 4)) |
7 | 561 octspergrp = (int)strtol(pp + 2, NULL, 0); |
562 else | |
563 { | |
564 if (!argv[2]) | |
2752 | 565 exit_with_usage(); |
7 | 566 octspergrp = (int)strtol(argv[2], NULL, 0); |
567 argv++; | |
568 argc--; | |
569 } | |
570 } | |
6655 | 571 else if (!STRNCMP(pp, "-o", 2)) |
572 { | |
15693
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
573 int reloffset = 0; |
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
574 int negoffset = 0; |
6655 | 575 if (pp[2] && STRNCMP("ffset", pp + 2, 5)) |
15693
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
576 displayoff = strtoul(pp + 2, NULL, 0); |
6655 | 577 else |
578 { | |
579 if (!argv[2]) | |
580 exit_with_usage(); | |
15693
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
581 |
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
582 if (argv[2][0] == '+') |
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
583 reloffset++; |
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
584 if (argv[2][reloffset] == '-') |
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
585 negoffset++; |
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
586 |
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
587 if (negoffset) |
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
588 displayoff = ULONG_MAX - strtoul(argv[2] + reloffset+negoffset, NULL, 0) + 1; |
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
589 else |
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
590 displayoff = strtoul(argv[2] + reloffset+negoffset, NULL, 0); |
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
591 |
6655 | 592 argv++; |
593 argc--; | |
594 } | |
595 } | |
7 | 596 else if (!STRNCMP(pp, "-s", 2)) |
597 { | |
598 relseek = 0; | |
599 negseek = 0; | |
600 if (pp[2] && STRNCMP("kip", pp+2, 3) && STRNCMP("eek", pp+2, 3)) | |
601 { | |
602 #ifdef TRY_SEEK | |
603 if (pp[2] == '+') | |
604 relseek++; | |
605 if (pp[2+relseek] == '-') | |
606 negseek++; | |
607 #endif | |
608 seekoff = strtol(pp + 2+relseek+negseek, (char **)NULL, 0); | |
609 } | |
610 else | |
611 { | |
612 if (!argv[2]) | |
2752 | 613 exit_with_usage(); |
7 | 614 #ifdef TRY_SEEK |
615 if (argv[2][0] == '+') | |
616 relseek++; | |
617 if (argv[2][relseek] == '-') | |
618 negseek++; | |
619 #endif | |
620 seekoff = strtol(argv[2] + relseek+negseek, (char **)NULL, 0); | |
621 argv++; | |
622 argc--; | |
623 } | |
624 } | |
625 else if (!STRNCMP(pp, "-l", 2)) | |
626 { | |
627 if (pp[2] && STRNCMP("en", pp + 2, 2)) | |
628 length = strtol(pp + 2, (char **)NULL, 0); | |
629 else | |
630 { | |
631 if (!argv[2]) | |
2752 | 632 exit_with_usage(); |
7 | 633 length = strtol(argv[2], (char **)NULL, 0); |
634 argv++; | |
635 argc--; | |
636 } | |
637 } | |
29330
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
638 else if (!STRNCMP(pp, "-n", 2)) |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
639 { |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
640 if (pp[2] && STRNCMP("ame", pp + 2, 3)) |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
641 varname = pp + 2; |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
642 else |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
643 { |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
644 if (!argv[2]) |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
645 exit_with_usage(); |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
646 varname = argv[2]; |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
647 argv++; |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
648 argc--; |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
649 } |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
650 } |
7 | 651 else if (!strcmp(pp, "--")) /* end of options */ |
652 { | |
653 argv++; | |
654 argc--; | |
655 break; | |
656 } | |
657 else if (pp[0] == '-' && pp[1]) /* unknown option */ | |
2752 | 658 exit_with_usage(); |
7 | 659 else |
660 break; /* not an option */ | |
661 | |
662 argv++; /* advance to next argument */ | |
663 argc--; | |
664 } | |
665 | |
27118
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
666 if (!colsgiven || (!cols && hextype != HEX_POSTSCRIPT)) |
7 | 667 switch (hextype) |
668 { | |
669 case HEX_POSTSCRIPT: cols = 30; break; | |
670 case HEX_CINCLUDE: cols = 12; break; | |
671 case HEX_BITS: cols = 6; break; | |
672 case HEX_NORMAL: | |
6655 | 673 case HEX_LITTLEENDIAN: |
7 | 674 default: cols = 16; break; |
675 } | |
676 | |
677 if (octspergrp < 0) | |
678 switch (hextype) | |
679 { | |
680 case HEX_BITS: octspergrp = 1; break; | |
681 case HEX_NORMAL: octspergrp = 2; break; | |
6655 | 682 case HEX_LITTLEENDIAN: octspergrp = 4; break; |
7 | 683 case HEX_POSTSCRIPT: |
684 case HEX_CINCLUDE: | |
685 default: octspergrp = 0; break; | |
686 } | |
687 | |
27118
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
688 if ((hextype == HEX_POSTSCRIPT && cols < 0) || |
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
689 (hextype != HEX_POSTSCRIPT && cols < 1) || |
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
690 ((hextype == HEX_NORMAL || hextype == HEX_BITS || hextype == HEX_LITTLEENDIAN) |
1452 | 691 && (cols > COLS))) |
7 | 692 { |
693 fprintf(stderr, "%s: invalid number of columns (max. %d).\n", pname, COLS); | |
694 exit(1); | |
695 } | |
696 | |
6655 | 697 if (octspergrp < 1 || octspergrp > cols) |
7 | 698 octspergrp = cols; |
6655 | 699 else if (hextype == HEX_LITTLEENDIAN && (octspergrp & (octspergrp-1))) |
26040
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
700 error_exit(1, "number of octets per group must be a power of 2 with -e."); |
7 | 701 |
702 if (argc > 3) | |
2752 | 703 exit_with_usage(); |
7 | 704 |
705 if (argc == 1 || (argv[1][0] == '-' && !argv[1][1])) | |
706 BIN_ASSIGN(fp = stdin, !revert); | |
707 else | |
708 { | |
709 if ((fp = fopen(argv[1], BIN_READ(!revert))) == NULL) | |
710 { | |
711 fprintf(stderr,"%s: ", pname); | |
712 perror(argv[1]); | |
713 return 2; | |
714 } | |
715 } | |
716 | |
717 if (argc < 3 || (argv[2][0] == '-' && !argv[2][1])) | |
718 BIN_ASSIGN(fpo = stdout, revert); | |
719 else | |
720 { | |
721 int fd; | |
722 int mode = revert ? O_WRONLY : (O_TRUNC|O_WRONLY); | |
723 | |
724 if (((fd = OPEN(argv[2], mode | BIN_CREAT(revert), 0666)) < 0) || | |
725 (fpo = fdopen(fd, BIN_WRITE(revert))) == NULL) | |
726 { | |
727 fprintf(stderr, "%s: ", pname); | |
728 perror(argv[2]); | |
729 return 3; | |
730 } | |
731 rewind(fpo); | |
732 } | |
733 | |
734 if (revert) | |
735 { | |
736 if (hextype && (hextype != HEX_POSTSCRIPT)) | |
26366
d227481dbe8e
patch 8.2.3714: some unused assignments and ugly code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26298
diff
changeset
|
737 error_exit(-1, "Sorry, cannot revert this type of hexdump"); |
26040
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
738 return huntype(fp, fpo, cols, hextype, |
7 | 739 negseek ? -seekoff : seekoff); |
740 } | |
741 | |
742 if (seekoff || negseek || !relseek) | |
743 { | |
744 #ifdef TRY_SEEK | |
745 if (relseek) | |
26123
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
746 e = fseek(fp, negseek ? -seekoff : seekoff, SEEK_CUR); |
7 | 747 else |
26123
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
748 e = fseek(fp, negseek ? -seekoff : seekoff, |
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
749 negseek ? SEEK_END : SEEK_SET); |
7 | 750 if (e < 0 && negseek) |
26366
d227481dbe8e
patch 8.2.3714: some unused assignments and ugly code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26298
diff
changeset
|
751 error_exit(4, "Sorry, cannot seek."); |
7 | 752 if (e >= 0) |
753 seekoff = ftell(fp); | |
754 else | |
755 #endif | |
756 { | |
757 long s = seekoff; | |
758 | |
759 while (s--) | |
26366
d227481dbe8e
patch 8.2.3714: some unused assignments and ugly code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26298
diff
changeset
|
760 if (getc_or_die(fp) == EOF) |
2754 | 761 { |
26366
d227481dbe8e
patch 8.2.3714: some unused assignments and ugly code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26298
diff
changeset
|
762 error_exit(4, "Sorry, cannot seek."); |
2754 | 763 } |
7 | 764 } |
765 } | |
766 | |
767 if (hextype == HEX_CINCLUDE) | |
768 { | |
29330
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
769 /* A user-set variable name overrides fp == stdin */ |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
770 if (varname == NULL && fp != stdin) |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
771 varname = argv[1]; |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
772 |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
773 if (varname != NULL) |
7 | 774 { |
29330
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
775 FPRINTF_OR_DIE((fpo, "unsigned char %s", isdigit((int)varname[0]) ? "__" : "")); |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
776 for (e = 0; (c = varname[e]) != 0; e++) |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
777 putc_or_die(isalnum(c) ? CONDITIONAL_CAPITALIZE(c) : '_', fpo); |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
778 fputs_or_die("[] = {\n", fpo); |
7 | 779 } |
780 | |
781 p = 0; | |
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
782 while ((length < 0 || p < length) && (c = getc_or_die(fp)) != EOF) |
7 | 783 { |
26366
d227481dbe8e
patch 8.2.3714: some unused assignments and ugly code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26298
diff
changeset
|
784 FPRINTF_OR_DIE((fpo, (hexx == hexxa) ? "%s0x%02x" : "%s0X%02X", |
d227481dbe8e
patch 8.2.3714: some unused assignments and ugly code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26298
diff
changeset
|
785 (p % cols) ? ", " : (!p ? " " : ",\n "), c)); |
7 | 786 p++; |
787 } | |
788 | |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
789 if (p) |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
790 fputs_or_die("\n", fpo); |
7 | 791 |
29330
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
792 if (varname != NULL) |
7 | 793 { |
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
794 fputs_or_die("};\n", fpo); |
29330
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
795 FPRINTF_OR_DIE((fpo, "unsigned int %s", isdigit((int)varname[0]) ? "__" : "")); |
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
796 for (e = 0; (c = varname[e]) != 0; e++) |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
797 putc_or_die(isalnum(c) ? CONDITIONAL_CAPITALIZE(c) : '_', fpo); |
26366
d227481dbe8e
patch 8.2.3714: some unused assignments and ugly code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26298
diff
changeset
|
798 FPRINTF_OR_DIE((fpo, "_%s = %d;\n", capitalize ? "LEN" : "len", p)); |
7 | 799 } |
800 | |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
801 fclose_or_die(fp, fpo); |
7 | 802 return 0; |
803 } | |
804 | |
805 if (hextype == HEX_POSTSCRIPT) | |
806 { | |
807 p = cols; | |
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
808 while ((length < 0 || n < length) && (e = getc_or_die(fp)) != EOF) |
7 | 809 { |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
810 putc_or_die(hexx[(e >> 4) & 0xf], fpo); |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
811 putc_or_die(hexx[e & 0xf], fpo); |
7 | 812 n++; |
27118
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
813 if (cols > 0 && !--p) |
7 | 814 { |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
815 putc_or_die('\n', fpo); |
7 | 816 p = cols; |
817 } | |
818 } | |
27118
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
819 if (cols == 0 || p < cols) |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
820 putc_or_die('\n', fpo); |
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
821 fclose_or_die(fp, fpo); |
7 | 822 return 0; |
823 } | |
824 | |
6655 | 825 /* hextype: HEX_NORMAL or HEX_BITS or HEX_LITTLEENDIAN */ |
7 | 826 |
6655 | 827 if (hextype != HEX_BITS) |
7 | 828 grplen = octspergrp + octspergrp + 1; /* chars per octet group */ |
829 else /* hextype == HEX_BITS */ | |
830 grplen = 8 * octspergrp + 1; | |
831 | |
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
832 while ((length < 0 || n < length) && (e = getc_or_die(fp)) != EOF) |
7 | 833 { |
26254
3a13efec0016
patch 8.2.3658: duplicate code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26220
diff
changeset
|
834 int x; |
3a13efec0016
patch 8.2.3658: duplicate code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26220
diff
changeset
|
835 |
7 | 836 if (p == 0) |
837 { | |
26220
d757c9c87a58
patch 8.2.3641: xxd code has duplicate expressions
Bram Moolenaar <Bram@vim.org>
parents:
26123
diff
changeset
|
838 addrlen = sprintf(l, decimal_offset ? "%08ld:" : "%08lx:", |
20601
75ef263d09d6
patch 8.2.0854: xxd cannot show offset as a decimal number
Bram Moolenaar <Bram@vim.org>
parents:
19195
diff
changeset
|
839 ((unsigned long)(n + seekoff + displayoff))); |
15693
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
840 for (c = addrlen; c < LLEN; l[c++] = ' '); |
7 | 841 } |
26254
3a13efec0016
patch 8.2.3658: duplicate code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26220
diff
changeset
|
842 x = hextype == HEX_LITTLEENDIAN ? p ^ (octspergrp-1) : p; |
3a13efec0016
patch 8.2.3658: duplicate code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26220
diff
changeset
|
843 c = addrlen + 1 + (grplen * x) / octspergrp; |
26220
d757c9c87a58
patch 8.2.3641: xxd code has duplicate expressions
Bram Moolenaar <Bram@vim.org>
parents:
26123
diff
changeset
|
844 if (hextype == HEX_NORMAL || hextype == HEX_LITTLEENDIAN) |
7 | 845 { |
26254
3a13efec0016
patch 8.2.3658: duplicate code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26220
diff
changeset
|
846 l[c] = hexx[(e >> 4) & 0xf]; |
26220
d757c9c87a58
patch 8.2.3641: xxd code has duplicate expressions
Bram Moolenaar <Bram@vim.org>
parents:
26123
diff
changeset
|
847 l[++c] = hexx[e & 0xf]; |
7 | 848 } |
849 else /* hextype == HEX_BITS */ | |
850 { | |
851 int i; | |
852 for (i = 7; i >= 0; i--) | |
26254
3a13efec0016
patch 8.2.3658: duplicate code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26220
diff
changeset
|
853 l[c++] = (e & (1 << i)) ? '1' : '0'; |
7 | 854 } |
13326
7f1a5e8d8289
patch 8.0.1537: xxd does not skip NUL lines when using ebcdic
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
855 if (e) |
7f1a5e8d8289
patch 8.0.1537: xxd does not skip NUL lines when using ebcdic
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
856 nonzero++; |
7 | 857 if (ebcdic) |
858 e = (e < 64) ? '.' : etoa64[e-64]; | |
1452 | 859 /* When changing this update definition of LLEN above. */ |
26254
3a13efec0016
patch 8.2.3658: duplicate code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26220
diff
changeset
|
860 c = addrlen + 3 + (grplen * cols - 1)/octspergrp + p; |
3a13efec0016
patch 8.2.3658: duplicate code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26220
diff
changeset
|
861 l[c++] = |
7 | 862 #ifdef __MVS__ |
863 (e >= 64) | |
864 #else | |
865 (e > 31 && e < 127) | |
866 #endif | |
867 ? e : '.'; | |
868 n++; | |
869 if (++p == cols) | |
870 { | |
26254
3a13efec0016
patch 8.2.3658: duplicate code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26220
diff
changeset
|
871 l[c] = '\n'; |
3a13efec0016
patch 8.2.3658: duplicate code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26220
diff
changeset
|
872 l[++c] = '\0'; |
7 | 873 xxdline(fpo, l, autoskip ? nonzero : 1); |
874 nonzero = 0; | |
875 p = 0; | |
876 } | |
877 } | |
878 if (p) | |
879 { | |
26254
3a13efec0016
patch 8.2.3658: duplicate code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26220
diff
changeset
|
880 l[c] = '\n'; |
3a13efec0016
patch 8.2.3658: duplicate code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26220
diff
changeset
|
881 l[++c] = '\0'; |
7 | 882 xxdline(fpo, l, 1); |
883 } | |
884 else if (autoskip) | |
1197 | 885 xxdline(fpo, l, -1); /* last chance to flush out suppressed lines */ |
7 | 886 |
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
887 fclose_or_die(fp, fpo); |
7 | 888 return 0; |
889 } | |
2752 | 890 |
891 /* vi:set ts=8 sw=4 sts=2 cino+={2 cino+=n-2 : */ |