f4ac32def2
Add some constness to avoid some warnings. Remove use register keyword. Deal with missing/unneeded extern/prototypes. Some minor type changes/casts to avoid warnings. Reviewed by: md5
145 lines
4.0 KiB
C
145 lines
4.0 KiB
C
/*-
|
|
* Copyright (c) 1990, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef lint
|
|
#if 0
|
|
static char sccsid[] = "@(#)hexsyntax.c 8.2 (Berkeley) 5/4/95";
|
|
#endif
|
|
#endif /* not lint */
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <err.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include "hexdump.h"
|
|
|
|
off_t skip; /* bytes to skip */
|
|
|
|
void
|
|
newsyntax(int argc, char ***argvp)
|
|
{
|
|
int ch;
|
|
char *p, **argv;
|
|
|
|
argv = *argvp;
|
|
if ((p = rindex(argv[0], 'h')) != NULL &&
|
|
strcmp(p, "hd") == 0) {
|
|
/* "Canonical" format, implies -C. */
|
|
add("\"%08.8_Ax\n\"");
|
|
add("\"%08.8_ax \" 8/1 \"%02x \" \" \" 8/1 \"%02x \" ");
|
|
add("\" |\" 16/1 \"%_p\" \"|\\n\"");
|
|
}
|
|
while ((ch = getopt(argc, argv, "bcCde:f:n:os:vx")) != -1)
|
|
switch (ch) {
|
|
case 'b':
|
|
add("\"%07.7_Ax\n\"");
|
|
add("\"%07.7_ax \" 16/1 \"%03o \" \"\\n\"");
|
|
break;
|
|
case 'c':
|
|
add("\"%07.7_Ax\n\"");
|
|
add("\"%07.7_ax \" 16/1 \"%3_c \" \"\\n\"");
|
|
break;
|
|
case 'C':
|
|
add("\"%08.8_Ax\n\"");
|
|
add("\"%08.8_ax \" 8/1 \"%02x \" \" \" 8/1 \"%02x \" ");
|
|
add("\" |\" 16/1 \"%_p\" \"|\\n\"");
|
|
break;
|
|
case 'd':
|
|
add("\"%07.7_Ax\n\"");
|
|
add("\"%07.7_ax \" 8/2 \" %05u \" \"\\n\"");
|
|
break;
|
|
case 'e':
|
|
add(optarg);
|
|
break;
|
|
case 'f':
|
|
addfile(optarg);
|
|
break;
|
|
case 'n':
|
|
if ((length = atoi(optarg)) < 0)
|
|
errx(1, "%s: bad length value", optarg);
|
|
break;
|
|
case 'o':
|
|
add("\"%07.7_Ax\n\"");
|
|
add("\"%07.7_ax \" 8/2 \" %06o \" \"\\n\"");
|
|
break;
|
|
case 's':
|
|
if ((skip = strtoll(optarg, &p, 0)) < 0)
|
|
errx(1, "%s: bad skip value", optarg);
|
|
switch(*p) {
|
|
case 'b':
|
|
skip *= 512;
|
|
break;
|
|
case 'k':
|
|
skip *= 1024;
|
|
break;
|
|
case 'm':
|
|
skip *= 1048576;
|
|
break;
|
|
}
|
|
break;
|
|
case 'v':
|
|
vflag = ALL;
|
|
break;
|
|
case 'x':
|
|
add("\"%07.7_Ax\n\"");
|
|
add("\"%07.7_ax \" 8/2 \" %04x \" \"\\n\"");
|
|
break;
|
|
case '?':
|
|
usage();
|
|
}
|
|
|
|
if (!fshead) {
|
|
add("\"%07.7_Ax\n\"");
|
|
add("\"%07.7_ax \" 8/2 \"%04x \" \"\\n\"");
|
|
}
|
|
|
|
*argvp += optind;
|
|
}
|
|
|
|
void
|
|
usage(void)
|
|
{
|
|
(void)fprintf(stderr, "%s\n%s\n%s\n%s\n",
|
|
"usage: hexdump [-bcCdovx] [-e fmt] [-f fmt_file] [-n length]",
|
|
" [-s skip] [file ...]",
|
|
" hd [-bcdovx] [-e fmt] [-f fmt_file] [-n length]",
|
|
" [-s skip] [file ...]");
|
|
exit(1);
|
|
}
|