lynx-dev DJGPP build (patch3)

[Leonid Pauzner]

And finally,

seems nobody have compiled DJGPP port since November 2001:
MV_PATH became undefined, perhaps by a cleanup based on a wrong
understanding of my comment;) which says about COPY_PATH only.

This and other problems are fixed below.

> diff -u -r LYNX2-8-.4/userdefs.h LYNX2-8-/userdefs.h
> --- LYNX2-8-.4/userdefs.h     Sun Jun  3 12:58:00 2001
> +++ LYNX2-8-/userdefs.h       Sun Nov 18 17:37:14 2001
> @@ -1432,6 +1431,7 @@
>  **    WINDOWS/DOS
>  **    ===========
>  */
> +#ifndef HAVE_CONFIG_H
>  #define COMPRESS_PATH   "compress"
>  #define UNCOMPRESS_PATH "uncompress"
>  #define UUDECODE_PATH   "uudecode"
> @@ -1440,18 +1440,21 @@
>  #define BZIP2_PATH      "bzip2"
>  #define INSTALL_PATH    "install"
>  #define TAR_PATH        "tar"
> -#define TOUCH_PATH      "touch"
>  #define ZIP_PATH        "zip"
>  #define UNZIP_PATH      "unzip"
> -#define MKDIR_PATH      "mkdir"
> -#define MV_PATH         "mv"
>  #define RM_PATH         "rm"
> -/* COPY_PATH is not required for DOSPATH any more (implemented directly) */
> -/* #define COPY_PATH       "cp" */
> -#define CHMOD_PATH      "chmod"
>  #define TELNET_PATH     "telnet"
>  #define TN3270_PATH     "tn3270"
>  #define RLOGIN_PATH     "rlogin"
> +/*
> + * These are implemented directly:
> + * #define COPY_PATH       "cp"
> + * #define CHMOD_PATH      "chmod"
> + * #define MKDIR_PATH      "mkdir"
> + * #define MV_PATH         "mv"
> + * #define TOUCH_PATH      "touch"
> + */
> +#endif /* HAVE_CONFIG_H */

>  #else        /* Unix */
>       /* Standard locations are defined via the configure script.  When


So:

* DJGPP build restored. MV_PATH was undefined long ago by mistake.
  Fix recent DJGPP changes in HTTCP.c: move _resolve_hook few lines
  below, it will not compiles otherwise.  Remove minor warnings.


diff -u -p -r LYNX2-8-.590/userdefs.h LYNX2-8-/userdefs.h
--- LYNX2-8-.590/userdefs.h     Sun Nov 18 17:37:14 2001
+++ LYNX2-8-/userdefs.h Fri Oct 11 12:45:26 2002
@@ -1438,6 +1438,7 @@
 #define ZCAT_PATH       "zcat"
 #define GZIP_PATH       "gzip"
 #define BZIP2_PATH      "bzip2"
+#define MV_PATH         "mv"
 #define INSTALL_PATH    "install"
 #define TAR_PATH        "tar"
 #define ZIP_PATH        "zip"
@@ -1447,11 +1448,10 @@
 #define TN3270_PATH     "tn3270"
 #define RLOGIN_PATH     "rlogin"
 /*
- * These are implemented directly:
+ * These are not used:
  * #define COPY_PATH       "cp"
  * #define CHMOD_PATH      "chmod"
  * #define MKDIR_PATH      "mkdir"
- * #define MV_PATH         "mv"
  * #define TOUCH_PATH      "touch"
  */
 #endif /* HAVE_CONFIG_H */
diff -u -p -r LYNX2-8-.590/www/library/implemen/httcp.c 
LYNX2-8-/www/library/implemen/httcp.c
--- LYNX2-8-.590/www/library/implemen/httcp.c   Sun Oct  6 17:43:28 2002
+++ LYNX2-8-/www/library/implemen/httcp.c       Fri Oct 11 13:18:40 2002
@@ -649,10 +649,6 @@ PUBLIC struct hostent * LYGetHostByName
     char *host = str;
 #endif

-#ifdef __DJGPP__
-    _resolve_hook = ResolveYield;
-#endif
-
 #ifdef NSL_FORK
     /* for transfer of result between from child to parent: */
     static AlignedHOSTENT aligned_full_rehostent;
@@ -685,6 +681,10 @@ PUBLIC struct hostent * LYGetHostByName
 #endif /* NSL_FORK */

     struct hostent *result_phost = NULL;
+
+#ifdef __DJGPP__
+    _resolve_hook = ResolveYield;
+#endif

     if (!str) {
        CTRACE((tfp, "LYGetHostByName: Can't parse `NULL'.\n"));
diff -u -p -r LYNX2-8-.590/www/library/implemen/htchunk.c 
LYNX2-8-/www/library/implemen/htchunk.c
--- LYNX2-8-.590/www/library/implemen/htchunk.c Sat Jul  7 18:30:14 2001
+++ LYNX2-8-/www/library/implemen/htchunk.c     Fri Oct 11 13:29:46 2002
@@ -60,7 +60,7 @@ PUBLIC HTChunk * HTChunkCreate2 ARGS2 (i
     if (needed > 0) {
        ch->allocated = needed-1 - ((needed-1) % ch->growby)
            + ch->growby; /* Round up */
-       CTRACE((tfp, "HTChunkCreate2: requested %d, allocate %d\n",
+       CTRACE((tfp, "HTChunkCreate2: requested %ld, allocate %d\n",
               needed, ch->allocated));
        ch->data = typecallocn(char, ch->allocated);
        if (!ch->data)
diff -u -p -r LYNX2-8-.590/src/lymail.c LYNX2-8-/src/lymail.c
--- LYNX2-8-.590/src/lymail.c   Sun Oct  6 17:43:28 2002
+++ LYNX2-8-/src/lymail.c       Sat Oct 12 22:38:16 2002
@@ -1122,9 +1122,9 @@ PUBLIC void reply_by_mail ARGS4(
     int i;
     int c = 0; /* user input */
     char my_tmpfile[LY_MAXPATH];
-    char *command = NULL;
     char default_subject[MAX_SUBJECT + 10];
 #if USE_VMS_MAILER
+    char *command = NULL;
     BOOLEAN isPMDF = LYMailPMDF();
     char hdrfile[LY_MAXPATH];
     FILE *hfd = 0;
@@ -1658,7 +1658,6 @@ PUBLIC void reply_by_mail ARGS4(
     if ((fp = LYPipeToMailer()) == 0) {
        HTInfoMsg(CANCELLED);
     }
-    FREE(command);
 #else
     if ((fp = LYOpenTemp(tmpfile2, ".txt", "w")) == NULL) {
        HTAlert(MAILTO_URL_TEMPOPEN_FAILED);
diff -u -p -r LYNX2-8-.590/src/lystring.c LYNX2-8-/src/lystring.c
--- LYNX2-8-.590/src/lystring.c Sun Oct  6 17:43:28 2002
+++ LYNX2-8-/src/lystring.c     Sat Oct 12 22:47:56 2002
@@ -328,7 +328,7 @@ PRIVATE void LYAddToCloset ARGS2(RecallT
        LYRemoveFromCloset(list);
 }

-
+#ifdef USE_MOUSE
 PRIVATE int XYdist ARGS5(
     int,       x1,
     int,       y1,
@@ -552,6 +552,7 @@ PRIVATE int set_clicked_link ARGS4(
     }
     return c;
 }
+#endif /* USE_MOUSE */

 /*
  *  LYstrncpy() terminates strings with a null byte.


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