From a28ea077f9d97a8db5ce44170b50cd7815167856 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Wed, 7 Jan 1998 22:31:19 +0000 Subject: [PATCH] Use the correct value in the call to swab(3) with conv=swab. Previously, dd if=/dev/zero of=/dev=null obs=23520 conv=swab coredumped. Please somebody review it, i'm not 105 % sure i'm understanding all this mess correctly. Detected by: Holm Tiffe --- bin/dd/Makefile | 3 ++- bin/dd/dd.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/dd/Makefile b/bin/dd/Makefile index 09158e5a81c0..30113668f292 100644 --- a/bin/dd/Makefile +++ b/bin/dd/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.4 1997/02/22 14:02:39 peter Exp $ PROG= dd SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c +CFLAGS+=-g .include diff --git a/bin/dd/dd.c b/bin/dd/dd.c index bf14e16ba8e1..6078bf50bc8a 100644 --- a/bin/dd/dd.c +++ b/bin/dd/dd.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: dd.c,v 1.11 1997/08/19 19:46:18 jlemon Exp $ + * $Id: dd.c,v 1.12 1997/10/11 20:09:05 joerg Exp $ */ #ifndef lint @@ -316,7 +316,7 @@ dd_in() } if (ddflags & C_SWAB) { - if ((n = in.dbcnt) & 1) { + if ((n = in.dbrcnt) & 1) { ++st.swab; --n; }