Sophie

Sophie

distrib > Mandriva > 2008.0 > x86_64 > by-pkgid > 62aac3d7bd9068a43e120f8e9522c207 > files > 2

gv-3.6.3-2mdv2008.0.src.rpm

diff -urN gv-3.6.1-orig/gvuncompress gv-3.6.1/gvuncompress
--- gv-3.6.1-orig/gvuncompress	1970-01-01 08:00:00.000000000 +0800
+++ gv-3.6.1/gvuncompress	2004-12-27 05:56:13.641826680 +0800
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# FIXME: $1 and $2 have not been checked properly, they may contain
+# harmful characters such as backquote and semicolon -- Abel
+
+[ -r "$1" ] || exit 1
+
+PATH=/bin:/usr/bin
+
+uncompress=
+
+if [ -x "/bin/file" -o -x "/usr/bin/file" ]; then
+    uncompress=`file "$1" | sed -n "s/.*\(gzip\|bzip2\).*/\1/p; s/.*compress'd.*/gzip/p;"`
+else
+    echo "$1" | grep -q '\.g\?z$\|\.Z$' && uncompress=gzip
+    echo "$1" | grep -q '\.bz2$' && uncompress=bzip2
+fi
+
+[ -z "$uncompress" ] && exit 2
+if [ -z "$2" ]; then
+    exec $uncompress -dc "$1"
+else
+    # make sure destination is clean
+    rm -f "$2"
+    [ -e "$2" ] && exit 3
+    touch "$2"
+    exec $uncompress -dc "$1" > "$2"
+fi
diff -urN gv-3.6.1-orig/src/file.c gv-3.6.1/src/file.c
--- gv-3.6.1-orig/src/file.c	2004-12-08 07:37:40.000000000 +0800
+++ gv-3.6.1/src/file.c	2004-12-27 05:37:44.075506400 +0800
@@ -375,6 +375,7 @@
   if      (!strncmp(mext,".gz",3))  ext = "";
   else if (!strncmp(mext,".bz2",4)) ext = "";
   else if (!strncmp(mext,".z",2))   ext = "";
+  else if (!strncmp(mext,".Z",2))   ext = "";
   else if (!strncmp(mext,".ps",3))  ext = ".ps";
   else if (!strncmp(mext,".pdf",4)) ext = ".pdf";
   else                              ext = e;
diff -urN gv-3.6.1-orig/src/Makefile.am gv-3.6.1/src/Makefile.am
--- gv-3.6.1-orig/src/Makefile.am	2004-12-20 03:15:35.000000000 +0800
+++ gv-3.6.1/src/Makefile.am	2004-12-27 05:36:44.859508600 +0800
@@ -199,7 +199,7 @@
 	@echo "GV.gsSafer:		True" >> $(srcdir)/gv_intern_res_unix.dat
 	@echo "GV.gsQuiet:		True" >> $(srcdir)/gv_intern_res_unix.dat
 	@echo "GV.gsArguments:		-dFIXEDMEDIA" >> $(srcdir)/gv_intern_res_unix.dat
-	@echo "GV.uncompressCommand:	gzip -d -c %s > %s" >> $(srcdir)/gv_intern_res_unix.dat
+	@echo "GV.uncompressCommand:	gvuncompress %s %s" >> $(srcdir)/gv_intern_res_unix.dat
 	@echo "GV.printCommand:	$(PRINT_COMMAND)" >> $(srcdir)/gv_intern_res_unix.dat
 
 
@@ -260,4 +260,4 @@
 
 if USE_MEMDEBUG_CODE
    gv_SOURCES += d_mem.c d_mem.h d_xtmem.c d_xtmem.h
-endif
\ No newline at end of file
+endif