diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-08-28 22:58:28 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-08-28 22:58:28 +0000 |
| commit | 9a4f8274e930ac2dff201dfb9c7af94e8f444f03 (patch) | |
| tree | fac1f774bf23bbe8a5cd175d3001576a268e2a6b /backend/socket.c | |
| parent | 5f64df29828e9ca71164342efd357e9debfb6e44 (diff) | |
| download | cups-9a4f8274e930ac2dff201dfb9c7af94e8f444f03.tar.gz | |
Merge changes from CUPS 1.4svn-r7874.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@933 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend/socket.c')
| -rw-r--r-- | backend/socket.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/backend/socket.c b/backend/socket.c index 70a089195..423000f0f 100644 --- a/backend/socket.c +++ b/backend/socket.c @@ -73,6 +73,7 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ int print_fd; /* Print file */ int copies; /* Number of copies to print */ time_t start_time, /* Time of first connect */ + current_time, /* Current time */ wait_time; /* Time to wait before shutting down socket */ int recoverable; /* Recoverable error shown? */ int contimeout; /* Connection timeout */ @@ -417,8 +418,8 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ */ wait_time = time(NULL) + 5; - while (wait_time >= time(NULL)) - if (wait_bc(device_fd, 1) <= 0) + while (wait_time >= time(¤t_time)) + if (wait_bc(device_fd, wait_time - current_time) <= 0) break; if (waiteof) |