Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3376 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/cups/ppd.c b/cups/ppd.c
index 9220b63993623d0a7a29a7f99ed86eda5e23b69b..722d8e1e8ca734c5ef70832cbccddf75eb0c1e40 100644 (file)
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.c,v 1.51.2.38 2003/02/18 22:29:54 mike Exp $"
+ * "$Id: ppd.c,v 1.51.2.39 2003/02/18 22:43:26 mike Exp $"
  *
  *   PPD file routines for the Common UNIX Printing System (CUPS).
  *
@@ -292,8 +292,8 @@ ppdErrorString(ppd_status_t status) /* I - PPD status */
                  "OK",
                  "Unable to open PPD file",
                  "NULL PPD file pointer",
-                 "Missing PPD-Adobe-4.x header",
                  "Memory allocation error",
+                 "Missing PPD-Adobe-4.x header",
                  "Missing value string",
                  "Internal error",
                  "Bad OpenGroup",
@@ -3218,5 +3218,5 @@ ppd_read(FILE *fp,                        /* I - File to read from */
 
 
 /*
- * End of "$Id: ppd.c,v 1.51.2.38 2003/02/18 22:29:54 mike Exp $".
+ * End of "$Id: ppd.c,v 1.51.2.39 2003/02/18 22:43:26 mike Exp $".
  */

diff --git a/cups/ppd.h b/cups/ppd.h
index 58b5c498e3ff9da7ea4ae336fc0e951900fa52b4..ec844931ff3a3caa045309cac7ac7a3af88c9128 100644 (file)
--- a/cups/ppd.h
+++ b/cups/ppd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.h,v 1.24.2.13 2003/02/18 22:29:55 mike Exp $"
+ * "$Id: ppd.h,v 1.24.2.14 2003/02/18 22:43:27 mike Exp $"
  *
  *   PostScript Printer Description definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -112,8 +112,8 @@ typedef enum                        /**** Status Codes ****/
   PPD_OK = 0,                  /* OK */
   PPD_FILE_OPEN_ERROR,         /* Unable to open PPD file */
   PPD_NULL_FILE,               /* NULL PPD file pointer */
-  PPD_MISSING_PPDADOBE4,       /* Missing PPD-Adobe-4.x header */
   PPD_ALLOC_ERROR,             /* Memory allocation error */
+  PPD_MISSING_PPDADOBE4,       /* Missing PPD-Adobe-4.x header */
   PPD_MISSING_VALUE,           /* Missing value string */
   PPD_INTERNAL_ERROR,          /* Internal error */
   PPD_BAD_OPEN_GROUP,          /* Bad OpenGroup */
@@ -389,5 +389,5 @@ extern int          ppdSaveFile(ppd_file_t *ppd, const char *filename);
 #endif /* !_CUPS_PPD_H_ */
 
 /*
- * End of "$Id: ppd.h,v 1.24.2.13 2003/02/18 22:29:55 mike Exp $".
+ * End of "$Id: ppd.h,v 1.24.2.14 2003/02/18 22:43:27 mike Exp $".
  */

diff --git a/scheduler/printers.c b/scheduler/printers.c
index a397d989fcc2b7ee0015f80087bfb14cb35eaabf..807e2f3eb4b18db1b3f222596b15639ac45de029 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c,v 1.93.2.36 2003/02/14 20:09:33 mike Exp $"
+ * "$Id: printers.c,v 1.93.2.37 2003/02/18 22:43:28 mike Exp $"
  *
  *   Printer routines for the Common UNIX Printing System (CUPS).
  *
@@ -1416,8 +1416,12 @@ SetPrinterAttrs(printer_t *p)            /* I - Printer to setup */
         pstatus = ppdLastError(&pline);
 
        LogMessage(L_ERROR, "PPD file for %s cannot be loaded!", p->name);
-       LogMessage(L_ERROR, "%s on line %d.", ppdErrorString(pstatus),
-                  pline);
+
+       if (pstatus <= PPD_ALLOC_ERROR)
+         LogMessage(L_ERROR, "%s", strerror(errno));
+        else
+         LogMessage(L_ERROR, "%s on line %d.", ppdErrorString(pstatus),
+                    pline);
 
        AddPrinterFilter(p, "application/vnd.cups-postscript 0 -");
       }
@@ -2150,5 +2154,5 @@ write_irix_state(printer_t *p)    /* I - Printer to update */
 
 
 /*
- * End of "$Id: printers.c,v 1.93.2.36 2003/02/14 20:09:33 mike Exp $".
+ * End of "$Id: printers.c,v 1.93.2.37 2003/02/18 22:43:28 mike Exp $".
  */

diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index e1bd5e67f1cf4a76e6fa1d65b579c847c83fe140..20a8b4e29400fbe69ab7d639a694c40c4795f3a0 100644 (file)
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupstestppd.c,v 1.1.2.10 2003/02/18 22:29:56 mike Exp $"
+ * "$Id: cupstestppd.c,v 1.1.2.11 2003/02/18 22:43:30 mike Exp $"
  *
  *   PPD test program for the Common UNIX Printing System (CUPS).
  *
@@ -190,7 +190,7 @@ main(int  argc,                     /* I - Number of command-line arguments */
       {
         error = ppdLastError(&line);
 
-       if (error <= PPD_NULL_FILE || error == PPD_ALLOC_ERROR)
+       if (error <= PPD_ALLOC_ERROR)
        {
          status = ERROR_FILE_OPEN;
 
@@ -831,5 +831,5 @@ usage(void)
 
 
 /*
- * End of "$Id: cupstestppd.c,v 1.1.2.10 2003/02/18 22:29:56 mike Exp $".
+ * End of "$Id: cupstestppd.c,v 1.1.2.11 2003/02/18 22:43:30 mike Exp $".
  */