Merging upstream version 1.6~pre2.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 15 insertions, 8 deletions

diff --git a/lzdiff b/lzdiff
index f289a95..c3c605d 100755
--- a/lzdiff
+++ b/lzdiff
@@ -5,6 +5,8 @@
 # This script is free software: you have unlimited permission
 # to copy, distribute and modify it.
 
+LC_ALL=C
+export LC_ALL
 invocation_name=$0
 args=
 default_ext=.lz
@@ -39,9 +41,12 @@ while [ x"$1" != x ] ; do
 		echo "      --lzip          use lzip as default decompressor (default)"
 		echo "      --diff          use diff to compare files (default)"
 		echo "      --cmp           use cmp to compare files"
+		echo
+		echo "Report bugs to lzip-bug@nongnu.org"
+		echo "Lzip home page: http://www.nongnu.org/lzip/lzip.html"
 		exit 0 ;;
 	--version | --ve* | -V)
-		echo "Lzdiff 0.3"
+		echo "Lzdiff 0.4"
 		echo "Copyright (C) 2009 Antonio Diaz Diaz."
 		echo "This script is free software: you have unlimited permission"
 		echo "to copy, distribute and modify it."
@@ -93,12 +98,14 @@ if test -z "${file2}"; then
 		file2=`echo "${file1}" | sed 's/tgz$/tar/'` ;;
 	*.bz2)
 		file2=`echo "${file1}" | sed 's/.bz2$//'` ;;
+	*.tbz)
+		file2=`echo "${file1}" | sed 's/tbz$/tar/'` ;;
 	*.tbz2)
 		file2=`echo "${file1}" | sed 's/tbz2$/tar/'` ;;
 	*.lz)
 		file2=`echo "${file1}" | sed 's/.lz$//'` ;;
 	*.tlz)
-		file2=`echo "${file1}" | sed 's/.tlz$/tar/'` ;;
+		file2=`echo "${file1}" | sed 's/tlz$/tar/'` ;;
 	*)
 		file2="${file1}"; file1="${file1}${default_ext}" ;;
 	esac
@@ -107,14 +114,14 @@ fi
 prog1=
 prog2=
 case "${file1}" in
-*.gz | *.tgz)	prog1=gzip ;;
-*.bz2 | *.tbz2)	prog1=bzip2 ;;
-*.lz | *.tlz)	prog1=lzip ;;
+*.gz | *.tgz)		prog1=gzip ;;
+*.bz2 | *.tbz | *.tbz2)	prog1=bzip2 ;;
+*.lz | *.tlz)		prog1=lzip ;;
 esac
 case "${file2}" in
-*.gz | *.tgz)	prog2=gzip ;;
-*.bz2 | *.tbz2)	prog2=bzip2 ;;
-*.lz | *.tlz)	prog2=lzip ;;
+*.gz | *.tgz)		prog2=gzip ;;
+*.bz2 | *.tbz | *.tbz2)	prog2=bzip2 ;;
+*.lz | *.tlz)		prog2=lzip ;;
 esac
 
 retval=0