Added version 1.3-RC2

Author: eribertomota

argmatch.c

@@ -18,7 +18,9 @@
 /* Written by David MacKenzie <djm@ai.mit.edu>
    Modified by Akim Demaille <demaille@inf.enst.fr> */
 
+#include "dcfldd.h"
 #include "argmatch.h"
+#include "log.h"
 
 #include <stdio.h>
 #ifdef STDC_HEADERS
@@ -156,7 +158,7 @@ argmatch_invalid (const char *context, const char *value, int problem)
 			? "invalid argument %s for `%s'"
 			: "ambiguous argument %s for `%s'");
 
-  fprintf(stderr, format, value, context);
+  log_info(format, value, context);
 }
 
 /* List the valid arguments for argmatch.
@@ -177,12 +179,12 @@ argmatch_valid (const char *const *arglist,
     if ((i == 0)
 	|| memcmp (last_val, vallist + valsize * i, valsize))
       {
-	fprintf (stderr, "\n  - `%s'", arglist[i]);
+	log_info("\n  - `%s'", arglist[i]);
 	last_val = vallist + valsize * i;
       }
     else
       {
-	fprintf (stderr, ", `%s'", arglist[i]);
+	log_info(", `%s'", arglist[i]);
       }
   putc ('\n', stderr);
 }
@@ -283,7 +285,7 @@ main (int argc, const char *const *argv)
 
   if (argc > 2)
     {
-      fprintf (stderr, "Usage: %s [VERSION_CONTROL]\n", program_name);
+      fprintf(stderr, "Usage: %s [VERSION_CONTROL]\n", program_name);
       exit (1);
     }
 

configure

@@ -1663,7 +1663,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=dcfldd
- VERSION=1.2.4
+ VERSION=1.3-RC2
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4087,6 +4087,76 @@ else
 _ACEOF
 
 
+fi
+echo "$as_me:$LINENO: checking whether strndup is declared" >&5
+echo $ECHO_N "checking whether strndup is declared... $ECHO_C" >&6
+if test "${ac_cv_have_decl_strndup+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+#ifndef strndup
+  char *p = (char *) strndup;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_have_decl_strndup=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_have_decl_strndup=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_have_decl_strndup" >&5
+echo "${ECHO_T}$ac_cv_have_decl_strndup" >&6
+if test $ac_cv_have_decl_strndup = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRNDUP 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRNDUP 0
+_ACEOF
+
+
 fi
 
 

configure.in

@@ -3,7 +3,7 @@ AC_INIT(dcfldd.c)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([dcfldd], [1.2.4])
+AM_INIT_AUTOMAKE([dcfldd], [1.3-RC2])
 
 AC_PROG_CC
 AC_PROG_CPP
@@ -19,6 +19,6 @@ AC_C_CONST
 AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
 
-AC_CHECK_DECLS([strtol, strtoul, strtoumax])
+AC_CHECK_DECLS([strtol, strtoul, strtoumax, strndup])
 
 AC_OUTPUT(Makefile)

copy.c

@@ -1,4 +1,4 @@
-/* $Id: copy.c,v 1.3 2005/05/13 18:52:06 harbourn Exp $
+/* $Id: copy.c,v 1.6 2005/05/19 20:59:12 harbourn Exp $
  * dcfldd - The Enhanced Forensic DD
  * By Nicholas Harbour
  */
@@ -20,10 +20,10 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* GNU dd originally written by Paul Rubin, David MacKenzie, and Stuart Kemp. */
-
+#include "dcfldd.h"
+#include <sys/types.h>
 #include <stdlib.h>
 #include <time.h>
-#include "dcfldd.h"
 #include "hash.h"
 #include "getpagesize.h"
 #include "safe-read.h"
@@ -278,7 +278,7 @@ int dd_copy(void)
         }
         n_bytes_read = nread;
 
-        if (do_hash)
+        if (do_hash && hashconv == HASHCONV_BEFORE)
             hash_update(ihashlist, ibuf, n_bytes_read);
 
         if (n_bytes_read < input_blocksize) {
@@ -326,7 +326,11 @@ int dd_copy(void)
             copy_simple(bufstart, n_bytes_read);
 
     }
+
 
+    if (do_hash && hashconv == HASHCONV_AFTER)
+        hash_update(ihashlist, ibuf, n_bytes_read);
+        
     /* If we have a char left as a result of conv=swab, output it.  */
     if (char_is_saved) {
         if (conversions_mask & C_BLOCK)

dcfldd.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
-.TH DCFLDD "1" "May 2005" "dcfldd (dcfldd) 1.2.4" "User Commands"
+.TH DCFLDD "1" "May 2005" "dcfldd (dcfldd) 1.3-RC1" "User Commands"
 .SH NAME
-dcfldd \- manual page for dcfldd (dcfldd) 1.2.4
+dcfldd \- manual page for dcfldd (dcfldd) 1.3-RC1
 .SH SYNOPSIS
 .B dcfldd
 [\fIOPTION\fR]...
@@ -36,6 +36,9 @@ NOTE: of=FILE may be used several times to write
 .IP
 output to multiple files simultaneously
 .TP
+of:=COMMAND
+exec and write output to process COMMAND
+.TP
 seek=BLOCKS
 skip BLOCKS obs\-sized blocks at start of output
 .TP
@@ -48,6 +51,9 @@ use the specified binary pattern as input
 textpattern=TEXT
 use repeating TEXT as input
 .TP
+errlog=FILE
+send error messages to FILE as well as stderr
+.TP
 hashwindow=BYTES
 perform a hash on every BYTES amount of data
 .TP
@@ -66,8 +72,13 @@ can send each to a seperate file using the
 convention ALGORITHMlog=FILE, for example
 md5log=FILE1, sha1log=FILE2, etc.
 .TP
-hashformat=FORMAT
-display each hashwindow according to FORMAT
+hashlog:=COMMAND
+exec and write hashlog to process COMMAND
+.IP
+ALGORITHMlog:=COMMAND also works in the same fashion
+.IP
+hashconv=[before|after] perform the hashing before or after the conversions
+hashformat=FORMAT      display each hashwindow according to FORMAT
 .IP
 the hash format mini\-language is described below
 .IP
@@ -117,6 +128,9 @@ verify that FILE matches the specified input
 verifylog=FILE
 send verify results to FILE instead of stderr
 .TP
+verifylog:=COMMAND
+exec and write verify results to process COMMAND
+.TP
 \fB\-\-help\fR
 display this help and exit
 .TP