Bump to cups 2.3.3

[platform/upstream/cups.git] / scheduler / statbuf.c

diff --git a/scheduler/statbuf.c b/scheduler/statbuf.c
index cb75877..db9d98d 100644 (file)
--- a/scheduler/statbuf.c
+++ b/scheduler/statbuf.c
@@ -1,22 +1,10 @@
 /*
- * "$Id: statbuf.c 9350 2010-11-04 23:23:25Z mike $"
+ * Status buffer routines for the CUPS scheduler.
  *
- *   Status buffer routines for the CUPS scheduler.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2010 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   cupsdStatBufDelete() - Destroy a status buffer.
- *   cupsdStatBufNew()    - Create a new status buffer.
- *   cupsdStatBufUpdate() - Update the status buffer.
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
  */
 
 /*
@@ -119,7 +107,7 @@ cupsdStatBufNew(int        fd,              /* I - File descriptor of pipe */
 char *                                 /* O - Line from buffer, "", or NULL */
 cupsdStatBufUpdate(
     cupsd_statbuf_t *sb,               /* I - Status buffer */
-    int             *loglevel,         /* O - Log level */ 
+    int             *loglevel,         /* O - Log level */
     char            *line,             /* I - Line buffer */
     int             linelen)           /* I - Size of line buffer */
 {
@@ -138,8 +126,7 @@ cupsdStatBufUpdate(
     * No, read more data...
     */
 
-    if ((bytes = read(sb->fd, sb->buffer + sb->bufused,
-                      CUPSD_SB_BUFFER_SIZE - sb->bufused - 1)) > 0)
+    if ((bytes = read(sb->fd, sb->buffer + sb->bufused, (size_t)(CUPSD_SB_BUFFER_SIZE - sb->bufused - 1))) > 0)
     {
       sb->bufused += bytes;
       sb->buffer[sb->bufused] = '\0';
@@ -258,6 +245,11 @@ cupsdStatBufUpdate(
     *loglevel = CUPSD_LOG_STATE;
     message   = sb->buffer + 6;
   }
+  else if (!strncmp(sb->buffer, "JOBSTATE:", 9))
+  {
+    *loglevel = CUPSD_LOG_JOBSTATE;
+    message   = sb->buffer + 9;
+  }
   else if (!strncmp(sb->buffer, "ATTR:", 5))
   {
     *loglevel = CUPSD_LOG_ATTR;
@@ -307,7 +299,7 @@ cupsdStatBufUpdate(
   * Copy the message to the line buffer...
   */
 
-  strlcpy(line, message, linelen);
+  strlcpy(line, message, (size_t)linelen);
 
  /*
   * Copy over the buffer data we've used up...
@@ -323,8 +315,3 @@ cupsdStatBufUpdate(
 
   return (line);
 }
-
-
-/*
- * End of "$Id: statbuf.c 9350 2010-11-04 23:23:25Z mike $".
- */