snapshot of project "lynx", label v2-9-0dev_7b

6 files changed, 26 insertions, 24 deletions

diff --git a/CHANGES b/CHANGES
index 72b0fc10..7ec533ae 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,11 @@
--- $LynxId: CHANGES,v 1.1088 2021/07/28 00:31:47 tom Exp $
+-- $LynxId: CHANGES,v 1.1089 2021/07/29 20:41:09 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2021-07-27 (2.9.0dev.8)
+2021-07-29 (2.9.0dev.8)
+* change keyword-matching in Lynx's special URLs such as LYNXDOWNLOAD to use
+  case-insensitive matching to work around idn2's conversion -TD
 * build-fix for idn library vs idn2 (report by GV)
 
 2021-07-26 (2.9.0dev.7)
diff --git a/src/LYDownload.c b/src/LYDownload.c
index fcaba027..afd6638e 100644
--- a/src/LYDownload.c
+++ b/src/LYDownload.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYDownload.c,v 1.71 2018/12/27 23:48:37 Kamil.Dudka Exp $ */
+/* $LynxId: LYDownload.c,v 1.72 2021/07/29 20:30:00 tom Exp $ */
 #include <HTUtils.h>
 #include <HTParse.h>
 #include <HTList.h>
@@ -63,7 +63,7 @@ void LYDownload(char *line)
     /*
      * Parse out the File, sug_file, and the Method.
      */
-    if ((file = strstr(Line, "/File=")) == NULL)
+    if ((file = LYstrstr(Line, "/File=")) == NULL)
 	goto failed;
     *file = '\0';
     /*
@@ -71,7 +71,7 @@ void LYDownload(char *line)
      */
     file += 6;
 
-    if ((sug_file = strstr(file + 1, "/SugFile=")) != NULL) {
+    if ((sug_file = LYstrstr(file + 1, "/SugFile=")) != NULL) {
 	*sug_file = '\0';
 	/*
 	 * Go past "SugFile=".
@@ -113,7 +113,7 @@ void LYDownload(char *line)
 #endif /* _WINDOWS */
 #endif /* DIRED_SUPPORT */
 
-    if ((method = strstr(Line, "Method=")) == NULL)
+    if ((method = LYstrstr(Line, "Method=")) == NULL)
 	goto failed;
     /*
      * Go past "Method=".
diff --git a/src/LYLocal.c b/src/LYLocal.c
index 2e14a526..bb9ba29f 100644
--- a/src/LYLocal.c
+++ b/src/LYLocal.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYLocal.c,v 1.132 2018/12/27 10:33:52 tom Exp $
+ * $LynxId: LYLocal.c,v 1.133 2021/07/29 21:15:21 tom Exp $
  *
  *  Routines to manipulate the local filesystem.
  *  Written by: Rick Mallett, Carleton University
@@ -1700,7 +1700,7 @@ static char *match_op(const char *prefix,
     size_t len = strlen(prefix);
 
     if (!StrNCmp("LYNXDIRED://", data, 12)
-	&& !StrNCmp(prefix, data + 12, len)) {
+	&& !strncasecomp(prefix, data + 12, len)) {
 	len += 12;
 #if defined(USE_DOS_DRIVES)
 	if (data[len] == '/') {	/* this is normal */
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index 6f96d63c..7a3df1c4 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMainLoop.c,v 1.243 2020/01/21 22:19:58 tom Exp $
+ * $LynxId: LYMainLoop.c,v 1.244 2021/07/29 20:33:05 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -2207,7 +2207,7 @@ static int handle_LYK_DOWNLOAD(int *cmd,
 	    }
 
 	} else if (lynx_edit_mode && !no_dired_support &&
-		   !strstr(links[curdoc.link].lname, "/SugFile=")) {
+		   !LYstrstr(links[curdoc.link].lname, "/SugFile=")) {
 	    /*
 	     * Don't bother making a /tmp copy of the local file.
 	     */
diff --git a/src/LYPrint.c b/src/LYPrint.c
index 6ac1f4b2..58b81a6f 100644
--- a/src/LYPrint.c
+++ b/src/LYPrint.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYPrint.c,v 1.108 2020/01/21 21:33:17 tom Exp $
+ * $LynxId: LYPrint.c,v 1.109 2021/07/29 20:38:35 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -1111,7 +1111,7 @@ int printfile(DocInfo *newdoc)
     /*
      * Get the number of lines in the file.
      */
-    if ((cp = strstr(link_info, "lines=")) != NULL) {
+    if ((cp = LYstrstr(link_info, "lines=")) != NULL) {
 	/*
 	 * Terminate prev string here.
 	 */
@@ -1127,24 +1127,24 @@ int printfile(DocInfo *newdoc)
     /*
      * Determine the type.
      */
-    if (strstr(link_info, "LOCAL_FILE")) {
+    if (LYstrstr(link_info, "LOCAL_FILE")) {
 	type = TO_FILE;
-    } else if (strstr(link_info, "TO_SCREEN")) {
+    } else if (LYstrstr(link_info, "TO_SCREEN")) {
 	type = TO_SCREEN;
-    } else if (strstr(link_info, "LPANSI")) {
+    } else if (LYstrstr(link_info, "LPANSI")) {
 	Lpansi = TRUE;
 	type = TO_SCREEN;
-    } else if (strstr(link_info, "MAIL_FILE")) {
+    } else if (LYstrstr(link_info, "MAIL_FILE")) {
 	type = MAIL;
-    } else if (strstr(link_info, "PRINTER")) {
+    } else if (LYstrstr(link_info, "PRINTER")) {
 	type = PRINTER;
 
-	if ((cp = strstr(link_info, "number=")) != NULL) {
+	if ((cp = LYstrstr(link_info, "number=")) != NULL) {
 	    /* number of characters in "number=" */
 	    cp += 7;
 	    printer_number = atoi(cp);
 	}
-	if ((cp = strstr(link_info, "pagelen=")) != NULL) {
+	if ((cp = LYstrstr(link_info, "pagelen=")) != NULL) {
 	    /* number of characters in "pagelen=" */
 	    cp += 8;
 	    pagelen = atoi(cp);
diff --git a/src/LYUpload.c b/src/LYUpload.c
index 20cfd5a3..a83a1037 100644
--- a/src/LYUpload.c
+++ b/src/LYUpload.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUpload.c,v 1.40 2013/11/28 11:22:34 tom Exp $
+ * $LynxId: LYUpload.c,v 1.41 2021/07/29 20:32:26 tom Exp $
  *
  *  Routines to upload files to the local filesystem.
  *  Created by: Rick Mallett, Carleton University
@@ -53,16 +53,16 @@ int LYUpload(char *line)
     /*
      * Use configured upload commands.
      */
-    if ((directory = strstr(line, "TO=")) == NULL)
+    if ((directory = LYstrstr(line, "TO=")) == NULL)
 	goto failed;
     *(directory - 1) = '\0';
-    /* go past "Directory=" */
+    /* go past "TO=" */
     directory += 3;
 
-    if ((method = strstr(line, "UPLOAD=")) == NULL)
+    if ((method = LYstrstr(line, "UPLOAD=")) == NULL)
 	goto failed;
     /*
-     * Go past "Method=".
+     * Go past "UPLOAD=".
      */
     method += 7;
     method_number = atoi(method);