Attachment 444364 Details for Bug 698451

foomatic-rip-3.diff-upw

foomatic-rip-3.diff-upw (text/plain), 3.67 KB, created by Johannes Meixner on 2011-08-05 10:00:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Meixner

Created: 2011-08-05 10:00:58 UTC

Size: 3.67 KB

patch

obsolete

>--- usr_bin_foomatic-rip.unpatched	2011-08-02 18:40:28.000000000 +0200
>+++ usr_bin_foomatic-rip.patched	2011-08-04 11:01:24.000000000 +0200
>@@ -413,10 +413,6 @@ if (defined($ENV{'LPOPTS'})) {
>     $spooler = 'gnulpr';
> }
> 
>-
>-
>-## Named command line options
>-
> # We do not use Getopt::Long because it does not work when between the
> # option and the argument is no space ("-w80" instead of "-w 80"). This
> # happens in the command line of LPRng, but also users could type in
>@@ -434,6 +430,15 @@ if (defined($ENV{'LPOPTS'})) {
> my $argstr = "\x01" . 
>     join("\x01", map { removeunprintables($_) } @ARGV) . "\x01";
> 
>+my ($verbose, $quiet, $show_docs, $do_docs, $cupscolorprofile, $genpdqfile);
>+
>+## Named command line options
>+
>+# CUPS calls foomatic-rip only with 5 or 6 positional parameters,
>+# not with named options, like for example "-p <string>". Also PPR
>+# does not used named options.
>+if (($spooler ne 'cups') && ($spooler ne 'ppr') && ($spooler ne 'ppr_int')) {
>+
> # Version check
> if ($argstr =~ /^\x01-(h|v|-help|-version)\x01$/i) {
>     my $ver;
>@@ -453,11 +458,9 @@ if ($argstr =~ s/\x01--debug\x01/\x01/)
> }
> 
> # Command line options for verbosity
>-my $verbose = ($argstr =~ s/\x01-v\x01/\x01/);
>-my $quiet = ($argstr =~ s/\x01-q\x01/\x01/);
>-my $show_docs = ($argstr =~ s/\x01-d\x01/\x01/);
>-my $do_docs;
>-my $cupscolorprofile;
>+    $verbose = ($argstr =~ s/\x01-v\x01/\x01/);
>+    $quiet = ($argstr =~ s/\x01-q\x01/\x01/);
>+    $show_docs = ($argstr =~ s/\x01-d\x01/\x01/);
> 
> if ($debug) {
>     # Grotesquely unsecure; use for debugging only
>@@ -500,7 +503,8 @@ if ($debug) {
> 
> ## Continue with named options
> 
>-# Check for LPRng first so we do not pick up bogus ppd files by the -p option
>+    # Check for LPRng first so we do not pick up bogus ppd files by the -p
>+    # option
> if ($argstr =~ s/\x01--lprng\x01/\x01/) {
>     # We have LPRng
>     $spooler = 'lprng';
>@@ -522,16 +526,6 @@ if (defined($ENV{'PRINTCAP_ENTRY'})){
>     $spooler = 'lprng';
> }
> 
>-
>-# PPD file name given via the command line
>-# allow duplicates, and use the last specified one
>-while ( ($spooler ne 'lprng') and ($argstr =~ s/\x01-p(\x01|)([^\x01]+)\x01/\x01/)) {
>-    $ppdfile = $2;
>-}
>-while ($argstr =~ s/\x01--ppd(\x01|=|)([^\x01]+)\x01/\x01/) {
>-    $ppdfile = $2;
>-}
>-
> # Check for LPD/GNUlpr by typical options which the spooler puts onto
> # the filter's command line (options "-w": text width, "-l": text
> # length, "-i": indent, "-x", "-y": graphics size, "-c": raw printing,
>@@ -562,6 +556,17 @@ if (($argstr =~ s/\x01-w(\x01|)\d+\x01/\
>     }
> }
> 
>+    # PPD file name given via the command line
>+    # allow duplicates, and use the last specified one
>+    if (($spooler ne 'lprng') && ($spooler ne 'lpd') && ($spooler ne 'gnulpr')){
>+	while ($argstr =~ s/\x01-p(\x01|)([^\x01]+)\x01/\x01/) {
>+	    $ppdfile = $2;
>+	}
>+	while ($argstr =~ s/\x01--ppd(\x01|=|)([^\x01]+)\x01/\x01/) {
>+	    $ppdfile = $2;
>+	}
>+    }
>+
> # LPRng delivers the option settings via the "-Z" argument
> if ($argstr =~ s/\x01-Z(\x01|)([^\x01]+)\x01/\x01/) {
>     my @lpopts = split(/,/, $2);
>@@ -630,7 +635,7 @@ if ($argstr =~ s/\x01--pdq\x01/\x01/) {
> # "--appendpdq=<file>" appends the data to the <file>,
> # "--genpdq=<file>" creates/overwrites <file> for the data, and
> # "--genpdq" writes to standard output
>-my $genpdqfile = "";
>+    $genpdqfile = "";
> if (($argstr =~ s/\x01--(gen)(raw|)pdq(\x01|=|)([^\x01]*)\x01/\x01/) ||
>     ($argstr =~ s/\x01--(append)(raw|)pdq(\x01|=|)([^\x01]+)\x01/\x01/)) {
>     # Determine output file name
>@@ -676,6 +681,8 @@ if (($argstr =~ s/\x01--(gen)(raw|)pdq(\
> # remove extra spacing if running as LPRng filter
> $added_lf = "" if $spooler eq 'lprng';
> 
>+}
>+
> ## Command line arguments without name
> 
> # Remaining arguments

Actions: View

Attachments on bug 698451: 438004 | 438006 | 439373 | 439374 | 444356 | 444364