Mirror 1.1.x changes.

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

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 89e654d3020ef3bd283d9f5250f8142dca2bd2f0..3842a29d052f4e93a5ca5839878890d6ca87229e 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,14 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.20rc1
 
+       - The cupstestppd program now checks for bad
+         JobPatchFile attributes and incorrect versions of the
+         Manufacturer attribute for HP printers (STR #155)
+       - The filter makefile incorrectly installed
+         libcupsimage.a in the filter directory (STR #180)
+       - The scheduler did not verify that the job history
+         files define the job-priority and
+         job-originating-user-name attributes (STR #178)
        - The pstops filter didn't handle poorly-formed binary
          PostScript files that had CTRL-D's in them (STR #156)
        - The ppdOpen*() and cupsLangGet() functions did not

diff --git a/filter/Makefile b/filter/Makefile
index 214d62a1fe28c9edfcd6c39f9d611476a0b26981..f378ef69ea47052e8e7b34dc736a3ce9121c0f7b 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.41.2.23 2003/04/17 23:10:34 mike Exp $"
+# "$Id: Makefile,v 1.41.2.24 2003/07/20 02:34:26 mike Exp $"
 #
 #   Filter makefile for the Common UNIX Printing System (CUPS).
 #
@@ -27,8 +27,7 @@
 include ../Makedefs
 
 FILTERS        =       gziptoany hpgltops texttops pstops imagetops imagetoraster \
-               rastertodymo rastertoepson rastertohp rastertortl \
-               libcupsimage.a
+               rastertodymo rastertoepson rastertohp rastertortl
 TARGETS        =       $(FILTERS) testraster
 
 HPGLOBJS =     hpgl-attr.o hpgl-config.o hpgl-main.o hpgl-prolog.o \
@@ -56,7 +55,7 @@ all:  $(TARGETS) libcupsimage.a
 #
 
 clean:
-       $(RM) $(OBJS) $(TARGETS) $(LIBCUPSIMAGE)
+       $(RM) $(OBJS) $(TARGETS) $(LIBCUPSIMAGE) libcupsimage.a
        $(RM) `basename $(LIBCUPSIMAGE) .2` libcupsimage.dylib
 
 
@@ -289,5 +288,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.41.2.23 2003/04/17 23:10:34 mike Exp $".
+# End of "$Id: Makefile,v 1.41.2.24 2003/07/20 02:34:26 mike Exp $".
 #

diff --git a/scheduler/job.c b/scheduler/job.c
index a167065a0d9601e575171ed6422cf7d06baa4bc8..fa75a0f6c2266f5e95a1fd4fee430e83f41eb925 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.c,v 1.124.2.74 2003/07/19 22:13:54 mike Exp $"
+ * "$Id: job.c,v 1.124.2.75 2003/07/20 02:34:27 mike Exp $"
  *
  *   Job management routines for the Common UNIX Printing System (CUPS).
  *
@@ -696,10 +696,26 @@ LoadAllJobs(void)
                                          IPP_TAG_INTEGER);
       job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
 
-      attr = ippFindAttribute(job->attrs, "job-priority", IPP_TAG_INTEGER);
+      if ((attr = ippFindAttribute(job->attrs, "job-priority", IPP_TAG_INTEGER)) == NULL)
+      {
+        LogMessage(L_ERROR, "LoadAllJobs: Missing or bad job-priority attribute in control file \"%s\"!",
+                  filename);
+       ippDelete(job->attrs);
+       free(job);
+       unlink(filename);
+       continue;
+      }
       job->priority = attr->values[0].integer;
 
-      attr = ippFindAttribute(job->attrs, "job-originating-user-name", IPP_TAG_NAME);
+      if ((attr = ippFindAttribute(job->attrs, "job-originating-user-name", IPP_TAG_NAME)) == NULL)
+      {
+        LogMessage(L_ERROR, "LoadAllJobs: Missing or bad job-originating-user-name attribute in control file \"%s\"!",
+                  filename);
+       ippDelete(job->attrs);
+       free(job);
+       unlink(filename);
+       continue;
+      }
       SetString(&job->username, attr->values[0].string.text);
 
      /*
@@ -2775,5 +2791,5 @@ start_process(const char *command,        /* I - Full path to command */
 
 
 /*
- * End of "$Id: job.c,v 1.124.2.74 2003/07/19 22:13:54 mike Exp $".
+ * End of "$Id: job.c,v 1.124.2.75 2003/07/20 02:34:27 mike Exp $".
  */

diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index 5eb0a8934c0f8f750990c31da01bab6f28087b5f..2e207c76ac7f65f8e2da163c2718e6e2b9b39e7a 100644 (file)
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupstestppd.c,v 1.1.2.23 2003/06/07 16:35:56 mike Exp $"
+ * "$Id: cupstestppd.c,v 1.1.2.24 2003/07/20 02:34:29 mike Exp $"
  *
  *   PPD test program for the Common UNIX Printing System (CUPS).
  *
@@ -421,7 +421,21 @@ main(int  argc,                    /* I - Number of command-line arguments */
 
       if (ppd->manufacturer != NULL)
       {
-       if (verbose > 0)
+        if (!strncasecmp(ppd->manufacturer, "Hewlett-Packard", 15) ||
+           !strncasecmp(ppd->manufacturer, "Hewlett Packard", 15))
+       {
+         if (verbose >= 0)
+         {
+           if (!errors && !verbose)
+             puts(" FAIL");
+
+           puts("      **FAIL**  BAD Manufacturer (should be \"HP\")");
+           puts("                REF: Page 211, table D.1.");
+          }
+
+         errors ++;
+       }
+       else if (verbose > 0)
          puts("        PASS    Manufacturer");
       }
       else if (ppdversion >= 43)
@@ -653,6 +667,21 @@ main(int  argc,                    /* I - Number of command-line arguments */
        errors ++;
       }
 
+      if (ppd->patches != NULL && strchr(ppd->patches, '\"') &&
+          strstr(ppd->patches, "*End"))
+      {
+       if (verbose >= 0)
+       {
+         if (!errors && !verbose)
+           puts(" FAIL");
+
+         puts("      **FAIL**  BAD JobPatchFile attribute in file");
+         puts("                REF: Page 24, section 3.4.");
+        }
+
+       errors ++;
+      }
+
       if (errors)
        status = ERROR_CONFORMANCE;
       else if (!verbose)
@@ -987,5 +1016,5 @@ usage(void)
 
 
 /*
- * End of "$Id: cupstestppd.c,v 1.1.2.23 2003/06/07 16:35:56 mike Exp $".
+ * End of "$Id: cupstestppd.c,v 1.1.2.24 2003/07/20 02:34:29 mike Exp $".
  */