Skip to content

Commit e0a36af

Browse files
committed
Added version 1.3.4.1
1 parent 3959d01 commit e0a36af

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ PRE_UNINSTALL = :
3636
POST_UNINSTALL = :
3737
build_triplet = @build@
3838
host_triplet = @host@
39+
LIBOBJDIR =
3940
bin_PROGRAMS = dcfldd$(EXEEXT)
4041
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
4142
$(srcdir)/Makefile.in $(srcdir)/config.h.in \

configure

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,7 +1663,7 @@ fi
16631663
16641664
# Define the identity of the package.
16651665
PACKAGE=dcfldd
1666-
VERSION=1.3.4
1666+
VERSION=1.3.4-1
16671667
16681668
16691669
cat >>confdefs.h <<_ACEOF
@@ -4244,9 +4244,10 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
42444244
# 1. Remove the extension, and $U if already installed.
42454245
ac_i=`echo "$ac_i" |
42464246
sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
4247-
# 2. Add them.
4248-
ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
4249-
ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
4247+
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
4248+
# will be set to the directory where LIBOBJS objects are built.
4249+
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
4250+
ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
42504251
done
42514252
LIBOBJS=$ac_libobjs
42524253

configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ AC_INIT(dcfldd.c)
33
AM_CONFIG_HEADER(config.h)
44
AC_CANONICAL_HOST
55

6-
AM_INIT_AUTOMAKE([dcfldd], [1.3.4])
6+
AM_INIT_AUTOMAKE([dcfldd], [1.3.4-1])
77

88
AC_PROG_CC
99
AC_PROG_CPP

copy.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,11 +266,15 @@ int dd_copy(void)
266266
print_stats();
267267
/* Seek past the bad block if possible. */
268268
lseek(STDIN_FILENO, (off_t) input_blocksize, SEEK_CUR);
269-
if (conversions_mask & C_SYNC)
269+
if (conversions_mask & C_SYNC) {
270270
/* Replace the missing input with null bytes and
271271
proceed normally. */
272+
// EXPERIMENTAL: let's try re-zeroing this buffer
273+
memset((char *) ibuf,
274+
(conversions_mask & (C_BLOCK | C_UNBLOCK)) ? ' ' : '\0',
275+
input_blocksize);
272276
nread = 0;
273-
else
277+
} else
274278
continue;
275279
} else {
276280
/* Write any partial block. */

0 commit comments

Comments
 (0)