From ba59365c93c5ee3fb62ef372e76124e87c1b5432 Mon Sep 17 00:00:00 2001 From: "S. Gilles" Date: Tue, 2 Jul 2019 16:36:31 -0400 Subject: [PATCH] app-editors/xxd: add, since I don't want all of vim --- app-editors/xxd/Manifest | 4 + app-editors/xxd/files/Makefile | 7 + app-editors/xxd/files/xxd.c | 884 +++++++++++++++++++++++++++++++++ app-editors/xxd/metadata.xml | 8 + app-editors/xxd/xxd-8.1.1306.ebuild | 24 + www-client/netsurf/Manifest | 2 +- www-client/netsurf/netsurf-9999.ebuild | 3 +- 7 files changed, 930 insertions(+), 2 deletions(-) create mode 100644 app-editors/xxd/Manifest create mode 100644 app-editors/xxd/files/Makefile create mode 100644 app-editors/xxd/files/xxd.c create mode 100644 app-editors/xxd/metadata.xml create mode 100644 app-editors/xxd/xxd-8.1.1306.ebuild diff --git a/app-editors/xxd/Manifest b/app-editors/xxd/Manifest new file mode 100644 index 0000000..1072cfc --- /dev/null +++ b/app-editors/xxd/Manifest @@ -0,0 +1,4 @@ +AUX Makefile 116 BLAKE2B e1274f5e146c2ca844289dc89636e9e26462767a93ab8fdfc9931f4c68e436426ec55f4f7c659596b86751f3f27f8d89a6e269aac1b2aad929ae653a4820826c SHA512 5f847d62ccd75a36471145a316b9ab77d5ade46d86d37c625989a74cb91cf713e0b0f8a89aa4d07ec253154a5fefb4487b4dc51d57635d0b083404f4d5d9777a +AUX xxd.c 24342 BLAKE2B 8125873a1cc70c19bbb03679b2eae744ab17972c30f623ddb3f0637232738dbec8a23ed2852aa620c3c1e1a4d5c93fbdd386c45f3634f4816a7f7fcc203d5562 SHA512 babd6853e01d5b48fb0a6fade27eede14e5bdc38a48990f0ece3c12890de405180c56c2667e862eee44634d12e145cedc3df6d50c4c2e80d9b81097e7240d576 +EBUILD xxd-8.1.1306.ebuild 697 BLAKE2B a6ec532a8e2685add7268c7fb4e47d634d09343229eb5e65cbfbd0cc8075931dfda79d2bab9c90eba161ae9a8a01ef89cab8a681cea343f84b2daa907a8d0999 SHA512 80d4c48d437ed9abe14e33dbc64a252354f64fa6c465d19359d60e3e4e9380777550607659954b1f07978e7876692dc333ae25a8a92a031c8f966f5894f83396 +MISC metadata.xml 245 BLAKE2B 4c24a2800e24e0cf46964eaa758418af78ec860cdac0bebd67753a5edc27c79c2687d76f75e68fe903fc645dfb12d7201c8548f21be2995cc78dc49702fe88d7 SHA512 b57a329570a21935fce6a7f09d98376e23c9a3a34d514ef55a6151fe490d2841441ef666626d364149ea5ef129eae39cab78913a7bc81c16a5b5aefb7ae37532 diff --git a/app-editors/xxd/files/Makefile b/app-editors/xxd/files/Makefile new file mode 100644 index 0000000..97bbcc7 --- /dev/null +++ b/app-editors/xxd/files/Makefile @@ -0,0 +1,7 @@ +# The most simplistic Makefile + +xxd: xxd.c + $(CC) $(CFLAGS) $(LDFLAGS) -DUNIX -o xxd xxd.c + +clean: + rm -f xxd xxd.o diff --git a/app-editors/xxd/files/xxd.c b/app-editors/xxd/files/xxd.c new file mode 100644 index 0000000..f2192cf --- /dev/null +++ b/app-editors/xxd/files/xxd.c @@ -0,0 +1,884 @@ +/* xxd: my hexdump facility. jw + * + * 2.10.90 changed to word output + * 3.03.93 new indent style, dumb bug inserted and fixed. + * -c option, mls + * 26.04.94 better option parser, -ps, -l, -s added. + * 1.07.94 -r badly needs - as input file. Per default autoskip over + * consecutive lines of zeroes, as unix od does. + * -a shows them too. + * -i dump as c-style #include "file.h" + * 1.11.95 if "xxd -i" knows the filename, an 'unsigned char filename_bits[]' + * array is written in correct c-syntax. + * -s improved, now defaults to absolute seek, relative requires a '+'. + * -r improved, now -r -s -0x... is supported. + * change/suppress leading '\0' bytes. + * -l n improved: stops exactly after n bytes. + * -r improved, better handling of partial lines with trailing garbage. + * -r improved, now -r -p works again! + * -r improved, less flushing, much faster now! (that was silly) + * 3.04.96 Per repeated request of a single person: autoskip defaults to off. + * 15.05.96 -v added. They want to know the version. + * -a fixed, to show last line inf file ends in all zeros. + * -u added: Print upper case hex-letters, as preferred by unix bc. + * -h added to usage message. Usage message extended. + * Now using outfile if specified even in normal mode, aehem. + * No longer mixing of ints and longs. May help doze people. + * Added binify ioctl for same reason. (Enough Doze stress for 1996!) + * 16.05.96 -p improved, removed occasional superfluous linefeed. + * 20.05.96 -l 0 fixed. tried to read anyway. + * 21.05.96 -i fixed. now honours -u, and prepends __ to numeric filenames. + * compile -DWIN32 for NT or W95. George V. Reilly, * -v improved :-) + * support --gnuish-longhorn-options + * 25.05.96 MAC support added: CodeWarrior already uses ``outline'' in Types.h + * which is included by MacHeaders (Axel Kielhorn). Renamed to + * xxdline(). + * 7.06.96 -i printed 'int' instead of 'char'. *blush* + * added Bram's OS2 ifdefs... + * 18.07.96 gcc -Wall @ SunOS4 is now slient. + * Added osver for MSDOS/DJGPP/WIN32. + * 29.08.96 Added size_t to strncmp() for Amiga. + * 24.03.97 Windows NT support (Phil Hanna). Clean exit for Amiga WB (Bram) + * 02.04.97 Added -E option, to have EBCDIC translation instead of ASCII + * (azc10@yahoo.com) + * 22.05.97 added -g (group octets) option (jcook@namerica.kla.com). + * 23.09.98 nasty -p -r misfeature fixed: slightly wrong output, when -c was + * missing or wrong. + * 26.09.98 Fixed: 'xxd -i infile outfile' did not truncate outfile. + * 27.10.98 Fixed: -g option parser required blank. + * option -b added: 01000101 binary output in normal format. + * 16.05.00 Added VAXC changes by Stephen P. Wall + * 16.05.00 Improved MMS file and merge for VMS by Zoltan Arpadffy + * 2011 March Better error handling by Florian Zumbiehl. + * 2011 April Formatting by Bram Moolenaar + * 08.06.2013 Little-endian hexdump (-e) and offset (-o) by Vadim Vygonets. + * 11.01.2019 Add full 64/32 bit range to -o and output by Christer Jensen. + * + * (c) 1990-1998 by Juergen Weigert (jnweiger@informatik.uni-erlangen.de) + * + * I hereby grant permission to distribute and use xxd + * under X11-MIT or GPL-2.0 (at the user's choice). + * + * Small changes made afterwards by Bram Moolenaar et al. + * + * Distribute freely and credit me, + * make money and share with me, + * lose money and don't ask me. + */ + +/* Visual Studio 2005 has 'deprecated' many of the standard CRT functions */ +#if _MSC_VER >= 1400 +# define _CRT_SECURE_NO_DEPRECATE +# define _CRT_NONSTDC_NO_DEPRECATE +#endif +#if !defined(CYGWIN) && defined(__CYGWIN__) +# define CYGWIN +#endif + +#include +#ifdef VAXC +# include +#else +# include +#endif +#if defined(WIN32) || defined(CYGWIN) +# include /* for setmode() */ +#else +# ifdef UNIX +# include +# endif +#endif +#include +#include /* for strncmp() */ +#include /* for isalnum() */ +#include +#if __MWERKS__ && !defined(BEBOX) +# include /* for fdopen() on MAC */ +#endif + + +/* This corrects the problem of missing prototypes for certain functions + * in some GNU installations (e.g. SunOS 4.1.x). + * Darren Hiebert (sparc-sun-sunos4.1.3_U1/2.7.2.2) + */ +#if defined(__GNUC__) && defined(__STDC__) +# ifndef __USE_FIXED_PROTOTYPES__ +# define __USE_FIXED_PROTOTYPES__ +# endif +#endif + +#ifndef __USE_FIXED_PROTOTYPES__ +/* + * This is historic and works only if the compiler really has no prototypes: + * + * Include prototypes for Sun OS 4.x, when using an ANSI compiler. + * FILE is defined on OS 4.x, not on 5.x (Solaris). + * if __SVR4 is defined (some Solaris versions), don't include this. + */ +#if defined(sun) && defined(FILE) && !defined(__SVR4) && defined(__STDC__) +# define __P(a) a +/* excerpt from my sun_stdlib.h */ +extern int fprintf __P((FILE *, char *, ...)); +extern int fputs __P((char *, FILE *)); +extern int _flsbuf __P((unsigned char, FILE *)); +extern int _filbuf __P((FILE *)); +extern int fflush __P((FILE *)); +extern int fclose __P((FILE *)); +extern int fseek __P((FILE *, long, int)); +extern int rewind __P((FILE *)); + +extern void perror __P((char *)); +# endif +#endif + +extern long int strtol(); +extern long int ftell(); + +char version[] = "xxd V1.10 27oct98 by Juergen Weigert"; +#ifdef WIN32 +char osver[] = " (Win32)"; +#else +char osver[] = ""; +#endif + +#if defined(WIN32) +# define BIN_READ(yes) ((yes) ? "rb" : "rt") +# define BIN_WRITE(yes) ((yes) ? "wb" : "wt") +# define BIN_CREAT(yes) ((yes) ? (O_CREAT|O_BINARY) : O_CREAT) +# define BIN_ASSIGN(fp, yes) setmode(fileno(fp), (yes) ? O_BINARY : O_TEXT) +# define PATH_SEP '\\' +#elif defined(CYGWIN) +# define BIN_READ(yes) ((yes) ? "rb" : "rt") +# define BIN_WRITE(yes) ((yes) ? "wb" : "w") +# define BIN_CREAT(yes) ((yes) ? (O_CREAT|O_BINARY) : O_CREAT) +# define BIN_ASSIGN(fp, yes) ((yes) ? (void) setmode(fileno(fp), O_BINARY) : (void) (fp)) +# define PATH_SEP '/' +#else +# ifdef VMS +# define BIN_READ(dummy) "r" +# define BIN_WRITE(dummy) "w" +# define BIN_CREAT(dummy) O_CREAT +# define BIN_ASSIGN(fp, dummy) fp +# define PATH_SEP ']' +# define FILE_SEP '.' +# else +# define BIN_READ(dummy) "r" +# define BIN_WRITE(dummy) "w" +# define BIN_CREAT(dummy) O_CREAT +# define BIN_ASSIGN(fp, dummy) fp +# define PATH_SEP '/' +# endif +#endif + +/* open has only to arguments on the Mac */ +#if __MWERKS__ +# define OPEN(name, mode, umask) open(name, mode) +#else +# define OPEN(name, mode, umask) open(name, mode, umask) +#endif + +#ifdef AMIGA +# define STRNCMP(s1, s2, l) strncmp(s1, s2, (size_t)l) +#else +# define STRNCMP(s1, s2, l) strncmp(s1, s2, l) +#endif + +#ifndef __P +# if defined(__STDC__) || defined(WIN32) +# define __P(a) a +# else +# define __P(a) () +# endif +#endif + +/* Let's collect some prototypes */ +/* CodeWarrior is really picky about missing prototypes */ +static void exit_with_usage __P((void)); +static void die __P((int)); +static int huntype __P((FILE *, FILE *, FILE *, int, int, long)); +static void xxdline __P((FILE *, char *, int)); + +#define TRY_SEEK /* attempt to use lseek, or skip forward by reading */ +#define COLS 256 /* change here, if you ever need more columns */ +#define LLEN ((2*(int)sizeof(unsigned long)) + 4 + (9*COLS-1) + COLS + 2) + +char hexxa[] = "0123456789abcdef0123456789ABCDEF", *hexx = hexxa; + +/* the different hextypes known by this program: */ +#define HEX_NORMAL 0 +#define HEX_POSTSCRIPT 1 +#define HEX_CINCLUDE 2 +#define HEX_BITS 3 /* not hex a dump, but bits: 01111001 */ +#define HEX_LITTLEENDIAN 4 + +#define CONDITIONAL_CAPITALIZE(c) (capitalize ? toupper((int)c) : c) + +static char *pname; + + static void +exit_with_usage(void) +{ + fprintf(stderr, "Usage:\n %s [options] [infile [outfile]]\n", pname); + fprintf(stderr, " or\n %s -r [-s [-]offset] [-c cols] [-ps] [infile [outfile]]\n", pname); + fprintf(stderr, "Options:\n"); + fprintf(stderr, " -a toggle autoskip: A single '*' replaces nul-lines. Default off.\n"); + fprintf(stderr, " -b binary digit dump (incompatible with -ps,-i,-r). Default hex.\n"); + fprintf(stderr, " -C capitalize variable names in C include file style (-i).\n"); + fprintf(stderr, " -c cols format octets per line. Default 16 (-i: 12, -ps: 30).\n"); + fprintf(stderr, " -E show characters in EBCDIC. Default ASCII.\n"); + fprintf(stderr, " -e little-endian dump (incompatible with -ps,-i,-r).\n"); + fprintf(stderr, " -g number of octets per group in normal output. Default 2 (-e: 4).\n"); + fprintf(stderr, " -h print this summary.\n"); + fprintf(stderr, " -i output in C include file style.\n"); + fprintf(stderr, " -l len stop after octets.\n"); + fprintf(stderr, " -o off add to the displayed file position.\n"); + fprintf(stderr, " -ps output in postscript plain hexdump style.\n"); + fprintf(stderr, " -r reverse operation: convert (or patch) hexdump into binary.\n"); + fprintf(stderr, " -r -s off revert with added to file positions found in hexdump.\n"); + fprintf(stderr, " -s %sseek start at bytes abs. %sinfile offset.\n", +#ifdef TRY_SEEK + "[+][-]", "(or +: rel.) "); +#else + "", ""); +#endif + fprintf(stderr, " -u use upper case hex letters.\n"); + fprintf(stderr, " -v show version: \"%s%s\".\n", version, osver); + exit(1); +} + + static void +die(int ret) +{ + fprintf(stderr, "%s: ", pname); + perror(NULL); + exit(ret); +} + +/* + * Max. cols binary characters are decoded from the input stream per line. + * Two adjacent garbage characters after evaluated data delimit valid data. + * Everything up to the next newline is discarded. + * + * The name is historic and came from 'undo type opt h'. + */ + static int +huntype( + FILE *fpi, + FILE *fpo, + FILE *fperr, + int cols, + int hextype, + long base_off) +{ + int c, ign_garb = 1, n1 = -1, n2 = 0, n3, p = cols; + long have_off = 0, want_off = 0; + + rewind(fpi); + + while ((c = getc(fpi)) != EOF) + { + if (c == '\r') /* Doze style input file? */ + continue; + + /* Allow multiple spaces. This doesn't work when there is normal text + * after the hex codes in the last line that looks like hex, thus only + * use it for PostScript format. */ + if (hextype == HEX_POSTSCRIPT && (c == ' ' || c == '\n' || c == '\t')) + continue; + + n3 = n2; + n2 = n1; + + if (c >= '0' && c <= '9') + n1 = c - '0'; + else if (c >= 'a' && c <= 'f') + n1 = c - 'a' + 10; + else if (c >= 'A' && c <= 'F') + n1 = c - 'A' + 10; + else + { + n1 = -1; + if (ign_garb) + continue; + } + + ign_garb = 0; + + if (p >= cols) + { + if (!hextype) + { + if (n1 < 0) + { + p = 0; + continue; + } + want_off = (want_off << 4) | n1; + continue; + } + else + p = 0; + } + + if (base_off + want_off != have_off) + { + if (fflush(fpo) != 0) + die(3); +#ifdef TRY_SEEK + c = fseek(fpo, base_off + want_off - have_off, 1); + if (c >= 0) + have_off = base_off + want_off; +#endif + if (base_off + want_off < have_off) + { + fprintf(fperr, "%s: sorry, cannot seek backwards.\n", pname); + return 5; + } + for (; have_off < base_off + want_off; have_off++) + if (putc(0, fpo) == EOF) + die(3); + } + + if (n2 >= 0 && n1 >= 0) + { + if (putc((n2 << 4) | n1, fpo) == EOF) + die(3); + have_off++; + want_off++; + n1 = -1; + if ((++p >= cols) && !hextype) + { + /* skip rest of line as garbage */ + want_off = 0; + while ((c = getc(fpi)) != '\n' && c != EOF) + ; + if (c == EOF && ferror(fpi)) + die(2); + ign_garb = 1; + } + } + else if (n1 < 0 && n2 < 0 && n3 < 0) + { + /* already stumbled into garbage, skip line, wait and see */ + if (!hextype) + want_off = 0; + while ((c = getc(fpi)) != '\n' && c != EOF) + ; + if (c == EOF && ferror(fpi)) + die(2); + ign_garb = 1; + } + } + if (fflush(fpo) != 0) + die(3); +#ifdef TRY_SEEK + fseek(fpo, 0L, 2); +#endif + if (fclose(fpo) != 0) + die(3); + if (fclose(fpi) != 0) + die(2); + return 0; +} + +/* + * Print line l. If nz is false, xxdline regards the line a line of + * zeroes. If there are three or more consecutive lines of zeroes, + * they are replaced by a single '*' character. + * + * If the output ends with more than two lines of zeroes, you + * should call xxdline again with l being the last line and nz + * negative. This ensures that the last line is shown even when + * it is all zeroes. + * + * If nz is always positive, lines are never suppressed. + */ + static void +xxdline(FILE *fp, char *l, int nz) +{ + static char z[LLEN+1]; + static int zero_seen = 0; + + if (!nz && zero_seen == 1) + strcpy(z, l); + + if (nz || !zero_seen++) + { + if (nz) + { + if (nz < 0) + zero_seen--; + if (zero_seen == 2) + if (fputs(z, fp) == EOF) + die(3); + if (zero_seen > 2) + if (fputs("*\n", fp) == EOF) + die(3); + } + if (nz >= 0 || zero_seen > 0) + if (fputs(l, fp) == EOF) + die(3); + if (nz) + zero_seen = 0; + } +} + +/* This is an EBCDIC to ASCII conversion table */ +/* from a proposed BTL standard April 16, 1979 */ +static unsigned char etoa64[] = +{ + 0040,0240,0241,0242,0243,0244,0245,0246, + 0247,0250,0325,0056,0074,0050,0053,0174, + 0046,0251,0252,0253,0254,0255,0256,0257, + 0260,0261,0041,0044,0052,0051,0073,0176, + 0055,0057,0262,0263,0264,0265,0266,0267, + 0270,0271,0313,0054,0045,0137,0076,0077, + 0272,0273,0274,0275,0276,0277,0300,0301, + 0302,0140,0072,0043,0100,0047,0075,0042, + 0303,0141,0142,0143,0144,0145,0146,0147, + 0150,0151,0304,0305,0306,0307,0310,0311, + 0312,0152,0153,0154,0155,0156,0157,0160, + 0161,0162,0136,0314,0315,0316,0317,0320, + 0321,0345,0163,0164,0165,0166,0167,0170, + 0171,0172,0322,0323,0324,0133,0326,0327, + 0330,0331,0332,0333,0334,0335,0336,0337, + 0340,0341,0342,0343,0344,0135,0346,0347, + 0173,0101,0102,0103,0104,0105,0106,0107, + 0110,0111,0350,0351,0352,0353,0354,0355, + 0175,0112,0113,0114,0115,0116,0117,0120, + 0121,0122,0356,0357,0360,0361,0362,0363, + 0134,0237,0123,0124,0125,0126,0127,0130, + 0131,0132,0364,0365,0366,0367,0370,0371, + 0060,0061,0062,0063,0064,0065,0066,0067, + 0070,0071,0372,0373,0374,0375,0376,0377 +}; + + int +main(int argc, char *argv[]) +{ + FILE *fp, *fpo; + int c, e, p = 0, relseek = 1, negseek = 0, revert = 0; + int cols = 0, nonzero = 0, autoskip = 0, hextype = HEX_NORMAL, capitalize = 0; + int ebcdic = 0; + int octspergrp = -1; /* number of octets grouped in output */ + int grplen; /* total chars per octet group */ + long length = -1, n = 0, seekoff = 0; + unsigned long displayoff = 0; + static char l[LLEN+1]; /* static because it may be too big for stack */ + char *pp; + int addrlen = 9; + +#ifdef AMIGA + /* This program doesn't work when started from the Workbench */ + if (argc == 0) + exit(1); +#endif + + pname = argv[0]; + for (pp = pname; *pp; ) + if (*pp++ == PATH_SEP) + pname = pp; +#ifdef FILE_SEP + for (pp = pname; *pp; pp++) + if (*pp == FILE_SEP) + { + *pp = '\0'; + break; + } +#endif + + while (argc >= 2) + { + pp = argv[1] + (!STRNCMP(argv[1], "--", 2) && argv[1][2]); + if (!STRNCMP(pp, "-a", 2)) autoskip = 1 - autoskip; + else if (!STRNCMP(pp, "-b", 2)) hextype = HEX_BITS; + else if (!STRNCMP(pp, "-e", 2)) hextype = HEX_LITTLEENDIAN; + else if (!STRNCMP(pp, "-u", 2)) hexx = hexxa + 16; + else if (!STRNCMP(pp, "-p", 2)) hextype = HEX_POSTSCRIPT; + else if (!STRNCMP(pp, "-i", 2)) hextype = HEX_CINCLUDE; + else if (!STRNCMP(pp, "-C", 2)) capitalize = 1; + else if (!STRNCMP(pp, "-r", 2)) revert++; + else if (!STRNCMP(pp, "-E", 2)) ebcdic++; + else if (!STRNCMP(pp, "-v", 2)) + { + fprintf(stderr, "%s%s\n", version, osver); + exit(0); + } + else if (!STRNCMP(pp, "-c", 2)) + { + if (pp[2] && !STRNCMP("apitalize", pp + 2, 9)) + capitalize = 1; + else if (pp[2] && STRNCMP("ols", pp + 2, 3)) + cols = (int)strtol(pp + 2, NULL, 0); + else + { + if (!argv[2]) + exit_with_usage(); + cols = (int)strtol(argv[2], NULL, 0); + argv++; + argc--; + } + } + else if (!STRNCMP(pp, "-g", 2)) + { + if (pp[2] && STRNCMP("roup", pp + 2, 4)) + octspergrp = (int)strtol(pp + 2, NULL, 0); + else + { + if (!argv[2]) + exit_with_usage(); + octspergrp = (int)strtol(argv[2], NULL, 0); + argv++; + argc--; + } + } + else if (!STRNCMP(pp, "-o", 2)) + { + int reloffset = 0; + int negoffset = 0; + if (pp[2] && STRNCMP("ffset", pp + 2, 5)) + displayoff = strtoul(pp + 2, NULL, 0); + else + { + if (!argv[2]) + exit_with_usage(); + + if (argv[2][0] == '+') + reloffset++; + if (argv[2][reloffset] == '-') + negoffset++; + + if (negoffset) + displayoff = ULONG_MAX - strtoul(argv[2] + reloffset+negoffset, NULL, 0) + 1; + else + displayoff = strtoul(argv[2] + reloffset+negoffset, NULL, 0); + + argv++; + argc--; + } + } + else if (!STRNCMP(pp, "-s", 2)) + { + relseek = 0; + negseek = 0; + if (pp[2] && STRNCMP("kip", pp+2, 3) && STRNCMP("eek", pp+2, 3)) + { +#ifdef TRY_SEEK + if (pp[2] == '+') + relseek++; + if (pp[2+relseek] == '-') + negseek++; +#endif + seekoff = strtol(pp + 2+relseek+negseek, (char **)NULL, 0); + } + else + { + if (!argv[2]) + exit_with_usage(); +#ifdef TRY_SEEK + if (argv[2][0] == '+') + relseek++; + if (argv[2][relseek] == '-') + negseek++; +#endif + seekoff = strtol(argv[2] + relseek+negseek, (char **)NULL, 0); + argv++; + argc--; + } + } + else if (!STRNCMP(pp, "-l", 2)) + { + if (pp[2] && STRNCMP("en", pp + 2, 2)) + length = strtol(pp + 2, (char **)NULL, 0); + else + { + if (!argv[2]) + exit_with_usage(); + length = strtol(argv[2], (char **)NULL, 0); + argv++; + argc--; + } + } + else if (!strcmp(pp, "--")) /* end of options */ + { + argv++; + argc--; + break; + } + else if (pp[0] == '-' && pp[1]) /* unknown option */ + exit_with_usage(); + else + break; /* not an option */ + + argv++; /* advance to next argument */ + argc--; + } + + if (!cols) + switch (hextype) + { + case HEX_POSTSCRIPT: cols = 30; break; + case HEX_CINCLUDE: cols = 12; break; + case HEX_BITS: cols = 6; break; + case HEX_NORMAL: + case HEX_LITTLEENDIAN: + default: cols = 16; break; + } + + if (octspergrp < 0) + switch (hextype) + { + case HEX_BITS: octspergrp = 1; break; + case HEX_NORMAL: octspergrp = 2; break; + case HEX_LITTLEENDIAN: octspergrp = 4; break; + case HEX_POSTSCRIPT: + case HEX_CINCLUDE: + default: octspergrp = 0; break; + } + + if (cols < 1 || ((hextype == HEX_NORMAL || hextype == HEX_BITS || hextype == HEX_LITTLEENDIAN) + && (cols > COLS))) + { + fprintf(stderr, "%s: invalid number of columns (max. %d).\n", pname, COLS); + exit(1); + } + + if (octspergrp < 1 || octspergrp > cols) + octspergrp = cols; + else if (hextype == HEX_LITTLEENDIAN && (octspergrp & (octspergrp-1))) + { + fprintf(stderr, + "%s: number of octets per group must be a power of 2 with -e.\n", + pname); + exit(1); + } + + if (argc > 3) + exit_with_usage(); + + if (argc == 1 || (argv[1][0] == '-' && !argv[1][1])) + BIN_ASSIGN(fp = stdin, !revert); + else + { + if ((fp = fopen(argv[1], BIN_READ(!revert))) == NULL) + { + fprintf(stderr,"%s: ", pname); + perror(argv[1]); + return 2; + } + } + + if (argc < 3 || (argv[2][0] == '-' && !argv[2][1])) + BIN_ASSIGN(fpo = stdout, revert); + else + { + int fd; + int mode = revert ? O_WRONLY : (O_TRUNC|O_WRONLY); + + if (((fd = OPEN(argv[2], mode | BIN_CREAT(revert), 0666)) < 0) || + (fpo = fdopen(fd, BIN_WRITE(revert))) == NULL) + { + fprintf(stderr, "%s: ", pname); + perror(argv[2]); + return 3; + } + rewind(fpo); + } + + if (revert) + { + if (hextype && (hextype != HEX_POSTSCRIPT)) + { + fprintf(stderr, "%s: sorry, cannot revert this type of hexdump\n", pname); + return -1; + } + return huntype(fp, fpo, stderr, cols, hextype, + negseek ? -seekoff : seekoff); + } + + if (seekoff || negseek || !relseek) + { +#ifdef TRY_SEEK + if (relseek) + e = fseek(fp, negseek ? -seekoff : seekoff, 1); + else + e = fseek(fp, negseek ? -seekoff : seekoff, negseek ? 2 : 0); + if (e < 0 && negseek) + { + fprintf(stderr, "%s: sorry cannot seek.\n", pname); + return 4; + } + if (e >= 0) + seekoff = ftell(fp); + else +#endif + { + long s = seekoff; + + while (s--) + if (getc(fp) == EOF) + { + if (ferror(fp)) + { + die(2); + } + else + { + fprintf(stderr, "%s: sorry cannot seek.\n", pname); + return 4; + } + } + } + } + + if (hextype == HEX_CINCLUDE) + { + if (fp != stdin) + { + if (fprintf(fpo, "unsigned char %s", isdigit((int)argv[1][0]) ? "__" : "") < 0) + die(3); + for (e = 0; (c = argv[1][e]) != 0; e++) + if (putc(isalnum(c) ? CONDITIONAL_CAPITALIZE(c) : '_', fpo) == EOF) + die(3); + if (fputs("[] = {\n", fpo) == EOF) + die(3); + } + + p = 0; + c = 0; + while ((length < 0 || p < length) && (c = getc(fp)) != EOF) + { + if (fprintf(fpo, (hexx == hexxa) ? "%s0x%02x" : "%s0X%02X", + (p % cols) ? ", " : &",\n "[2*!p], c) < 0) + die(3); + p++; + } + if (c == EOF && ferror(fp)) + die(2); + + if (p && fputs("\n", fpo) == EOF) + die(3); + if (fputs(&"};\n"[3 * (fp == stdin)], fpo) == EOF) + die(3); + + if (fp != stdin) + { + if (fprintf(fpo, "unsigned int %s", isdigit((int)argv[1][0]) ? "__" : "") < 0) + die(3); + for (e = 0; (c = argv[1][e]) != 0; e++) + if (putc(isalnum(c) ? CONDITIONAL_CAPITALIZE(c) : '_', fpo) == EOF) + die(3); + if (fprintf(fpo, "_%s = %d;\n", capitalize ? "LEN" : "len", p) < 0) + die(3); + } + + if (fclose(fp)) + die(2); + if (fclose(fpo)) + die(3); + return 0; + } + + if (hextype == HEX_POSTSCRIPT) + { + p = cols; + e = 0; + while ((length < 0 || n < length) && (e = getc(fp)) != EOF) + { + if (putc(hexx[(e >> 4) & 0xf], fpo) == EOF + || putc(hexx[e & 0xf], fpo) == EOF) + die(3); + n++; + if (!--p) + { + if (putc('\n', fpo) == EOF) + die(3); + p = cols; + } + } + if (e == EOF && ferror(fp)) + die(2); + if (p < cols) + if (putc('\n', fpo) == EOF) + die(3); + if (fclose(fp)) + die(2); + if (fclose(fpo)) + die(3); + return 0; + } + + /* hextype: HEX_NORMAL or HEX_BITS or HEX_LITTLEENDIAN */ + + if (hextype != HEX_BITS) + grplen = octspergrp + octspergrp + 1; /* chars per octet group */ + else /* hextype == HEX_BITS */ + grplen = 8 * octspergrp + 1; + + e = 0; + while ((length < 0 || n < length) && (e = getc(fp)) != EOF) + { + if (p == 0) + { + addrlen = sprintf(l, "%08lx:", + ((unsigned long)(n + seekoff + displayoff))); + for (c = addrlen; c < LLEN; l[c++] = ' '); + } + if (hextype == HEX_NORMAL) + { + l[c = (addrlen + 1 + (grplen * p) / octspergrp)] = hexx[(e >> 4) & 0xf]; + l[++c] = hexx[ e & 0xf]; + } + else if (hextype == HEX_LITTLEENDIAN) + { + int x = p ^ (octspergrp-1); + l[c = (addrlen + 1 + (grplen * x) / octspergrp)] = hexx[(e >> 4) & 0xf]; + l[++c] = hexx[ e & 0xf]; + } + else /* hextype == HEX_BITS */ + { + int i; + + c = (addrlen + 1 + (grplen * p) / octspergrp) - 1; + for (i = 7; i >= 0; i--) + l[++c] = (e & (1 << i)) ? '1' : '0'; + } + if (e) + nonzero++; + if (ebcdic) + e = (e < 64) ? '.' : etoa64[e-64]; + /* When changing this update definition of LLEN above. */ + l[addrlen + 3 + (grplen * cols - 1)/octspergrp + p] = +#ifdef __MVS__ + (e >= 64) +#else + (e > 31 && e < 127) +#endif + ? e : '.'; + n++; + if (++p == cols) + { + l[c = (addrlen + 3 + (grplen * cols - 1)/octspergrp + p)] = '\n'; l[++c] = '\0'; + xxdline(fpo, l, autoskip ? nonzero : 1); + nonzero = 0; + p = 0; + } + } + if (e == EOF && ferror(fp)) + die(2); + if (p) + { + l[c = (addrlen + 3 + (grplen * cols - 1)/octspergrp + p)] = '\n'; l[++c] = '\0'; + xxdline(fpo, l, 1); + } + else if (autoskip) + xxdline(fpo, l, -1); /* last chance to flush out suppressed lines */ + + if (fclose(fp)) + die(2); + if (fclose(fpo)) + die(3); + return 0; +} + +/* vi:set ts=8 sw=4 sts=2 cino+={2 cino+=n-2 : */ diff --git a/app-editors/xxd/metadata.xml b/app-editors/xxd/metadata.xml new file mode 100644 index 0000000..42e9022 --- /dev/null +++ b/app-editors/xxd/metadata.xml @@ -0,0 +1,8 @@ + + + + + sgilles@math.umd.edu + S. Gilles + + diff --git a/app-editors/xxd/xxd-8.1.1306.ebuild b/app-editors/xxd/xxd-8.1.1306.ebuild new file mode 100644 index 0000000..72dc462 --- /dev/null +++ b/app-editors/xxd/xxd-8.1.1306.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2019 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="xxd, ripped from vim-core" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +SRC_URI="" + +LICENSE="vim" +SLOT="0" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND="!app-editors/vim-core" + +src_unpack() { + mkdir -p "${P}" + cp "${FILESDIR}/Makefile" "${P}/Makefile" + cp "${FILESDIR}/xxd.c" "${P}/xxd.c" +} + +src_install() { + dobin xxd +} diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest index 866e42e..2bfa604 100644 --- a/www-client/netsurf/Manifest +++ b/www-client/netsurf/Manifest @@ -1,5 +1,5 @@ AUX netsurf-9999-reenable-glib-deprecated.patch 466 BLAKE2B 65b838e7c3cd0ffc9fbe0b91db7e062d3c2ea55bb8e60b9dac1114bef5a10030595e16cd7cebfbe1d88aa75a69b097c39a3da466dfc71fc94707860a22f2455a SHA512 244cf76f6647c17810e406df191384c60c08c0855e7bdc7a082aceaccc0f6cbebda655529fe69c8f05cce350a78c811d79022a54823468ec7dadfb90735d4c20 DIST netsurf-fb.modes-example.gz 4586 BLAKE2B 89c76fde1ddc79e46f22d9f628f8d75ec57be2a29d31383550137e3b502aa4d8c0a733b755731c916d4d544679a4253323bc343528c5e2c4f145c3318ac1d86d SHA512 753a707dc428212803dd64250bb723a498fdc1c328fdac4df38be533eab3af45f727cdc6b7ced3faaa0e82db182c4eab140b8e81b0d3cfe2152252b89e6d2981 -EBUILD netsurf-9999.ebuild 4866 BLAKE2B 3d890738c55e8a289f47c4186cea87dce185ef3dc03837fcca8bf958e4b291a540e1a6161243d6c94a1728e7519bdcd4329d85a3decd3a5b5b9e68b755ad4103 SHA512 e9646d9bcef95534e7ceebd676d4787834d6e0fd53d0aee47466b80dd77724dce551f18b0d9aad25669feb1bd76869c3785a7a916ec4cb6fd6a8d9f47553aa45 +EBUILD netsurf-9999.ebuild 4914 BLAKE2B 983b2ddfcfd0d27aec23f7804938d8b644b93adc9b93c4d2fef6ef6b2513fdc5806de27bf957eea1aa24a9398325ee62d121b84ba3e024a1c1a9587c22ffc26c SHA512 91118b0995c048a7f32cac15299c483105ab2b0eb819abbf063d413d36a3ce55fb61d0634bdb3e3a23a90f2ee6fed53f4e9542caebdea3cfa7f9d82c2027a11d MISC ChangeLog 1987 BLAKE2B 22eeb881d5fe196aec7d93fedca04d1844ad479f187153c59a3433a34e97bd702e751f8b54ca6e5e43fa7f9b32d3b018f5aa995fbdab15d1dd31d5c95272450e SHA512 10767ac215f11823d66c7c72e76424984e7adcb3a3e5b0ccf00b9b23cebb395dbcb05838894e1fcd897054e9d00f30e5bf5d49b985ad787a6229092ed0170f1d MISC metadata.xml 1577 BLAKE2B 12f3dcb44bf7b8c0357084d57db23228e365804ebd7a976c0168c383c5a78e24f33789de9ac8f84200063b0729c6f0eed5fd1e371103e3bde29970a1be8349fa SHA512 4003d28e9ef15fe3f3a46080a2584986e166148a43f060cbc90bbcc46ffe130becca495b65ee3e0d3bd348f78fdd42bccfd0e1fa90a7176a8ff5d01151a4ffc8 diff --git a/www-client/netsurf/netsurf-9999.ebuild b/www-client/netsurf/netsurf-9999.ebuild index 2f8a108..accb031 100644 --- a/www-client/netsurf/netsurf-9999.ebuild +++ b/www-client/netsurf/netsurf-9999.ebuild @@ -47,7 +47,8 @@ RDEPEND="dev-libs/libxml2 mng? ( >=media-libs/libmng-1.0.10-r2[${MULTILIB_USEDEP}] ) png? ( >=media-libs/libpng-1.2.51[${MULTILIB_USEDEP}] ) svg? ( svgtiny? ( >=media-libs/libsvgtiny-9999[${MULTILIB_USEDEP}] ) - !svgtiny? ( gnome-base/librsvg:2 ) )" + !svgtiny? ( gnome-base/librsvg:2 ) ) + (|| ( app-editors/vim-core app-editors/xxd ) )" DEPEND="${RDEPEND} javascript? ( >=dev-libs/nsgenbind-0.1.1 ) rosprite? ( >=media-libs/librosprite-0.1.1[${MULTILIB_USEDEP}] ) -- 2.11.4.GIT