Merge changes from CUPS 1.4svn-r7715.

[thirdparty/cups.git] / ppdc / ppdc-file.cxx

diff --git a/ppdc/ppdc-file.cxx b/ppdc/ppdc-file.cxx
index 3af0e4975129f6f3d0b2b9332e21d7ca3f84423a..29f109ce2134b4faf2c4ac2cb4fbe43e030691eb 100644 (file)
--- a/ppdc/ppdc-file.cxx
+++ b/ppdc/ppdc-file.cxx
@@ -31,9 +31,17 @@
 // 'ppdcFile::ppdcFile()' - Create (open) a file.
 //
 
-ppdcFile::ppdcFile(const char *f)              // I - File to open
+ppdcFile::ppdcFile(const char  *f,             // I - File to open
+                   cups_file_t *ffp)           // I - File pointer to use
 {
-  fp       = cupsFileOpen(f, "r");
+  if (ffp)
+  {
+    fp = ffp;
+    cupsFileRewind(fp);
+  }
+  else
+    fp = cupsFileOpen(f, "r");
+
   filename = f;
   line     = 1;