Deleted Added
sdiff udiff text old ( 51137 ) new ( 51208 )
full compact
args.c (51137) args.c (51208)
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 51137 1999-09-11 00:02:42Z green $";
43 "$FreeBSD: head/bin/dd/args.c 51208 1999-09-12 16:51:53Z 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>

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

63static void f_files __P((char *));
64static void f_ibs __P((char *));
65static void f_if __P((char *));
66static void f_obs __P((char *));
67static void f_of __P((char *));
68static void f_seek __P((char *));
69static void f_skip __P((char *));
70static quad_t get_num __P((char *));
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>

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

63static void f_files __P((char *));
64static void f_ibs __P((char *));
65static void f_if __P((char *));
66static void f_obs __P((char *));
67static void f_of __P((char *));
68static void f_seek __P((char *));
69static void f_skip __P((char *));
70static quad_t get_num __P((char *));
71static off_t get_offset __P((char *));
71
72
72static struct arg {
73static const struct arg {
73 char *name;
74 void (*f) __P((char *));
75 u_int set, noset;
76} args[] = {
77 { "bs", f_bs, C_BS, C_BS|C_IBS|C_OBS|C_OSYNC },
78 { "cbs", f_cbs, C_CBS, C_CBS },
79 { "conv", f_conv, 0, 0 },
80 { "count", f_count, C_COUNT, C_COUNT },

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

155 } else {
156 ddflags |= C_BLOCK;
157 cfunc = block;
158 }
159 } else
160 errx(1, "cbs meaningless if not doing record operations");
161 } else
162 cfunc = def;
74 char *name;
75 void (*f) __P((char *));
76 u_int set, noset;
77} args[] = {
78 { "bs", f_bs, C_BS, C_BS|C_IBS|C_OBS|C_OSYNC },
79 { "cbs", f_cbs, C_CBS, C_CBS },
80 { "conv", f_conv, 0, 0 },
81 { "count", f_count, C_COUNT, C_COUNT },

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

156 } else {
157 ddflags |= C_BLOCK;
158 cfunc = block;
159 }
160 } else
161 errx(1, "cbs meaningless if not doing record operations");
162 } else
163 cfunc = def;
164 /*
165 * Bail out if the calculation of a file offset would overflow.
166 */
167 if (in.offset > QUAD_MAX / in.dbsz || out.offset > QUAD_MAX / out.dbsz)
168 errx(1, "seek offsets cannot be larger than %qd", QUAD_MAX);
163}
164
165static int
166c_arg(a, b)
167 const void *a, *b;
168{
169
170 return (strcmp(((struct arg *)a)->name, ((struct arg *)b)->name));
171}
172
173static void
174f_bs(arg)
175 char *arg;
176{
169}
170
171static int
172c_arg(a, b)
173 const void *a, *b;
174{
175
176 return (strcmp(((struct arg *)a)->name, ((struct arg *)b)->name));
177}
178
179static void
180f_bs(arg)
181 char *arg;
182{
177 quad_t res = get_num(arg);
183 quad_t res;
178
184
179 if (res < 1 || res > INT_MAX)
180 errx(1, "bs must be between 1 and %d", INT_MAX);
181 in.dbsz = out.dbsz = (int)res;
185 res = get_num(arg);
186 if (res < 1 || res > SSIZE_MAX)
187 errx(1, "bs must be between 1 and %d", SSIZE_MAX);
188 in.dbsz = out.dbsz = (size_t)res;
182}
183
184static void
185f_cbs(arg)
186 char *arg;
187{
189}
190
191static void
192f_cbs(arg)
193 char *arg;
194{
188 quad_t res = get_num(arg);
195 quad_t res;
189
196
190 if (res < 1 || res > INT_MAX)
191 errx(1, "cbs must be between 1 and %d", INT_MAX);
192 cbsz = (int)res;
197 res = get_num(arg);
198 if (res < 1 || res > SSIZE_MAX)
199 errx(1, "cbs must be between 1 and %d", SSIZE_MAX);
200 cbsz = (size_t)res;
193}
194
195static void
196f_count(arg)
197 char *arg;
198{
199
200 cpy_cnt = get_num(arg);
201
202 if (!cpy_cnt)
203 terminate(0);
201}
202
203static void
204f_count(arg)
205 char *arg;
206{
207
208 cpy_cnt = get_num(arg);
209
210 if (!cpy_cnt)
211 terminate(0);
204 if (cpy_cnt < 0)
205 errx(1, "count cannot be negative");
206}
207
208static void
209f_files(arg)
210 char *arg;
211{
212
213 files_cnt = get_num(arg);
212}
213
214static void
215f_files(arg)
216 char *arg;
217{
218
219 files_cnt = get_num(arg);
214 if (files_cnt < 0)
215 errx(1, "files cannot be negative");
216}
217
218static void
219f_ibs(arg)
220 char *arg;
221{
220}
221
222static void
223f_ibs(arg)
224 char *arg;
225{
226 quad_t res;
222
223 if (!(ddflags & C_BS)) {
227
228 if (!(ddflags & C_BS)) {
224 quad_t res = get_num(arg);
225
226 if (res < 1 || res > INT_MAX)
229 res = get_num(arg);
230 if (res < 1 || res > SSIZE_MAX)
227 errx(1, "ibs must be between 1 and %d", INT_MAX);
228 in.dbsz = (int)res;
229 }
230}
231
232static void
233f_if(arg)
234 char *arg;
235{
236
237 in.name = arg;
238}
239
240static void
241f_obs(arg)
242 char *arg;
243{
231 errx(1, "ibs must be between 1 and %d", INT_MAX);
232 in.dbsz = (int)res;
233 }
234}
235
236static void
237f_if(arg)
238 char *arg;
239{
240
241 in.name = arg;
242}
243
244static void
245f_obs(arg)
246 char *arg;
247{
248 quad_t res;
244
245 if (!(ddflags & C_BS)) {
249
250 if (!(ddflags & C_BS)) {
246 quad_t res = get_num(arg);
247
248 if (res < 1 || res > INT_MAX)
249 errx(1, "ibs must be between 1 and %d", INT_MAX);
250 out.dbsz = (int)res;
251 res = get_num(arg);
252 if (res < 1 || res > SSIZE_MAX)
253 errx(1, "obs must be between 1 and %d", SSIZE_MAX);
254 out.dbsz = (size_t)res;
251 }
252}
253
254static void
255f_of(arg)
256 char *arg;
257{
258
259 out.name = arg;
260}
261
262static void
263f_seek(arg)
264 char *arg;
265{
266
255 }
256}
257
258static void
259f_of(arg)
260 char *arg;
261{
262
263 out.name = arg;
264}
265
266static void
267f_seek(arg)
268 char *arg;
269{
270
267 out.offset = get_num(arg);
271 out.offset = get_offset(arg);
268}
269
270static void
271f_skip(arg)
272 char *arg;
273{
274
272}
273
274static void
275f_skip(arg)
276 char *arg;
277{
278
275 in.offset = get_num(arg);
279 in.offset = get_offset(arg);
276}
277
280}
281
278static struct conv {
282static const struct conv {
279 char *name;
280 u_int set, noset;
283 char *name;
284 u_int set, noset;
281 u_char *ctab;
285 const u_char *ctab;
282} clist[] = {
283 { "ascii", C_ASCII, C_EBCDIC, e2a_POSIX },
284 { "block", C_BLOCK, C_UNBLOCK, NULL },
285 { "ebcdic", C_EBCDIC, C_ASCII, a2e_POSIX },
286 { "ibm", C_EBCDIC, C_ASCII, a2ibm_POSIX },
287 { "lcase", C_LCASE, C_UCASE, NULL },
288 { "noerror", C_NOERROR, 0, NULL },
289 { "notrunc", C_NOTRUNC, 0, NULL },

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

301static void
302f_conv(arg)
303 char *arg;
304{
305 struct conv *cp, tmp;
306
307 while (arg != NULL) {
308 tmp.name = strsep(&arg, ",");
286} clist[] = {
287 { "ascii", C_ASCII, C_EBCDIC, e2a_POSIX },
288 { "block", C_BLOCK, C_UNBLOCK, NULL },
289 { "ebcdic", C_EBCDIC, C_ASCII, a2e_POSIX },
290 { "ibm", C_EBCDIC, C_ASCII, a2ibm_POSIX },
291 { "lcase", C_LCASE, C_UCASE, NULL },
292 { "noerror", C_NOERROR, 0, NULL },
293 { "notrunc", C_NOTRUNC, 0, NULL },

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

305static void
306f_conv(arg)
307 char *arg;
308{
309 struct conv *cp, tmp;
310
311 while (arg != NULL) {
312 tmp.name = strsep(&arg, ",");
309 if (!(cp = (struct conv *)bsearch(&tmp, clist,
310 sizeof(clist)/sizeof(struct conv), sizeof(struct conv),
311 c_conv)))
313 cp = bsearch(&tmp, clist, sizeof(clist) / sizeof(struct conv),
314 sizeof(struct conv), c_conv);
315 if (cp == NULL)
312 errx(1, "unknown conversion %s", tmp.name);
313 if (ddflags & cp->noset)
314 errx(1, "%s: illegal conversion combination", tmp.name);
315 ddflags |= cp->set;
316 if (cp->ctab)
317 ctab = cp->ctab;
318 }
319}

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

342get_num(val)
343 char *val;
344{
345 quad_t num, t;
346 char *expr;
347
348 errno = 0;
349 num = strtoq(val, &expr, 0);
316 errx(1, "unknown conversion %s", tmp.name);
317 if (ddflags & cp->noset)
318 errx(1, "%s: illegal conversion combination", tmp.name);
319 ddflags |= cp->set;
320 if (cp->ctab)
321 ctab = cp->ctab;
322 }
323}

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

346get_num(val)
347 char *val;
348{
349 quad_t num, t;
350 char *expr;
351
352 errno = 0;
353 num = strtoq(val, &expr, 0);
350 if (errno) /* Overflow or underflow. */
354 if (errno != 0) /* Overflow or underflow. */
351 err(1, "%s", oper);
352
355 err(1, "%s", oper);
356
353 if (expr == val) /* Not a valid number */
357 if (expr == val) /* No valid digits. */
354 errx(1, "%s: illegal numeric value", oper);
355
356 switch (*expr) {
357 case 'b':
358 t = num;
359 num *= 512;
360 if (t > num)
361 goto erange;

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

402 break;
403erange:
404 errx(1, "%s: %s", oper, strerror(ERANGE));
405 default:
406 errx(1, "%s: illegal numeric value", oper);
407 }
408 return (num);
409}
358 errx(1, "%s: illegal numeric value", oper);
359
360 switch (*expr) {
361 case 'b':
362 t = num;
363 num *= 512;
364 if (t > num)
365 goto erange;

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

406 break;
407erange:
408 errx(1, "%s: %s", oper, strerror(ERANGE));
409 default:
410 errx(1, "%s: illegal numeric value", oper);
411 }
412 return (num);
413}
414
415static off_t
416get_offset(val)
417 char *val;
418{
419 quad_t num;
420
421 num = get_num(val);
422 if (num > QUAD_MAX || num < 0) /* XXX quad_t != off_t */
423 errx(1, "%s: illegal offset", oper); /* Too big/negative. */
424 return ((off_t)num);
425}