Re: lynx-dev 2.8.3dev.2 patch 2 - misc.

[Leonid Pauzner]

26-Jun-99 05:02 Klaus Weide wrote:
> On Sat, 26 Jun 1999, Leonid Pauzner wrote:

>> 22-Jun-99 01:19 Klaus Weide wrote:
>>
>> > * Entify strings when adding them to LYNXMESSAGES: stack.
>>
>> That messages also available for LYstatusline_messages_on_exit()
>> called from mainloop, they will be written to stdout (not HTML format).
>> Strings should be entified in LYshow_statusline_messages() directly

> Yes, that makes more sense.

patch:

diff -u old/lyhistor.c ./lyhistor.c
--- old/lyhistor.c      Sat May 29 20:27:26 1999
+++ ./lyhistor.c        Sat Jun 26 15:11:56 1999
@@ -663,6 +663,7 @@
     DocAddress WWWDoc;  /* need on exit */
     FILE *fp0;
     int i;
+    char *temp = NULL;

     LYRemoveTemp(tempfile);
     if ((fp0 = LYOpenTemp (tempfile, HTML_SUFFIX, "w")) == 0) {
@@ -680,22 +681,29 @@
     /* print messages in reverse order: */
     i = topOfStack;
     while (--i >= 0) {
-       if (buffstack[i] != NULL)
-           fprintf(fp0,  "<li> <em>%s</em>\n",  buffstack[i]);
+       if (buffstack[i] != NULL) {
+           StrAllocCopy(temp, buffstack[i]);
+           LYEntify(&temp, TRUE);
+           fprintf(fp0,  "<li> <em>%s</em>\n",  temp);
+       }
     }
     i = STATUSBUFSIZE;
     while (--i >= topOfStack) {
-       if (buffstack[i] != NULL)
-       fprintf(fp0,  "<li> <em>%s</em>\n",  buffstack[i]);
+       if (buffstack[i] != NULL) {
+           StrAllocCopy(temp, buffstack[i]);
+           LYEntify(&temp, TRUE);
+           fprintf(fp0,  "<li> <em>%s</em>\n",  temp);
+       }
     }

     fprintf(fp0, "</ol>\n");
     fprintf(fp0, "</pre>\n");
     EndInternalPage(fp0);
     LYCloseTempFP(fp0);
+    FREE(temp);


-    /* exit to getfile() cyrcle */
+    /* exit to getfile() cycle */
     StrAllocCopy(newdoc->address, info_url);
     WWWDoc.address = newdoc->address;
     WWWDoc.post_data = newdoc->post_data;


>> (small overhead with copying temp string but this function is not something
>> called a lot).
>>
>>
>> > * More general checking in postoptions - `lynx LYNXOPTIONS:foo'
>> >   now doesn't crash.
>>
>> > Index: lynx2-8-3/src/LYOptions.c
>> > --- lynx2-8-3.old/src/LYOptions.c Mon, 21 Jun 1999 00:31:29 -0500
>> > +++ lynx2-8-3/src/LYOptions.c Mon, 21 Jun 1999 22:55:36 -0500
>> > @@ -3553,17 +3553,22 @@
>> >       return(NULLFILE);
>> >      }
>>
>> > +    data = break_data(newdoc->post_data);
>> > +
>> > +    if (!data) {
>> > +     int status;
>>
>> > +     HTAlwaysAlert("Unexpected way of accessing", newdoc->address);
>>
>> Do you mean every call of LYNXOPTIONS:foo with no post data is unexpected
>> way of accessing?
>> IMHO, LYNXOPTIONS:/ is the standart way of accessing forms options menu
>> (see LYK_OPTIONS in mainloop, was changed a month ago or so).

> You are right, the message is inappropriately generated now.
> (I originally added the message in my code at a time when LYK_OPTIONS
> was handled differently, and didn't take the change into account.)

> We can take out the message, the rest should be ok, agreed?
yes.

> Please send a patch for this and the statusline thing.


>    Klaus