Page MenuHomeFreeBSD
Files F139457338

D5248.id13193.diff
No OneTemporary
Actions

D5248.id13193.diff
View Options

Index: bin/dd/Makefile
===================================================================
--- bin/dd/Makefile
+++ bin/dd/Makefile
@@ -24,7 +24,18 @@
LC_ALL=en_US.US-ASCII hexdump -C | \
diff -I FreeBSD - ${.CURDIR}/ref.${conv}
.endfor
- @rm -f gen
+ @${ECHO} "testing sparse file (obs zeroes)"
+ @./gen 189284 | ./dd ibs=16 obs=8 conv=sparse of=obs_zeroes 2> /dev/null
+ @hexdump -C obs_zeroes | diff - ${.CURDIR}/ref.obs_zeroes
+
+ @${ECHO} "testing spase file (all zeroes)"
+ @./dd if=/dev/zero of=1M_zeroes bs=1048576 count=1 2> /dev/null
+ @./dd if=1M_zeroes of=1M_zeroes.1 bs=1048576 conv=sparse 2> /dev/null
+ @./dd if=1M_zeroes of=1M_zeroes.2 bs=1048576 2> /dev/null
+ @diff 1M_zeroes 1M_zeroes.1
+ @diff 1M_zeroes 1M_zeroes.2
+
+ @rm -f gen 1M_zeroes* obs_zeroes
.if ${MK_TESTS} != "no"
SUBDIR+= tests
Index: bin/dd/dd.h
===================================================================
--- bin/dd/dd.h
+++ bin/dd/dd.h
@@ -54,6 +54,7 @@
const char *name; /* name */
int fd; /* file descriptor */
off_t offset; /* # of blocks to skip */
+ off_t seek_offset; /* offset of last seek past output hole */
} IO;
typedef struct {
Index: bin/dd/dd.c
===================================================================
--- bin/dd/dd.c
+++ bin/dd/dd.c
@@ -77,7 +77,6 @@
void (*cfunc)(void); /* conversion function */
uintmax_t cpy_cnt; /* # of blocks to copy */
static off_t pending = 0; /* pending seek if sparse */
-static off_t last_sp = 0; /* size of last added sparse block */
u_int ddflags = 0; /* conversion options */
size_t cbsz; /* conversion block size */
uintmax_t files_cnt = 1; /* # of files to copy */
@@ -409,6 +408,15 @@
}
if (out.dbcnt || pending)
dd_out(1);
+
+ /*
+ * If the file ends with a hole, ftruncate it to extend its size
+ * up to the end of the hole (without having to write any data).
+ */
+ if (out.seek_offset > 0) {
+ if (ftruncate(out.fd, out.seek_offset) == -1)
+ err(1, "truncating %s", out.name);
+ }
}
void
@@ -457,29 +465,27 @@
}
if (sparse && !force) {
pending += cnt;
- last_sp = cnt;
nw = cnt;
} else {
if (pending != 0) {
- /* If forced to write, and we have no
- * data left, we need to write the last
- * sparse block explicitly.
+ /*
+ * Seek past hole. Note that we need to record the
+ * reached offset, because we might have no more data
+ * to write, in which case we'll need to call
+ * ftruncate to extend the file size.
*/
- if (force && cnt == 0) {
- pending -= last_sp;
- assert(outp == out.db);
- memset(outp, 0, cnt);
- }
- if (lseek(out.fd, pending, SEEK_CUR) ==
- -1)
+ out.seek_offset = lseek(out.fd, pending, SEEK_CUR);
+ if (out.seek_offset == -1)
err(2, "%s: seek error creating sparse file",
out.name);
- pending = last_sp = 0;
+ pending = 0;
}
- if (cnt)
+ if (cnt) {
nw = write(out.fd, outp, cnt);
- else
+ out.seek_offset = 0;
+ } else {
return;
+ }
}
if (nw <= 0) {
Index: bin/dd/ref.obs_zeroes
===================================================================
--- /dev/null
+++ bin/dd/ref.obs_zeroes
@@ -0,0 +1,2 @@
+00000000 41 42 43 44 45 46 47 48 00 00 00 00 00 00 00 00 |ABCDEFGH........|
+00000010

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 13, 7:49 AM (3 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26925599
Default Alt Text
D5248.id13193.diff (3 KB)

Event Timeline