diff options
author | joerg <joerg@FreeBSD.org> | 1997-10-14 16:01:02 +0000 |
---|---|---|
committer | joerg <joerg@FreeBSD.org> | 1997-10-14 16:01:02 +0000 |
commit | fef7c77457bb37b4446a11916d0e18bfbed5fca8 (patch) | |
tree | 5f0c559d9ab9b959f3e9d5b41198a5706e25b662 /usr.sbin/lpr/common_source/displayq.c | |
parent | eadc6c642e65bfe3b9c54fbfbe4c9a1b569663a8 (diff) | |
download | FreeBSD-src-fef7c77457bb37b4446a11916d0e18bfbed5fca8.zip FreeBSD-src-fef7c77457bb37b4446a11916d0e18bfbed5fca8.tar.gz |
Improve my hack from rev 1.6 of displayq.c, and make the TCP
connection timeout controllable by a new printcap(5) capability named
`ct' (connectiom timeout), defaulting to 120 seconds (which is the
default TCP connection timeout).
Would anybody see a problem with merging all this into RELENG_2_2?
Diffstat (limited to 'usr.sbin/lpr/common_source/displayq.c')
-rw-r--r-- | usr.sbin/lpr/common_source/displayq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c index 4e5f060..2903084 100644 --- a/usr.sbin/lpr/common_source/displayq.c +++ b/usr.sbin/lpr/common_source/displayq.c @@ -112,6 +112,8 @@ displayq(format) LO = DEFLOCK; if (cgetstr(bp, "st", &ST) < 0) ST = DEFSTAT; + if (cgetnum(bp, "ct", &CT) < 0) + CT = DEFTIMEOUT; cgetstr(bp, "rm", &RM); if ((cp = checkremote())) printf("Warning: %s\n", cp); @@ -237,7 +239,7 @@ displayq(format) } strcat(line, "\n"); savealrm = signal(SIGALRM, alarmhandler); - alarm(10); + alarm(CT); fd = getport(RM, 0); (void)signal(SIGALRM, savealrm); if (fd < 0) { |