Deleted Added
full compact
hexdump.c (27315) hexdump.c (30921)
1/*
2 * Copyright (c) 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 28 unchanged lines hidden (view full) ---

37 The Regents of the University of California. All rights reserved.\n";
38#endif /* not lint */
39
40#ifndef lint
41#if 0
42static char sccsid[] = "@(#)hexdump.c 8.1 (Berkeley) 6/6/93";
43#endif
44static const char rcsid[] =
1/*
2 * Copyright (c) 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 28 unchanged lines hidden (view full) ---

37 The Regents of the University of California. All rights reserved.\n";
38#endif /* not lint */
39
40#ifndef lint
41#if 0
42static char sccsid[] = "@(#)hexdump.c 8.1 (Berkeley) 6/6/93";
43#endif
44static const char rcsid[] =
45 "$Id$";
45 "$Id: hexdump.c,v 1.2 1997/07/10 06:48:16 charnier Exp $";
46#endif /* not lint */
47
48#include <sys/types.h>
46#endif /* not lint */
47
48#include <sys/types.h>
49
49#include <locale.h>
50#include <stdlib.h>
51#include <stdio.h>
52#include <string.h>
53#include "hexdump.h"
54
55FS *fshead; /* head of format strings */
56int blocksize; /* data block size */
57int exitval; /* final exit value */
58int length = -1; /* max bytes to read */
59
60int
61main(argc, argv)
62 int argc;
63 char *argv[];
64{
65 register FS *tfs;
66 char *p;
67
50#include <stdlib.h>
51#include <stdio.h>
52#include <string.h>
53#include "hexdump.h"
54
55FS *fshead; /* head of format strings */
56int blocksize; /* data block size */
57int exitval; /* final exit value */
58int length = -1; /* max bytes to read */
59
60int
61main(argc, argv)
62 int argc;
63 char *argv[];
64{
65 register FS *tfs;
66 char *p;
67
68 (void)setlocale(LC_CTYPE, "");
69
68 if (!(p = rindex(argv[0], 'o')) || strcmp(p, "od"))
69 newsyntax(argc, &argv);
70 else
71 oldsyntax(argc, &argv);
72
73 /* figure out the data block size */
74 for (blocksize = 0, tfs = fshead; tfs; tfs = tfs->nextfs) {
75 tfs->bcnt = size(tfs);
76 if (blocksize < tfs->bcnt)
77 blocksize = tfs->bcnt;
78 }
79 /* rewrite the rules, do syntax checking */
80 for (tfs = fshead; tfs; tfs = tfs->nextfs)
81 rewrite(tfs);
82
83 (void)next(argv);
84 display();
85 exit(exitval);
86}
70 if (!(p = rindex(argv[0], 'o')) || strcmp(p, "od"))
71 newsyntax(argc, &argv);
72 else
73 oldsyntax(argc, &argv);
74
75 /* figure out the data block size */
76 for (blocksize = 0, tfs = fshead; tfs; tfs = tfs->nextfs) {
77 tfs->bcnt = size(tfs);
78 if (blocksize < tfs->bcnt)
79 blocksize = tfs->bcnt;
80 }
81 /* rewrite the rules, do syntax checking */
82 for (tfs = fshead; tfs; tfs = tfs->nextfs)
83 rewrite(tfs);
84
85 (void)next(argv);
86 display();
87 exit(exitval);
88}