Attachment 159440 Details for Bug 248550 – RHEL4-ized patch

[patch] RHEL4-ized patch

cups-str1985.patch (text/plain), 2.95 KB, created by Matt Hyclak on 2007-07-17 14:30:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Hyclak

Created: 2007-07-17 14:30:49 UTC

Size: 2.95 KB

patch

obsolete

>diff -uNr cups-1.1.22rc1.orig/systemv/cupsaddsmb.c cups-1.1.22rc1/systemv/cupsaddsmb.c
>--- cups-1.1.22rc1.orig/systemv/cupsaddsmb.c	2004-08-23 14:36:50.000000000 -0400
>+++ cups-1.1.22rc1/systemv/cupsaddsmb.c	2007-07-17 09:36:24.000000000 -0400
>@@ -188,6 +188,7 @@
> 			option[41],	/* Option */
> 			choice[41];	/* Choice */
>   int			jcloption,	/* In a JCL option? */
>+			jclorder,	/* Next JCL order dependency */
> 			linenum;	/* Current line number */
>   time_t		curtime;	/* Current time */
>   struct tm		*curdate;	/* Current date */
>@@ -243,6 +244,7 @@
>   */
> 
>   jcloption = 0;
>+  jclorder  = 0;
>   linenum   = 0;
> 
>   while (ppd_gets(srcfp, line, sizeof(line)) != NULL)
>@@ -279,10 +281,23 @@
>       jcloption = 0;
>       fputs(line, dstfp);
>     }
>+    else if (jcloption && !strncmp(line, "*OrderDependency:", 17))
>+    {
>+      for (ptr = line + 17; *ptr && isspace(*ptr & 255); ptr ++);
>+
>+      ptr = strchr(ptr, ' ');
>+
>+      if (ptr)
>+      {
>+        fprintf(dstfp, "*OrderDependency: %d%s\n", jclorder, ptr);
>+        jclorder ++;
>+      }
>+      else
>+        fprintf(dstfp, "%s\n", line);
>+    }
>     else if (jcloption &&
>              strncmp(line, "*End", 4) &&
>-             strncmp(line, "*Default", 8) &&
>-             strncmp(line, "*OrderDependency", 16))
>+             strncmp(line, "*Default", 8))
>     {
>       if ((ptr = strchr(line, ':')) == NULL)
>       {
>@@ -358,24 +373,24 @@
>                                   IPP_TAG_ZERO)) != NULL &&
>       (suppattr = ippFindAttribute(info, "job-hold-until-supported",
>                                    IPP_TAG_ZERO)) != NULL)
>-    write_option(dstfp, 10, "cupsJobHoldUntil", "Hold Until", "job-hold-until",
>-                 suppattr, defattr, 0, 1);
>+    write_option(dstfp, jclorder ++, "cupsJobHoldUntil", "Hold Until", 
>+                 "job-hold-until", suppattr, defattr, 0, 1);
> 
>   if ((defattr = ippFindAttribute(info, "job-priority-default",
>                                   IPP_TAG_INTEGER)) != NULL &&
>       (suppattr = ippFindAttribute(info, "job-priority-supported",
>                                    IPP_TAG_RANGE)) != NULL)
>-    write_option(dstfp, 11, "cupsJobPriority", "Priority", "job-priority",
>-                 suppattr, defattr, 0, 1);
>+    write_option(dstfp, jclorder ++, "cupsJobPriority", "Priority", 
>+                 "job-priority", suppattr, defattr, 0, 1);
> 
>   if ((defattr = ippFindAttribute(info, "job-sheets-default",
>                                   IPP_TAG_ZERO)) != NULL &&
>       (suppattr = ippFindAttribute(info, "job-sheets-supported",
>                                    IPP_TAG_ZERO)) != NULL)
>   {
>-    write_option(dstfp, 20, "cupsJobSheetsStart", "Start Banner",
>+    write_option(dstfp, jclorder ++, "cupsJobSheetsStart", "Start Banner",
>                  "job-sheets", suppattr, defattr, 0, 2);
>-    write_option(dstfp, 21, "cupsJobSheetsEnd", "End Banner",
>+    write_option(dstfp, jclorder ++, "cupsJobSheetsEnd", "End Banner",
>                  "job-sheets", suppattr, defattr, 1, 2);
>   }
>

Actions: View | Diff

Attachments on bug 248550: 159440