diff options
| -rw-r--r-- | CHANGES | 24 | ||||
| -rw-r--r-- | INSTALLATION | 7 | ||||
| -rw-r--r-- | WWW/Library/Implementation/HTAccess.c | 2 | ||||
| -rw-r--r-- | WWW/Library/Implementation/SGML.c | 3 | ||||
| -rw-r--r-- | lynx.hlp | 72 | ||||
| -rw-r--r-- | lynx.man | 10 | ||||
| -rw-r--r-- | lynx_help/lynx_help_main.html | 4 | ||||
| -rw-r--r-- | makefile.in | 4 | ||||
| -rw-r--r-- | src/LYClean.c | 2 | ||||
| -rw-r--r-- | src/LYCurses.c | 2 | ||||
| -rw-r--r-- | src/LYGetFile.c | 11 | ||||
| -rw-r--r-- | src/LYUtils.c | 4 | ||||
| -rw-r--r-- | src/LYexit.c | 2 | ||||
| -rw-r--r-- | userdefs.h | 4 |
14 files changed, 94 insertions, 57 deletions
diff --git a/CHANGES b/CHANGES index 20aa8f09..02660e6a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,30 @@ Changes since Lynx 2.8 release =============================================================================== +2000-05-05 (2.8.4dev.1) +* use built-in LYCopyFile logic for CYGWIN rather than external cp program -DK +* minor refinement to LYValidateFilename() to avoid prepending a drive + letter when saving files via the PRINT command on DOS systems -DK +* update URLs in lynx_help_main.html (Frederic L W Meunier) +* update description in INSTALLATION dealing with passive ftp (report by + Frederic L W Meunier) -TD +* correct ifdef'ing in LYtouchline() for VMS curses versus slang (report by + Jerome Lauret) +* correct an overlooked change of ifdef's from + CONV_JISX0201KANA_TO_JISX0208KANA to CONV_JISX0201KANA_JISX0208KANA -TH +* move include of LYClean.h in LYexit.c to ensure that cleanup_files() is + prototyped on VMS (report by Jerome Lauret) +* move assignment of HadVMSInterrupt in cleanup_sig() to avoid interaction with + logic in HTConfirmDefault() on VMS (reported/tested by Jerome Lauret) -KW +* minor fixes to lynx.man / lynx.hlp for descriptions of -get_data, -post_data, + -short_url -KW +* avoid invalid memory access that can result from redirection messages + that include a fragment in the new URL -KW +* change sed delimiter in makefile.in from '%' to '"', to work around SINIX + v5.43 (SYSV4) sed which becomes confused by nested '%' in expression for + htmlized cfg install (reported by Shishakov Vjacheslav" + <shishako@avn.skiftel.ru>) -TD + 2000-04-23 (2.8.3rel.1) * replace LYNX_RELEASE variable in userdefs.h by functions LYVersionIsRelease() and LYVersionStatus() in LYShowInfo.c -TD diff --git a/INSTALLATION b/INSTALLATION index a7cfb9b4..c29966e4 100644 --- a/INSTALLATION +++ b/INSTALLATION @@ -590,10 +590,9 @@ Step 1. Downloading binary files. comments in FIXED512.COM, userdefs.h and lynx.cfg for more information. Step 2. Passive FTP - If your system requires the PASV FTP code instead of the standard - PORT FTP code (e.g., to deal with a firewall) then edit "WWW/Library/ - Implementation/HTFTP.c" and comment out line 43 like so: - /* #define LISTEN /* @@@@ Test LJM */. + If your system requires the PASV FTP code instead of the standard PORT FTP + code (e.g., to deal with a firewall) then set the FTP_PASSIVE option in + lynx.cfg Step 3a. Lynx uses the VMS port of gzip for uncompressing streams which have diff --git a/WWW/Library/Implementation/HTAccess.c b/WWW/Library/Implementation/HTAccess.c index 4642f279..4d44a317 100644 --- a/WWW/Library/Implementation/HTAccess.c +++ b/WWW/Library/Implementation/HTAccess.c @@ -823,7 +823,7 @@ PRIVATE BOOL HTLoadDocument ARGS4( NewDoc.bookmark = anchor->bookmark; NewDoc.isHEAD = anchor->isHEAD; NewDoc.safe = anchor->safe; - anchor = (HTParentAnchor *)HTAnchor_findAddress(&NewDoc); + anchor = HTAnchor_parent(HTAnchor_findAddress(&NewDoc)); } } /* diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c index 03c3ac37..e6f0fab7 100644 --- a/WWW/Library/Implementation/SGML.c +++ b/WWW/Library/Implementation/SGML.c @@ -1740,8 +1740,9 @@ top1: */ if ((HTCJK==JAPANESE) && (context->state==S_in_kanji) && !IS_JAPANESE_2BYTE(context->kanji_buf,(unsigned char)c)) { -#ifdef CONV_JISX0201KANA_TO_JISX0208KANA +#ifdef CONV_JISX0201KANA_JISX0208KANA if (IS_SJIS_X0201KANA(context->kanji_buf)) { + unsigned char sjis_hi, sjis_lo; JISx0201TO0208_SJIS(context->kanji_buf, &sjis_hi, &sjis_lo); PUTC(sjis_hi); PUTC(sjis_lo); diff --git a/lynx.hlp b/lynx.hlp index b2a86c7e..ffad490d 100644 --- a/lynx.hlp +++ b/lynx.hlp @@ -197,8 +197,9 @@ -ftp disable ftp access. -get_data - send form data from stdin using GET method and dump - results. + properly formatted data for a get form are read in + from stdin and passed to the form. Input is + terminated by a line that starts with '---'. -head send a HEAD request for the mime headers. @@ -208,18 +209,19 @@ control the display of hidden links. merge hidden links show up as bracketed numbers and - are numbered together with other links in the + are numbered together with other links in the sequence of their occurrence in the document. - listonly hidden links are shown only on L)ist + listonly hidden links are shown only on L)ist screens and listings generated by -dump or from the - P)rint menu, but appear separately at the end of + P)rint menu, but appear separately at the end of + those lists. This is the default behavior. ignore hidden links do not appear even in listings. -historical - toggles use of '>' or '-->' as a terminator for + toggles use of '>' or '-->' as a terminator for comments. -homepage=URL @@ -231,7 +233,7 @@ -index=URL set the default index file to the specified URL. - -ismap toggles inclusion of ISMAP links when client-side + -ismap toggles inclusion of ISMAP links when client-side MAPs are present. -justify @@ -245,12 +247,12 @@ disable URLs that point to remote hosts. -locexec - enable local program execution from local files - only (if Lynx was compiled with local execution + enable local program execution from local files + only (if Lynx was compiled with local execution enabled). -mime_header - prints the MIME header of a fetched document along + prints the MIME header of a fetched document along with its source. -minimal @@ -260,7 +262,7 @@ number of articles in chunked news listings. -newsmaxchunk=NUMBER - maximum news articles in listings before chunking. + maximum news articles in listings before chunking. -nobold disable bold video-attribute. @@ -268,20 +270,20 @@ -nobrowse disable directory browsing. - -nocc disable Cc: prompts for self copies of mailings. - Note that this does not disable any CCs which are + -nocc disable Cc: prompts for self copies of mailings. + Note that this does not disable any CCs which are incorporated within a mailto URL or form ACTION. -nocolor force color mode off, overriding terminal - capabilities and any -color flags, COLORTERM + capabilities and any -color flags, COLORTERM variable, and saved .lynxrc settings. -noexec disable local program execution. (DEFAULT) -nofilereferer - disable transmissions of Referer headers for file + disable transmissions of Referer headers for file URLs. -nolist @@ -291,10 +293,10 @@ owners. -nonrestarting_sigwinch - This flag is not available on all systems, Lynx - needs to be compiled with HAVE_SIGACTION defined. - If available, this flag may cause Lynx to react - more immediately to window changes when run within + This flag is not available on all systems, Lynx + needs to be compiled with HAVE_SIGACTION defined. + If available, this flag may cause Lynx to react + more immediately to window changes when run within an xterm. -nopause @@ -323,8 +325,7 @@ disable underline video-attribute. -number_fields - force numbering of links as well as form input - + force numbering of links as well as form input fields -number_links @@ -338,16 +339,17 @@ with partial-display logic -pauth=ID:PASSWD - set authorization ID and password for a protected - proxy server at startup. Be sure to protect any + set authorization ID and password for a protected + proxy server at startup. Be sure to protect any script files which use this switch. - -popup toggles handling of single-choice SELECT options + -popup toggles handling of single-choice SELECT options via popup windows or as lists of radio buttons. -post_data - send form data from stdin using POST method and - dump results. + properly formatted data for a post form are read in + from stdin and passed to the form. Input is + terminated by a line that starts with '---'. -preparsed show HTML source preparsed and reformatted when @@ -379,6 +381,7 @@ no options are specified. all - restricts all options listed below. + bookmark - disallow changing the location of the bookmark file. @@ -433,7 +436,6 @@ inside your domain (utmp required for selectivity). inside_news - disallow USENET news posting for - people coming from inside your domain (utmp required for selectivity). @@ -484,7 +486,6 @@ telnet_port - disallow specifying a port in telnet G)oto's. - useragent - disallow modifications of the User- Agent header. @@ -501,7 +502,7 @@ require .www_browsable files to browse directories. -short_url - show very long URLs in the status line with "___" + show very long URLs in the status line with "..." to represent the portion which cannot be displayed. The beginning and end of the URL are displayed, rather than suppressing the end. @@ -542,7 +543,6 @@ -term=TERM tell Lynx what terminal type to assume it is talking to. (This may be useful for remote - execution, when, for example, Lynx connects to a remote TCP/IP port that starts a script that, in turn, starts another Lynx process.) @@ -647,6 +647,7 @@ The actual value assigned to the variable is ignored. This variable is only meaningful if Lynx was built + using the slang screen-handling library. @@ -701,6 +702,7 @@ ORGANIZATION This variable, if set, provides the string used in the Organization: header of USENET news postings. On + UNIX, it will override the contents of an /etc/organization file, if present. @@ -755,10 +757,10 @@ any. It is created for use by an external program, as defined in a lynx.cfg PRINTER: definition + statement. If the field does not exist for the document, the variable is set to a null string under UNIX, or - "No LastMod" under VMS. LYNX_PRINT_TITLE This variable is set by the Lynx @@ -864,6 +866,7 @@ LANG This variable, if set, will override the default message language. It is an ISO 639 two-letter code identifying + the language. Language codes are NOT the same as the country codes given in ISO 3166. @@ -917,11 +920,12 @@ A section shown as (GNU), is intended to denote that the topic may be available via an info page, instead of a man - page (i.e., try "info subject", rather than "man subject"). + page (i.e., try "info subject", rather than "man sub + ject"). A section shown as (?) denotes that documentation on the - topic exists, but is not part of an established documenta - tion retrieval system (see the distribution files associated + topic exists, but is not part of an established documentation + retrieval system (see the distribution files associated with the topic, or contact your System Administrator for further information). diff --git a/lynx.man b/lynx.man index fc873e3a..cc68df85 100644 --- a/lynx.man +++ b/lynx.man @@ -212,7 +212,9 @@ toggles transmissions of From headers. disable ftp access. .TP .B -get_data -send form data from stdin using GET method and dump results. +properly formatted data for a get form are read in from +stdin and passed to the form. +Input is terminated by a line that starts with '---'. .TP .B -head send a HEAD request for the mime headers. @@ -361,7 +363,9 @@ toggles handling of single-choice SELECT options via popup windows or as lists of radio buttons. .TP .B -post_data -send form data from stdin using POST method and dump results. +properly formatted data for a post form are read in from +stdin and passed to the form. +Input is terminated by a line that starts with '---'. .TP .B -preparsed show HTML source preparsed and reformatted when used with -source @@ -537,7 +541,7 @@ disable recognition of rlogin commands. require .www_browsable files to browse directories. .TP .B -short_url -show very long URLs in the status line with "___" to represent the +show very long URLs in the status line with "..." to represent the portion which cannot be displayed. The beginning and end of the URL are displayed, rather than suppressing the end. .TP diff --git a/lynx_help/lynx_help_main.html b/lynx_help/lynx_help_main.html index 16cc0180..c22d69a4 100644 --- a/lynx_help/lynx_help_main.html +++ b/lynx_help/lynx_help_main.html @@ -74,7 +74,9 @@ SSL & security, and more <ul> <li><a href="ftp://gnjilux.cc.fer.hr/pub/unix/util/wget/">WGET</a> -- powerful & flexible non-interactive downloader -<li><a href="http://www.fts.frontec.se/%7Edast/curl/">cURL</a> +<li><a href="http://www.idata.sk/~ondrej/pavuk/">Pavuk</a> + -- powerful & an even more-featured downloader +<li><a href="http://curl.haxx.nu/">cURL</a> -- non-interactive downloader which supports HTTPS <li><a href="http://www.xach.com/snarf/">SNARF</a> -- small simple 1-file non-interactive downloader diff --git a/makefile.in b/makefile.in index f9cc4258..6929b8d0 100644 --- a/makefile.in +++ b/makefile.in @@ -331,8 +331,8 @@ install-doc : $(DOCDIR) $(HELPDIR) done' # HPUX 'sed' does not seem to like '=' as pattern delimiter. -FIX_SED = tr '=' '%' -#FIX_SED = cat +# We cannot use '%' because it may appear in a URL. +FIX_SED = tr '=' '"' help_files.sed : makefile $(srcdir)/lynx_help/help_files.txt @echo Constructing sed-script $@ diff --git a/src/LYClean.c b/src/LYClean.c index c7eb4815..216b1618 100644 --- a/src/LYClean.c +++ b/src/LYClean.c @@ -43,7 +43,6 @@ PUBLIC void cleanup_sig ARGS1( * Reassert the AST. */ (void) signal(SIGINT, cleanup_sig); - HadVMSInterrupt = TRUE; if (!LYCursesON) return; @@ -61,6 +60,7 @@ PUBLIC void cleanup_sig ARGS1( } else { c = HTConfirmDefault(REALLY_EXIT_N, NO); } + HadVMSInterrupt = TRUE; if (LYQuitDefaultYes == TRUE) { if (c == NO) { return; diff --git a/src/LYCurses.c b/src/LYCurses.c index 75727790..4717f9f7 100644 --- a/src/LYCurses.c +++ b/src/LYCurses.c @@ -1356,7 +1356,7 @@ PUBLIC void LYtouchline ARGS1( #if defined(HAVE_WREDRAWLN) wredrawln(stdscr, row, 1); #else -#if defined(VMS) && !defined(_BSD44_CURSES) +#if defined(VMS) && !defined(_BSD44_CURSES) && !defined(USE_SLANG) /* touchline() is not available on VMS before version 7.0, and then * only on Alpha, since prior ports of curses were broken. */ diff --git a/src/LYGetFile.c b/src/LYGetFile.c index 0ac77c47..a1289c36 100644 --- a/src/LYGetFile.c +++ b/src/LYGetFile.c @@ -1055,11 +1055,14 @@ Try_Redirected_URL: return(NULLFILE); } else { - /* - * May set www_search_result. - */ - if (pound != NULL) + if (pound != NULL) { + if (!HTMainText) /* this should not happen... */ + return(NULLFILE); /* but it can. - kw */ + /* + * May set www_search_result. + */ HTFindPoundSelector(pound+1); + } return(NORMAL); } } diff --git a/src/LYUtils.c b/src/LYUtils.c index 89008bcc..89767250 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -7044,7 +7044,7 @@ PUBLIC BOOLEAN LYValidateFilename ARGS2( #else #ifndef __EMX__ - if (!LYIsPathSep(*given)) { + if (!LYisAbsPath(given)) { #if defined(__DJGPP__) || defined(_WINDOWS) if (strchr(result, ':') != NULL) cp = NULL; @@ -7331,7 +7331,7 @@ PUBLIC int LYCopyFile ARGS2( char *, src, char *, dst) { -#if defined(DOSPATH) /* thanks to Hiroyuki Senshu */ +#if defined(DOSPATH) || defined(__CYGWIN__) /* thanks to Hiroyuki Senshu */ #define BUF_SIZE 1024 diff --git a/src/LYexit.c b/src/LYexit.c index cc1d2b9a..3a1adacf 100644 --- a/src/LYexit.c +++ b/src/LYexit.c @@ -8,9 +8,9 @@ #include <LYGlobalDefs.h> #include <LYUtils.h> #include <LYSignal.h> -#include <LYClean.h> #include <LYMainLoop.h> #endif /* !VMS */ +#include <LYClean.h> /* * Flag for outofmem macro. - FM diff --git a/userdefs.h b/userdefs.h index c44fd31b..5355b27b 100644 --- a/userdefs.h +++ b/userdefs.h @@ -1339,11 +1339,11 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8.3rel.1" +#define LYNX_VERSION "2.8.4dev.1" #define LYNX_WWW_HOME "http://lynx.browser.org/" #define LYNX_WWW_DIST "http://lynx.isc.org/current/" /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ -#define LYNX_DATE "Sun, 23 Apr 2000 18:44:03 -0700" +#define LYNX_DATE "Fri, 05 May 2000 07:01:56 -0700" #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ |