lynx-dev [PATCH 2.8.4dev.18] No fatal error from .lynx-keymaps

[Ilya Zakharevich]

Currently an error in .lynx-keymaps is fatal, but a more or less
equivalent error in the KEYMAP section of lynx.cfg is benign.

This patch makes tehm both benign.

Enjoy,
Ilya

--- ./src/LYStrings.c-pre=fail  Tue Feb 20 04:37:42 2001
+++ ./src/LYStrings.c   Sat Mar  3 00:40:58 2001
@@ -1237,7 +1237,6 @@ PRIVATE int read_keymap_file NOARGS
     char *line = NULL;
     FILE *fp;
     char file[LY_MAXPATH];
-    int ret;
     int linenum;
     size_t n;
 
@@ -1247,8 +1246,7 @@ PRIVATE int read_keymap_file NOARGS
        return 0;
 
     linenum = 0;
-    ret = 0;
-    while (LYSafeGets(&line, fp) != 0 && (ret == 0)) {
+    while (LYSafeGets(&line, fp) != 0) {
        char *s = LYSkipBlanks(line);
 
        linenum++;
@@ -1258,23 +1256,15 @@ PRIVATE int read_keymap_file NOARGS
 
        for (n = 0; n < TABLESIZE(table); n++) {
            size_t len = strlen(table[n].name);
-           if (strlen(s) > len
-            && !strncmp(s, table[n].name, len)) {
-               if ((*(table[n].func))(LYSkipBlanks(s+len)) < 0) {
-                   ret = -1;
-                   break;
-               }
-           }
+
+           if ( strlen(s) > len && !strncmp(s, table[n].name, len)
+                && (*(table[n].func))(LYSkipBlanks(s+len)) < 0 )
+               fprintf (stderr, FAILED_READING_KEYMAP, linenum, file);
        }
     }
     FREE(line);
-
     LYCloseInput (fp);
-
-    if (ret == -1)
-       fprintf (stderr, FAILED_READING_KEYMAP, linenum, file);
-
-    return ret;
+    return 0;
 }
 
 PRIVATE void setup_vtXXX_keymap NOARGS

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