--- dd_rhelp-0.0.6/src/dd_rhelp-sh.orig 2004-10-20 11:36:01.000000000 -0500 +++ dd_rhelp-0.0.6/src/dd_rhelp-sh 2005-07-05 19:32:16.000000000 -0500 @@ -310,7 +310,7 @@ function get_eof() { - eoflines="$("${CAT}" "$logfile" | "$tr" -d "\\r" | "$GREP" "$eofstring" | "$SED" 's/^dd_rescue: (info): .* (\([0-9\.]\+\)k): EOF$/\1/g')" + eoflines="$("${CAT}" "$logfile" | "$tr" -d "\\r" | "$GREP" "$eofstring" | "$SED" 's/^dd_rescue: (info): .*\<(\([0-9\.]\+\)k): EOF$/\1/g')" eof="nothing" @@ -752,15 +752,15 @@ [ "$DEBUG" == "on" ] && echo -n "." data=$(echo "$data" | "$GREP" "$infoline" -A 1 | "${CUT}" -c 12-) [ "$DEBUG" == "on" ] && echo -n "." - data=$(echo "$data" | "$SED" 's/^(info): ipos: \+//g') + data=$(echo "$data" | "$SED" 's/^(info): ipos: *//g') [ "$DEBUG" == "on" ] && echo -n "." - data=$(echo "$data" | "$SED" 's/^ \+errs: \+/NR:/g') + data=$(echo "$data" | "$SED" 's/^ \+errs: */NR:/g') [ "$DEBUG" == "on" ] && echo -n "." - data=$(echo "$data" | "$SED" 's/^ \+- \+errs: \+/RE:/g') + data=$(echo "$data" | "$SED" 's/^ \+- \+errs: */RE:/g') [ "$DEBUG" == "on" ] && echo -n "." - data=$(echo "$data" | "$SED" 's/^\([0-9\.]\+\)k, opos:.\+xferd: \+\([0-9\.]\+\)k$/ipos=\1:xferd=\2:/g') + data=$(echo "$data" | "$SED" 's/^\([0-9\.]\+\)k, opos:.\+xferd: *\([0-9\.]\+\)k$/ipos=\1:xferd=\2:/g') [ "$DEBUG" == "on" ] && echo -n "." - data=$(echo "$data" | "$SED" 's/^\(RE\|NR\):[0-9]\+, errxfer: \+\([0-9\.]\+\)k, succxfer: \+\([0-9\.]\+\)k$/\1:errxfer=\2:succxfer=\3;/g') + data=$(echo "$data" | "$SED" 's/^\(RE\|NR\):[0-9]\+, errxfer: *\([0-9\.]\+\)k, succxfer: *\([0-9\.]\+\)k$/\1:errxfer=\2:succxfer=\3;/g') [ "$DEBUG" == "on" ] && echo -n "." data=$(echo "$data" | "${TR}" -d "\n") [ "$DEBUG" == "on" ] && echo -n "."