[src/netbsd-1-4]: src/bin/dd Pull up revisions 1.7-1.8 (requested by jhawk):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b54924ff4ce2
branches:  netbsd-1-4
changeset: 470525:b54924ff4ce2
user:      he <he%NetBSD.org@localhost>
date:      Sun Apr 30 11:52:00 2000 +0000

description:
Pull up revisions 1.7-1.8 (requested by jhawk):
  Correctly lseek() on non-tape character devices (e.g. disks)
  as the manual page documents.

diffstat:

 bin/dd/position.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 0f7d185f3c34 -r b54924ff4ce2 bin/dd/position.c
--- a/bin/dd/position.c Sun Apr 30 11:49:18 2000 +0000
+++ b/bin/dd/position.c Sun Apr 30 11:52:00 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: position.c,v 1.6 1997/07/25 06:46:24 phil Exp $        */
+/*     $NetBSD: position.c,v 1.6.4.1 2000/04/30 11:52:00 he Exp $      */
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)position.c 8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: position.c,v 1.6 1997/07/25 06:46:24 phil Exp $");
+__RCSID("$NetBSD: position.c,v 1.6.4.1 2000/04/30 11:52:00 he Exp $");
 #endif
 #endif /* not lint */
 
@@ -70,8 +70,8 @@
 {
        int bcnt, cnt, nr, warned;
 
-       /* If not a character, pipe or tape device, try to seek on it. */
-       if (!(in.flags & (ISCHR|ISPIPE|ISTAPE))) {
+       /* If not a pipe or tape device, try to seek on it. */
+       if (!(in.flags & (ISPIPE|ISTAPE))) {
                if (lseek(in.fd, (off_t)in.offset * (off_t)in.dbsz, SEEK_CUR)
                    == -1)
                        err(1, "%s", in.name);