Mercurial > vim
annotate src/xxd/xxd.c @ 34165:38965f1cc21a v9.1.0041
patch 9.1.0041: xxd -i may generate incorrect C statements
Commit: https://github.com/vim/vim/commit/7062be13129985fe297b9a8e59c57b8f0db61b8f
Author: Kuratius <Kuratius@gmx.net>
Date: Wed Jan 17 18:37:32 2024 +0100
patch 9.1.0041: xxd -i may generate incorrect C statements
Problem: xxd -i may generate incorrect C statements
(Kuratius)
Solution: xxd: Make size type returned by -i option compatible
with C standard by using type size_t instead of
unsigned int (Kuratius)
Also change affected tests to now correctly expect size_t's
fixes: #13876
closes: #13880
Signed-off-by: Kuratius <Kuratius@gmx.net>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 17 Jan 2024 22:45:02 +0100 |
| parents | 941f7dc1c7dd |
| children | 5aee5855ccfe |
| 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 |
|
33094
e1a219f47e3a
patch 9.0.1832: xxd: reporting wrong version
Christian Brabandt <cb@256bit.org>
parents:
33083
diff
changeset
|
59 * 31.08.2023 -R never/auto/always prints colored output |
|
33496
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
60 * 06.10.2023 enable -r -b to reverse bit dumps |
|
34118
941f7dc1c7dd
patch 9.1.0023: xxd: few problems with EBCDIC for z/OS (MVS)
Christian Brabandt <cb@256bit.org>
parents:
34074
diff
changeset
|
61 * 12.01.2024 disable auto-conversion for z/OS (MVS) |
|
34165
38965f1cc21a
patch 9.1.0041: xxd -i may generate incorrect C statements
Christian Brabandt <cb@256bit.org>
parents:
34118
diff
changeset
|
62 * 17.01.2024 use size_t instead of usigned int for code-generation (-i), #13876 |
| 7 | 63 * |
|
25076
5690cf66ee07
patch 8.2.3075: xxd always reports an old version string
Bram Moolenaar <Bram@vim.org>
parents:
20601
diff
changeset
|
64 * (c) 1990-1998 by Juergen Weigert (jnweiger@gmail.com) |
| 7 | 65 * |
| 6973 | 66 * I hereby grant permission to distribute and use xxd |
| 67 * under X11-MIT or GPL-2.0 (at the user's choice). | |
| 68 * | |
|
25076
5690cf66ee07
patch 8.2.3075: xxd always reports an old version string
Bram Moolenaar <Bram@vim.org>
parents:
20601
diff
changeset
|
69 * Contributions by Bram Moolenaar et al. |
| 7 | 70 */ |
| 714 | 71 |
| 72 /* Visual Studio 2005 has 'deprecated' many of the standard CRT functions */ | |
| 73 #if _MSC_VER >= 1400 | |
| 74 # define _CRT_SECURE_NO_DEPRECATE | |
| 75 # define _CRT_NONSTDC_NO_DEPRECATE | |
| 76 #endif | |
|
15963
2d8fa45b341d
patch 8.1.0987: unnecessary condition in #ifdef
Bram Moolenaar <Bram@vim.org>
parents:
15695
diff
changeset
|
77 #if !defined(CYGWIN) && defined(__CYGWIN__) |
| 1912 | 78 # define CYGWIN |
| 79 #endif | |
| 714 | 80 |
|
26859
b9ede1952107
patch 8.2.3958: build failure compiling xxd with "-std=c2x"
Bram Moolenaar <Bram@vim.org>
parents:
26366
diff
changeset
|
81 #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
|
82 # 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
|
83 #endif |
|
b9ede1952107
patch 8.2.3958: build failure compiling xxd with "-std=c2x"
Bram Moolenaar <Bram@vim.org>
parents:
26366
diff
changeset
|
84 |
| 7 | 85 #include <stdio.h> |
| 86 #ifdef VAXC | |
| 87 # include <file.h> | |
| 88 #else | |
| 89 # include <fcntl.h> | |
| 90 #endif | |
|
16606
7e733046db1d
patch 8.1.1306: Borland support is outdated and doesn't work
Bram Moolenaar <Bram@vim.org>
parents:
15963
diff
changeset
|
91 #if defined(WIN32) || defined(CYGWIN) |
| 7 | 92 # include <io.h> /* for setmode() */ |
|
33656
38b0ea4d17cc
patch 9.0.2067: xxd: coloring was disabled on Cygwin
Christian Brabandt <cb@256bit.org>
parents:
33654
diff
changeset
|
93 #endif |
|
38b0ea4d17cc
patch 9.0.2067: xxd: coloring was disabled on Cygwin
Christian Brabandt <cb@256bit.org>
parents:
33654
diff
changeset
|
94 #ifdef WIN32 |
|
33099
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
95 # include <windows.h> |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
96 #endif |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
97 #ifdef UNIX |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
98 # include <unistd.h> |
| 7 | 99 #endif |
| 100 #include <stdlib.h> | |
|
34074
1629cc65d78d
patch 9.1.0006: is*() and to*() function may be unsafe
Christian Brabandt <cb@256bit.org>
parents:
33656
diff
changeset
|
101 #include <string.h> |
|
1629cc65d78d
patch 9.1.0006: is*() and to*() function may be unsafe
Christian Brabandt <cb@256bit.org>
parents:
33656
diff
changeset
|
102 #include <ctype.h> |
|
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
|
103 #include <limits.h> |
| 7 | 104 #if __MWERKS__ && !defined(BEBOX) |
| 105 # include <unix.h> /* for fdopen() on MAC */ | |
| 106 #endif | |
| 107 | |
| 108 | |
| 109 /* This corrects the problem of missing prototypes for certain functions | |
| 110 * in some GNU installations (e.g. SunOS 4.1.x). | |
| 111 * Darren Hiebert <darren@hmi.com> (sparc-sun-sunos4.1.3_U1/2.7.2.2) | |
| 112 */ | |
| 113 #if defined(__GNUC__) && defined(__STDC__) | |
| 114 # ifndef __USE_FIXED_PROTOTYPES__ | |
| 115 # define __USE_FIXED_PROTOTYPES__ | |
| 116 # endif | |
| 117 #endif | |
| 118 | |
| 119 #ifndef __USE_FIXED_PROTOTYPES__ | |
| 120 /* | |
| 121 * This is historic and works only if the compiler really has no prototypes: | |
| 122 * | |
| 123 * Include prototypes for Sun OS 4.x, when using an ANSI compiler. | |
| 124 * FILE is defined on OS 4.x, not on 5.x (Solaris). | |
| 125 * if __SVR4 is defined (some Solaris versions), don't include this. | |
| 126 */ | |
| 127 #if defined(sun) && defined(FILE) && !defined(__SVR4) && defined(__STDC__) | |
| 128 # define __P(a) a | |
| 129 /* excerpt from my sun_stdlib.h */ | |
| 130 extern int fprintf __P((FILE *, char *, ...)); | |
| 131 extern int fputs __P((char *, FILE *)); | |
| 132 extern int _flsbuf __P((unsigned char, FILE *)); | |
| 133 extern int _filbuf __P((FILE *)); | |
| 134 extern int fflush __P((FILE *)); | |
| 135 extern int fclose __P((FILE *)); | |
| 136 extern int fseek __P((FILE *, long, int)); | |
| 137 extern int rewind __P((FILE *)); | |
| 138 | |
| 139 extern void perror __P((char *)); | |
| 140 # endif | |
| 141 #endif | |
| 142 | |
|
34165
38965f1cc21a
patch 9.1.0041: xxd -i may generate incorrect C statements
Christian Brabandt <cb@256bit.org>
parents:
34118
diff
changeset
|
143 char version[] = "xxd 2024-01-17 by Juergen Weigert et al."; |
| 7 | 144 #ifdef WIN32 |
| 145 char osver[] = " (Win32)"; | |
| 146 #else | |
| 147 char osver[] = ""; | |
| 148 #endif | |
| 149 | |
|
9536
b2aada04d84e
commit https://github.com/vim/vim/commit/a06ecab7a5159e744448ace731036f0dc5f87dd4
Christian Brabandt <cb@256bit.org>
parents:
7837
diff
changeset
|
150 #if defined(WIN32) |
| 7 | 151 # define BIN_READ(yes) ((yes) ? "rb" : "rt") |
| 152 # define BIN_WRITE(yes) ((yes) ? "wb" : "wt") | |
| 153 # define BIN_CREAT(yes) ((yes) ? (O_CREAT|O_BINARY) : O_CREAT) | |
| 154 # define BIN_ASSIGN(fp, yes) setmode(fileno(fp), (yes) ? O_BINARY : O_TEXT) | |
| 602 | 155 # define PATH_SEP '\\' |
| 156 #elif defined(CYGWIN) | |
| 157 # define BIN_READ(yes) ((yes) ? "rb" : "rt") | |
| 158 # define BIN_WRITE(yes) ((yes) ? "wb" : "w") | |
| 159 # define BIN_CREAT(yes) ((yes) ? (O_CREAT|O_BINARY) : O_CREAT) | |
| 160 # define BIN_ASSIGN(fp, yes) ((yes) ? (void) setmode(fileno(fp), O_BINARY) : (void) (fp)) | |
| 161 # define PATH_SEP '/' | |
| 7 | 162 #else |
| 163 # ifdef VMS | |
| 164 # define BIN_READ(dummy) "r" | |
| 165 # define BIN_WRITE(dummy) "w" | |
| 166 # define BIN_CREAT(dummy) O_CREAT | |
| 167 # define BIN_ASSIGN(fp, dummy) fp | |
| 168 # define PATH_SEP ']' | |
| 169 # define FILE_SEP '.' | |
| 170 # else | |
| 171 # define BIN_READ(dummy) "r" | |
| 172 # define BIN_WRITE(dummy) "w" | |
| 173 # define BIN_CREAT(dummy) O_CREAT | |
| 174 # define BIN_ASSIGN(fp, dummy) fp | |
| 175 # define PATH_SEP '/' | |
| 176 # endif | |
| 177 #endif | |
| 178 | |
| 179 /* open has only to arguments on the Mac */ | |
| 180 #if __MWERKS__ | |
| 181 # define OPEN(name, mode, umask) open(name, mode) | |
| 182 #else | |
| 183 # define OPEN(name, mode, umask) open(name, mode, umask) | |
| 184 #endif | |
| 185 | |
| 186 #ifdef AMIGA | |
| 187 # define STRNCMP(s1, s2, l) strncmp(s1, s2, (size_t)l) | |
| 188 #else | |
| 189 # define STRNCMP(s1, s2, l) strncmp(s1, s2, l) | |
| 190 #endif | |
| 191 | |
| 192 #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
|
193 # if defined(__STDC__) || defined(WIN32) |
| 7 | 194 # define __P(a) a |
| 195 # else | |
| 196 # define __P(a) () | |
| 197 # endif | |
| 198 #endif | |
| 199 | |
| 200 #define TRY_SEEK /* attempt to use lseek, or skip forward by reading */ | |
| 201 #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
|
202 #define LLEN ((2*(int)sizeof(unsigned long)) + 4 + (9*COLS-1) + COLS + 2) |
| 7 | 203 |
| 204 char hexxa[] = "0123456789abcdef0123456789ABCDEF", *hexx = hexxa; | |
| 205 | |
| 206 /* the different hextypes known by this program: */ | |
| 207 #define HEX_NORMAL 0 | |
| 208 #define HEX_POSTSCRIPT 1 | |
| 209 #define HEX_CINCLUDE 2 | |
| 210 #define HEX_BITS 3 /* not hex a dump, but bits: 01111001 */ | |
| 6655 | 211 #define HEX_LITTLEENDIAN 4 |
| 7 | 212 |
|
34074
1629cc65d78d
patch 9.1.0006: is*() and to*() function may be unsafe
Christian Brabandt <cb@256bit.org>
parents:
33656
diff
changeset
|
213 #define CONDITIONAL_CAPITALIZE(c) (capitalize ? toupper((unsigned char)(c)) : (c)) |
|
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
|
214 |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
215 #define COLOR_PROLOGUE \ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
216 l[c++] = '\033'; \ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
217 l[c++] = '['; \ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
218 l[c++] = '1'; \ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
219 l[c++] = ';'; \ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
220 l[c++] = '3'; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
221 |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
222 #define COLOR_EPILOGUE \ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
223 l[c++] = '\033'; \ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
224 l[c++] = '['; \ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
225 l[c++] = '0'; \ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
226 l[c++] = 'm'; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
227 #define COLOR_RED '1' |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
228 #define COLOR_GREEN '2' |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
229 #define COLOR_YELLOW '3' |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
230 #define COLOR_BLUE '4' |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
231 #define COLOR_WHITE '7' |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
232 |
| 2752 | 233 static char *pname; |
| 234 | |
| 235 static void | |
|
7837
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
236 exit_with_usage(void) |
| 7 | 237 { |
| 238 fprintf(stderr, "Usage:\n %s [options] [infile [outfile]]\n", pname); | |
| 239 fprintf(stderr, " or\n %s -r [-s [-]offset] [-c cols] [-ps] [infile [outfile]]\n", pname); | |
| 240 fprintf(stderr, "Options:\n"); | |
| 241 fprintf(stderr, " -a toggle autoskip: A single '*' replaces nul-lines. Default off.\n"); | |
|
33496
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
242 fprintf(stderr, " -b binary digit dump (incompatible with -ps,-i). 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
|
243 fprintf(stderr, " -C capitalize variable names in C include file style (-i).\n"); |
| 7 | 244 fprintf(stderr, " -c cols format <cols> octets per line. Default 16 (-i: 12, -ps: 30).\n"); |
| 245 fprintf(stderr, " -E show characters in EBCDIC. Default ASCII.\n"); | |
| 6655 | 246 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
|
247 fprintf(stderr, " -g bytes number of octets per group in normal output. Default 2 (-e: 4).\n"); |
| 7 | 248 fprintf(stderr, " -h print this summary.\n"); |
| 249 fprintf(stderr, " -i output in C include file style.\n"); | |
| 250 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
|
251 fprintf(stderr, " -n name set the variable name used in C include output (-i).\n"); |
| 6655 | 252 fprintf(stderr, " -o off add <off> to the displayed file position.\n"); |
| 7 | 253 fprintf(stderr, " -ps output in postscript plain hexdump style.\n"); |
| 254 fprintf(stderr, " -r reverse operation: convert (or patch) hexdump into binary.\n"); | |
| 255 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
|
256 fprintf(stderr, " -d show offset in decimal instead of hex.\n"); |
| 7 | 257 fprintf(stderr, " -s %sseek start at <seek> bytes abs. %sinfile offset.\n", |
| 258 #ifdef TRY_SEEK | |
| 259 "[+][-]", "(or +: rel.) "); | |
| 260 #else | |
| 261 "", ""); | |
| 262 #endif | |
| 263 fprintf(stderr, " -u use upper case hex letters.\n"); | |
|
33099
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
264 fprintf(stderr, " -R when colorize the output; <when> can be 'always', 'auto' or 'never'. Default: 'auto'.\n"), |
| 7 | 265 fprintf(stderr, " -v show version: \"%s%s\".\n", version, osver); |
| 266 exit(1); | |
| 267 } | |
| 268 | |
| 2752 | 269 static void |
|
26040
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
270 perror_exit(int ret) |
| 2752 | 271 { |
| 272 fprintf(stderr, "%s: ", pname); | |
| 273 perror(NULL); | |
| 274 exit(ret); | |
| 275 } | |
| 276 | |
|
26040
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
277 static void |
|
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
278 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
|
279 { |
|
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
280 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
|
281 exit(ret); |
|
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
282 } |
|
3c36cc7bd7a8
patch 8.2.3554: xxd has various way to exit
Bram Moolenaar <Bram@vim.org>
parents:
26036
diff
changeset
|
283 |
|
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
284 static int |
|
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
285 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
|
286 { |
|
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
287 int c = getc(fpi); |
|
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
288 if (c == EOF && ferror(fpi)) |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
289 perror_exit(2); |
|
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
290 return c; |
|
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
291 } |
|
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 static void |
|
26282
71bdede8afd8
patch 8.2.3672: build failure with unsigned char
Bram Moolenaar <Bram@vim.org>
parents:
26278
diff
changeset
|
294 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
|
295 { |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
296 if (putc(c, fpo) == EOF) |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
297 perror_exit(3); |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
298 } |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
299 |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
300 static void |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
301 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
|
302 { |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
303 if (fputs(s, fpo) == EOF) |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
304 perror_exit(3); |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
305 } |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
306 |
|
26366
d227481dbe8e
patch 8.2.3714: some unused assignments and ugly code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26298
diff
changeset
|
307 /* 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
|
308 #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
|
309 |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
310 static void |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
311 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
|
312 { |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
313 if (fclose(fpo) != 0) |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
314 perror_exit(3); |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
315 if (fclose(fpi) != 0) |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
316 perror_exit(2); |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
317 } |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
318 |
| 7 | 319 /* |
|
26123
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
320 * 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
|
321 * 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
|
322 */ |
|
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
323 static int |
|
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
324 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
|
325 { |
|
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
326 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
|
327 : (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
|
328 : (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
|
329 : -1; |
|
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
330 } |
|
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
331 |
|
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
332 /* |
|
33496
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
333 * If "c" is a bin digit, return the value. |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
334 * Otherwise return -1. |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
335 */ |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
336 static int |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
337 parse_bin_digit(int c) |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
338 { |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
339 return (c >= '0' && c <= '1') ? c - '0' |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
340 : -1; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
341 } |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
342 |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
343 /* |
|
26123
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
344 * 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
|
345 * 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
|
346 * 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
|
347 */ |
|
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
348 static int |
|
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
349 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
|
350 { |
|
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
351 while (c != '\n' && c != EOF) |
|
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
352 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
|
353 return c; |
|
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
354 } |
|
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
355 |
|
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
356 /* |
| 7 | 357 * Max. cols binary characters are decoded from the input stream per line. |
| 358 * Two adjacent garbage characters after evaluated data delimit valid data. | |
| 359 * Everything up to the next newline is discarded. | |
| 360 * | |
| 361 * The name is historic and came from 'undo type opt h'. | |
| 362 */ | |
| 2752 | 363 static int |
|
7837
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
364 huntype( |
|
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
365 FILE *fpi, |
|
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
366 FILE *fpo, |
|
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
367 int cols, |
|
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
368 int hextype, |
|
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
369 long base_off) |
| 7 | 370 { |
|
33509
e083de1ef4b4
patch 9.0.2003: xxd: compilation warning
Christian Brabandt <cb@256bit.org>
parents:
33496
diff
changeset
|
371 int c, ign_garb = 1, n1 = -1, n2 = 0, n3 = 0, p = cols, bt = 0, b = 0, bcnt = 0; |
| 7 | 372 long have_off = 0, want_off = 0; |
| 373 | |
| 374 rewind(fpi); | |
| 375 | |
| 376 while ((c = getc(fpi)) != EOF) | |
| 377 { | |
| 378 if (c == '\r') /* Doze style input file? */ | |
| 379 continue; | |
| 380 | |
|
2083
24eb7921b8f0
updated for version 7.2.367
Bram Moolenaar <bram@zimbu.org>
parents:
1912
diff
changeset
|
381 /* 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
|
382 * 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
|
383 * use it for PostScript format. */ |
|
24eb7921b8f0
updated for version 7.2.367
Bram Moolenaar <bram@zimbu.org>
parents:
1912
diff
changeset
|
384 if (hextype == HEX_POSTSCRIPT && (c == ' ' || c == '\n' || c == '\t')) |
| 856 | 385 continue; |
| 809 | 386 |
|
33496
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
387 if (hextype == HEX_NORMAL || hextype == HEX_POSTSCRIPT) |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
388 { |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
389 n3 = n2; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
390 n2 = n1; |
| 7 | 391 |
|
33496
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
392 n1 = parse_hex_digit(c); |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
393 if (n1 == -1 && ign_garb) |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
394 continue; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
395 } |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
396 else /* HEX_BITS */ |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
397 { |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
398 n1 = parse_hex_digit(c); |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
399 if (n1 == -1 && ign_garb) |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
400 continue; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
401 |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
402 bt = parse_bin_digit(c); |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
403 if (bt != -1) |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
404 { |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
405 b = ((b << 1) | bt); |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
406 ++bcnt; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
407 } |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
408 } |
| 7 | 409 |
| 410 ign_garb = 0; | |
| 411 | |
|
33496
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
412 if ((hextype != HEX_POSTSCRIPT) && (p >= cols)) |
| 7 | 413 { |
|
33496
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
414 if (hextype == HEX_NORMAL) |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
415 { |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
416 if (n1 < 0) |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
417 { |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
418 p = 0; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
419 continue; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
420 } |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
421 want_off = (want_off << 4) | n1; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
422 } |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
423 else /* HEX_BITS */ |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
424 { |
|
33654
a3616b5f5b25
patch 9.0.2066: xxd: corrupting files when reversing bit dumps
Christian Brabandt <cb@256bit.org>
parents:
33509
diff
changeset
|
425 if (n1 < 0) |
|
a3616b5f5b25
patch 9.0.2066: xxd: corrupting files when reversing bit dumps
Christian Brabandt <cb@256bit.org>
parents:
33509
diff
changeset
|
426 { |
|
a3616b5f5b25
patch 9.0.2066: xxd: corrupting files when reversing bit dumps
Christian Brabandt <cb@256bit.org>
parents:
33509
diff
changeset
|
427 p = 0; |
|
33496
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
428 bcnt = 0; |
|
33654
a3616b5f5b25
patch 9.0.2066: xxd: corrupting files when reversing bit dumps
Christian Brabandt <cb@256bit.org>
parents:
33509
diff
changeset
|
429 continue; |
|
a3616b5f5b25
patch 9.0.2066: xxd: corrupting files when reversing bit dumps
Christian Brabandt <cb@256bit.org>
parents:
33509
diff
changeset
|
430 } |
|
a3616b5f5b25
patch 9.0.2066: xxd: corrupting files when reversing bit dumps
Christian Brabandt <cb@256bit.org>
parents:
33509
diff
changeset
|
431 want_off = (want_off << 4) | n1; |
|
33496
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
432 } |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
433 continue; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
434 } |
| 7 | 435 |
| 436 if (base_off + want_off != have_off) | |
| 437 { | |
| 2752 | 438 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
|
439 perror_exit(3); |
| 7 | 440 #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
|
441 if (fseek(fpo, base_off + want_off - have_off, SEEK_CUR) >= 0) |
| 7 | 442 have_off = base_off + want_off; |
| 443 #endif | |
| 444 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
|
445 error_exit(5, "Sorry, cannot seek backwards."); |
| 7 | 446 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
|
447 putc_or_die(0, fpo); |
| 7 | 448 } |
| 449 | |
|
33496
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
450 if (hextype == HEX_NORMAL || hextype == HEX_POSTSCRIPT) |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
451 { |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
452 if (n2 >= 0 && n1 >= 0) |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
453 { |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
454 putc_or_die((n2 << 4) | n1, fpo); |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
455 have_off++; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
456 want_off++; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
457 n1 = -1; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
458 if (!hextype && (++p >= cols)) |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
459 /* skip the rest of the line as garbage */ |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
460 c = skip_to_eol(fpi, c); |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
461 } |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
462 else if (n1 < 0 && n2 < 0 && n3 < 0) |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
463 /* already stumbled into garbage, skip line, wait and see */ |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
464 c = skip_to_eol(fpi, c); |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
465 } |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
466 else /* HEX_BITS */ |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
467 { |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
468 if (bcnt == 8) |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
469 { |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
470 putc_or_die(b, fpo); |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
471 have_off++; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
472 want_off++; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
473 b = 0; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
474 bcnt = 0; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
475 if (++p >= cols) |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
476 /* skip the rest of the line as garbage */ |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
477 c = skip_to_eol(fpi, c); |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
478 } |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
479 } |
|
26123
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
480 |
|
26036
c8165ec9dcad
patch 8.2.3552: xxd revert does not handle end of line correctly
Bram Moolenaar <Bram@vim.org>
parents:
26000
diff
changeset
|
481 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
|
482 { |
|
33496
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
483 if (hextype == HEX_NORMAL || hextype == HEX_BITS) |
| 7 | 484 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
|
485 p = cols; |
| 7 | 486 ign_garb = 1; |
| 487 } | |
| 488 } | |
| 2752 | 489 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
|
490 perror_exit(3); |
| 7 | 491 #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
|
492 fseek(fpo, 0L, SEEK_END); |
| 7 | 493 #endif |
|
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
494 fclose_or_die(fpi, fpo); |
| 7 | 495 return 0; |
| 496 } | |
| 497 | |
| 498 /* | |
| 499 * Print line l. If nz is false, xxdline regards the line a line of | |
| 500 * zeroes. If there are three or more consecutive lines of zeroes, | |
| 501 * they are replaced by a single '*' character. | |
| 502 * | |
| 503 * If the output ends with more than two lines of zeroes, you | |
| 504 * should call xxdline again with l being the last line and nz | |
| 505 * negative. This ensures that the last line is shown even when | |
| 506 * it is all zeroes. | |
| 507 * | |
| 508 * If nz is always positive, lines are never suppressed. | |
| 509 */ | |
| 2752 | 510 static void |
|
7837
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
511 xxdline(FILE *fp, char *l, int nz) |
| 7 | 512 { |
| 513 static char z[LLEN+1]; | |
| 514 static int zero_seen = 0; | |
| 515 | |
| 516 if (!nz && zero_seen == 1) | |
| 517 strcpy(z, l); | |
| 518 | |
| 519 if (nz || !zero_seen++) | |
| 520 { | |
| 521 if (nz) | |
| 522 { | |
| 523 if (nz < 0) | |
| 524 zero_seen--; | |
| 525 if (zero_seen == 2) | |
|
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
526 fputs_or_die(z, fp); |
| 7 | 527 if (zero_seen > 2) |
|
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
528 fputs_or_die("*\n", fp); |
| 7 | 529 } |
| 530 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
|
531 fputs_or_die(l, fp); |
| 7 | 532 if (nz) |
| 533 zero_seen = 0; | |
| 534 } | |
| 535 } | |
| 536 | |
| 537 /* This is an EBCDIC to ASCII conversion table */ | |
| 538 /* from a proposed BTL standard April 16, 1979 */ | |
| 539 static unsigned char etoa64[] = | |
| 540 { | |
| 541 0040,0240,0241,0242,0243,0244,0245,0246, | |
| 542 0247,0250,0325,0056,0074,0050,0053,0174, | |
| 543 0046,0251,0252,0253,0254,0255,0256,0257, | |
| 544 0260,0261,0041,0044,0052,0051,0073,0176, | |
| 545 0055,0057,0262,0263,0264,0265,0266,0267, | |
| 546 0270,0271,0313,0054,0045,0137,0076,0077, | |
| 547 0272,0273,0274,0275,0276,0277,0300,0301, | |
| 548 0302,0140,0072,0043,0100,0047,0075,0042, | |
| 549 0303,0141,0142,0143,0144,0145,0146,0147, | |
| 550 0150,0151,0304,0305,0306,0307,0310,0311, | |
| 551 0312,0152,0153,0154,0155,0156,0157,0160, | |
| 552 0161,0162,0136,0314,0315,0316,0317,0320, | |
| 553 0321,0345,0163,0164,0165,0166,0167,0170, | |
| 554 0171,0172,0322,0323,0324,0133,0326,0327, | |
| 555 0330,0331,0332,0333,0334,0335,0336,0337, | |
| 556 0340,0341,0342,0343,0344,0135,0346,0347, | |
| 557 0173,0101,0102,0103,0104,0105,0106,0107, | |
| 558 0110,0111,0350,0351,0352,0353,0354,0355, | |
| 559 0175,0112,0113,0114,0115,0116,0117,0120, | |
| 560 0121,0122,0356,0357,0360,0361,0362,0363, | |
| 561 0134,0237,0123,0124,0125,0126,0127,0130, | |
| 562 0131,0132,0364,0365,0366,0367,0370,0371, | |
| 563 0060,0061,0062,0063,0064,0065,0066,0067, | |
| 564 0070,0071,0372,0373,0374,0375,0376,0377 | |
| 565 }; | |
| 566 | |
|
33099
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
567 static void |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
568 begin_coloring_char (char *l, int *c, int e, int ebcdic) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
569 { |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
570 if (ebcdic) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
571 { |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
572 if ((e >= 75 && e <= 80) || (e >= 90 && e <= 97) || |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
573 (e >= 107 && e <= 111) || (e >= 121 && e <= 127) || |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
574 (e >= 129 && e <= 137) || (e >= 145 && e <= 154) || |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
575 (e >= 162 && e <= 169) || (e >= 192 && e <= 201) || |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
576 (e >= 208 && e <= 217) || (e >= 226 && e <= 233) || |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
577 (e >= 240 && e <= 249) || (e == 189) || (e == 64) || |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
578 (e == 173) || (e == 224) ) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
579 l[(*c)++] = COLOR_GREEN; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
580 |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
581 else if (e == 37 || e == 13 || e == 5) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
582 l[(*c)++] = COLOR_YELLOW; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
583 else if (e == 0) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
584 l[(*c)++] = COLOR_WHITE; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
585 else if (e == 255) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
586 l[(*c)++] = COLOR_BLUE; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
587 else |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
588 l[(*c)++] = COLOR_RED; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
589 } |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
590 else /* ASCII */ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
591 { |
|
34118
941f7dc1c7dd
patch 9.1.0023: xxd: few problems with EBCDIC for z/OS (MVS)
Christian Brabandt <cb@256bit.org>
parents:
34074
diff
changeset
|
592 #if defined(__MVS__) && __CHARSET_LIB == 0 |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
593 if (e >= 64) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
594 l[(*c)++] = COLOR_GREEN; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
595 #else |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
596 if (e > 31 && e < 127) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
597 l[(*c)++] = COLOR_GREEN; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
598 #endif |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
599 |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
600 else if (e == 9 || e == 10 || e == 13) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
601 l[(*c)++] = COLOR_YELLOW; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
602 else if (e == 0) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
603 l[(*c)++] = COLOR_WHITE; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
604 else if (e == 255) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
605 l[(*c)++] = COLOR_BLUE; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
606 else |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
607 l[(*c)++] = COLOR_RED; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
608 } |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
609 l[(*c)++] = 'm'; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
610 } |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
611 |
|
33099
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
612 static int |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
613 enable_color(void) |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
614 { |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
615 #ifdef WIN32 |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
616 DWORD mode; |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
617 HANDLE out; |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
618 |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
619 if (!isatty(1)) |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
620 return 0; |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
621 |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
622 out = GetStdHandle(STD_OUTPUT_HANDLE); |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
623 GetConsoleMode(out, &mode); |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
624 mode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING; |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
625 return (int)SetConsoleMode(out, mode); |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
626 #elif defined(UNIX) |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
627 return isatty(STDOUT_FILENO); |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
628 #else |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
629 return 0; |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
630 #endif |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
631 } |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
632 |
| 2752 | 633 int |
|
7837
33ba2adb6065
commit https://github.com/vim/vim/commit/b638a7be952544ceb03052c25b84224577a6494b
Christian Brabandt <cb@256bit.org>
parents:
6973
diff
changeset
|
634 main(int argc, char *argv[]) |
| 7 | 635 { |
| 636 FILE *fp, *fpo; | |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
637 int c, e, p = 0, relseek = 1, negseek = 0, revert = 0, i, x; |
|
27118
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
638 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
|
639 int capitalize = 0, decimal_offset = 0; |
| 7 | 640 int ebcdic = 0; |
| 641 int octspergrp = -1; /* number of octets grouped in output */ | |
| 642 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
|
643 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
|
644 unsigned long displayoff = 0; |
| 2770 | 645 static char l[LLEN+1]; /* static because it may be too big for stack */ |
| 2752 | 646 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
|
647 char *varname = NULL; |
|
15695
ac05f8fb4200
patch 8.1.0855: cannot build xxd with MSVC 10
Bram Moolenaar <Bram@vim.org>
parents:
15693
diff
changeset
|
648 int addrlen = 9; |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
649 int color = 0; |
|
33099
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
650 char *no_color; |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
651 |
|
33099
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
652 no_color = getenv("NO_COLOR"); |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
653 if (no_color == NULL || no_color[0] == '\0') |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
654 color = enable_color(); |
| 7 | 655 |
| 656 #ifdef AMIGA | |
| 657 /* This program doesn't work when started from the Workbench */ | |
| 658 if (argc == 0) | |
| 659 exit(1); | |
| 660 #endif | |
| 661 | |
| 662 pname = argv[0]; | |
| 663 for (pp = pname; *pp; ) | |
| 664 if (*pp++ == PATH_SEP) | |
| 665 pname = pp; | |
| 666 #ifdef FILE_SEP | |
| 667 for (pp = pname; *pp; pp++) | |
| 668 if (*pp == FILE_SEP) | |
| 669 { | |
| 670 *pp = '\0'; | |
| 671 break; | |
| 672 } | |
| 673 #endif | |
| 674 | |
| 675 while (argc >= 2) | |
| 676 { | |
| 677 pp = argv[1] + (!STRNCMP(argv[1], "--", 2) && argv[1][2]); | |
| 678 if (!STRNCMP(pp, "-a", 2)) autoskip = 1 - autoskip; | |
| 679 else if (!STRNCMP(pp, "-b", 2)) hextype = HEX_BITS; | |
| 6655 | 680 else if (!STRNCMP(pp, "-e", 2)) hextype = HEX_LITTLEENDIAN; |
| 7 | 681 else if (!STRNCMP(pp, "-u", 2)) hexx = hexxa + 16; |
| 682 else if (!STRNCMP(pp, "-p", 2)) hextype = HEX_POSTSCRIPT; | |
| 683 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
|
684 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
|
685 else if (!STRNCMP(pp, "-d", 2)) decimal_offset = 1; |
| 7 | 686 else if (!STRNCMP(pp, "-r", 2)) revert++; |
| 687 else if (!STRNCMP(pp, "-E", 2)) ebcdic++; | |
| 688 else if (!STRNCMP(pp, "-v", 2)) | |
| 689 { | |
| 690 fprintf(stderr, "%s%s\n", version, osver); | |
| 691 exit(0); | |
| 692 } | |
| 693 else if (!STRNCMP(pp, "-c", 2)) | |
| 694 { | |
|
15627
11879b89bb69
patch 8.1.0821: xxd "usage" output and other arguments not tested
Bram Moolenaar <Bram@vim.org>
parents:
13571
diff
changeset
|
695 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
|
696 capitalize = 1; |
|
11879b89bb69
patch 8.1.0821: xxd "usage" output and other arguments not tested
Bram Moolenaar <Bram@vim.org>
parents:
13571
diff
changeset
|
697 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
|
698 { |
|
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
699 colsgiven = 1; |
|
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
700 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
|
701 } |
| 7 | 702 else |
| 703 { | |
| 704 if (!argv[2]) | |
| 2752 | 705 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
|
706 colsgiven = 1; |
| 7 | 707 cols = (int)strtol(argv[2], NULL, 0); |
| 708 argv++; | |
| 709 argc--; | |
| 710 } | |
| 711 } | |
| 712 else if (!STRNCMP(pp, "-g", 2)) | |
| 713 { | |
|
15627
11879b89bb69
patch 8.1.0821: xxd "usage" output and other arguments not tested
Bram Moolenaar <Bram@vim.org>
parents:
13571
diff
changeset
|
714 if (pp[2] && STRNCMP("roup", pp + 2, 4)) |
| 7 | 715 octspergrp = (int)strtol(pp + 2, NULL, 0); |
| 716 else | |
| 717 { | |
| 718 if (!argv[2]) | |
| 2752 | 719 exit_with_usage(); |
| 7 | 720 octspergrp = (int)strtol(argv[2], NULL, 0); |
| 721 argv++; | |
| 722 argc--; | |
| 723 } | |
| 724 } | |
| 6655 | 725 else if (!STRNCMP(pp, "-o", 2)) |
| 726 { | |
|
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
|
727 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
|
728 int negoffset = 0; |
| 6655 | 729 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
|
730 displayoff = strtoul(pp + 2, NULL, 0); |
| 6655 | 731 else |
| 732 { | |
| 733 if (!argv[2]) | |
| 734 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
|
735 |
|
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
736 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
|
737 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
|
738 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
|
739 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
|
740 |
|
e00983850550
patch 8.1.0854: xxd does not work with more than 32 bit addresses
Bram Moolenaar <Bram@vim.org>
parents:
15627
diff
changeset
|
741 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
|
742 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
|
743 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
|
744 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
|
745 |
| 6655 | 746 argv++; |
| 747 argc--; | |
| 748 } | |
| 749 } | |
| 7 | 750 else if (!STRNCMP(pp, "-s", 2)) |
| 751 { | |
| 752 relseek = 0; | |
| 753 negseek = 0; | |
| 754 if (pp[2] && STRNCMP("kip", pp+2, 3) && STRNCMP("eek", pp+2, 3)) | |
| 755 { | |
| 756 #ifdef TRY_SEEK | |
| 757 if (pp[2] == '+') | |
| 758 relseek++; | |
| 759 if (pp[2+relseek] == '-') | |
| 760 negseek++; | |
| 761 #endif | |
| 762 seekoff = strtol(pp + 2+relseek+negseek, (char **)NULL, 0); | |
| 763 } | |
| 764 else | |
| 765 { | |
| 766 if (!argv[2]) | |
| 2752 | 767 exit_with_usage(); |
| 7 | 768 #ifdef TRY_SEEK |
| 769 if (argv[2][0] == '+') | |
| 770 relseek++; | |
| 771 if (argv[2][relseek] == '-') | |
| 772 negseek++; | |
| 773 #endif | |
| 774 seekoff = strtol(argv[2] + relseek+negseek, (char **)NULL, 0); | |
| 775 argv++; | |
| 776 argc--; | |
| 777 } | |
| 778 } | |
| 779 else if (!STRNCMP(pp, "-l", 2)) | |
| 780 { | |
| 781 if (pp[2] && STRNCMP("en", pp + 2, 2)) | |
| 782 length = strtol(pp + 2, (char **)NULL, 0); | |
| 783 else | |
| 784 { | |
| 785 if (!argv[2]) | |
| 2752 | 786 exit_with_usage(); |
| 7 | 787 length = strtol(argv[2], (char **)NULL, 0); |
| 788 argv++; | |
| 789 argc--; | |
| 790 } | |
| 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 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
|
793 { |
|
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
794 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
|
795 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
|
796 else |
|
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
797 { |
|
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
798 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
|
799 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
|
800 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
|
801 argv++; |
|
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
802 argc--; |
|
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
803 } |
|
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
804 } |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
805 else if (!STRNCMP(pp, "-R", 2)) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
806 { |
|
33099
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
807 char *pw = pp + 2; |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
808 if (!pw[0]) |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
809 { |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
810 pw = argv[2]; |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
811 argv++; |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
812 argc--; |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
813 } |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
814 if (!pw) |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
815 exit_with_usage(); |
|
33099
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
816 if (!STRNCMP(pw, "always", 6)) |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
817 { |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
818 (void)enable_color(); |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
819 color = 1; |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
820 } |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
821 else if (!STRNCMP(pw, "never", 5)) |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
822 color = 0; |
|
33099
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
823 else if (!STRNCMP(pw, "auto", 4)) |
|
33158
e8805650fec1
patch 9.0.1861: xxd: issue when -R is specified several times
Christian Brabandt <cb@256bit.org>
parents:
33099
diff
changeset
|
824 color = enable_color(); |
|
33099
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
825 else |
|
49f317597430
patch 9.0.1834: Some problems with xxd coloring
Christian Brabandt <cb@256bit.org>
parents:
33094
diff
changeset
|
826 exit_with_usage(); |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
827 } |
| 7 | 828 else if (!strcmp(pp, "--")) /* end of options */ |
| 829 { | |
| 830 argv++; | |
| 831 argc--; | |
| 832 break; | |
| 833 } | |
| 834 else if (pp[0] == '-' && pp[1]) /* unknown option */ | |
| 2752 | 835 exit_with_usage(); |
| 7 | 836 else |
| 837 break; /* not an option */ | |
| 838 | |
| 839 argv++; /* advance to next argument */ | |
| 840 argc--; | |
| 841 } | |
| 842 | |
|
27118
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
843 if (!colsgiven || (!cols && hextype != HEX_POSTSCRIPT)) |
| 7 | 844 switch (hextype) |
| 845 { | |
| 846 case HEX_POSTSCRIPT: cols = 30; break; | |
| 847 case HEX_CINCLUDE: cols = 12; break; | |
| 848 case HEX_BITS: cols = 6; break; | |
| 849 case HEX_NORMAL: | |
| 6655 | 850 case HEX_LITTLEENDIAN: |
| 7 | 851 default: cols = 16; break; |
| 852 } | |
| 853 | |
| 854 if (octspergrp < 0) | |
| 855 switch (hextype) | |
| 856 { | |
| 857 case HEX_BITS: octspergrp = 1; break; | |
| 858 case HEX_NORMAL: octspergrp = 2; break; | |
| 6655 | 859 case HEX_LITTLEENDIAN: octspergrp = 4; break; |
| 7 | 860 case HEX_POSTSCRIPT: |
| 861 case HEX_CINCLUDE: | |
| 862 default: octspergrp = 0; break; | |
| 863 } | |
| 864 | |
|
27118
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
865 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
|
866 (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
|
867 ((hextype == HEX_NORMAL || hextype == HEX_BITS || hextype == HEX_LITTLEENDIAN) |
| 1452 | 868 && (cols > COLS))) |
| 7 | 869 { |
| 870 fprintf(stderr, "%s: invalid number of columns (max. %d).\n", pname, COLS); | |
| 871 exit(1); | |
| 872 } | |
| 873 | |
| 6655 | 874 if (octspergrp < 1 || octspergrp > cols) |
| 7 | 875 octspergrp = cols; |
| 6655 | 876 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
|
877 error_exit(1, "number of octets per group must be a power of 2 with -e."); |
| 7 | 878 |
| 879 if (argc > 3) | |
| 2752 | 880 exit_with_usage(); |
| 7 | 881 |
| 882 if (argc == 1 || (argv[1][0] == '-' && !argv[1][1])) | |
| 883 BIN_ASSIGN(fp = stdin, !revert); | |
| 884 else | |
| 885 { | |
| 886 if ((fp = fopen(argv[1], BIN_READ(!revert))) == NULL) | |
| 887 { | |
| 888 fprintf(stderr,"%s: ", pname); | |
| 889 perror(argv[1]); | |
| 890 return 2; | |
| 891 } | |
| 892 } | |
| 893 | |
| 894 if (argc < 3 || (argv[2][0] == '-' && !argv[2][1])) | |
| 895 BIN_ASSIGN(fpo = stdout, revert); | |
| 896 else | |
| 897 { | |
| 898 int fd; | |
| 899 int mode = revert ? O_WRONLY : (O_TRUNC|O_WRONLY); | |
| 900 | |
| 901 if (((fd = OPEN(argv[2], mode | BIN_CREAT(revert), 0666)) < 0) || | |
| 902 (fpo = fdopen(fd, BIN_WRITE(revert))) == NULL) | |
| 903 { | |
| 904 fprintf(stderr, "%s: ", pname); | |
| 905 perror(argv[2]); | |
| 906 return 3; | |
| 907 } | |
| 908 rewind(fpo); | |
| 909 } | |
|
34118
941f7dc1c7dd
patch 9.1.0023: xxd: few problems with EBCDIC for z/OS (MVS)
Christian Brabandt <cb@256bit.org>
parents:
34074
diff
changeset
|
910 #ifdef __MVS__ |
|
941f7dc1c7dd
patch 9.1.0023: xxd: few problems with EBCDIC for z/OS (MVS)
Christian Brabandt <cb@256bit.org>
parents:
34074
diff
changeset
|
911 // Disable auto-conversion on input file descriptors |
|
941f7dc1c7dd
patch 9.1.0023: xxd: few problems with EBCDIC for z/OS (MVS)
Christian Brabandt <cb@256bit.org>
parents:
34074
diff
changeset
|
912 __disableautocvt(fileno(fp)); |
|
941f7dc1c7dd
patch 9.1.0023: xxd: few problems with EBCDIC for z/OS (MVS)
Christian Brabandt <cb@256bit.org>
parents:
34074
diff
changeset
|
913 #endif |
| 7 | 914 |
| 915 if (revert) | |
|
33496
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
916 switch (hextype) |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
917 { |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
918 case HEX_NORMAL: |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
919 case HEX_POSTSCRIPT: |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
920 case HEX_BITS: |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
921 return huntype(fp, fpo, cols, hextype, |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
922 negseek ? -seekoff : seekoff); |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
923 break; |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
924 default: |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
925 error_exit(-1, "Sorry, cannot revert this type of hexdump"); |
|
33cbd544dc46
patch 9.0.1998: xxd: cannot reverse a bit dump
Christian Brabandt <cb@256bit.org>
parents:
33158
diff
changeset
|
926 } |
| 7 | 927 |
| 928 if (seekoff || negseek || !relseek) | |
| 929 { | |
| 930 #ifdef TRY_SEEK | |
| 931 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
|
932 e = fseek(fp, negseek ? -seekoff : seekoff, SEEK_CUR); |
| 7 | 933 else |
|
26123
56d1d2cb4ad5
patch 8.2.3594: xxd code is a bit difficult to understand
Bram Moolenaar <Bram@vim.org>
parents:
26040
diff
changeset
|
934 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
|
935 negseek ? SEEK_END : SEEK_SET); |
| 7 | 936 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
|
937 error_exit(4, "Sorry, cannot seek."); |
| 7 | 938 if (e >= 0) |
| 939 seekoff = ftell(fp); | |
| 940 else | |
| 941 #endif | |
| 942 { | |
| 943 long s = seekoff; | |
| 944 | |
| 945 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
|
946 if (getc_or_die(fp) == EOF) |
| 2754 | 947 { |
|
26366
d227481dbe8e
patch 8.2.3714: some unused assignments and ugly code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26298
diff
changeset
|
948 error_exit(4, "Sorry, cannot seek."); |
| 2754 | 949 } |
| 7 | 950 } |
| 951 } | |
| 952 | |
| 953 if (hextype == HEX_CINCLUDE) | |
| 954 { | |
|
29330
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
955 /* 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
|
956 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
|
957 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
|
958 |
|
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
959 if (varname != NULL) |
| 7 | 960 { |
|
34074
1629cc65d78d
patch 9.1.0006: is*() and to*() function may be unsafe
Christian Brabandt <cb@256bit.org>
parents:
33656
diff
changeset
|
961 FPRINTF_OR_DIE((fpo, "unsigned char %s", isdigit((unsigned char)varname[0]) ? "__" : "")); |
|
29330
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
962 for (e = 0; (c = varname[e]) != 0; e++) |
|
34074
1629cc65d78d
patch 9.1.0006: is*() and to*() function may be unsafe
Christian Brabandt <cb@256bit.org>
parents:
33656
diff
changeset
|
963 putc_or_die(isalnum((unsigned char)c) ? CONDITIONAL_CAPITALIZE(c) : '_', fpo); |
|
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
964 fputs_or_die("[] = {\n", fpo); |
| 7 | 965 } |
| 966 | |
| 967 p = 0; | |
|
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
968 while ((length < 0 || p < length) && (c = getc_or_die(fp)) != EOF) |
| 7 | 969 { |
|
26366
d227481dbe8e
patch 8.2.3714: some unused assignments and ugly code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26298
diff
changeset
|
970 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
|
971 (p % cols) ? ", " : (!p ? " " : ",\n "), c)); |
| 7 | 972 p++; |
| 973 } | |
| 974 | |
|
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
975 if (p) |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
976 fputs_or_die("\n", fpo); |
| 7 | 977 |
|
29330
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
978 if (varname != NULL) |
| 7 | 979 { |
|
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
980 fputs_or_die("};\n", fpo); |
|
34165
38965f1cc21a
patch 9.1.0041: xxd -i may generate incorrect C statements
Christian Brabandt <cb@256bit.org>
parents:
34118
diff
changeset
|
981 FPRINTF_OR_DIE((fpo, "size_t %s", isdigit((unsigned char)varname[0]) ? "__" : "")); |
|
29330
948c947cb1ed
patch 9.0.0008: cannot specify the variable name for "xxd -i"
Bram Moolenaar <Bram@vim.org>
parents:
27118
diff
changeset
|
982 for (e = 0; (c = varname[e]) != 0; e++) |
|
34074
1629cc65d78d
patch 9.1.0006: is*() and to*() function may be unsafe
Christian Brabandt <cb@256bit.org>
parents:
33656
diff
changeset
|
983 putc_or_die(isalnum((unsigned char)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
|
984 FPRINTF_OR_DIE((fpo, "_%s = %d;\n", capitalize ? "LEN" : "len", p)); |
| 7 | 985 } |
| 986 | |
|
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
987 fclose_or_die(fp, fpo); |
| 7 | 988 return 0; |
| 989 } | |
| 990 | |
| 991 if (hextype == HEX_POSTSCRIPT) | |
| 992 { | |
| 993 p = cols; | |
|
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
994 while ((length < 0 || n < length) && (e = getc_or_die(fp)) != EOF) |
| 7 | 995 { |
|
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
996 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
|
997 putc_or_die(hexx[e & 0xf], fpo); |
| 7 | 998 n++; |
|
27118
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
999 if (cols > 0 && !--p) |
| 7 | 1000 { |
|
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
1001 putc_or_die('\n', fpo); |
| 7 | 1002 p = cols; |
| 1003 } | |
| 1004 } | |
|
27118
2f854597399f
patch 8.2.4088: xxd cannot output everything in one line
Bram Moolenaar <Bram@vim.org>
parents:
26859
diff
changeset
|
1005 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
|
1006 putc_or_die('\n', fpo); |
|
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
1007 fclose_or_die(fp, fpo); |
| 7 | 1008 return 0; |
| 1009 } | |
| 1010 | |
| 6655 | 1011 /* hextype: HEX_NORMAL or HEX_BITS or HEX_LITTLEENDIAN */ |
| 7 | 1012 |
| 6655 | 1013 if (hextype != HEX_BITS) |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1014 { |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1015 grplen = octspergrp + octspergrp + 1; /* chars per octet group */ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1016 if (color) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1017 grplen += 11 * octspergrp; /* color-code needs 11 extra characters */ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1018 } |
| 7 | 1019 else /* hextype == HEX_BITS */ |
| 1020 grplen = 8 * octspergrp + 1; | |
| 1021 | |
|
26298
bb58c4530851
patch 8.2.3680: repeated code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26282
diff
changeset
|
1022 while ((length < 0 || n < length) && (e = getc_or_die(fp)) != EOF) |
| 7 | 1023 { |
| 1024 if (p == 0) | |
| 1025 { | |
|
26220
d757c9c87a58
patch 8.2.3641: xxd code has duplicate expressions
Bram Moolenaar <Bram@vim.org>
parents:
26123
diff
changeset
|
1026 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
|
1027 ((unsigned long)(n + seekoff + displayoff))); |
|
32104
5a1113ece237
patch 9.0.1383: xxd: combination of little endian and cols fails
Bram Moolenaar <Bram@vim.org>
parents:
30118
diff
changeset
|
1028 for (c = addrlen; c < LLEN; l[c++] = ' ') |
|
5a1113ece237
patch 9.0.1383: xxd: combination of little endian and cols fails
Bram Moolenaar <Bram@vim.org>
parents:
30118
diff
changeset
|
1029 ; |
| 7 | 1030 } |
|
26254
3a13efec0016
patch 8.2.3658: duplicate code in xxd
Bram Moolenaar <Bram@vim.org>
parents:
26220
diff
changeset
|
1031 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
|
1032 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
|
1033 if (hextype == HEX_NORMAL || hextype == HEX_LITTLEENDIAN) |
| 7 | 1034 { |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1035 if (color) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1036 { |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1037 COLOR_PROLOGUE |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1038 begin_coloring_char(l,&c,e,ebcdic); |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1039 l[c++] = hexx[(e >> 4) & 0xf]; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1040 l[c++] = hexx[e & 0xf]; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1041 COLOR_EPILOGUE |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1042 } |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1043 else /*No colors*/ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1044 { |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1045 l[c] = hexx[(e >> 4) & 0xf]; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1046 l[++c] = hexx[e & 0xf]; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1047 } |
| 7 | 1048 } |
| 1049 else /* hextype == HEX_BITS */ | |
| 1050 { | |
| 1051 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
|
1052 l[c++] = (e & (1 << i)) ? '1' : '0'; |
| 7 | 1053 } |
|
13326
7f1a5e8d8289
patch 8.0.1537: xxd does not skip NUL lines when using ebcdic
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
1054 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
|
1055 nonzero++; |
| 1452 | 1056 /* When changing this update definition of LLEN above. */ |
|
32104
5a1113ece237
patch 9.0.1383: xxd: combination of little endian and cols fails
Bram Moolenaar <Bram@vim.org>
parents:
30118
diff
changeset
|
1057 if (hextype == HEX_LITTLEENDIAN) |
|
5a1113ece237
patch 9.0.1383: xxd: combination of little endian and cols fails
Bram Moolenaar <Bram@vim.org>
parents:
30118
diff
changeset
|
1058 /* last group will be fully used, round up */ |
|
5a1113ece237
patch 9.0.1383: xxd: combination of little endian and cols fails
Bram Moolenaar <Bram@vim.org>
parents:
30118
diff
changeset
|
1059 c = grplen * ((cols + octspergrp - 1) / octspergrp); |
|
5a1113ece237
patch 9.0.1383: xxd: combination of little endian and cols fails
Bram Moolenaar <Bram@vim.org>
parents:
30118
diff
changeset
|
1060 else |
|
5a1113ece237
patch 9.0.1383: xxd: combination of little endian and cols fails
Bram Moolenaar <Bram@vim.org>
parents:
30118
diff
changeset
|
1061 c = (grplen * cols - 1) / octspergrp; |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1062 |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1063 if (color) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1064 { |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1065 if (hextype == HEX_BITS) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1066 c += addrlen + 3 + p*12; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1067 else |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1068 c = addrlen + 3 + (grplen * cols - 1)/octspergrp + p*12; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1069 |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1070 if (hextype == HEX_LITTLEENDIAN) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1071 c += 1; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1072 |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1073 COLOR_PROLOGUE |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1074 begin_coloring_char(l,&c,e,ebcdic); |
|
34118
941f7dc1c7dd
patch 9.1.0023: xxd: few problems with EBCDIC for z/OS (MVS)
Christian Brabandt <cb@256bit.org>
parents:
34074
diff
changeset
|
1075 #if defined(__MVS__) && __CHARSET_LIB == 0 |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1076 if (e >= 64) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1077 l[c++] = e; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1078 else |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1079 l[c++] = '.'; |
| 7 | 1080 #else |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1081 if (ebcdic) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1082 e = (e < 64) ? '.' : etoa64[e-64]; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1083 l[c++] = (e > 31 && e < 127) ? e : '.'; |
| 7 | 1084 #endif |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1085 COLOR_EPILOGUE |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1086 n++; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1087 if (++p == cols) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1088 { |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1089 l[c++] = '\n'; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1090 l[c++] = '\0'; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1091 xxdline(fpo, l, autoskip ? nonzero : 1); |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1092 nonzero = 0; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1093 p = 0; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1094 } |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1095 } |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1096 else /*no colors*/ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1097 { |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1098 if (ebcdic) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1099 e = (e < 64) ? '.' : etoa64[e-64]; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1100 |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1101 c += addrlen + 3 + p; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1102 l[c++] = |
|
34118
941f7dc1c7dd
patch 9.1.0023: xxd: few problems with EBCDIC for z/OS (MVS)
Christian Brabandt <cb@256bit.org>
parents:
34074
diff
changeset
|
1103 #if defined(__MVS__) && __CHARSET_LIB == 0 |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1104 (e >= 64) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1105 #else |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1106 (e > 31 && e < 127) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1107 #endif |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1108 ? e : '.'; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1109 n++; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1110 if (++p == cols) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1111 { |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1112 l[c++] = '\n'; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1113 l[c] = '\0'; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1114 xxdline(fpo, l, autoskip ? nonzero : 1); |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1115 nonzero = 0; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1116 p = 0; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1117 } |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1118 } |
| 7 | 1119 } |
| 1120 if (p) | |
| 1121 { | |
|
33083
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1122 l[c++] = '\n'; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1123 l[c] = '\0'; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1124 if (color) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1125 { |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1126 c++; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1127 |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1128 x = p; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1129 if (hextype == HEX_LITTLEENDIAN) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1130 { |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1131 int fill = octspergrp - (p % octspergrp); |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1132 if (fill == octspergrp) fill = 0; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1133 |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1134 c = addrlen + 1 + (grplen * (x - (octspergrp-fill))) / octspergrp; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1135 |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1136 for (i = 0; i < fill;i++) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1137 { |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1138 COLOR_PROLOGUE |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1139 l[c++] = COLOR_RED; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1140 l[c++] = 'm'; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1141 l[c++] = ' '; /* empty space */ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1142 COLOR_EPILOGUE |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1143 x++; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1144 p++; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1145 } |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1146 } |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1147 |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1148 if (hextype != HEX_BITS) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1149 { |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1150 c = addrlen + 1 + (grplen * x) / octspergrp; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1151 c += cols - p; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1152 c += (cols - p) / octspergrp; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1153 |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1154 for (i = cols - p; i > 0;i--) |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1155 { |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1156 COLOR_PROLOGUE |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1157 l[c++] = COLOR_RED; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1158 l[c++] = 'm'; |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1159 l[c++] = ' '; /* empty space */ |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1160 COLOR_EPILOGUE |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1161 } |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1162 } |
|
79b2eb83f2df
patch 9.0.1827: xxd: no color support
Christian Brabandt <cb@256bit.org>
parents:
32104
diff
changeset
|
1163 } |
| 7 | 1164 xxdline(fpo, l, 1); |
| 1165 } | |
| 1166 else if (autoskip) | |
| 1197 | 1167 xxdline(fpo, l, -1); /* last chance to flush out suppressed lines */ |
| 7 | 1168 |
|
26278
3061c07855ce
patch 8.2.3670: error checks repeated several times
Bram Moolenaar <Bram@vim.org>
parents:
26254
diff
changeset
|
1169 fclose_or_die(fp, fpo); |
| 7 | 1170 return 0; |
| 1171 } | |
| 2752 | 1172 |
| 1173 /* vi:set ts=8 sw=4 sts=2 cino+={2 cino+=n-2 : */ |