diff options
Diffstat (limited to 'bin/dd')
| -rw-r--r-- | bin/dd/dd.1 | 14 | ||||
| -rw-r--r-- | bin/dd/misc.c | 8 |
2 files changed, 10 insertions, 12 deletions
diff --git a/bin/dd/dd.1 b/bin/dd/dd.1 index 67d6b3727baab..bfe05eeee2856 100644 --- a/bin/dd/dd.1 +++ b/bin/dd/dd.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $Id: dd.1,v 1.7 1998/05/06 06:51:35 charnier Exp $ +.\" $Id: dd.1,v 1.6 1997/10/11 20:09:04 joerg Exp $ .\" .Dd January 13, 1994 .Dt DD 1 @@ -59,9 +59,7 @@ and truncated input records to the standard error output. The following operands are available: .Bl -tag -width of=file .It Cm bs= Ns Ar n -Set both input and output block size to -.Va n -bytes, superseding the +Set both input and output block size, superseding the .Cm ibs and .Cm obs @@ -109,13 +107,13 @@ Any regular output file is truncated unless the conversion value is specified. If an initial portion of the output file is skipped (see the .Cm seek -operand), +operand) the output file is truncated at that point. .It Cm seek= Ns Ar n Seek .Va n blocks from the beginning of the output before copying. -On non-tape devices, an +On non-tape devices, a .Xr lseek 2 operation is used. Otherwise, existing blocks are read and the data discarded. @@ -131,7 +129,7 @@ bytes. Skip .Va n blocks from the beginning of the input before copying. -On input which supports seeks, an +On input which supports seeks, a .Xr lseek 2 operation is used. Otherwise, input data is read and discarded. @@ -332,7 +330,7 @@ will exit. .Pp The .Nm -utility exits 0 on success or >0 if an error occurred. +utility exits 0 on success and >0 if an error occurred. .Sh SEE ALSO .Xr cp 1 , .Xr mt 1 , diff --git a/bin/dd/misc.c b/bin/dd/misc.c index 00ef7aed06c9c..6f7fcafcd2f8d 100644 --- a/bin/dd/misc.c +++ b/bin/dd/misc.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94"; #endif static const char rcsid[] = - "$Id: misc.c,v 1.14 1998/05/13 07:33:50 charnier Exp $"; + "$Id: misc.c,v 1.13 1998/05/06 06:51:40 charnier Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -66,16 +66,16 @@ summary() secs = 1e-6; /* Use snprintf(3) so that we don't reenter stdio(3). */ (void)snprintf(buf, sizeof(buf), - "%lu+%lu records in\n%lu+%lu records out\n", + "%u+%u records in\n%u+%u records out\n", st.in_full, st.in_part, st.out_full, st.out_part); (void)write(STDERR_FILENO, buf, strlen(buf)); if (st.swab) { - (void)snprintf(buf, sizeof(buf), "%lu odd length swab %s\n", + (void)snprintf(buf, sizeof(buf), "%u odd length swab %s\n", st.swab, (st.swab == 1) ? "block" : "blocks"); (void)write(STDERR_FILENO, buf, strlen(buf)); } if (st.trunc) { - (void)snprintf(buf, sizeof(buf), "%lu truncated %s\n", + (void)snprintf(buf, sizeof(buf), "%u truncated %s\n", st.trunc, (st.trunc == 1) ? "block" : "blocks"); (void)write(STDERR_FILENO, buf, strlen(buf)); } |