diff options
| author | markm <markm@FreeBSD.org> | 2002-03-07 14:00:33 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2002-03-07 14:00:33 +0000 |
| commit | 43cc55dd2fb8fc69429d9265f32323612073e91f (patch) | |
| tree | 3ba6ac2647a05b36f2459c039fa1f0448912c734 /bin/dd/dd.c | |
| parent | 8159ebd5e2fe5b1476da07259eac8de18614b694 (diff) | |
| download | FreeBSD-src-43cc55dd2fb8fc69429d9265f32323612073e91f.zip FreeBSD-src-43cc55dd2fb8fc69429d9265f32323612073e91f.tar.gz | |
1) Rev.1.35 of dd.c has a more serious regression. It backs out rev.1.31,
thus breaking systems with unpolluted <sys/stat.h>'s.
2) Back out an initialisation of a variable in BSS.
Reported by: bde (1), many(2)
Diffstat (limited to 'bin/dd/dd.c')
| -rw-r--r-- | bin/dd/dd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/dd/dd.c b/bin/dd/dd.c index cdd358e..d2d3a26 100644 --- a/bin/dd/dd.c +++ b/bin/dd/dd.c @@ -54,6 +54,7 @@ static const char rcsid[] = #include <sys/conf.h> #include <sys/disklabel.h> #include <sys/filio.h> +#include <sys/time.h> #include <ctype.h> #include <err.h> @@ -78,7 +79,7 @@ STAT st; /* statistics */ void (*cfunc)(void); /* conversion function */ u_quad_t cpy_cnt; /* # of blocks to copy */ static off_t pending = 0; /* pending seek if sparse */ -u_int ddflags = 0; /* conversion options */ +u_int ddflags; /* conversion options */ size_t cbsz; /* conversion block size */ quad_t files_cnt = 1; /* # of files to copy */ const u_char *ctab; /* conversion table */ |
