Save and restore printer-state-reasons.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@7967 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index 3b6c4ba5d7e74ca20d84bff7fe12534670f9d174..3939448929459058bc7481cdffc9416001633984 100644 (file)
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -494,6 +494,18 @@ cupsdLoadRemoteCache(void)
                                       &(p->options));
       }
     }
+    else if (!strcasecmp(line, "Reason"))
+    {
+      if (value &&
+          p->num_reasons < (int)(sizeof(p->reasons) / sizeof(p->reasons[0])))
+      {
+        p->reasons[p->num_reasons] = _cupsStrAlloc(value);
+       p->num_reasons ++;
+      }
+      else
+       cupsdLogMessage(CUPSD_LOG_ERROR,
+                       "Syntax error on line %d of remote.cache.", linenum);
+    }
     else if (!strcasecmp(line, "State"))
     {
      /*
@@ -776,6 +788,9 @@ cupsdSaveRemoteCache(void)
     else
       cupsFilePuts(fp, "State Idle\n");
 
+    for (i = 0; i < printer->num_reasons; i ++)
+      cupsFilePrintf(fp, "Reason %s\n", printer->reasons[i]);
+
     if (printer->accepting)
       cupsFilePuts(fp, "Accepting Yes\n");
     else

diff --git a/scheduler/printers.c b/scheduler/printers.c
index ea2531ca6d71eba8e0e5a295814f85e5b4abf36e..a3459a7386abbbba289fe240ccd5193274f67834 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1023,6 +1023,18 @@ cupsdLoadAllPrinters(void)
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
     }
+    else if (!strcasecmp(line, "Reason"))
+    {
+      if (value &&
+          p->num_reasons < (int)(sizeof(p->reasons) / sizeof(p->reasons[0])))
+      {
+        p->reasons[p->num_reasons] = _cupsStrAlloc(value);
+       p->num_reasons ++;
+      }
+      else
+       cupsdLogMessage(CUPSD_LOG_ERROR,
+                       "Syntax error on line %d of printers.conf.", linenum);
+    }
     else if (!strcasecmp(line, "State"))
     {
      /*
@@ -1452,6 +1464,9 @@ cupsdSaveAllPrinters(void)
 
     cupsFilePrintf(fp, "StateTime %d\n", (int)printer->state_time);
 
+    for (i = 0; i < printer->num_reasons; i ++)
+      cupsFilePrintf(fp, "Reason %s\n", printer->reasons[i]);
+
     if (printer->accepting)
       cupsFilePuts(fp, "Accepting Yes\n");
     else