summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorgreen <green@FreeBSD.org>1999-09-11 00:02:42 +0000
committergreen <green@FreeBSD.org>1999-09-11 00:02:42 +0000
commita9f7b5ee698afe56d1167bfa395f23b1fff1730c (patch)
tree393cf880a9dcff3b4a3f9f87e347a3aae411d2dd /bin
parentf95e7771eeb859d148e01daa24d5fa2368720e47 (diff)
downloadFreeBSD-src-a9f7b5ee698afe56d1167bfa395f23b1fff1730c.zip
FreeBSD-src-a9f7b5ee698afe56d1167bfa395f23b1fff1730c.tar.gz
Make a bit more headway with dd's argument parsing, etc. get_bsz() is
renamed get_num() since it's not just about block sizes. skip and seek can be any offset, including negative, now. Some style bogons are fixed.
Diffstat (limited to 'bin')
-rw-r--r--bin/dd/args.c46
-rw-r--r--bin/dd/position.c12
2 files changed, 32 insertions, 26 deletions
diff --git a/bin/dd/args.c b/bin/dd/args.c
index 3de0e30..08555c1 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -67,7 +67,7 @@ static void f_obs __P((char *));
static void f_of __P((char *));
static void f_seek __P((char *));
static void f_skip __P((char *));
-static quad_t get_bsz __P((char *));
+static quad_t get_num __P((char *));
static struct arg {
char *name;
@@ -174,7 +174,7 @@ static void
f_bs(arg)
char *arg;
{
- quad_t res = get_bsz(arg);
+ quad_t res = get_num(arg);
if (res < 1 || res > INT_MAX)
errx(1, "bs must be between 1 and %d", INT_MAX);
@@ -185,11 +185,10 @@ static void
f_cbs(arg)
char *arg;
{
- quad_t res = get_bsz(arg);
+ quad_t res = get_num(arg);
if (res < 1 || res > INT_MAX)
errx(1, "cbs must be between 1 and %d", INT_MAX);
-
cbsz = (int)res;
}
@@ -198,7 +197,8 @@ f_count(arg)
char *arg;
{
- cpy_cnt = get_bsz(arg);
+ cpy_cnt = get_num(arg);
+
if (!cpy_cnt)
terminate(0);
if (cpy_cnt < 0)
@@ -209,9 +209,10 @@ static void
f_files(arg)
char *arg;
{
- quad_t res = get_bsz(arg);
- files_cnt = res;
+ files_cnt = get_num(arg);
+ if (files_cnt < 0)
+ errx(1, "files cannot be negative");
}
static void
@@ -220,7 +221,7 @@ f_ibs(arg)
{
if (!(ddflags & C_BS)) {
- quad_t res = get_bsz(arg);
+ quad_t res = get_num(arg);
if (res < 1 || res > INT_MAX)
errx(1, "ibs must be between 1 and %d", INT_MAX);
@@ -242,7 +243,7 @@ f_obs(arg)
{
if (!(ddflags & C_BS)) {
- quad_t res = get_bsz(arg);
+ quad_t res = get_num(arg);
if (res < 1 || res > INT_MAX)
errx(1, "ibs must be between 1 and %d", INT_MAX);
@@ -263,7 +264,7 @@ f_seek(arg)
char *arg;
{
- out.offset = get_bsz(arg);
+ out.offset = get_num(arg);
}
static void
@@ -271,7 +272,7 @@ f_skip(arg)
char *arg;
{
- in.offset = get_bsz(arg);
+ in.offset = get_num(arg);
}
static struct conv {
@@ -338,7 +339,7 @@ c_conv(a, b)
* the product of the indicated values.
*/
static quad_t
-get_bsz(val)
+get_num(val)
char *val;
{
quad_t num, t;
@@ -346,17 +347,13 @@ get_bsz(val)
errno = 0;
num = strtoq(val, &expr, 0);
- if (num == QUAD_MAX && errno) /* Overflow. */
+ if (errno) /* Overflow or underflow. */
err(1, "%s", oper);
- /*
- * XXX (BFF) - The checks in individual f_* functions are
- * now redundant, but this is only temporary.
- */
- if (expr == val || num < 0) /* No digits or negative. */
+ if (expr == val) /* Not a valid number */
errx(1, "%s: illegal numeric value", oper);
- switch(*expr) {
+ switch (*expr) {
case 'b':
t = num;
num *= 512;
@@ -394,16 +391,17 @@ get_bsz(val)
break;
}
- switch(*expr) {
+ switch (*expr) {
case '\0':
break;
case '*': /* Backward compatible. */
case 'x':
t = num;
- num *= get_bsz(expr + 1);
- if (t > num)
-erange: errx(1, "%s: %s", oper, strerror(ERANGE));
- break;
+ num *= get_num(expr + 1);
+ if (t <= num)
+ break;
+erange:
+ errx(1, "%s: %s", oper, strerror(ERANGE));
default:
errx(1, "%s: illegal numeric value", oper);
}
diff --git a/bin/dd/position.c b/bin/dd/position.c
index 5299c5b..74b612c 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -47,6 +47,7 @@ static const char rcsid[] =
#include <sys/mtio.h>
#include <err.h>
+#include <errno.h>
#include <unistd.h>
#include "dd.h"
@@ -67,7 +68,8 @@ pos_in()
/* If not a character, pipe or tape device, try to seek on it. */
if (!(in.flags & (ISCHR|ISPIPE|ISTAPE)) || in.flags & ISDISK) {
- if (lseek(in.fd, in.offset * in.dbsz, SEEK_CUR) == -1)
+ errno = 0;
+ if (lseek(in.fd, in.offset * in.dbsz, SEEK_CUR) == -1 && errno)
err(1, "%s", in.name);
return;
}
@@ -77,6 +79,8 @@ pos_in()
* being skipped. No differentiation for reading complete and partial
* blocks for other devices.
*/
+ if (in.offset < 0)
+ errx(1, "skip must be positive");
for (bcnt = in.dbsz, cnt = in.offset, warned = 0; cnt;) {
if ((nr = read(in.fd, in.db, bcnt)) > 0) {
if (in.flags & ISPIPE) {
@@ -123,7 +127,9 @@ pos_out()
/* If not a character, pipe or tape device, try to seek on it. */
if (!(out.flags & (ISCHR|ISPIPE|ISTAPE)) || out.flags & ISDISK) {
- if (lseek(out.fd, out.offset * out.dbsz, SEEK_SET) == -1)
+ errno = 0;
+ if (lseek(out.fd, out.offset * out.dbsz, SEEK_SET) == -1 &&
+ errno)
err(1, "%s", out.name);
return;
}
@@ -139,6 +145,8 @@ pos_out()
}
/* Read it. */
+ if (out.offset < 0)
+ errx(1, "seek must be positive");
for (cnt = 0; cnt < out.offset; ++cnt) {
if ((n = read(out.fd, out.db, out.dbsz)) > 0)
continue;
OpenPOWER on IntegriCloud