lynx-dev lynx2.8.3dev.11a.patch

[T.E.Dickey]

-- sorrrrry about that.

I'll put this in the next patch (since it was rather large, there may be other
ones that I missed - so I'll wait til tomorrow to see).  The infinite loop
is fixed by adding a break statement at the end of do_check_recall; I also
had second thoughts about the FirstURLRecall flag - made it in/out.  And there
were a couple of K&R nits that were from dev.9 in makeuctbc.c

# ------------------------------------------------------------------------------
#  LYMainLoop.c        |   28 +++++++++++++++-------------
#  chrtrans/makeuctb.c |    6 +++---
#  2 files changed, 18 insertions, 16 deletions
# ------------------------------------------------------------------------------
Index: src/LYMainLoop.c
--- lynx2.8.3dev.11+/src/LYMainLoop.c   Wed Oct 13 10:29:33 1999
+++ lynx2.8.3dev.11a/src/LYMainLoop.c   Wed Oct 13 21:55:50 1999
@@ -536,7 +536,7 @@
     int,       URLTotal,
     int *,     URLNum,
     int,       recall,
-    BOOLEAN,   FirstURLRecall)
+    BOOLEAN *, FirstURLRecall)
 {
     char *cp;
 
@@ -582,21 +582,21 @@
            break;
        }
        if (recall && ch == UPARROW) {
-           if (FirstURLRecall) {
+           if (*FirstURLRecall) {
                /*
-                *      Use last URL in the list. - FM
+                * Use last URL in the list.  - FM
                 */
-               FirstURLRecall = FALSE;
+               *FirstURLRecall = FALSE;
                *URLNum = 0;
            } else {
                /*
-                *      Go back to the previous URL in the list. - FM
+                * Go back to the previous URL in the list.  - FM
                 */
                *URLNum += 1;
            }
            if (*URLNum >= URLTotal)
                /*
-                *      Roll around to the last URL in the list. - FM
+                * Roll around to the last URL in the list.  - FM
                 */
                *URLNum = 0;
            if ((cp = (char *)HTList_objectAt(Goto_URLs,
@@ -627,21 +627,21 @@
                continue;
            }
        } else if (recall && ch == DNARROW) {
-           if (FirstURLRecall) {
+           if (*FirstURLRecall) {
                /*
-                *      Use the first URL in the list. - FM
+                * Use the first URL in the list.  - FM
                 */
-               FirstURLRecall = FALSE;
+               *FirstURLRecall = FALSE;
                *URLNum = URLTotal - 1;
            } else {
                /*
-                *      Advance to the next URL in the list. - FM
+                * Advance to the next URL in the list.  - FM
                 */
                *URLNum -= 1;
            }
            if (*URLNum < 0)
                /*
-                *      Roll around to the first URL in the list. - FM
+                * Roll around to the first URL in the list.  - FM
                 */
                *URLNum = URLTotal - 1;
            if ((cp=(char *)HTList_objectAt(Goto_URLs, *URLNum)) != NULL) {
@@ -669,6 +669,8 @@
                }
                continue;
            }
+       } else {
+           break;
        }
     }
 }
@@ -6775,7 +6777,7 @@
                                &URLTotal, &URLNum, &FirstURLRecall, &old_c,
                                real_c)) {
                do_check_recall (ch, user_input_buffer, &temp, URLTotal,
-                                &URLNum, recall, FirstURLRecall);
+                                &URLNum, recall, &FirstURLRecall);
                do_check_goto_URL(user_input_buffer, &temp, &force_load);
            }
            break;
@@ -6979,7 +6981,7 @@
                                    &FirstURLRecall, &URLNum, &URLTotal, &ch,
                                    &old_c, real_c)) {
                do_check_recall (ch, user_input_buffer, &temp, URLTotal,
-                                &URLNum, recall, FirstURLRecall);
+                                &URLNum, recall, &FirstURLRecall);
                do_check_goto_URL(user_input_buffer, &temp, &force_load);
            }
            break;
Index: src/chrtrans/makeuctb.c
--- lynx2.8.3dev.11+/src/chrtrans/makeuctb.c    Sat Aug 28 17:04:13 1999
+++ lynx2.8.3dev.11a/src/chrtrans/makeuctb.c    Wed Oct 13 21:57:26 1999
@@ -62,10 +62,10 @@
 PRIVATE void usage NOARGS
 {
     static CONST char *tbl[] = {
-       "Usage: makeuctb [parameters]"
+       "Usage: makeuctb [parameters]",
        "",
        "Utility to convert .tbl into .h files for Lynx compilation.",
-       ""
+       "",
        "Parameters (all are optional):",
        "  1: the input file (normally {filename}.tbl, but \"-\" for stdin",
        "  2: the output file (normally {filename}.tbl but \"-\" for stdout",
@@ -269,7 +269,7 @@
     };
     static char *last_ifdefs[] = {
        "",
-       "#endif /* NO_CHARSET%s */"
+       "#endif /* NO_CHARSET%s */",
        "",
        "#endif /* INCL_CHARSET%s */"
     };

-- 
Thomas E. Dickey
address@hidden
http://www.clark.net/pub/dickey