libcupsfilters: In pdftops() call pstops() only if we have a PPD

After doing the actual PDF-to-PostScript conversion and afterwards
sometimes post-processing to work around PostScript interpreter bugs
in some PostScript printers we call the pstops() filter function to
insert the printer-specific PostScript instructions for the option
settings into the PostScript output data stream.

If there is no PPD file pstops() has nothing to do, and therefore we
simply skip it now. In addition, in absence of a PPD, some standard
PostScript code for standard options is inserted in the postprocessing
step.

diff --git a/cupsfilters/pdftops.c b/cupsfilters/pdftops.c
index 78ecfa7cd9cc149ab672dd48df9b9c0ac04f9037..cee1095ea0fc17a1d0f640466d51a6b05d7ab635 100644 (file)
--- a/cupsfilters/pdftops.c
+++ b/cupsfilters/pdftops.c
@@ -288,7 +288,7 @@ pdftops(int inputfd,         /* I - File descriptor input stream */
   cups_file_t  *fp;                    /* Post-processing input file */
   int          pdf_pid,                /* Process ID for pdftops/gs */
                pdf_argc = 0,           /* Number of args for pdftops/gs */
-               pstops_pid,             /* Process ID of pstops filter */
+               pstops_pid = 0,         /* Process ID of pstops filter */
                pstops_pipe[2],         /* Pipe to pstops filter */
                need_post_proc = 0,     /* Post-processing needed? */
                post_proc_pid = 0,      /* Process ID of post-processing */
@@ -1103,7 +1103,7 @@ pdftops(int inputfd,         /* I - File descriptor input stream */
     need_post_proc = 1;
 
  /*
-  * Execute "pdftops/gs/mutool [ | PS post-processing ] | pstops"...
+  * Execute "pdftops/gs/mutool [ | PS post-processing ] [ | pstops ]"...
   */
 
 
@@ -1111,15 +1111,18 @@ pdftops(int inputfd,         /* I - File descriptor input stream */
   * Create a pipe for each pair of subsequent processes. The variables
   * are named by the receiving process.
   */
-  
-  if (pipe(pstops_pipe))
+
+  if (ppd)
   {
-    if (log) log(ld, FILTER_LOGLEVEL_ERROR,
-                "pdftops: Unable to create pipe for pstops: %s",
-                strerror(errno));
+    if (pipe(pstops_pipe))
+    {
+      if (log) log(ld, FILTER_LOGLEVEL_ERROR,
+                  "pdftops: Unable to create pipe for pstops: %s",
+                  strerror(errno));
 
-    exit_status = 1;
-    goto error;
+      exit_status = 1;
+      goto error;
+    }
   }
 
   if (need_post_proc)
@@ -1147,10 +1150,14 @@ pdftops(int inputfd,         /* I - File descriptor input stream */
       close(post_proc_pipe[0]);
       close(post_proc_pipe[1]);
     }
-    else
+    else if (ppd)
+    {
       dup2(pstops_pipe[1], 1);
-    close(pstops_pipe[0]);
-    close(pstops_pipe[1]);
+      close(pstops_pipe[0]);
+      close(pstops_pipe[1]);
+    }
+    else
+      dup2(outputfd, 1);
 
     if (renderer == PDFTOPS)
     {
@@ -1248,9 +1255,14 @@ pdftops(int inputfd,         /* I - File descriptor input stream */
       dup2(post_proc_pipe[0], 0);
       close(post_proc_pipe[0]);
       close(post_proc_pipe[1]);
-      dup2(pstops_pipe[1], 1);
-      close(pstops_pipe[0]);
-      close(pstops_pipe[1]);
+      if (ppd)
+      {
+       dup2(pstops_pipe[1], 1);
+       close(pstops_pipe[0]);
+       close(pstops_pipe[1]);
+      }
+      else
+       dup2(outputfd, 1);
 
       fp = cupsFileStdin();
 
@@ -1588,47 +1600,51 @@ pdftops(int inputfd,         /* I - File descriptor input stream */
                 "pdftops: Started post-processing (PID %d)", post_proc_pid);
   }
 
-  if ((pstops_pid = fork()) == 0)
+  if (ppd)
   {
-   /*
-    * Child comes here...
-    */
-
-    close(pstops_pipe[1]);
-    if (need_post_proc)
+    if ((pstops_pid = fork()) == 0)
     {
-      close(post_proc_pipe[0]);
-      close(post_proc_pipe[1]);
-    }
+     /*
+      * Child comes here...
+      */
 
-    ret = pstops(pstops_pipe[0], outputfd, 0, &pstops_filter_data, NULL);
-    close(pstops_pipe[0]);
+      close(pstops_pipe[1]);
+      if (need_post_proc)
+      {
+       close(post_proc_pipe[0]);
+       close(post_proc_pipe[1]);
+      }
 
-    if (ret && log) log(ld, FILTER_LOGLEVEL_ERROR,
-                       "pdftops: pstops filter function failed.");
+      ret = pstops(pstops_pipe[0], outputfd, 0, &pstops_filter_data, NULL);
+      close(pstops_pipe[0]);
 
-    close(outputfd);
-    exit(ret);
-  }
-  else if (pstops_pid < 0)
-  {
-   /*
-    * Unable to fork!
-    */
+      if (ret && log) log(ld, FILTER_LOGLEVEL_ERROR,
+                         "pdftops: pstops filter function failed.");
 
-    if (log) log(ld, FILTER_LOGLEVEL_ERROR,
-                "pdftops: Unable to execute pstops program: %s",
-                strerror(errno));
+      close(outputfd);
+      exit(ret);
+    }
+    else if (pstops_pid < 0)
+    {
+     /*
+      * Unable to fork!
+      */
 
-    exit_status = 1;
-    goto error;
-  }
+      if (log) log(ld, FILTER_LOGLEVEL_ERROR,
+                  "pdftops: Unable to execute pstops program: %s",
+                  strerror(errno));
 
-  if (log) log(ld, FILTER_LOGLEVEL_DEBUG,
-              "pdftops: Started filter pstops (PID %d)", pstops_pid);
+      exit_status = 1;
+      goto error;
+    }
+
+    if (log) log(ld, FILTER_LOGLEVEL_DEBUG,
+                "pdftops: Started filter pstops (PID %d)", pstops_pid);
+
+    close(pstops_pipe[0]);
+    close(pstops_pipe[1]);
+  }
 
-  close(pstops_pipe[0]);
-  close(pstops_pipe[1]);
   if (need_post_proc)
   {
     close(post_proc_pipe[0]);
@@ -1639,7 +1655,7 @@ pdftops(int inputfd,         /* I - File descriptor input stream */
   * Wait for the child processes to exit...
   */
 
-  wait_children = 2 + need_post_proc;
+  wait_children = 1 + need_post_proc + (ppd ? 1 : 0);
 
   while (wait_children > 0)
   {