Deleted Added
full compact
args.c (57523) args.c (62311)
1/*-
2 * Copyright (c) 1991, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Keith Muller of the University of California, San Diego and Lance
7 * Visser of Convex Computer Corporation.
8 *

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

35 * SUCH DAMAGE.
36 */
37
38#ifndef lint
39#if 0
40static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94";
41#endif
42static const char rcsid[] =
1/*-
2 * Copyright (c) 1991, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Keith Muller of the University of California, San Diego and Lance
7 * Visser of Convex Computer Corporation.
8 *

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

35 * SUCH DAMAGE.
36 */
37
38#ifndef lint
39#if 0
40static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94";
41#endif
42static const char rcsid[] =
43 "$FreeBSD: head/bin/dd/args.c 57523 2000-02-26 21:29:44Z green $";
43 "$FreeBSD: head/bin/dd/args.c 62311 2000-07-01 05:36:25Z green $";
44#endif /* not lint */
45
46#include <sys/types.h>
47
48#include <err.h>
49#include <errno.h>
50#include <limits.h>
51#include <stdlib.h>

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

127 /* Final sanity checks. */
128
129 if (ddflags & C_BS) {
130 /*
131 * Bs is turned off by any conversion -- we assume the user
132 * just wanted to set both the input and output block sizes
133 * and didn't want the bs semantics, so we don't warn.
134 */
44#endif /* not lint */
45
46#include <sys/types.h>
47
48#include <err.h>
49#include <errno.h>
50#include <limits.h>
51#include <stdlib.h>

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

127 /* Final sanity checks. */
128
129 if (ddflags & C_BS) {
130 /*
131 * Bs is turned off by any conversion -- we assume the user
132 * just wanted to set both the input and output block sizes
133 * and didn't want the bs semantics, so we don't warn.
134 */
135 if (ddflags & (C_BLOCK|C_LCASE|C_SWAB|C_UCASE|C_UNBLOCK))
135 if (ddflags & (C_BLOCK | C_LCASE | C_SWAB | C_UCASE |
136 C_UNBLOCK))
136 ddflags &= ~C_BS;
137
138 /* Bs supersedes ibs and obs. */
137 ddflags &= ~C_BS;
138
139 /* Bs supersedes ibs and obs. */
139 if (ddflags & C_BS && ddflags & (C_IBS|C_OBS))
140 if (ddflags & C_BS && ddflags & (C_IBS | C_OBS))
140 warnx("bs supersedes ibs and obs");
141 }
142
143 /*
144 * Ascii/ebcdic and cbs implies block/unblock.
145 * Block/unblock requires cbs and vice-versa.
146 */
147 if (ddflags & (C_BLOCK | C_UNBLOCK)) {

--- 286 unchanged lines hidden ---
141 warnx("bs supersedes ibs and obs");
142 }
143
144 /*
145 * Ascii/ebcdic and cbs implies block/unblock.
146 * Block/unblock requires cbs and vice-versa.
147 */
148 if (ddflags & (C_BLOCK | C_UNBLOCK)) {

--- 286 unchanged lines hidden ---