diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-02-25 23:37:25 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-02-25 23:37:25 +0000 |
| commit | b9faaae17cfc7cd8dfd6e82cf607c05b2f4def68 (patch) | |
| tree | 11ae14d6d1fc0cd6d834e8c819b74167dbe2a413 /scheduler/cups-deviced.c | |
| parent | ede613e028030f6b2b5871b5e40682806ee1acd0 (diff) | |
| download | cups-b9faaae17cfc7cd8dfd6e82cf607c05b2f4def68.tar.gz | |
Merge changes from CUPS 1.4svn-r8394.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1253 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/cups-deviced.c')
| -rw-r--r-- | scheduler/cups-deviced.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c index 912109f1b..547a032d0 100644 --- a/scheduler/cups-deviced.c +++ b/scheduler/cups-deviced.c @@ -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 @@ main(int argc, /* I - Number of command-line args */ { 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)); + } } /* |