File tree Expand file tree Collapse file tree 4 files changed +13
-7
lines changed Expand file tree Collapse file tree 4 files changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -36,6 +36,7 @@ PRE_UNINSTALL = :
36
36
POST_UNINSTALL = :
37
37
build_triplet = @build@
38
38
host_triplet = @host@
39
+ LIBOBJDIR =
39
40
bin_PROGRAMS = dcfldd$(EXEEXT )
40
41
DIST_COMMON = README $(am__configure_deps ) $(srcdir ) /Makefile.am \
41
42
$(srcdir ) /Makefile.in $(srcdir ) /config.h.in \
Original file line number Diff line number Diff line change 1663
1663
1664
1664
# Define the identity of the package.
1665
1665
PACKAGE=dcfldd
1666
- VERSION=1.3.4
1666
+ VERSION=1.3.4-1
1667
1667
1668
1668
1669
1669
cat >> confdefs.h << _ACEOF
@@ -4244,9 +4244,10 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
4244
4244
# 1. Remove the extension, and $U if already installed.
4245
4245
ac_i=` echo " $ac_i " |
4246
4246
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'
4250
4251
done
4251
4252
LIBOBJS=$ac_libobjs
4252
4253
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ AC_INIT(dcfldd.c)
3
3
AM_CONFIG_HEADER(config.h)
4
4
AC_CANONICAL_HOST
5
5
6
- AM_INIT_AUTOMAKE ( [ dcfldd] , [ 1.3.4] )
6
+ AM_INIT_AUTOMAKE ( [ dcfldd] , [ 1.3.4-1 ] )
7
7
8
8
AC_PROG_CC
9
9
AC_PROG_CPP
Original file line number Diff line number Diff line change @@ -266,11 +266,15 @@ int dd_copy(void)
266
266
print_stats ();
267
267
/* Seek past the bad block if possible. */
268
268
lseek (STDIN_FILENO , (off_t ) input_blocksize , SEEK_CUR );
269
- if (conversions_mask & C_SYNC )
269
+ if (conversions_mask & C_SYNC ) {
270
270
/* Replace the missing input with null bytes and
271
271
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 );
272
276
nread = 0 ;
273
- else
277
+ } else
274
278
continue ;
275
279
} else {
276
280
/* Write any partial block. */
You can’t perform that action at this time.
0 commit comments