Re: lynx-dev lynx2.8.3dev.4

[Leonid Pauzner]

14-Jul-99 12:46 T.E.Dickey wrote:
> 1999-07-14 (2.8.3dev.4)
> * incorporate changes for win32 by Hiroyuki Senshu <address@hidden>
>   from
>     ftp://crab.it.osha.sut.ac.jp/pub/Win32/develope/senshu/Lynx/
>   based on his patch against 2.8.2pre.6
>   Most changes are ifdef'd
>     #define _WIN_CC=    .... for Windows C Compiler
>     #define CJK_EX      .... CJK EXtention
>     #define SH_EX       .... Senshu Hiroyuki EXtention
>     #define WIN_EX      .... Windows EXtention


Looking into dev.4.patch I found out several minore problems
still present from pre4 Hiroyuki diff (I sent him letter when pre6
resinc was out, but we never got pre7 etc from Hiroyuki),
quoted from my private letter:


To: address@hidden
From: "Leonid Pauzner" <address@hidden>
Date: Thu, 27 May 1999 00:18:20 +0400 (MSD)
Subject: Re: lynx-dev Lynx for win32 pre6 is out

26-May-99 08:34 Hiroyuki Senshu wrote:
> May 25  3:18  GNU Compressed   win32pr6.dif.gz .............     96 Kb

Thanks.
...


diff -uNr lynx282.pr6/src/GridText.h lynx282.w32/src/GridText.h
--- lynx282.pr6/src/GridText.h  Tue May 25 08:17:32 1999
+++ lynx282.w32/src/GridText.h  Tue May 25 10:40:22 1999
@@ -47,6 +47,13 @@
 #define NOCHOP 0
^^^^^^^^^^^^^^^^^
 #define CHOP   1

+#define TABSTOP 8
+#define SPACES  "        "  /* must be at least TABSTOP spaces long */
+#define SPLAT   '.'
+
+#define NOCHOP 0
^^^^^^^^^^^^^^^^^
+#define CHOP   1
+
 /* just for information:
 US-ASCII control characters <32 which are not defined in Unicode standard
 =00    U+0000  NULL

^^^^ redundant: defines already there (perhaps a mismatch from earlies changes)


diff -uNr lynx282.pr6/src/HTAlert.c lynx282.w32/src/HTAlert.c
--- lynx282.pr6/src/HTAlert.c   Tue May 25 08:17:32 1999
+++ lynx282.w32/src/HTAlert.c   Tue May 25 10:53:16 1999
 /*     Issue a read-progress message.                  HTReadProgress()
@@ -122,6 +179,67 @@
        long,           bytes,
        long,           total)
 {

...

+       if (total <  0) {
+           if (total < -1)
+               strcat(line, " (Press 'z' to abort)");
+       }
+       _HTProgress(line);
        ^^^^^^^^^^^^^^^^^^^^^
+    }
+#else
     static long kb_units = 1024;
     static time_t first, last;
     static long bytes_last;
@@ -184,6 +302,7 @@
            CTRACE(tfp, "%s\n", line);
        }
     }
+#endif
 }


^^^ _HTProgress(line) should be changed according the #else case:
            /* do not store the message for history page. */
            statusline(line);
            CTRACE(tfp, "%s\n", line);
     so this kind of messages will not fill a limited 40-line cycled buffer
     of LYNXMESSAGES:/


diff -uNr lynx282.pr6/src/LYPrint.c lynx282.w32/src/LYPrint.c
--- lynx282.pr6/src/LYPrint.c   Tue Apr 13 18:39:16 1999
+++ lynx282.w32/src/LYPrint.c   Tue May 25 11:24:00 1999
@@ -651,6 +658,9 @@
     }

     stop_curses();
+#ifdef SH_EX
+    SetOutputMode(O_TEXT);
+#endif
     printf(MAILING_FILE);
     LYSystem(buffer);
     sleep(AlertSecs);
@@ -658,9 +668,9 @@
     if (isPMDF)
        LYRemoveTemp(hdrfile);
     LYRemoveTemp(my_temp);
-#else /* Unix or DOS */
+#else /* !VMS (Unix or DOS) */

-#ifdef DOSPATH
+#if defined(DOSPATH) || defined(WIN_EX)
     outfile_fp = LYOpenTemp(my_temp, ".txt", "w");
 #else
     HTSprintf0(&buffer, "%s %s", system_mail, system_mail_flags);


^^^ unbalansed SetOutputMode() - no return to O_BINARY here.
    Also I wonder whether WIN_EX may be defined when DOSPATH undefined...