Load cups into easysw/current.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@69 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 27 insertions, 2 deletions

diff --git a/scheduler/classes.c b/scheduler/classes.c
index fe36555d8..749a1bda0 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: classes.c 5083 2006-02-06 02:57:43Z mike $"
+ * "$Id: classes.c 5151 2006-02-22 22:43:17Z mike $"
  *
  *   Printer class routines for the Common UNIX Printing System (CUPS).
  *
@@ -410,6 +410,25 @@ cupsdLoadAllClasses(void)
       if (value)
         cupsdSetString(&p->location, value);
     }
+    else if (!strcasecmp(line, "Option") && value)
+    {
+     /*
+      * Option name value
+      */
+
+      for (valueptr = value; *valueptr && !isspace(*valueptr & 255); valueptr ++);
+
+      if (!*valueptr)
+        cupsdLogMessage(CUPSD_LOG_ERROR,
+	                "Syntax error on line %d of classes.conf.", linenum);
+      else
+      {
+        for (; *valueptr && isspace(*valueptr & 255); *valueptr++ = '\0');
+
+        p->num_options = cupsAddOption(value, valueptr, p->num_options,
+	                               &(p->options));
+      }
+    }
     else if (!strcasecmp(line, "Printer"))
     {
       if (!value)
@@ -683,6 +702,7 @@ cupsdSaveAllClasses(void)
   int			i;		/* Looping var */
   time_t		curtime;	/* Current time */
   struct tm		*curdate;	/* Current date */
+  cups_option_t		*option;	/* Current option */
 
 
  /*
@@ -801,6 +821,11 @@ cupsdSaveAllClasses(void)
     if (pclass->error_policy)
       cupsFilePrintf(fp, "ErrorPolicy %s\n", pclass->error_policy);
 
+    for (i = pclass->num_options, option = pclass->options;
+         i > 0;
+	 i --, option ++)
+      cupsFilePrintf(fp, "Option %s %s\n", option->name, option->value);
+
     cupsFilePuts(fp, "</Class>\n");
   }
 
@@ -839,5 +864,5 @@ cupsdUpdateImplicitClasses(void)
 
 
 /*
- * End of "$Id: classes.c 5083 2006-02-06 02:57:43Z mike $".
+ * End of "$Id: classes.c 5151 2006-02-22 22:43:17Z mike $".
  */