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