Merge branch 'upstream'

4 files changed, 32 insertions, 9 deletions

diff --git a/CVS/Entries b/CVS/Entries
index 6e856c0..adf92a6 100644
--- a/CVS/Entries
+++ b/CVS/Entries
@@ -1,5 +1,5 @@
 /COPYING/3.1/Mon Feb  3 16:35:19 2003//Tfoomatic-3_0-branch
-/ChangeLog/3.62.2.21/Thu May 19 13:42:46 2005//Tfoomatic-3_0-branch
+/ChangeLog/3.62.2.23/Tue Jul 19 22:59:13 2005//Tfoomatic-3_0-branch
 /Makefile.in/3.4.2.5/Sat Jan 24 02:16:19 2004//Tfoomatic-3_0-branch
 /README/3.9.2.6/Tue Sep 14 20:16:43 2004//Tfoomatic-3_0-branch
 /STANDARD_installation/1.1.4.3/Thu Jan 22 02:47:21 2004//Tfoomatic-3_0-branch
@@ -9,9 +9,9 @@
 /configure.in/3.7.2.6/Sun Jan 25 13:13:22 2004//Tfoomatic-3_0-branch
 /filter.conf/3.3.2.2/Thu Jan 22 02:47:21 2004//Tfoomatic-3_0-branch
 /foomatic-gswrapper.1.in/3.0.2.2/Thu Jan 22 03:42:35 2004//Tfoomatic-3_0-branch
-/foomatic-gswrapper.in/3.4.2.3/Sat Dec  4 17:53:32 2004//Tfoomatic-3_0-branch
+/foomatic-gswrapper.in/3.4.2.5/Tue Jul 19 22:59:13 2005//Tfoomatic-3_0-branch
 /foomatic-rip.1.in/3.6.2.2/Thu Jan 22 03:42:35 2004//Tfoomatic-3_0-branch
-/foomatic-rip.in/3.43.2.11/Thu May 19 13:42:46 2005//Tfoomatic-3_0-branch
+/foomatic-rip.in/3.43.2.13/Tue Jul 19 22:59:13 2005//Tfoomatic-3_0-branch
 /install-sh/3.0/Fri Oct 11 01:20:44 2002//Tfoomatic-3_0-branch
 /makeMan.in/3.3.2.2/Thu Jan 22 03:42:35 2004//Tfoomatic-3_0-branch
 /make_configure/3.0.2.2/Thu Jan 22 02:47:21 2004//Tfoomatic-3_0-branch
diff --git a/ChangeLog b/ChangeLog
index 09c84cd..b3e0a43 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2005-07-19  Till Kamppeter <till.kamppeter@gmx.net>
+
+	* foomatic-rip.in, foomatic-gswrapper.in: Fix for the fix on the
+	  regexp for reading the config file (Thanks to Hans-Dieter Kosch,
+	  hdkosch at t-online dot de, for this fix).
+
+2005-07-18  Till Kamppeter <till.kamppeter@gmx.net>
+
+	* foomatic-rip.in: In quiet mode (non-logging mode) $logh is
+	  closed in the beginning but was never opened (Thanks to
+	  Hans-Dieter Kosch, hdkosch at t-online dot de, for this fix).
+
+	* foomatic-gswrapper.in: Fixed quoting of single quotes (Thanks to
+	  Hans-Dieter Kosch, hdkosch at t-online dot de, for this fix).
+
+	* foomatic-rip.in, foomatic-gswrapper.in: Fixed regexp for reading
+	  the config file (Thanks to Hans-Dieter Kosch, hdkosch at
+	  t-online dot de, for this fix).
+
 2005-05-19  Till Kamppeter <till.kamppeter@gmx.net>
 
 	* foomatic-rip.in: Make EPSF files not be an exception when
diff --git a/foomatic-gswrapper.in b/foomatic-gswrapper.in
index f02bb52..1973013 100755
--- a/foomatic-gswrapper.in
+++ b/foomatic-gswrapper.in
@@ -1,6 +1,6 @@
 #!@PERL@
 # -*- perl -*-
-# $Revision: 3.4.2.3 $
+# $Revision: 3.4.2.5 $
 
 # This is a little Ghostscript regularization script.  It massages
 # arguments to make Ghostscript execute properly as a filter, with
@@ -43,7 +43,12 @@ grep (((m!^\-$!) || (m!^\-_$!))
 my @myargs = grep (! m!^\-q$!, @ARGV);
 
 # Escape any quotes, and then quote everything just to be sure...
-grep (s!\'!\\\'!g, @myargs);
+
+# Escaping a single quote inside single quotes is a bit complex as the shell
+# takes everything literal there. So we have to assemble it by concatinating
+# different quoted strings.
+# Finally we get e.g.: 'x'"'"'y' or ''"'"'xy' or 'xy'"'"'' or ...
+grep (s/\'/\'\"\'\"\'/g, @myargs);
 my $args = "'" . join("' '", @myargs) . "'";
 
 # Execute Ghostscript, with both job and gs errors on stderr, and job
@@ -64,7 +69,7 @@ sub readConfFile {
     if (open CONF, "< $file") {
 	while (<CONF>)
 	{
-	    $conf{$1}="$2" if (m/^\s*([^\#\s]\S*)\s*:\s*(.*)\s*$/);
+	    $conf{$1}="$2" if (m/^\s*([^\#\s]\S*)\s*:\s*(.*?)\s*$/);
 	}
 	close CONF;
     }
diff --git a/foomatic-rip.in b/foomatic-rip.in
index 5b0415b..74e6798 100755
--- a/foomatic-rip.in
+++ b/foomatic-rip.in
@@ -5,7 +5,7 @@ use strict;
 use POSIX;
 use Cwd;
 
-my $ripversion='$Revision: 3.43.2.11 $';
+my $ripversion='$Revision: 3.43.2.13 $';
 #'# Fix emacs syntax highlighting
 
 # foomatic-rip is a spooler-independent filter script which takes
@@ -374,7 +374,6 @@ if ($debug) {
     $logh->autoflush(1);
 } elsif (($quiet) && (!$verbose)) {
     # Quiet mode, do not log
-    close $logh;
     open LOG, "> /dev/null";
     $logh = *LOG;
 
@@ -4777,7 +4776,7 @@ sub readConfFile {
     if (open CONF, "< $file") {
 	while (<CONF>)
 	{
-	    $conf{$1}="$2" if (m/^\s*([^\#\s]\S*)\s*:\s*(.*)\s*$/);
+	    $conf{$1}="$2" if (m/^\s*([^\#\s]\S*)\s*:\s*(.*?)\s*$/);
 	}
 	close CONF;
     }