Index: scheduler/util.h
===================================================================
--- scheduler/util.h	(revision 8387)
+++ scheduler/util.h	(working copy)
@@ -3,7 +3,7 @@
  *
  *   Mini-daemon utility definitions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -20,13 +20,8 @@
  * Include necessary headers...
  */
 
-#  include <cups/cups.h>
-#  include <cups/file.h>
-#  include <cups/string.h>
-#  include <stdlib.h>
-#  include <errno.h>
+#  include <cups/file-private.h>
 #  include <signal.h>
-#  include <dirent.h>
 
 
 /*
Index: scheduler/Dependencies
===================================================================
--- scheduler/Dependencies	(revision 8387)
+++ scheduler/Dependencies	(working copy)
@@ -206,10 +206,12 @@
 cupsfilter.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
 cupsfilter.o: ../cups/transcode.h ../cups/string.h ../config.h mime.h
 cupsfilter.o: ../cups/array.h ../cups/ipp.h ../cups/file.h
-cups-deviced.o: util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-cups-deviced.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-cups-deviced.o: ../cups/file.h ../cups/language.h ../cups/file.h
-cups-deviced.o: ../cups/string.h ../config.h ../cups/array.h ../cups/dir.h
+cups-deviced.o: util.h ../cups/file-private.h ../cups/http-private.h
+cups-deviced.o: ../config.h ../cups/http.h ../cups/versioning.h ../cups/md5.h
+cups-deviced.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/globals.h
+cups-deviced.o: ../cups/string.h ../cups/cups.h ../cups/i18n.h
+cups-deviced.o: ../cups/transcode.h ../cups/language.h ../cups/array.h
+cups-deviced.o: ../cups/debug.h ../cups/array.h ../cups/dir.h
 cups-lpd.o: ../cups/http-private.h ../config.h ../cups/http.h
 cups-lpd.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
 cups-lpd.o: ../cups/ipp.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
@@ -235,12 +237,16 @@
 testsub.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
 testsub.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 testsub.o: ../cups/debug.h ../cups/string.h ../config.h
-util.o: util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-util.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-util.o: ../cups/language.h ../cups/file.h ../cups/string.h ../config.h
-cups-driverd.o: util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-cups-driverd.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-cups-driverd.o: ../cups/file.h ../cups/language.h ../cups/file.h
-cups-driverd.o: ../cups/string.h ../config.h ../cups/dir.h
-cups-driverd.o: ../cups/transcode.h ../cups/ppd-private.h ../cups/cups.h
-cups-driverd.o: ../ppdc/ppdc.h
+util.o: util.h ../cups/file-private.h ../cups/http-private.h ../config.h
+util.o: ../cups/http.h ../cups/versioning.h ../cups/md5.h
+util.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/globals.h
+util.o: ../cups/string.h ../cups/cups.h ../cups/i18n.h ../cups/transcode.h
+util.o: ../cups/language.h ../cups/array.h ../cups/debug.h
+cups-driverd.o: util.h ../cups/file-private.h ../cups/http-private.h
+cups-driverd.o: ../config.h ../cups/http.h ../cups/versioning.h ../cups/md5.h
+cups-driverd.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/globals.h
+cups-driverd.o: ../cups/string.h ../cups/cups.h ../cups/i18n.h
+cups-driverd.o: ../cups/transcode.h ../cups/language.h ../cups/array.h
+cups-driverd.o: ../cups/debug.h ../cups/dir.h ../cups/transcode.h
+cups-driverd.o: ../cups/ppd-private.h ../ppdc/ppdc.h ../cups/string.h
+cups-driverd.o: ../cups/file.h
Index: scheduler/cups-deviced.c
===================================================================
--- scheduler/cups-deviced.c	(revision 8387)
+++ scheduler/cups-deviced.c	(working copy)
@@ -3,7 +3,7 @@
  *
  *   Device scanning mini-daemon for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -313,11 +313,22 @@
     {
       for (i = 0; i < num_backends; i ++)
         if (backend_fds[i].revents && backends[i].pipe)
-	  if (get_device(backends + i))
+	{
+	  cups_file_t *bpipe = backends[i].pipe;
+					/* Copy of pipe for backend... */
+
+	  do
 	  {
-	    backend_fds[i].fd     = 0;
-	    backend_fds[i].events = 0;
+	    if (get_device(backends + i))
+	    {
+	      backend_fds[i].fd     = 0;
+	      backend_fds[i].events = 0;
+	      break;
+	    }
 	  }
+	  while (bpipe->ptr &&
+	         memchr(bpipe->ptr, '\n', bpipe->end - bpipe->ptr));
+        }
     }
 
    /*