Re: lynx-dev Dosish diffs for MingW32 version of November 3 lynx

[Leonid Pauzner]

11-Nov-99 23:16 address@hidden wrote:
> You can do a diff of sorts using Dos's fc.exe.  The batch file for doing
                                   ^^^^^^^^^^^^
> this is enclosed so that a Unix guru can improve it to match Unix diff
> output more exactly.  After the text for diff.bat is the condensed
> version of what diff.bat gives you when comparing the directory
> \lynx2.8.3 (The original source) and \lynx for changes.

You are in a guest position, you shouldn't probably change the rules and
add inconvenience for Unix majority on this list. Get a diff.exe binary
and live happy. (BTW, you could compile your own copy from GNU sources,
why not?).

Also, you lost Klaus' point on LYUtils.c ifdef'ing - you very very wrong
when changing #ifndef to #ifdef entirely (this will affect Unix ports).


> diff.bat
> ======================================================================
> ======================================================================
> REM Batch file implementation of Unix diff?
> if "%1" == "1" goto one
> if "%1" == "2" goto two
> ECHO OFF
> ECHO ""
> ECHO diff.bat must be called from one of the directories in
> ECHO which files are being compared.
> ECHO ""
> ECHO Directory two must be a path relative to the present search
> ECHO directory.
> ECHO ""
> ECHO Usage: diff.bat 1 .h directory2 output.txt
> ECHO Usage: diff.bat 2 .h .c directory2 output.txt
> goto exit

> :two
> if exists %5 erase %5
> for %%f in (*%2 *%3) do fc /L /N /W %%f %4\%%f >> %5

> goto exit

> :one
> if exists %4 erase %4
> for %%f in (*%2) do fc /L /N /W %%f %3\%%f >> %4

> :exit
> =======================================================================
> =======================================================================
> Comparing files www_tcp.h and 
> ..\..\..\..\lynx\www\library\implementation\WWW_TCP.H
> ****** www_tcp.h
>     57:                  /* NB: newer libwww has something different for 
> Windows */
>     59:  typedef struct sockaddr_in SockA;  /* See netinet/in.h */
>     61:  #ifndef VMS
> ****** ..\..\..\..\lynx\www\library\implementation\WWW_TCP.H
>     57:                  /* NB: newer libwww has something different for 
> Windows */
>     59:  #ifndef __MINGW32__
>     60:  typedef struct sockaddr_in SockA;  /* See netinet/in.h */
>     61:  #endif
>     63:  #ifndef VMS
> ******

> ****** www_tcp.h
>     81:  # define D_NAMLEN(dirent) strlen((dirent)->d_name)
>     82:  # define STRUCT_DIRENT struct dirent
>     83:  #else
> ****** ..\..\..\..\lynx\www\library\implementation\WWW_TCP.H
>     83:  # define D_NAMLEN(dirent) strlen((dirent)->d_name)
>     84:  # define STRUCT_DIRENT dirent
>     85:  #else
> ******

> ****** www_tcp.h
>    182:  typedef struct sockaddr_in SockA;  /* See netinet/in.h */
>    184:  #if defined(_MSC_VER)
>    185:  #undef EINTR
> ****** ..\..\..\..\lynx\www\library\implementation\WWW_TCP.H
>    184:  typedef struct sockaddr_in SockA;  /* See netinet/in.h */
>    186:  #if defined(_MSC_VER) || defined(__MINGW32__)
>    187:  #undef EINTR
> ******


> Comparing files HTTCP.c and 
> ..\..\..\..\lynx\www\library\implementation\HTTCP.C
> ****** HTTCP.c
>    107:  #ifndef THINK_C
>    109:  #ifdef DECL_SYS_ERRLIST
>    110:  extern char *sys_errlist[];             /* see man perror on cernvax 
> */
> ****** ..\..\..\..\lynx\www\library\implementation\HTTCP.C
>    107:  #if !defined(THINK_C) && !defined(__MINGW32__)
>    109:  #ifdef DECL_SYS_ERRLIST
>    110:  extern char *sys_errlist[];             /* see man perror on cernvax 
> */
> ******

> Comparing files Xsystem.c and ..\..\lynx\src\XSYSTEM.C
> ****** Xsystem.c
>    548:  }
>    550:  int exec_command(char * cmd, int wait_flag)
> ****** ..\..\lynx\src\XSYSTEM.C
>    548:  }
>    551:  #ifdef __MINGW32__
>    552:  int exec_command(char * cmd, int wait_flag)
> ******

> ****** Xsystem.c
>    551:  {
>    552:      PRO *p;
> ****** ..\..\lynx\src\XSYSTEM.C
>    553:  {
>    554:          return system(cmd);
>    555:  }
>    556:  #else
>    557:  int exec_command(char * cmd, int wait_flag)
>    558:  {
>    559:      PRO *p;
> ******

> ****** Xsystem.c
>    587:  }
>    590:  #ifdef TEST
> ****** ..\..\lynx\src\XSYSTEM.C
>    594:  }
>    595:  #endif /* MINGW32 */
>    597:  #ifdef TEST
> ******

> Comparing files LYCurses.c and ..\..\lynx\src\LYCURSES.C
> ****** LYCurses.c
>  1,209:  #endif /* HAVE_SIZECHANGE && !USE_SLANG && USE_NOTDEFINED */
>  1,210:  #if defined(WIN_EX) && defined(CJK_EX) /* 1999/08/26 (Thu) 17:53:38 
> */
>  1,211:      {
> ****** ..\..\lynx\src\LYCURSES.C
>  1,209:  #endif /* HAVE_SIZECHANGE && !USE_SLANG && USE_NOTDEFINED */
>  1,210:  #if defined(PDCURSES) && defined(WIN_EX) && defined(CJK_EX) /* 
> 1999/08/26 (Thu) 17:53:38 */
>  1,211:      {
> ******

> Comparing files LYUtils.c and ..\..\lynx\src\LYUTILS.C
> ****** LYUtils.c
>  2,220:          return((int)FALSE);
>  2,222:  #ifndef _WINDOWS        /* 1998/03/30 (Mon) 17:07:41 */
>  2,223:  #ifdef USE_SLANG
> ****** ..\..\lynx\src\LYUTILS.C
>  2,220:          return((int)FALSE);
>  2,222:  #ifdef _WINDOWS /* 1998/03/30 (Mon) 17:07:41 */
>  2,223:  #ifdef USE_SLANG
> ******