diff options
author | green <green@FreeBSD.org> | 1999-06-20 14:58:55 +0000 |
---|---|---|
committer | green <green@FreeBSD.org> | 1999-06-20 14:58:55 +0000 |
commit | 788bc0cf602a4339422fb952290bf85f5e320e07 (patch) | |
tree | 6d6fc3c96961d0a8f6b4ab0507fdfeac4a671380 /bin/dd/dd.h | |
parent | 615565283ac17a71ab572b235e8e2ec107b6dfe1 (diff) | |
download | FreeBSD-src-788bc0cf602a4339422fb952290bf85f5e320e07.zip FreeBSD-src-788bc0cf602a4339422fb952290bf85f5e320e07.tar.gz |
This is the second round of dd(1) changes. Some changes made/reversed by
request of Bruce. More changes may follow later. 'g' multiplier has
been added (i.e. dd seek=5g if=bigfile.) Some minor corrections were made
as well.
Noticed by: bde
Diffstat (limited to 'bin/dd/dd.h')
-rw-r--r-- | bin/dd/dd.h | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/bin/dd/dd.h b/bin/dd/dd.h index 6269621..bc3fd60 100644 --- a/bin/dd/dd.h +++ b/bin/dd/dd.h @@ -38,15 +38,13 @@ * $Id: dd.h,v 1.8 1998/02/11 02:23:31 asami Exp $ */ -#define uint64 u_int64_t - /* Input/output stream state. */ typedef struct { u_char *db; /* buffer address */ u_char *dbp; /* current buffer I/O address */ - size_t dbcnt, /* current buffer byte count */ - dbrcnt, /* last read byte count */ - dbsz; /* buffer size */ + int dbcnt; /* current buffer byte count */ + int dbrcnt; /* last read byte count */ + int dbsz; /* buffer size */ #define ISCHR 0x01 /* character device (warn on short) */ #define ISPIPE 0x02 /* pipe (not truncatable) */ @@ -58,20 +56,20 @@ typedef struct { int fd; /* file descriptor */ off_t offset; /* # of blocks to skip */ - uint64 f_stats, /* # of full blocks processed */ - p_stats, /* # of partial blocks processed */ - s_stats, /* # of odd swab blocks */ - t_stats; /* # of truncations */ + quad_t f_stats; /* # of full blocks processed */ + quad_t p_stats; /* # of partial blocks processed */ + quad_t s_stats; /* # of odd swab blocks */ + quad_t t_stats; /* # of truncations */ } IO; typedef struct { - uint64 in_full, /* # of full input blocks */ - in_part, /* # of partial input blocks */ - out_full, /* # of full output blocks */ - out_part, /* # of partial output blocks */ - trunc, /* # of truncated records */ - swab, /* # of odd-length swab blocks */ - bytes; /* # of bytes written */ + quad_t in_full; /* # of full input blocks */ + quad_t in_part; /* # of partial input blocks */ + quad_t out_full; /* # of full output blocks */ + quad_t out_part; /* # of partial output blocks */ + quad_t trunc; /* # of truncated records */ + quad_t swab; /* # of odd-length swab blocks */ + quad_t bytes; /* # of bytes written */ double start; /* start time of dd */ } STAT; |