lynx-dev connect_time patch

[Gisle Vanem]

With my previous patch to use non-blocking connect in djgpp 
version, the connect_time should be defined on cmd-line or in 
lynx.cfg.

Patch in lyutils.c: undef "select" in case Lynx is compiled with
curses (and not S-Lang). Watt-32's select_s cannot be used on a 
stdin handle, so one must undef it and use djgpp's select().

----------------------------------------------

diff -H -B -u3 -r orig/lynx.cfg ./lynx.cfg
--- orig/lynx.cfg Wed Jan 22 09:43:12 2003
+++ ./lynx.cfg Wed Feb  5 04:15:52 2003
@@ -3170,8 +3176,7 @@
 .h1 Timeouts
 
 .h2 CONNECT_TIMEOUT
-# Specifies (in seconds) connect timeout. Not available under DOS (use
-# sockdelay parameter of wattcp). Default value is rather huge.
+# Specifies (in seconds) connect timeout. Default value is rather huge.
 #CONNECT_TIMEOUT:18000
 
 diff -H -B -u3 -r orig/lynx.hlp ./lynx.hlp
--- orig/lynx.hlp Wed Jan 22 09:43:12 2003
+++ ./lynx.hlp Fri Apr  4 12:02:24 2003
@@ -152,8 +152,7 @@
 
        -connect_timeout=N
               Sets  the  connection  timeout, where N is given in
-              seconds.  This is not available under DOS (use  the
-              sockdelay parameter of WATTCP under DOS).
+              seconds.
 
        -cookie_file=FILENAME
               specifies  a  file to use to read cookies.  If none

diff -H -B -u3 -r orig/lynx.man ./lynx.man
--- orig/lynx.man Wed Jan 22 09:43:12 2003
+++ ./lynx.man Fri Apr  4 12:02:58 2003
@@ -172,8 +172,6 @@
 .TP
 .B \-connect_timeout\fR=\fIN
 Sets the connection timeout, where N is given in seconds.
-This is not available under DOS (use the sockdelay
-parameter of WATTCP under DOS).
 .TP
 .B \-cookie_file\fR=\fIFILENAME
 specifies a file to use to read cookies.

diff -H -B -u3 -r orig/lynx_hel/lynx_use.htm ./lynx_hel/lynx_use.htm
--- orig/lynx_hel/lynx_use.htm Wed Jan 22 09:43:12 2003
+++ ./lynx_hel/lynx_use.htm Fri Apr  4 12:13:30 2003
@@ -2387,8 +2387,6 @@
                        in .lynxrc on startup is overridden by this flag.
              <dt><code>-connect_timeout=N</code>
                 <dd>Sets the connection timeout, where N is given in seconds.
-                    This is not available under DOS (use the sockdelay
-                    parameter of WATTCP under DOS).
              <dt><code>-cookie_file=FILENAME</code>
                 <dd>specifies a file to use to read cookies.
                     If none is specified, the default value is ~/.lynx_cookies

diff -H -B -u3 -r orig/src/lymain.c ./src/lymain.c
--- orig/src/lymain.c Wed Jan 22 09:43:12 2003
+++ ./src/lymain.c Tue Apr  1 14:58:16 2003
@@ -3230,12 +3249,10 @@
       "force color mode on with standard bg colors"
    ),
 #endif
-#ifndef __DJGPP__
    PARSE_INT(
       "connect_timeout", 4|NEED_INT_ARG, connect_timeout,
       "=N\nset the N-second connection timeout"
    ),
-#endif
 #ifdef MISC_EXP
    PARSE_FUN(
       "convert_to", 4|FUNCTION_ARG,  convert_to_fun,

diff -H -B -u3 -r orig/src/lyreadcf.c ./src/lyreadcf.c
--- orig/src/lyreadcf.c Wed Jan 22 09:43:12 2003
+++ ./src/lyreadcf.c Wed Jan 22 14:02:34 2003
@@ -1252,9 +1252,7 @@
 #endif
      PARSE_PRG(RC_COMPRESS_PATH,        ppCOMPRESS),
      PARSE_PRG(RC_COPY_PATH,            ppCOPY),
-#ifndef __DJGPP__
      PARSE_INT(RC_CONNECT_TIMEOUT,      connect_timeout),
-#endif
      PARSE_STR(RC_COOKIE_ACCEPT_DOMAINS, LYCookieSAcceptDomains),
 #ifdef EXP_PERSISTENT_COOKIES
      PARSE_STR(RC_COOKIE_FILE,          LYCookieFile),

diff -H -B -u3 -r orig/src/lyutils.c ./src/lyutils.c
--- orig/src/lyutils.c Wed Jan 22 09:43:12 2003
+++ ./src/lyutils.c Wed Jan 22 14:04:32 2003
@@ -113,6 +113,10 @@
 #define FD_SETSIZE 256
 #endif /* !FD_SETSIZE */
 
+#ifdef __DJGPP__
+#undef select  /* defined to select_s in www_tcp.h */
+#endif
+
 #ifndef UTMP_FILE
 #if defined(__FreeBSD__) || defined(__bsdi__)
 #define UTMP_FILE _PATH_UTMP

----------------------------------------------

BTW the line-numbers in the LYmain.c patch are wrong since I've done 
other "private" patches. Please patch manually.

Gisle V.




; To UNSUBSCRIBE: Send "unsubscribe lynx-dev" to address@hidden