From afa5289a984180303779af765a0cd9f07f1a3fdb Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Thu, 7 Mar 2002 14:00:33 +0000
Subject: [PATCH] 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)
---
 bin/dd/dd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index cdd358e7d288..d2d3a260e2d6 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 */