lynx-dev dev.22 (followup patch #1)

[Leonid Pauzner]

Few changes (lost during dev22 patch integration,
more things added).


Please add this two flags into all DJGPP makefile's under /WWW and /src dirs:

diff -u old/makefile.dos ./makefile.dos
--- old/makefile.dos    Tue Apr 13 02:39:16 1999
+++ ./makefile.dos      Tue Apr 13 17:46:24 1999
@@ -13,6 +13,7 @@

 CC = gcc
 MCFLAGS = -O2 -DHAVE_GETBKGD -DDISP_PARTIAL -DUSE_ZLIB \
+ -DSOURCE_CACHE -DUSE_PSRC \
  -DUSE_EXTERNALS -DCOLOR_CURSES -DNCURSES -DFANCY_CURSES \
  -DACCESS_AUTH -DNO_CUSERID -DNOUSERS -DDOSPATH -DNO_TTYTYPE -DNO_UTMP \
  -Ichrtrans -I../WWW/library/implementation \


Cut-n-paste typo:

diff -u old/htformat.h ./htformat.h
--- old/htformat.h      Tue Apr 13 02:39:16 1999
+++ ./htformat.h        Tue Apr 13 21:49:26 1999
@@ -325,10 +325,10 @@
 #include <HTChunk.h>
 /*

-HTFileCopy:  Copy a file to a stream
+HTMemCopy:  Copy a memory chunk to a stream

    This is used by the protocol engines to send data down a stream, typically 
one which
-   has been generated by HTStreamStack.  It is currently called by HTParseFile
+   has been generated by HTStreamStack.  It is currently called by HTParseMem

  */
 extern int HTMemCopy PARAMS((


more fixes under /src directory:

diff -u old/lycurses.c ./lycurses.c
--- old/lycurses.c      Tue Apr 13 02:39:16 1999
+++ ./lycurses.c        Tue Apr 13 22:35:48 1999
@@ -622,6 +622,7 @@
 }
 #endif /* USE_COLOR_TABLE */

+#ifdef NOTUSED
 #if defined (DJGPP) && !defined (USE_SLANG)
 /*
  * Sorry about making a completely new function,
@@ -660,6 +661,10 @@
     noecho();
 }
 #else
+#endif /* defined (DJGPP) && !defined (USE_SLANG) */
+#endif /* NOTUSED */
+
+
 PUBLIC void start_curses NOARGS
 {
 #ifdef USE_SLANG
@@ -758,13 +763,15 @@

 #else /* Using curses: */

+
 #ifdef VMS
     /*
      * If we are VMS then do initscr() everytime start_curses()
      * is called!
      */
     initscr(); /* start curses */
-#else /* Unix: */
+#else  /* Unix: */
+
     static BOOLEAN first_time = TRUE;

     if (first_time) {
@@ -827,7 +834,10 @@
        lynx_called_initscr = TRUE;
 #endif /* USE_COLOR_TABLE */
     }
-#endif /* VMS */
+#ifdef __DJGPP__
+    else sock_init();
+#endif /* __DJGPP__ */
+#endif /* not VMS */

     /* nonl();  */ /* seems to slow things down */

@@ -862,7 +872,7 @@

     LYCursesON = TRUE;
 }
-#endif /* defined (DJGPP) && !defined (USE_SLANG) */
+

 PUBLIC void lynx_enable_mouse ARGS1(int,state)
 {
diff -u old/lyhistor.c ./lyhistor.c
--- old/lyhistor.c      Tue Apr 13 02:39:16 1999
+++ ./lyhistor.c        Tue Apr 13 22:21:30 1999
@@ -459,6 +459,12 @@
     if ((number = atoi(newdoc->address+9)) > nhist || number < 0)
        return(FALSE);

+    /*
+     * Optimization: assume we came from the History Page,
+     * so never return back - always a new version next time.
+     */
+    HTuncache_current_document();  /* don't waste the cache */
+
     LYpop_num(number, newdoc);
     if (((newdoc->internal_link &&
          history[number].intern_seq_start == 
history[nhist-1].intern_seq_start) ||
diff -u old/lymain.c ./lymain.c
--- old/lymain.c        Tue Apr 13 02:39:16 1999
+++ ./lymain.c  Tue Apr 13 21:30:54 1999
@@ -1782,7 +1782,8 @@
         *  mode.  Instead of calling cleanup() here, let's only call
         *  this one. - BJP
         */
-       LYStoreCookies(LYCookieFile);
+       if (persistent_cookies)
+           LYStoreCookies(LYCookieFile);
 #endif /* EXP_PERSISTENT_COOKIES */
        exit_immediately(status);
     } else {
@@ -1832,6 +1833,7 @@
     HTRegisterProtocol(&LYLynxCookies);
 }

+#ifndef NO_CONFIG_INFO
 /*
  *  Some staff to reload lynx.cfg without restarting new lynx session,
  *  also load options menu items and command-line options
@@ -1882,6 +1884,7 @@

     }
 }
+#endif /* !NO_CONFIG_INFO */


 /* There are different ways of setting arguments on the command line, and
@@ -1913,13 +1916,13 @@
 #ifdef  PARSE_DEBUG
 #define ParseData BOOLEAN *set_value; int *int_value; char **str_value; 
ParseFunc fun_value
 #define PARSE_SET(n,t,v,h) {n,t,    v,  0,  0,  0,    h}
-#define PARSE_INT(n,t,v,h) {n,t,    0, &v,  0,  0,    h}
+#define PARSE_INT(n,t,v,h) {n,t,    0,  v,  0,  0,    h}
 #define PARSE_STR(n,t,v,h) {n,t,    0,  0,  v,  0,    h}
 #define PARSE_FUN(n,t,v,h) {n,t,    0,  0,  0,  v,    h}
 #else
 #define ParseData long value
 #define PARSE_SET(n,t,v,h) {n,t,   (long) (v),        h}
-#define PARSE_INT(n,t,v,h) {n,t,   (long)&(v),        h}
+#define PARSE_INT(n,t,v,h) {n,t,   (long) (v),        h}
 #define PARSE_STR(n,t,v,h) {n,t,   (long) (v),        h}
 #define PARSE_FUN(n,t,v,h) {n,t,   (long) (v),        h}
 #endif
@@ -2751,7 +2754,7 @@
       "toggles inclusion of ISMAP links when client-side\nMAPs are present"
    ),
    PARSE_INT(
-      "link",          NEED_INT_ARG,           ccount,
+      "link",          NEED_INT_ARG,           &ccount,
       "=NUMBER\nstarting count for lnk#.dat files produced by -crawl"
    ),
    PARSE_SET(
@@ -2842,7 +2845,7 @@
       "toggles display partial pages while downloading"
    ),
    PARSE_INT(
-      "partial_thres",  IGNORE_ARG|INT_ARG,     partial_threshold,
+      "partial_thres",  NEED_INT_ARG,          &partial_threshold,
       "[=NUMBER]\nnumber of lines to render before repainting display\n\
 with partial-display logic"
    ),
@@ -2862,7 +2865,7 @@
    PARSE_SET(
       "preparsed",     SET_ARG,                &LYPreparsedSource,
       "show parsed text/html with -source and in source view\n\
-       to visualize how lynx behaves with invalid HTML"
+to visualize how lynx behaves with invalid HTML"
    ),
 #ifdef USE_PSRC
    PARSE_SET(
diff -u old/lyoption.c ./lyoption.c
--- old/lyoption.c      Tue Mar 30 09:10:38 1999
+++ ./lyoption.c        Tue Apr 13 21:19:30 1999
@@ -3935,6 +3935,7 @@
     if (!HTLoadAbsolute(&WWWDoc))
        return(NOT_FOUND);

+    HTuncache_current_document(); /* will never used again */

     /*
      *  Return to previous doc, not to options menu!
diff -u old/lyreadcf.c ./lyreadcf.c
--- old/lyreadcf.c      Tue Apr 13 02:39:16 1999
+++ ./lyreadcf.c        Tue Apr 13 21:19:50 1999
@@ -1541,7 +1541,7 @@
        /*
         *  Some staff to reload read_cfg(),
         *  but also load options menu items and command-line options
-        *  to made things consistent.  Not implemented yet. Dummy.
+        *  to made things consistent.  Implemented in LYMain.c
         */
        reload_read_cfg();

@@ -1572,6 +1572,7 @@
        if (!HTLoadAbsolute(&WWWDoc))
            return(NOT_FOUND);

+       HTuncache_current_document();  /* will never used again */

        /*  now set up the flag and fall down to create a new LYNXCFG:/ page */
        local_url = 0;  /* see below */