diff options
58 files changed, 2963 insertions, 2764 deletions
diff --git a/CHANGES b/CHANGES index 193633b0..42896c59 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,130 @@ Changes since Lynx 2.8 release =============================================================================== +1999-07-30 (2.8.3dev.5) +* add/use LYHideCursor() macro to accommodate position in older curses -TD +* add configure option --enable-cjk to compile-in CJK_EX logic -TD +* add -short_url option and associated logic to elide middle of long urls + (adapted from patch by Eduardo Chappa L <chappa@math.washington.edu>) -TD +* ifdef'd read-progress changes with EXP_READPROGRESS, add configure option + --enable-read-eta to turn this on -TD +* enhanced read-progress logic (Ilya Zakharevich) + a) makes size/transfer rate reports use format "8.3 KB" (instead + of "8 KB") if numbers are below 10 KB and reports are in KB; + b) makes transferred/expected/transfer-rate use bytes/KB independently + so "236 bytes of 56 KB" is possible, as is + "8.3 of 56 KB, 456 bytes/sec"; + c) adds "ETA 23 sec" info if available; + d) adds " (stalled for 75 sec)" info if available (updated each 5 + sec or so); + e) uses gettimeofday() if present (instead of current hacks) to get more + frequent updates. +* fixes for OS/2 and ncurses from Ilya Zakharevich: + a) Makes lynx ignore mouse events which are not clicks (filtering through + ncurses does not work as expected). + b) Makes mouse-clicks "basin of attraction" of a link wider (the area where + clicks make the link a current link). It was 2 units vertically and + horizontally, make it 2 units vertically, and 6 units horizontally. This + leads to "more intuitive selection". + c) Make processing of .lynx-keymap write messages to trace buffer; + d) LAC-keybindings were not working; + e) Allow .lss files include one another via INCLUDE:/file/name + g) Allow a change of default color in .lss files (not the color of attributes + text, but colors for a style if "default" is specified); This (together + with "e") allows for a simple modification of a color scheme + Here is an example of a .lss file with a changed default + foreground/background and a handful of other declarations fine-tuned for + this change. (It implements "Commander" style). "Overriding" + declarations should be put before INCLUDE:, and the "default:" declaration + should be the last one. + status:reverse:yellow:black + h1:bold:yellow:black + em.a:reverse:black:blue + em.b:reverse:white:black + font.letter:normal:default:black + link.blue:bold:white:brightblue + link.blue.prev:bold:yellow:brightblue + title:normal:magenta:black + i:bold:white + table:normal:white + blockquote:normal:white + li.blue:bold:blue:black + link.blue.next:bold:blue:black + normal:normal:default:default + INCLUDE:F:/emx.add/lib/lynx.lss + default:normal:brightcyan:blue + h) Improve algorithm for allocation of color-pairs; + i) Lynx was not recognizing HOME directory on EMX; + j) UP_LINK and DOWN_LINK now actually move along a vertical line (as far as + it is possible), including an arbitrary sequence of such keypresses. +* modify LYIsPathSep() macro to include '\' for OS/2 EMX -TD +* correct a problem with spurious cookie names when reloading lynx.cfg (Michael + Warner & KW) +* add check for too-long line in HText_ExtEditForm(), splitting it if needed + (reported by <yury.burkatovsky@telrad.co.il>) -TD +* move NO_GROUPS definitions from HTFile.c to HTFile.h to make them available + for use in LYUtils.c on DOS -LP +* correct several minor problems with integration of HS's changes in GridText.h, + HTAlert.c and LYPrint.c (reported by LP) -TD +* restore dev.3 interface to LYLowerCase and LYUpperCase and do casts internally + to work on unsigned chars -PG +* corrected typos in some messages (reported by Dmitry Sivachenko + <demon@gpad.ac.ru>). +* changes for win32 -SH + + added ifdef's using _WIN_CC (for Borland C) to some places in prettysrc + definitions which use the __STDC__ symbol. + + renamed makefile.w32 to makefile.bcb + + renamed src/chrtrans/makefile.w32 to src/chrtrans/makefile.bcb +* the DOS port compiled with WATT-32 now works in a DOS window under Windows + 3.11 and Windows for Workgroups 3.11. It still needs its own packet driver + and does not use any native winsocks and has only been tested with Toni + Lopez's DOSPPP. This does fill a void for those running Win3.x, who + previously had to close Windows and go back to plain DOS before they could + run lynx. Updated the help files, reflecting current platform support -DK +* corrected definitions in HTTP.c and HTDOS.h to build with old TCP library -LP +* When keypad_mode was changed from forms options menu + set_numbers_as_arrows()/reset_numbers_as_arrows() was not reinitialized + (reported by KED). - LP +* SOURCE_CACHE: add one more parse setting member (keypad_mode) + to HText structure -LP +* SOURCE_CACHE: fix updating the document when "display charset" was changed + from Options Menu by user: FREE(anchor->UCStages) call from + HTuncache_current_document() now duplicated in HTreparse_document(). + (problem reported by KW) - LP. +* tweak trace message in scan_cookie_sublist(): limit trace output by trying + LYstrstr() as a first approximation before host_matches() -LP +* open temp-file in LYNewsPost() in binary mode for DJGPP to avoid translation + of \r\n vs \n -DK +* add note about potential conflicts with cookie files to description of + --disable-persistent-cookies -BJP +* added status message to indicate state of text inputs -VH +* added ability to make text inputs non-sticky (i.e., user will have to + activate them explicitly via an LYK_ACTIVATE action) - seems useful for + people navigating with alphanumeric keys. Default is 'sticky' - i.e., old + behavior. Behavior is controlled via command line option '--sticky-inputs' + and STICKY_INPUTS in lynx.cfg -VH +* added conditionals to 'userdefs.h' that disable support for + force-empty-hrefless-a mode if lynx is configured without lss (it's not + useful for such setup) -VH +* minor change to prettysrc mode, writing comments one character at a time + to avoid translation of \r\n to \n\n in HText_appendText() -VH +* correct rendering of DL in EXP_JUSTIFY_ELTS, will inhibit justification of + DT's content -VH +* other modifications to EXP_JUSTIFY_ELTS logic, to use information associated + with each element that indicates whether it can be justified -VH +* modify HTMLDTD.c so that "center" is not treated with EXP_JUSTIFY_ELTS -VH +* fix for core-dump in EXP_JUSTIFY_ELTS -VH +* modify signal handling in LYSystem to workaround competing SIGTSTP handlers + when a subprocess is active. This adds a new function LYToggleSigDfl(), + using sigaction as an alternative to signal to save/restore as much of the + signal state as possible -KW +* add configure option --enable-justify-elts (request by VH) -TD +* add configure test for sigaction function and related structs -TD +* restore hardcoded escape sequences on Unix in setup_vtXXX_keymap() + inadvertantly dropped in dev.4, to accommodate users of slang library who + have their $TERM set incorrectly -TD +* correct ifdef's for resizeterm() call to allow Lynx to build with old + versions of ncurses -TD 1999-07-14 (2.8.3dev.4) * minor fixes to build with SunOS K&R compiler -TD * cleanup unbalanced curly braces from other recent experimental options -TD @@ -45,14 +169,14 @@ Changes since Lynx 2.8 release commandline option is --force-empty-hrefless-a, and force_empty_hrefless_a in lynx.cfg, ifdef'd with NO_EMPTY_HREFLESS_A -VH * incorporate changes for win32 by Hiroyuki Senshu <senshu@shonai-cit.ac.jp> - from + (SH) from ftp://crab.it.osha.sut.ac.jp/pub/Win32/develope/senshu/Lynx/ based on his patch against 2.8.2pre.6 Most changes are ifdef'd #define _WIN_CC= .... for Windows C Compiler - #define CJK_EX .... CJK EXtention - #define SH_EX .... Senshu Hiroyuki EXtention - #define WIN_EX .... Windows EXtention + #define CJK_EX .... CJK EXtension + #define SH_EX .... Senshu Hiroyuki EXtension + #define WIN_EX .... Windows EXtension * add missing null-pointer check in MakeNewMapValue(), for verbose-images (from Debian bug report #39596) -TD * test/build with gettext-0.10.35 -TD @@ -78,7 +202,8 @@ Changes since Lynx 2.8 release some OS/2 servers. Only one server was known and used for testing, so the heuristics used may not be quite general enough. File date/time is not shown since it doesn't seem to be part of the basic format -KW -* In lynx.man removed bogus "ID:" for -assume_charset, -assume_local_charset -KW +* in lynx.man removed bogus "ID:" for -assume_charset, + -assume_local_charset -KW * in a list, render a <DIV> that doesn't have an ALIGN="center" or ALIGN="right" attribute like a <P> in that situation: break the line if necessary but don't create an empty line, an keep list indentation. This diff --git a/INSTALLATION b/INSTALLATION index 7ace6593..2ce819e2 100644 --- a/INSTALLATION +++ b/INSTALLATION @@ -279,10 +279,11 @@ II. Compile instructions -- UNIX --disable-persistent-cookies (define EXP_PERSISTENT_COOKIES) Use this option to tell configure whether to compile-in support for - saving cookies to a file, for subsequent reuse. This creates the file - specified by the 'COOKIE_FILE' option, or defaults to ".lynx_cookies" - in the home directory. (Currently there is no protection against - conflict if several lynx copies are active from the same account). + saving cookies to a file, for subsequent reuse. Persistent cookie + support will use (or create) the file specified by the 'COOKIE_FILE' + option, or default to ".lynx_cookies" in the home directory. + (Currently there is no protection against conflict if several lynx + sessions are active from the same account). --disable-trace (define NO_LYNX_TRACE) Turn off code that lets you trace internal details of Lynx's operation. @@ -302,6 +303,9 @@ II. Compile instructions -- UNIX Allows lynx to access a cgi script directly without the need for a http daemon. + --enable-cjk (define CJK_EX) + Add special logic for supporting CJK documents. + --enable-color-style (define USE_COLOR_STYLE) Use this option to enable optional and *experimental* color style. (Also defines USE_HASH, LINKEDSTYLES) @@ -340,6 +344,9 @@ II. Compile instructions -- UNIX --enable-gzip-help Install the lynx help files in gzip'd format [*.gz] to save space. + --enable-justify-elts (define EXP_JUSTIFY_ELTS) + use experimental element-justification logic. + --enable-internal-links (define DONT_TRACK_INTERNAL_LINKS) Disabled by default, this option allows tracking of internal links, a feature which could, however, compromise a secure transaction by @@ -368,6 +375,11 @@ II. Compile instructions -- UNIX HTML pages. If compiled-in, new source view mode is available with -prettysrc command line option. + --enable-read-eta (define EXP_READPROGRESS) + Enhance the read-progress message to show ETA (estimated time to + completion), as well as the amount of time stalled without any data + transferred. + --enable-source-cache (define SOURCE_CACHE) Use this option to compile-in support for caching HTML pages locally, in files or in memory. Configurable from lynx.cfg @@ -609,11 +621,11 @@ IV. Compile instructions -- Win32 (Windows95/98/NT) IDE file. A sample IDE file and helper libraries are available at "http://www.fdisk.com/doslynx/wlynx/source/". - First build the .h files in src\chrtrans using "MAKEW32.BAT". Double + First build the .h files in src\chrtrans using "makew32.bat". Double check for new .tbl files; hand edit in any new ones, and then do "makew32". Jump into Borland C++, load the project (IDE file) and compile Lynx. Alternately, after compiling the chartrans tables, you can come back to - the top directory and compile manually, i.e., do "make -f makefile.w32". + the top directory and compile manually, i.e., do "make -f makefile.bcb". I also have a binary available at "http://www.fdisk.com/doslynx/". This binary was compiled with pdcurses 2.3, hacked so win32 mouse support works, diff --git a/LYMessages_en.h b/LYMessages_en.h index e68d4f03..584fabe8 100644 --- a/LYMessages_en.h +++ b/LYMessages_en.h @@ -2,7 +2,7 @@ * Lynx - Hypertext navigation system * * (c) Copyright 1992, 1993, 1994 University of Kansas - * 1995, 1996: GNU General Public License + * 1995-1999: GNU General Public License */ #ifndef LYMESSAGES_EN_H #define LYMESSAGES_EN_H @@ -22,10 +22,9 @@ * * http://www.crl.com/~subir/lynx.html * - * Because the gettext facility is only recently (with release 2.8.2) - * introduced, these alternate definitions are given as variants on this - * file. Use them as a starting point to construct a new message - * library as needed. (see po/readme). + * See ABOUT-NLS and po/readme for details and location of contributed + * translations. When no translation is available, the English default is + * used. */ #define ALERT_FORMAT gettext("Alert!: %s") #define WELCOME_MSG gettext("Welcome") @@ -720,7 +719,7 @@ #define URL_PORT_BAD gettext("URL has a bad port field.") #define HTML_STACK_OVERRUN gettext("Maximum nesting of HTML elements exceeded.") #define BAD_PARTIAL_REFERENCE gettext("Bad partial reference! Stripping lead dots.") -#define TRACELOG_OPEN_FAILED gettext("Trace Log open failed. Trace off!.") +#define TRACELOG_OPEN_FAILED gettext("Trace Log open failed. Trace off!") #define LYNX_TRACELOG_TITLE gettext("Lynx Trace Log") #define NO_TRACELOG_STARTED gettext("No trace log has been started for this session.") #define MAX_TEMPCOUNT_REACHED \ diff --git a/WWW/Library/Implementation/HTAccess.c b/WWW/Library/Implementation/HTAccess.c index a87d14dc..8c1eb009 100644 --- a/WWW/Library/Implementation/HTAccess.c +++ b/WWW/Library/Implementation/HTAccess.c @@ -1044,7 +1044,7 @@ PRIVATE BOOL HTLoadDocument ARGS4( fprintf(stderr, gettext("**** HTAccess: socket or file number returned by obsolete load routine!\n")); fprintf(stderr, - gettext("**** HTAccess: Internal software error. Please mail lynx_dev@sig.net!\n")); + gettext("**** HTAccess: Internal software error. Please mail lynx-dev@sig.net!\n")); fprintf(stderr, gettext("**** HTAccess: Status returned was: %d\n"),status); exit(-1); } diff --git a/WWW/Library/Implementation/HTCJK.h b/WWW/Library/Implementation/HTCJK.h index 95221e38..8858085a 100644 --- a/WWW/Library/Implementation/HTCJK.h +++ b/WWW/Library/Implementation/HTCJK.h @@ -111,4 +111,6 @@ extern void TO_JIS PARAMS(( CONST unsigned char * any, unsigned char * jis)); +extern char *str_kcode PARAMS((HTkcode code)); + #endif /* HTCJK_H */ diff --git a/WWW/Library/Implementation/HTDOS.h b/WWW/Library/Implementation/HTDOS.h index a4c68446..4907f6ae 100644 --- a/WWW/Library/Implementation/HTDOS.h +++ b/WWW/Library/Implementation/HTDOS.h @@ -31,8 +31,10 @@ char * HTDOS_wwwName PARAMS((char * dosname)); */ char * HTDOS_name PARAMS((char * wwwname)); -#ifdef __WIN32__ +#ifdef WIN_EX char * HTDOS_short_name (char * fn); +#else +#define HTDOS_short_name(fn) fn #endif #endif /* HTDOS_H */ diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c index 8a213373..575e9e7f 100644 --- a/WWW/Library/Implementation/HTFile.c +++ b/WWW/Library/Implementation/HTFile.c @@ -208,9 +208,9 @@ PRIVATE void LYListFmtParse ARGS5( #ifdef _WINDOWS /* 1998/01/06 (Tue) 21:20:53 */ static char *pbits[] = { "---", "--x", "-w-", "-wx", - "r--", "r-x", "rw-", "rwx", + "r--", "r-x", "rw-", "rwx", 0 }; -#define PBIT(a, n, s) pbits[((a) >> (n)) & 0x7] +#define PBIT(a, n, s) pbits[((a) >> (n)) & 0x7] #else static char *pbits[] = { "---", "--x", "-w-", "-wx", @@ -378,7 +378,7 @@ PRIVATE void LYListFmtParse ARGS5( default: type = '?'; break; } #ifdef _WINDOWS - sprintf(tmp, "%c%s", type, + sprintf(tmp, "%c%s", type, PBIT(st.st_mode, 6, st.st_mode & S_IRWXU)); #else sprintf(tmp, "%c%s%s%s", type, @@ -1123,30 +1123,6 @@ PUBLIC float HTFileValue ARGS1( ** 1. No code for non-unix systems. ** 2. Isn't there a quicker way? */ - -#if defined(HAVE_CONFIG_H) - -#ifndef HAVE_GETGROUPS -#define NO_GROUPS -#endif - -#else - -#ifdef VMS -#define NO_GROUPS -#endif /* VMS */ -#ifdef NO_UNIX_IO -#define NO_GROUPS -#endif /* NO_UNIX_IO */ -#ifdef PCNFS -#define NO_GROUPS -#endif /* PCNFS */ -#ifdef NOUSERS -#define NO_GROUPS -#endif /* PCNFS */ - -#endif /* HAVE_CONFIG_H */ - PUBLIC BOOL HTEditable ARGS1( CONST char *, filename) { diff --git a/WWW/Library/Implementation/HTFile.h b/WWW/Library/Implementation/HTFile.h index 50e38273..9e03b790 100644 --- a/WWW/Library/Implementation/HTFile.h +++ b/WWW/Library/Implementation/HTFile.h @@ -175,6 +175,30 @@ extern float HTFileValue PARAMS(( ** ** Isn't there a quicker way? */ + +#if defined(HAVE_CONFIG_H) + +#ifndef HAVE_GETGROUPS +#define NO_GROUPS +#endif + +#else + +#ifdef VMS +#define NO_GROUPS +#endif /* VMS */ +#ifdef NO_UNIX_IO +#define NO_GROUPS +#endif /* NO_UNIX_IO */ +#ifdef PCNFS +#define NO_GROUPS +#endif /* PCNFS */ +#ifdef NOUSERS +#define NO_GROUPS +#endif /* PCNFS */ + +#endif /* HAVE_CONFIG_H */ + extern BOOL HTEditable PARAMS((CONST char * filename)); /* Make a save stream. diff --git a/WWW/Library/Implementation/HTMLDTD.c b/WWW/Library/Implementation/HTMLDTD.c index ddea0b49..878c573e 100644 --- a/WWW/Library/Implementation/HTMLDTD.c +++ b/WWW/Library/Implementation/HTMLDTD.c @@ -1406,7 +1406,7 @@ static CONST HTTag tags_old[HTML_ELEMENTS] = { { P("BR") , gen_attr, HTML_GEN_ATTRIBUTES, SGML_EMPTY,T_BR}, { P("BUTTON") , button_attr, HTML_BUTTON_ATTRIBUTES, SGML_MIXED,T_BUTTON}, { P("CAPTION") , caption_attr, HTML_CAPTION_ATTRIBUTES, SGML_MIXED,T_CAPTION}, - { P0("CENTER") , div_attr, HTML_DIV_ATTRIBUTES, SGML_MIXED,T_CENTER}, + { P("CENTER") , div_attr, HTML_DIV_ATTRIBUTES, SGML_MIXED,T_CENTER}, { P("CITE") , gen_attr, HTML_GEN_ATTRIBUTES, SGML_EMPTY,T_CITE}, { P("CODE") , gen_attr, HTML_GEN_ATTRIBUTES, SGML_MIXED,T_CODE}, { P("COL") , col_attr, HTML_COL_ATTRIBUTES, SGML_EMPTY,T_COL}, @@ -1485,7 +1485,7 @@ static CONST HTTag tags_old[HTML_ELEMENTS] = { { P("SUB") , gen_attr, HTML_GEN_ATTRIBUTES, SGML_MIXED,T_SUB}, { P("SUP") , gen_attr, HTML_GEN_ATTRIBUTES, SGML_MIXED,T_SUP}, { P("TAB") , tab_attr, HTML_TAB_ATTRIBUTES, SGML_EMPTY,T_TAB}, - { P0("TABLE") , table_attr, HTML_TABLE_ATTRIBUTES, SGML_MIXED,T_TABLE}, + { P("TABLE") , table_attr, HTML_TABLE_ATTRIBUTES, SGML_MIXED,T_TABLE}, { P("TBODY") , tr_attr, HTML_TR_ATTRIBUTES, SGML_EMPTY,T_TBODY}, { P("TD") , td_attr, HTML_TD_ATTRIBUTES, SGML_EMPTY,T_TD}, { P("TEXTAREA"), textarea_attr,HTML_TEXTAREA_ATTRIBUTES, SGML_LITTERAL,T_TEXTAREA}, @@ -1527,7 +1527,7 @@ static CONST HTTag tags_new[HTML_ELEMENTS] = { { P("BR") , gen_attr, HTML_GEN_ATTRIBUTES, SGML_EMPTY,T_BR}, { P("BUTTON") , button_attr, HTML_BUTTON_ATTRIBUTES, SGML_MIXED,T_BUTTON}, { P("CAPTION") , caption_attr, HTML_CAPTION_ATTRIBUTES, SGML_MIXED,T_CAPTION}, - { P0("CENTER") , div_attr, HTML_DIV_ATTRIBUTES, SGML_MIXED,T_CENTER}, + { P("CENTER") , div_attr, HTML_DIV_ATTRIBUTES, SGML_MIXED,T_CENTER}, { P("CITE") , gen_attr, HTML_GEN_ATTRIBUTES, SGML_MIXED,T_CITE}, { P("CODE") , gen_attr, HTML_GEN_ATTRIBUTES, SGML_MIXED,T_CODE}, { P("COL") , col_attr, HTML_COL_ATTRIBUTES, SGML_EMPTY,T_COL}, @@ -1606,7 +1606,7 @@ static CONST HTTag tags_new[HTML_ELEMENTS] = { { P("SUB") , gen_attr, HTML_GEN_ATTRIBUTES, SGML_MIXED,T_SUB}, { P("SUP") , gen_attr, HTML_GEN_ATTRIBUTES, SGML_MIXED,T_SUP}, { P("TAB") , tab_attr, HTML_TAB_ATTRIBUTES, SGML_EMPTY,T_TAB}, - { P0("TABLE") , table_attr, HTML_TABLE_ATTRIBUTES, SGML_ELEMENT,T_TABLE}, + { P("TABLE") , table_attr, HTML_TABLE_ATTRIBUTES, SGML_ELEMENT,T_TABLE}, { P("TBODY") , tr_attr, HTML_TR_ATTRIBUTES, SGML_ELEMENT,T_TBODY}, { P("TD") , td_attr, HTML_TD_ATTRIBUTES, SGML_MIXED,T_TD}, { P("TEXTAREA"), textarea_attr,HTML_TEXTAREA_ATTRIBUTES, SGML_LITTERAL,T_TEXTAREA}, diff --git a/WWW/Library/Implementation/HTString.c b/WWW/Library/Implementation/HTString.c index 7ab09c78..aecebf34 100644 --- a/WWW/Library/Implementation/HTString.c +++ b/WWW/Library/Implementation/HTString.c @@ -151,7 +151,7 @@ PUBLIC int strncasecomp ARGS3( return ((long)n < 0 ? 0 : cm[*us1] - cm[*--us2]); } -#else +#else /* SH_EX */ /* Strings of any length ** --------------------- diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c index bd68d5be..46c85034 100644 --- a/WWW/Library/Implementation/HTTCP.c +++ b/WWW/Library/Implementation/HTTCP.c @@ -1776,6 +1776,10 @@ PUBLIC int HTDoRead ARGS3( fd_set readfds; struct timeval timeout; int tries=0; +#ifdef EXP_READPROGRESS + int otries = 0; + time_t otime = time((time_t *)0); +#endif #if defined(UNIX) || defined(UCX) int nb; #endif /* UCX, BSN */ @@ -1823,6 +1827,18 @@ PUBLIC int HTDoRead ARGS3( return HT_INTERRUPTED; } +#ifdef EXP_READPROGRESS + if (tries - otries > 10) { + time_t t = time((time_t *)0); + + otries = tries; + if (t - otime >= 5) { + otime = t; + HTReadProgress(-1, 0); /* Put "stalled" message */ + } + } +#endif + /* ** If we suspend, then it is possible that select will be ** interrupted. Allow for this possibility. - JED diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c index ff9a5534..8c162fe2 100644 --- a/WWW/Library/Implementation/HTTP.c +++ b/WWW/Library/Implementation/HTTP.c @@ -7,7 +7,7 @@ */ #include <HTUtils.h> -#ifdef __DJGPP__ +#if defined(__DJGPP__) && defined (WATT32) #include <tcp.h> #endif /* __DJGPP__ */ #include <HTTP.h> diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h index f5237989..06df62c6 100644 --- a/WWW/Library/Implementation/HTUtils.h +++ b/WWW/Library/Implementation/HTUtils.h @@ -130,6 +130,11 @@ typedef unsigned short mode_t; #endif +#ifndef USE_COLOR_STYLE + /* it's useless for such setup */ +# define NO_EMPTY_HREFLESS_A +#endif + /* Debug message control. diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c index 7efb4d9b..7d5b450e 100644 --- a/WWW/Library/Implementation/SGML.c +++ b/WWW/Library/Implementation/SGML.c @@ -228,7 +228,7 @@ PRIVATE void HTMLSRC_apply_markup ARGS3( } } -#ifdef __STDC__ +#if defined(__STDC__) || _WIN_CC # define PSRCSTART(x) HTMLSRC_apply_markup(context,HTL_##x,START) # define PSRCSTOP(x) HTMLSRC_apply_markup(context,HTL_##x,STOP) #else @@ -4628,7 +4628,7 @@ PUBLIC void TO_SJIS ARGS2( { unsigned char *euc; - euc = malloc(strlen(any) + 1); + euc = malloc(strlen((CONST char *) any) + 1); #ifdef CJK_EX if (!euc) outofmem(__FILE__, "TO_SJIS"); @@ -4637,7 +4637,7 @@ PUBLIC void TO_SJIS ARGS2( if (is_EUC_JP(euc)) EUC_TO_SJIS(euc, sjis); else - strcpy(sjis, any); + strcpy((char *) sjis, (CONST char *) any); free(euc); } @@ -4651,7 +4651,7 @@ PUBLIC void TO_JIS ARGS2( jis[0] = 0; return; } - euc = malloc(strlen(any) + 1); + euc = malloc(strlen((CONST char *) any) + 1); #ifdef CJK_EX if (!euc) outofmem(__FILE__, "TO_JIS"); diff --git a/aclocal.m4 b/aclocal.m4 index c619e2c8..9144f671 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1026,6 +1026,25 @@ if test $ac_cv_func_lstat = yes; then fi ])dnl dnl --------------------------------------------------------------------------- +dnl Check if we have the sigaction function and related structures. +AC_DEFUN([CF_FUNC_SIGACTION],[ +AC_CACHE_CHECK(for sigaction and structs,cf_cv_func_sigaction,[ +AC_TRY_LINK([ +#include <sys/types.h> +#include <signal.h>], + [struct sigaction act; + act.sa_handler = SIG_DFL; +#ifdef SA_RESTART + act.sa_flags |= SA_RESTART; +#endif /* SA_RESTART */ + sigaction(1, &act, 0); + ], + [cf_cv_func_sigaction=yes], + [cf_cv_func_sigaction=no]) +]) +test "$cf_cv_func_sigaction" = yes && AC_DEFINE(HAVE_SIGACTION) +])dnl +dnl --------------------------------------------------------------------------- dnl Test for the presence of <sys/wait.h>, 'union wait', arg-type of 'wait()' dnl and/or 'waitpid()'. dnl @@ -1204,6 +1223,7 @@ test "$prefix" != NONE && $1="[$]$1 $prefix/include $prefix/include/$2 fi test "$prefix" != /usr/local && $1="[$]$1 /usr/local/include /usr/local/include/$2" test "$prefix" != /usr && $1="[$]$1 /usr/include /usr/include/$2" +test "$prefix" != /opt && $1="[$]$1 /opt/include /opt/include/$2" ])dnl dnl --------------------------------------------------------------------------- dnl Insert text into the help-message, for readability, from AC_ARG_WITH. @@ -1278,6 +1298,7 @@ test "$prefix" != "$exec_prefix" && $1="[$]$1 $prefix/lib $prefix/lib/$2" fi test "$prefix" != /usr/local && $1="[$]$1 /usr/local/lib /usr/local/lib/$2" test "$prefix" != /usr && $1="[$]$1 /usr/lib /usr/lib/$2" +test "$prefix" != /opt && $1="[$]$1 /opt/lib /opt/lib/$2" ])dnl dnl --------------------------------------------------------------------------- dnl Check if we've got setlocale() and its header, <locale.h> diff --git a/config.hin b/config.hin index 1628adc4..4731e392 100644 --- a/config.hin +++ b/config.hin @@ -7,6 +7,7 @@ #undef ARCHIVE_ONLY /* CF_ARG_DISABLE(dired-archive) */ #undef BZIP2_PATH /* CF_PATH_PROG(bzip2) */ #undef CHMOD_PATH /* CF_PATH_PROG(chmod) */ +#undef CJK_EX /* CF_ARG_ENABLE(cjk) */ #undef COLOR_CURSES /* defined by CF_COLOR_CURSES */ #undef COMPRESS_PATH /* CF_PATH_PROG(compress) */ #undef COPY_PATH /* CF_PATH_PROG(cp) */ @@ -33,9 +34,11 @@ #undef EXP_ALT_BINDINGS /* CF_ARG_ENABLE(alt-bindings) */ #undef EXP_CHARTRANS_AUTOSWITCH /* CF_ARG_ENABLE(font-switch) */ #undef EXP_FILE_UPLOAD /* CF_ARG_ENABLE(file-upload) */ +#undef EXP_JUSTIFY_ELTS /* CF_ARG_ENABLE(justify-elts) */ #undef EXP_KEYBOARD_LAYOUT /* CF_ARG_ENABLE(kbd-layout) */ #undef EXP_LIBJS /* CF_ARG_ENABLE(libjs) */ #undef EXP_PERSISTENT_COOKIES /* CF_ARG_ENABLE(persistent-cookies) */ +#undef EXP_READPROGRESS /* CF_ARG_ENABLE(read-eta) */ #undef FANCY_CURSES /* defined by CF_FANCY_CURSES */ #undef GCC_PRINTF /* CF_GCC_ATTRIBUTES */ #undef GCC_UNUSED /* CF_GCC_ATTRIBUTES */ @@ -75,8 +78,10 @@ #undef HAVE_PUTENV #undef HAVE_READDIR #undef HAVE_RESOLV_H +#undef HAVE_RESIZETERM #undef HAVE_SETENV /* defined by AM_GNU_GETTEXT */ #undef HAVE_SETLOCALE +#undef HAVE_SIGACTION /* CF_FUNC_SIGACTION */ #undef HAVE_SIZECHANGE /* defined by CF_SIZECHANGE */ #undef HAVE_STDARG_H /* CF_VARARGS */ #undef HAVE_STDLIB_H diff --git a/configure b/configure index 552f588c..079d52c4 100755 --- a/configure +++ b/configure @@ -208,14 +208,17 @@ Experimental Options: --disable-forms-options disable experimental forms-based options --disable-menu-options disable old-style option menu --enable-addrlist-page use experimental address-list page + --enable-cjk use experimental CJK logic --enable-color-style use optional/experimental color style --enable-default-colors enable use of default-colors (ncurses/slang) --enable-file-upload use experimental file-upload support - --enable-kbd-layout use experimental keyboard-layout support EOF cat <<EOF + --enable-justify-elts use experimental element-justification logic + --enable-kbd-layout use experimental keyboard-layout support --enable-libjs use experimental JavaScript support (Mozilla libjs) --enable-prettysrc colorize HTML source + --enable-read-eta experimental read-progress message shows ETA --enable-source-cache cache HTML source for parse mode changes Miscellaneous Options: --disable-alt-bindings disable alternative line-edit bindings @@ -223,11 +226,11 @@ Miscellaneous Options: --disable-partial use partial-display logic --enable-externs use external commands --enable-font-switch use Linux setfont for character-translation +EOF +cat <<EOF --enable-cgi-links support cgi links w/o a http daemon --enable-change-exec allow users to change exec options --enable-exec-links allow lynx to execute programs accessed via a link -EOF -cat <<EOF --enable-exec-scripts allow lynx to execute programs inferred from a link --enable-internal-links handle following links to same doc differently --enable-nsl-fork fork NSL requests, allowing them to be aborted @@ -237,11 +240,11 @@ cat <<EOF --enable-gzip-help install gzip'ed help files --with-zlib use zlib for decompression of some gzip files --disable-finger disable FINGER logic +EOF +cat <<EOF --disable-gopher disable GOPHER logic --disable-news disable NEWS logic --disable-ftp disable FTP logic -EOF -cat <<EOF Directory Editor Options: --disable-dired disable optional directory-editor, DirEd --disable-dired-archive disable dearchiving commands @@ -251,13 +254,13 @@ Directory Editor Options: --disable-dired-tar disable "tar" command --disable-dired-uudecode disable "uudecode" command --disable-dired-zip disable "zip", "unzip" commands +EOF +cat <<EOF --disable-dired-gzip disable "gzip", "gunzip" commands --disable-long-list disable long "ls -l" directory listings --disable-parent-dir-refs disable "Up-to" links in directory listings EOF -cat <<EOF -EOF exit 0 ;; -host | --host | --hos | --ho) @@ -625,7 +628,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:629: checking host system type" >&5 +echo "configure:632: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -680,7 +683,7 @@ test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && ec # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:684: checking for $ac_word" >&5 +echo "configure:687: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -710,7 +713,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:714: checking for $ac_word" >&5 +echo "configure:717: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -761,7 +764,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:765: checking for $ac_word" >&5 +echo "configure:768: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -793,7 +796,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:797: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:800: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -804,12 +807,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 808 "configure" +#line 811 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -835,12 +838,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:839: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:842: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:844: checking whether we are using GNU C" >&5 +echo "configure:847: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -849,7 +852,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -868,7 +871,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:872: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:875: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -900,7 +903,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:904: checking how to run the C preprocessor" >&5 +echo "configure:907: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -915,13 +918,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 919 "configure" +#line 922 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -932,13 +935,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 936 "configure" +#line 939 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -949,13 +952,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 953 "configure" +#line 956 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -980,7 +983,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:984: checking whether ln -s works" >&5 +echo "configure:987: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1003,7 +1006,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1007: checking for $ac_word" >&5 +echo "configure:1010: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1031,7 +1034,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1035: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1038: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1069,7 +1072,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1073: checking for a BSD compatible install" >&5 +echo "configure:1076: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1126,7 +1129,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1130: checking for $ac_word" >&5 +echo "configure:1133: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LINT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1157,9 +1160,9 @@ done echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1161: checking for AIX" >&5 +echo "configure:1164: checking for AIX" >&5 cat > conftest.$ac_ext <<EOF -#line 1163 "configure" +#line 1166 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -1181,7 +1184,7 @@ rm -f conftest* echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1185: checking for POSIXized ISC" >&5 +echo "configure:1188: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1207,7 +1210,7 @@ fi echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:1211: checking if you want to see long compiling messages" >&5 +echo "configure:1214: checking if you want to see long compiling messages" >&5 # Check whether --enable-echo or --disable-echo was given. if test "${enable_echo+set}" = set; then @@ -1255,7 +1258,7 @@ fi echo $ac_n "checking if you want to check memory-leaks""... $ac_c" 1>&6 -echo "configure:1259: checking if you want to check memory-leaks" >&5 +echo "configure:1262: checking if you want to check memory-leaks" >&5 # Check whether --enable-find-leaks or --disable-find-leaks was given. if test "${enable_find_leaks+set}" = set; then @@ -1279,7 +1282,7 @@ EOF echo $ac_n "checking if you want to enable debug-code""... $ac_c" 1>&6 -echo "configure:1283: checking if you want to enable debug-code" >&5 +echo "configure:1286: checking if you want to enable debug-code" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -1321,7 +1324,7 @@ else fi echo $ac_n "checking if you want to enable lynx trace code *recommended* ""... $ac_c" 1>&6 -echo "configure:1325: checking if you want to enable lynx trace code *recommended* " >&5 +echo "configure:1328: checking if you want to enable lynx trace code *recommended* " >&5 # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then @@ -1347,7 +1350,7 @@ EOF if test -n "$GCC" then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:1351: checking if you want to turn on gcc warnings" >&5 +echo "configure:1354: checking if you want to turn on gcc warnings" >&5 # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then @@ -1387,9 +1390,9 @@ EOF if test -n "$GCC" then echo "checking for gcc __attribute__ directives" 1>&6 -echo "configure:1391: checking for gcc __attribute__ directives" >&5 +echo "configure:1394: checking for gcc __attribute__ directives" >&5 cat > conftest.$ac_ext <<EOF -#line 1393 "configure" +#line 1396 "configure" #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -1427,7 +1430,7 @@ EOF EOF ;; esac - if { (eval echo configure:1431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6 cat conftest.h >>confdefs.h # else @@ -1444,11 +1447,11 @@ fi if test -n "$GCC" then cat > conftest.$ac_ext <<EOF -#line 1448 "configure" +#line 1451 "configure" int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } EOF echo "checking for gcc warning options" 1>&6 -echo "configure:1452: checking for gcc warning options" >&5 +echo "configure:1455: checking for gcc warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -1466,7 +1469,7 @@ echo "configure:1452: checking for gcc warning options" >&5 Wstrict-prototypes $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:1470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES" @@ -1484,12 +1487,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1488: checking for ANSI C header files" >&5 +echo "configure:1491: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1493 "configure" +#line 1496 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1497,7 +1500,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1514,7 +1517,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1518 "configure" +#line 1521 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1532,7 +1535,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1536 "configure" +#line 1539 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1553,7 +1556,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1557 "configure" +#line 1560 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1564,7 +1567,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1588,12 +1591,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1592: checking for working const" >&5 +echo "configure:1595: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1597 "configure" +#line 1600 "configure" #include "confdefs.h" int main() { @@ -1642,7 +1645,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:1646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1663,21 +1666,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1667: checking for inline" >&5 +echo "configure:1670: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 1674 "configure" +#line 1677 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:1681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1703,12 +1706,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1707: checking for off_t" >&5 +echo "configure:1710: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1712 "configure" +#line 1715 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1736,12 +1739,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1740: checking for size_t" >&5 +echo "configure:1743: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1745 "configure" +#line 1748 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1771,19 +1774,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1775: checking for working alloca.h" >&5 +echo "configure:1778: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1780 "configure" +#line 1783 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1804,12 +1807,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1808: checking for alloca" >&5 +echo "configure:1811: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1813 "configure" +#line 1816 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -1837,7 +1840,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:1841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1869,12 +1872,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1873: checking whether alloca needs Cray hooks" >&5 +echo "configure:1876: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1878 "configure" +#line 1881 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -1899,12 +1902,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1903: checking for $ac_func" >&5 +echo "configure:1906: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1908 "configure" +#line 1911 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1927,7 +1930,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1954,7 +1957,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1958: checking stack direction for C alloca" >&5 +echo "configure:1961: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1962,7 +1965,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 1966 "configure" +#line 1969 "configure" #include "confdefs.h" find_stack_direction () { @@ -1981,7 +1984,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:1985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2006,17 +2009,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2010: checking for $ac_hdr" >&5 +echo "configure:2013: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2015 "configure" +#line 2018 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2045,12 +2048,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2049: checking for $ac_func" >&5 +echo "configure:2052: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2054 "configure" +#line 2057 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2073,7 +2076,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2098,7 +2101,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2102: checking for working mmap" >&5 +echo "configure:2105: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2106,7 +2109,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 2110 "configure" +#line 2113 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -2246,7 +2249,7 @@ main() } EOF -if { (eval echo configure:2250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2274,17 +2277,17 @@ unistd.h values.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2278: checking for $ac_hdr" >&5 +echo "configure:2281: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2283 "configure" +#line 2286 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2314,12 +2317,12 @@ done __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2318: checking for $ac_func" >&5 +echo "configure:2321: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2323 "configure" +#line 2326 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2342,7 +2345,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2371,12 +2374,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2375: checking for $ac_func" >&5 +echo "configure:2378: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2380 "configure" +#line 2383 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2399,7 +2402,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2433,19 +2436,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2437: checking for LC_MESSAGES" >&5 +echo "configure:2440: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2442 "configure" +#line 2445 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:2449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -2466,7 +2469,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2470: checking whether NLS is requested" >&5 +echo "configure:2473: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then @@ -2487,7 +2490,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2491: checking whether included gettext is requested" >&5 +echo "configure:2494: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then @@ -2507,17 +2510,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2511: checking for libintl.h" >&5 +echo "configure:2514: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2516 "configure" +#line 2519 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2534,19 +2537,19 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:2538: checking for gettext in libc" >&5 +echo "configure:2541: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2543 "configure" +#line 2546 "configure" #include "confdefs.h" #include <libintl.h> int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:2550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -2562,7 +2565,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:2566: checking for bindtextdomain in -lintl" >&5 +echo "configure:2569: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2570,7 +2573,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2574 "configure" +#line 2577 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2581,7 +2584,7 @@ int main() { bindtextdomain() ; return 0; } EOF -if { (eval echo configure:2585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2597,19 +2600,19 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:2601: checking for gettext in libintl" >&5 +echo "configure:2604: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2606 "configure" +#line 2609 "configure" #include "confdefs.h" int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:2613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libintl=yes else @@ -2637,7 +2640,7 @@ EOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2641: checking for $ac_word" >&5 +echo "configure:2644: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2671,12 +2674,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2675: checking for $ac_func" >&5 +echo "configure:2678: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2680 "configure" +#line 2683 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2699,7 +2702,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2726,7 +2729,7 @@ done # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2730: checking for $ac_word" >&5 +echo "configure:2733: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2762,7 +2765,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2766: checking for $ac_word" >&5 +echo "configure:2769: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2794,7 +2797,7 @@ else fi cat > conftest.$ac_ext <<EOF -#line 2798 "configure" +#line 2801 "configure" #include "confdefs.h" int main() { @@ -2802,7 +2805,7 @@ extern int _nl_msg_cat_cntr; return _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:2806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -2825,7 +2828,7 @@ fi if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:2829: checking whether catgets can be used" >&5 +echo "configure:2832: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then @@ -2839,7 +2842,7 @@ fi if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:2843: checking for main in -li" >&5 +echo "configure:2846: checking for main in -li" >&5 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2847,14 +2850,14 @@ else ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <<EOF -#line 2851 "configure" +#line 2854 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2882,12 +2885,12 @@ else fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:2886: checking for catgets" >&5 +echo "configure:2889: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2891 "configure" +#line 2894 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char catgets(); below. */ @@ -2910,7 +2913,7 @@ catgets(); ; return 0; } EOF -if { (eval echo configure:2914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -2932,7 +2935,7 @@ EOF # Extract the first word of "gencat", so it can be a program name with args. set dummy gencat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2936: checking for $ac_word" >&5 +echo "configure:2939: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2968,7 +2971,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2972: checking for $ac_word" >&5 +echo "configure:2975: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3005,7 +3008,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3009: checking for $ac_word" >&5 +echo "configure:3012: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3040,7 +3043,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3044: checking for $ac_word" >&5 +echo "configure:3047: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3098,7 +3101,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3102: checking for $ac_word" >&5 +echo "configure:3105: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3132,7 +3135,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3136: checking for $ac_word" >&5 +echo "configure:3139: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3168,7 +3171,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3172: checking for $ac_word" >&5 +echo "configure:3175: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3258,7 +3261,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:3262: checking for catalogs to be installed" >&5 +echo "configure:3265: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -3287,17 +3290,17 @@ echo "configure:3262: checking for catalogs to be installed" >&5 if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:3291: checking for linux/version.h" >&5 +echo "configure:3294: checking for linux/version.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3296 "configure" +#line 3299 "configure" #include "confdefs.h" #include <linux/version.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3409,7 +3412,7 @@ SUB_MAKEFILE= use_our_messages=no if test -d $srcdir/po ; then echo $ac_n "checking if we should use included message-library""... $ac_c" 1>&6 -echo "configure:3413: checking if we should use included message-library" >&5 +echo "configure:3416: checking if we should use included message-library" >&5 # Check whether --enable-included-msgs or --disable-included-msgs was given. if test "${enable_included_msgs+set}" = set; then @@ -3445,17 +3448,17 @@ elif test "$USE_NLS" = yes ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3449: checking for $ac_hdr" >&5 +echo "configure:3452: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3454 "configure" +#line 3457 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3525,7 +3528,7 @@ EOF fi echo $ac_n "checking if you want full utility pathnames""... $ac_c" 1>&6 -echo "configure:3529: checking if you want full utility pathnames" >&5 +echo "configure:3532: checking if you want full utility pathnames" >&5 # Check whether --enable-full-paths or --disable-full-paths was given. if test "${enable_full_paths+set}" = set; then @@ -3550,7 +3553,7 @@ EOF echo $ac_n "checking for system mailer""... $ac_c" 1>&6 -echo "configure:3554: checking for system mailer" >&5 +echo "configure:3557: checking for system mailer" >&5 if eval "test \"`echo '$''{'cf_cv_SYSTEM_MAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3577,7 +3580,7 @@ EOF echo $ac_n "checking system mail flags""... $ac_c" 1>&6 -echo "configure:3581: checking system mail flags" >&5 +echo "configure:3584: checking system mail flags" >&5 if eval "test \"`echo '$''{'cf_cv_system_mail_flags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3605,7 +3608,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "chmod", so it can be a program name with args. set dummy chmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3609: checking for $ac_word" >&5 +echo "configure:3612: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3640,7 +3643,7 @@ fi else echo $ac_n "checking for chmod""... $ac_c" 1>&6 -echo "configure:3644: checking for chmod" >&5 +echo "configure:3647: checking for chmod" >&5 echo "$ac_t""$CHMOD" 1>&6 eval 'ac_cv_path_'CHMOD'="'chmod'"' fi @@ -3682,7 +3685,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "compress", so it can be a program name with args. set dummy compress; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3686: checking for $ac_word" >&5 +echo "configure:3689: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_COMPRESS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3717,7 +3720,7 @@ fi else echo $ac_n "checking for compress""... $ac_c" 1>&6 -echo "configure:3721: checking for compress" >&5 +echo "configure:3724: checking for compress" >&5 echo "$ac_t""$COMPRESS" 1>&6 eval 'ac_cv_path_'COMPRESS'="'compress'"' fi @@ -3759,7 +3762,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "cp", so it can be a program name with args. set dummy cp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3763: checking for $ac_word" >&5 +echo "configure:3766: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_COPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3794,7 +3797,7 @@ fi else echo $ac_n "checking for cp""... $ac_c" 1>&6 -echo "configure:3798: checking for cp" >&5 +echo "configure:3801: checking for cp" >&5 echo "$ac_t""$COPY" 1>&6 eval 'ac_cv_path_'COPY'="'cp'"' fi @@ -3836,7 +3839,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "gzip", so it can be a program name with args. set dummy gzip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3840: checking for $ac_word" >&5 +echo "configure:3843: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3871,7 +3874,7 @@ fi else echo $ac_n "checking for gzip""... $ac_c" 1>&6 -echo "configure:3875: checking for gzip" >&5 +echo "configure:3878: checking for gzip" >&5 echo "$ac_t""$GZIP" 1>&6 eval 'ac_cv_path_'GZIP'="'gzip'"' fi @@ -3913,7 +3916,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "mkdir", so it can be a program name with args. set dummy mkdir; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3917: checking for $ac_word" >&5 +echo "configure:3920: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3948,7 +3951,7 @@ fi else echo $ac_n "checking for mkdir""... $ac_c" 1>&6 -echo "configure:3952: checking for mkdir" >&5 +echo "configure:3955: checking for mkdir" >&5 echo "$ac_t""$MKDIR" 1>&6 eval 'ac_cv_path_'MKDIR'="'mkdir'"' fi @@ -3990,7 +3993,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "mv", so it can be a program name with args. set dummy mv; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3994: checking for $ac_word" >&5 +echo "configure:3997: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4025,7 +4028,7 @@ fi else echo $ac_n "checking for mv""... $ac_c" 1>&6 -echo "configure:4029: checking for mv" >&5 +echo "configure:4032: checking for mv" >&5 echo "$ac_t""$MV" 1>&6 eval 'ac_cv_path_'MV'="'mv'"' fi @@ -4067,7 +4070,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4071: checking for $ac_word" >&5 +echo "configure:4074: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4102,7 +4105,7 @@ fi else echo $ac_n "checking for rm""... $ac_c" 1>&6 -echo "configure:4106: checking for rm" >&5 +echo "configure:4109: checking for rm" >&5 echo "$ac_t""$RM" 1>&6 eval 'ac_cv_path_'RM'="'rm'"' fi @@ -4144,7 +4147,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "tar", so it can be a program name with args. set dummy tar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4148: checking for $ac_word" >&5 +echo "configure:4151: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4179,7 +4182,7 @@ fi else echo $ac_n "checking for tar""... $ac_c" 1>&6 -echo "configure:4183: checking for tar" >&5 +echo "configure:4186: checking for tar" >&5 echo "$ac_t""$TAR" 1>&6 eval 'ac_cv_path_'TAR'="'tar'"' fi @@ -4221,7 +4224,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "touch", so it can be a program name with args. set dummy touch; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4225: checking for $ac_word" >&5 +echo "configure:4228: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TOUCH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4256,7 +4259,7 @@ fi else echo $ac_n "checking for touch""... $ac_c" 1>&6 -echo "configure:4260: checking for touch" >&5 +echo "configure:4263: checking for touch" >&5 echo "$ac_t""$TOUCH" 1>&6 eval 'ac_cv_path_'TOUCH'="'touch'"' fi @@ -4298,7 +4301,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "gunzip", so it can be a program name with args. set dummy gunzip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4302: checking for $ac_word" >&5 +echo "configure:4305: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_UNCOMPRESS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4333,7 +4336,7 @@ fi else echo $ac_n "checking for gunzip""... $ac_c" 1>&6 -echo "configure:4337: checking for gunzip" >&5 +echo "configure:4340: checking for gunzip" >&5 echo "$ac_t""$UNCOMPRESS" 1>&6 eval 'ac_cv_path_'UNCOMPRESS'="'gunzip'"' fi @@ -4375,7 +4378,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "unzip", so it can be a program name with args. set dummy unzip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4379: checking for $ac_word" >&5 +echo "configure:4382: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4410,7 +4413,7 @@ fi else echo $ac_n "checking for unzip""... $ac_c" 1>&6 -echo "configure:4414: checking for unzip" >&5 +echo "configure:4417: checking for unzip" >&5 echo "$ac_t""$UNZIP" 1>&6 eval 'ac_cv_path_'UNZIP'="'unzip'"' fi @@ -4452,7 +4455,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "bzip2", so it can be a program name with args. set dummy bzip2; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4456: checking for $ac_word" >&5 +echo "configure:4459: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BZIP2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4487,7 +4490,7 @@ fi else echo $ac_n "checking for bzip2""... $ac_c" 1>&6 -echo "configure:4491: checking for bzip2" >&5 +echo "configure:4494: checking for bzip2" >&5 echo "$ac_t""$BZIP2" 1>&6 eval 'ac_cv_path_'BZIP2'="'bzip2'"' fi @@ -4529,7 +4532,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "uudecode", so it can be a program name with args. set dummy uudecode; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4533: checking for $ac_word" >&5 +echo "configure:4536: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_UUDECODE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4564,7 +4567,7 @@ fi else echo $ac_n "checking for uudecode""... $ac_c" 1>&6 -echo "configure:4568: checking for uudecode" >&5 +echo "configure:4571: checking for uudecode" >&5 echo "$ac_t""$UUDECODE" 1>&6 eval 'ac_cv_path_'UUDECODE'="'uudecode'"' fi @@ -4606,7 +4609,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "zcat", so it can be a program name with args. set dummy zcat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4610: checking for $ac_word" >&5 +echo "configure:4613: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ZCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4641,7 +4644,7 @@ fi else echo $ac_n "checking for zcat""... $ac_c" 1>&6 -echo "configure:4645: checking for zcat" >&5 +echo "configure:4648: checking for zcat" >&5 echo "$ac_t""$ZCAT" 1>&6 eval 'ac_cv_path_'ZCAT'="'zcat'"' fi @@ -4683,7 +4686,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "zip", so it can be a program name with args. set dummy zip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4687: checking for $ac_word" >&5 +echo "configure:4690: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4718,7 +4721,7 @@ fi else echo $ac_n "checking for zip""... $ac_c" 1>&6 -echo "configure:4722: checking for zip" >&5 +echo "configure:4725: checking for zip" >&5 echo "$ac_t""$ZIP" 1>&6 eval 'ac_cv_path_'ZIP'="'zip'"' fi @@ -4760,7 +4763,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "telnet", so it can be a program name with args. set dummy telnet; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4764: checking for $ac_word" >&5 +echo "configure:4767: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TELNET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4795,7 +4798,7 @@ fi else echo $ac_n "checking for telnet""... $ac_c" 1>&6 -echo "configure:4799: checking for telnet" >&5 +echo "configure:4802: checking for telnet" >&5 echo "$ac_t""$TELNET" 1>&6 eval 'ac_cv_path_'TELNET'="'telnet'"' fi @@ -4837,7 +4840,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "tn3270", so it can be a program name with args. set dummy tn3270; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4841: checking for $ac_word" >&5 +echo "configure:4844: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TN3270'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4872,7 +4875,7 @@ fi else echo $ac_n "checking for tn3270""... $ac_c" 1>&6 -echo "configure:4876: checking for tn3270" >&5 +echo "configure:4879: checking for tn3270" >&5 echo "$ac_t""$TN3270" 1>&6 eval 'ac_cv_path_'TN3270'="'tn3270'"' fi @@ -4914,7 +4917,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "rlogin", so it can be a program name with args. set dummy rlogin; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4918: checking for $ac_word" >&5 +echo "configure:4921: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RLOGIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4949,7 +4952,7 @@ fi else echo $ac_n "checking for rlogin""... $ac_c" 1>&6 -echo "configure:4953: checking for rlogin" >&5 +echo "configure:4956: checking for rlogin" >&5 echo "$ac_t""$RLOGIN" 1>&6 eval 'ac_cv_path_'RLOGIN'="'rlogin'"' fi @@ -5001,7 +5004,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "install", so it can be a program name with args. set dummy install; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5005: checking for $ac_word" >&5 +echo "configure:5008: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_INSTALL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5036,7 +5039,7 @@ fi else echo $ac_n "checking for install""... $ac_c" 1>&6 -echo "configure:5040: checking for install" >&5 +echo "configure:5043: checking for install" >&5 echo "$ac_t""$INSTALL" 1>&6 eval 'ac_cv_path_'INSTALL'="'install'"' fi @@ -5085,7 +5088,7 @@ EOF if test -z "$GCC" ; then echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:5089: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:5092: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5109,7 +5112,7 @@ for cf_arg in "-DCC_HAS_PROTOS" \ do CFLAGS="$cf_save_CFLAGS $cf_arg" cat > conftest.$ac_ext <<EOF -#line 5113 "configure" +#line 5116 "configure" #include "confdefs.h" #ifndef CC_HAS_PROTOS @@ -5125,7 +5128,7 @@ int main() { struct s2 {int (*f) (double a);}; ; return 0; } EOF -if { (eval echo configure:5129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -5153,12 +5156,12 @@ fi fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5157: checking for working const" >&5 +echo "configure:5160: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5162 "configure" +#line 5165 "configure" #include "confdefs.h" int main() { @@ -5207,7 +5210,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:5211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5249,7 +5252,7 @@ clix*) # contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also # references -lmalloc and -lbsd. echo $ac_n "checking for strcmp in -lc_s""... $ac_c" 1>&6 -echo "configure:5253: checking for strcmp in -lc_s" >&5 +echo "configure:5256: checking for strcmp in -lc_s" >&5 ac_lib_var=`echo c_s'_'strcmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5257,7 +5260,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 5261 "configure" +#line 5264 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5268,7 +5271,7 @@ int main() { strcmp() ; return 0; } EOF -if { (eval echo configure:5272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5358,7 +5361,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5362: checking for $ac_word" >&5 +echo "configure:5365: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5403,17 +5406,17 @@ sony-newsos*) do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5407: checking for $ac_hdr" >&5 +echo "configure:5410: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5412 "configure" +#line 5415 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5457,17 +5460,17 @@ ultrix*) do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5461: checking for $ac_hdr" >&5 +echo "configure:5464: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5466 "configure" +#line 5469 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5505,16 +5508,16 @@ if test -n "$TRY_CFLAGS" ; then cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $TRY_CFLAGS" echo $ac_n "checking if we should use compile options $TRY_CFLAGS""... $ac_c" 1>&6 -echo "configure:5509: checking if we should use compile options $TRY_CFLAGS" >&5 +echo "configure:5512: checking if we should use compile options $TRY_CFLAGS" >&5 cat > conftest.$ac_ext <<EOF -#line 5511 "configure" +#line 5514 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *fp = stdin ; return 0; } EOF -if { (eval echo configure:5518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -5532,7 +5535,7 @@ fi ### Look for network libraries first, since some functions (such as gethostname) ### are used in a lot of places. echo $ac_n "checking if you want socks library""... $ac_c" 1>&6 -echo "configure:5536: checking if you want socks library" >&5 +echo "configure:5539: checking if you want socks library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libsocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5552,7 +5555,7 @@ fi echo "$ac_t""$cf_cv_use_libsocks" 1>&6 echo $ac_n "checking if you want socks5 library""... $ac_c" 1>&6 -echo "configure:5556: checking if you want socks5 library" >&5 +echo "configure:5559: checking if you want socks5 library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libsocks5'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5618,7 +5621,7 @@ cat >> confdefs.h <<\EOF EOF cat > conftest.$ac_ext <<EOF -#line 5622 "configure" +#line 5625 "configure" #include "confdefs.h" #include <stdio.h> @@ -5627,7 +5630,7 @@ int main() { accept((char *)0) ; return 0; } EOF -if { (eval echo configure:5631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -5657,9 +5660,9 @@ cat >> confdefs.h <<\EOF EOF echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6 -echo "configure:5661: checking if the socks library uses socks4 prefix" >&5 +echo "configure:5664: checking if the socks library uses socks4 prefix" >&5 cat > conftest.$ac_ext <<EOF -#line 5663 "configure" +#line 5666 "configure" #include "confdefs.h" #include <socks.h> @@ -5668,7 +5671,7 @@ int main() { Rinit((char *)0) ; return 0; } EOF -if { (eval echo configure:5672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define USE_SOCKS4_PREFIX 1 @@ -5680,14 +5683,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 5684 "configure" +#line 5687 "configure" #include "confdefs.h" #include <socks.h> int main() { SOCKSinit((char *)0) ; return 0; } EOF -if { (eval echo configure:5691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_use_socks4=no else @@ -5756,7 +5759,7 @@ else cf_test_netlibs=no echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:5760: checking for network libraries" >&5 +echo "configure:5763: checking for network libraries" >&5 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5767,12 +5770,12 @@ cf_test_netlibs=yes for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5771: checking for $ac_func" >&5 +echo "configure:5774: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5776 "configure" +#line 5779 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5795,7 +5798,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5818,7 +5821,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:5822: checking for gethostname in -lnsl" >&5 +echo "configure:5825: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5826,7 +5829,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 5830 "configure" +#line 5833 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5837,7 +5840,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:5841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5870,7 +5873,7 @@ else echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:5874: checking for gethostname in -lsocket" >&5 +echo "configure:5877: checking for gethostname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5878,7 +5881,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 5882 "configure" +#line 5885 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5889,7 +5892,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:5893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5933,21 +5936,21 @@ done # FIXME: sequent needs this library (i.e., -lsocket -linet -lnsl), but # I don't know the entrypoints - 97/7/22 TD echo $ac_n "checking for -linet""... $ac_c" 1>&6 -echo "configure:5937: checking for -linet" >&5 +echo "configure:5940: checking for -linet" >&5 if eval "test \"`echo '$''{'ac_cv_lib_inet'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <<EOF -#line 5944 "configure" +#line 5947 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_lib_inet=yes else @@ -5970,12 +5973,12 @@ if test "$ac_cv_func_lsocket" != no ; then for ac_func in socket do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5974: checking for $ac_func" >&5 +echo "configure:5977: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5979 "configure" +#line 5982 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5998,7 +6001,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6021,7 +6024,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:6025: checking for socket in -lsocket" >&5 +echo "configure:6028: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6029,7 +6032,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6033 "configure" +#line 6036 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6040,7 +6043,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:6044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6073,7 +6076,7 @@ else echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:6077: checking for socket in -lbsd" >&5 +echo "configure:6080: checking for socket in -lbsd" >&5 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6081,7 +6084,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6085 "configure" +#line 6088 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6092,7 +6095,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:6096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6137,12 +6140,12 @@ fi for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6141: checking for $ac_func" >&5 +echo "configure:6144: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6146 "configure" +#line 6149 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6165,7 +6168,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6188,7 +6191,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:6192: checking for gethostbyname in -lnsl" >&5 +echo "configure:6195: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6196,7 +6199,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6200 "configure" +#line 6203 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6207,7 +6210,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:6211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6248,12 +6251,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6252: checking for $ac_func" >&5 +echo "configure:6255: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6257 "configure" +#line 6260 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6276,7 +6279,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6299,7 +6302,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:6303: checking for strcasecmp in -lresolv" >&5 +echo "configure:6306: checking for strcasecmp in -lresolv" >&5 ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6307,7 +6310,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6311 "configure" +#line 6314 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6318,7 +6321,7 @@ int main() { strcasecmp() ; return 0; } EOF -if { (eval echo configure:6322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6364,13 +6367,13 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6 fi echo $ac_n "checking for inet_aton function""... $ac_c" 1>&6 -echo "configure:6368: checking for inet_aton function" >&5 +echo "configure:6371: checking for inet_aton function" >&5 if eval "test \"`echo '$''{'cf_cv_have_inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6374 "configure" +#line 6377 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6381,7 +6384,7 @@ int main() { inet_aton(0, (struct in_addr *)0) ; return 0; } EOF -if { (eval echo configure:6385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_inet_aton=yes else @@ -6401,13 +6404,13 @@ EOF else echo $ac_n "checking for inet_addr function""... $ac_c" 1>&6 -echo "configure:6405: checking for inet_addr function" >&5 +echo "configure:6408: checking for inet_addr function" >&5 if eval "test \"`echo '$''{'cf_cv_have_inet_addr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6411 "configure" +#line 6414 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6418,7 +6421,7 @@ int main() { inet_addr(0) ; return 0; } EOF -if { (eval echo configure:6422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_inet_addr=yes else @@ -6433,7 +6436,7 @@ fi echo "$ac_t""$cf_cv_have_inet_addr" 1>&6 if test "$cf_cv_have_inet_addr" = no ; then echo $ac_n "checking for library with inet_addr""... $ac_c" 1>&6 -echo "configure:6437: checking for library with inet_addr" >&5 +echo "configure:6440: checking for library with inet_addr" >&5 if eval "test \"`echo '$''{'cf_cv_lib_inet_addr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6443,7 +6446,7 @@ else do LIBS="$cf_save_LIBS $cf_inetlib" cat > conftest.$ac_ext <<EOF -#line 6447 "configure" +#line 6450 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6454,7 +6457,7 @@ int main() { inet_addr(0) ; return 0; } EOF -if { (eval echo configure:6458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_lib_inet_addr=$cf_inetlib else @@ -6481,7 +6484,7 @@ fi echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:6485: checking for screen type" >&5 +echo "configure:6488: checking for screen type" >&5 if eval "test \"`echo '$''{'cf_cv_screen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6516,12 +6519,12 @@ case $cf_cv_screen in curses) echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:6520: checking for initscr" >&5 +echo "configure:6523: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6525 "configure" +#line 6528 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr(); below. */ @@ -6544,7 +6547,7 @@ initscr(); ; return 0; } EOF -if { (eval echo configure:6548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -6565,7 +6568,7 @@ else case $host_os in #(vi freebsd*) #(vi echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:6569: checking for tgoto in -lmytinfo" >&5 +echo "configure:6572: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6573,7 +6576,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 6577 "configure" +#line 6580 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6584,7 +6587,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:6588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6607,7 +6610,7 @@ fi ;; hpux10.*) echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:6611: checking for initscr in -lcur_colr" >&5 +echo "configure:6614: checking for initscr in -lcur_colr" >&5 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6615,7 +6618,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcur_colr $LIBS" cat > conftest.$ac_ext <<EOF -#line 6619 "configure" +#line 6622 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6626,7 +6629,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6650,7 +6653,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:6654: checking for initscr in -lHcurses" >&5 +echo "configure:6657: checking for initscr in -lHcurses" >&5 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6658,7 +6661,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 6662 "configure" +#line 6665 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6669,7 +6672,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6718,12 +6721,12 @@ if test ".$ac_cv_func_initscr" != .yes ; then # Check for library containing tgoto. Do this before curses library # because it may be needed to link the test-case for initscr. echo $ac_n "checking for tgoto""... $ac_c" 1>&6 -echo "configure:6722: checking for tgoto" >&5 +echo "configure:6725: checking for tgoto" >&5 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6727 "configure" +#line 6730 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto(); below. */ @@ -6746,7 +6749,7 @@ tgoto(); ; return 0; } EOF -if { (eval echo configure:6750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_tgoto=yes" else @@ -6767,7 +6770,7 @@ else for cf_term_lib in termcap termlib unknown do echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 -echo "configure:6771: checking for tgoto in -l$cf_term_lib" >&5 +echo "configure:6774: checking for tgoto in -l$cf_term_lib" >&5 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6775,7 +6778,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_term_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 6779 "configure" +#line 6782 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6786,7 +6789,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:6790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6816,7 +6819,7 @@ fi for cf_curs_lib in cursesX curses ncurses xcurses jcurses unknown do echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 -echo "configure:6820: checking for initscr in -l$cf_curs_lib" >&5 +echo "configure:6823: checking for initscr in -l$cf_curs_lib" >&5 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6824,7 +6827,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_curs_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 6828 "configure" +#line 6831 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6835,7 +6838,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6861,16 +6864,16 @@ fi LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 -echo "configure:6865: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:6868: checking if we can link with $cf_curs_lib library" >&5 cat > conftest.$ac_ext <<EOF -#line 6867 "configure" +#line 6870 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -6884,16 +6887,16 @@ rm -f conftest* test $cf_result = no && { echo "configure: error: Cannot link curses library" 1>&2; exit 1; } elif test "$cf_term_lib" != predefined ; then echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 -echo "configure:6888: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo "configure:6891: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 cat > conftest.$ac_ext <<EOF -#line 6890 "configure" +#line 6893 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr(); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:6897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=no else @@ -6903,14 +6906,14 @@ else LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 6907 "configure" +#line 6910 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -6932,14 +6935,14 @@ fi echo $ac_n "checking for curses performance tradeoff""... $ac_c" 1>&6 -echo "configure:6936: checking for curses performance tradeoff" >&5 +echo "configure:6939: checking for curses performance tradeoff" >&5 if eval "test \"`echo '$''{'cf_cv_curs_performance'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cf_cv_curs_performance=no cat > conftest.$ac_ext <<EOF -#line 6943 "configure" +#line 6946 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -6953,11 +6956,11 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 6961 "configure" +#line 6964 "configure" #include "confdefs.h" #define CURS_PERFORMANCE @@ -6972,7 +6975,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_curs_performance=yes else @@ -6997,13 +7000,13 @@ EOF ncurses) echo $ac_n "checking for ncurses header file""... $ac_c" 1>&6 -echo "configure:7001: checking for ncurses header file" >&5 +echo "configure:7004: checking for ncurses header file" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7007 "configure" +#line 7010 "configure" #include "confdefs.h" #include <curses.h> int main() { @@ -7020,7 +7023,7 @@ make an error ; return 0; } EOF -if { (eval echo configure:7024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=predefined else @@ -7040,6 +7043,7 @@ test "$prefix" != NONE && cf_search="$cf_search $prefix/include $prefi fi test "$prefix" != /usr/local && cf_search="$cf_search /usr/local/include /usr/local/include/ncurses" test "$prefix" != /usr && cf_search="$cf_search /usr/include /usr/include/ncurses" +test "$prefix" != /opt && cf_search="$cf_search /opt/include /opt/include/ncurses" test -n "$verbose" && echo for cf_incdir in $cf_search @@ -7106,7 +7110,7 @@ done ;; esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:7110: checking for ncurses version" >&5 +echo "configure:7114: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7131,7 +7135,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:7135: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:7139: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's@^Autoconf @@' -e 's@^[^"]*"@@' -e 's@".*@@'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -7140,7 +7144,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 7144 "configure" +#line 7148 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7163,7 +7167,7 @@ int main() exit(0); } EOF -if { (eval echo configure:7167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7188,7 +7192,7 @@ echo "$ac_t""$cf_cv_ncurses_version" 1>&6 cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:7192: checking for Gpm_Open in -lgpm" >&5 +echo "configure:7196: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7196,7 +7200,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 7200 "configure" +#line 7204 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7207,7 +7211,7 @@ int main() { Gpm_Open() ; return 0; } EOF -if { (eval echo configure:7211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7223,7 +7227,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:7227: checking for initscr in -lgpm" >&5 +echo "configure:7231: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7231,7 +7235,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 7235 "configure" +#line 7239 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7242,7 +7246,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7273,7 +7277,7 @@ freebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:7277: checking for tgoto in -lmytinfo" >&5 +echo "configure:7281: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7281,7 +7285,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 7285 "configure" +#line 7289 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7292,7 +7296,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:7296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7320,12 +7324,12 @@ LIBS="$cf_ncurses_LIBS $LIBS" cf_cv_have_lib_ncurses=no cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:7324: checking for initscr" >&5 +echo "configure:7328: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7329 "configure" +#line 7333 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr(); below. */ @@ -7348,7 +7352,7 @@ initscr(); ; return 0; } EOF -if { (eval echo configure:7352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -7368,17 +7372,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:7372: checking for initscr in -lncurses" >&5 +echo "configure:7376: checking for initscr in -lncurses" >&5 LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 7375 "configure" +#line 7379 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_ncurses=yes @@ -7401,21 +7405,22 @@ test "$prefix" != "$exec_prefix" && cf_search="$cf_search $prefix/lib $prefix/li fi test "$prefix" != /usr/local && cf_search="$cf_search /usr/local/lib /usr/local/lib/ncurses" test "$prefix" != /usr && cf_search="$cf_search /usr/lib /usr/lib/ncurses" +test "$prefix" != /opt && cf_search="$cf_search /opt/lib /opt/lib/ncurses" for cf_libdir in $cf_search do echo $ac_n "checking for -lncurses in $cf_libdir""... $ac_c" 1>&6 -echo "configure:7409: checking for -lncurses in $cf_libdir" >&5 +echo "configure:7414: checking for -lncurses in $cf_libdir" >&5 LIBS="-L$cf_libdir -lncurses $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 7412 "configure" +#line 7417 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_ncurses=yes @@ -7447,7 +7452,7 @@ esac if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link ncurses without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:7451: checking if we can link ncurses without $cf_ncurses_LIBS" >&5 +echo "configure:7456: checking if we can link ncurses without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e 's/'$p' //' -e 's/'$p'$//'` @@ -7456,14 +7461,14 @@ echo "configure:7451: checking if we can link ncurses without $cf_ncurses_LIBS" fi done cat > conftest.$ac_ext <<EOF -#line 7460 "configure" +#line 7465 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:7467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -7480,20 +7485,20 @@ fi slang) echo $ac_n "checking for slang header file""... $ac_c" 1>&6 -echo "configure:7484: checking for slang header file" >&5 +echo "configure:7489: checking for slang header file" >&5 if eval "test \"`echo '$''{'cf_cv_slang_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7490 "configure" +#line 7495 "configure" #include "confdefs.h" #include <slang.h> int main() { printf("%s\n", SLANG_VERSION) ; return 0; } EOF -if { (eval echo configure:7497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_slang_header=predefined else @@ -7513,6 +7518,7 @@ test "$prefix" != NONE && cf_search="$cf_search $prefix/include $prefi fi test "$prefix" != /usr/local && cf_search="$cf_search /usr/local/include /usr/local/include/slang" test "$prefix" != /usr && cf_search="$cf_search /usr/include /usr/include/slang" +test "$prefix" != /opt && cf_search="$cf_search /opt/include /opt/include/slang" for cf_incdir in $cf_search do @@ -7575,24 +7581,24 @@ else cf_cv_termlib=none cat > conftest.$ac_ext <<EOF -#line 7579 "configure" +#line 7585 "configure" #include "confdefs.h" int main() { char *x=(char*)tgoto("",0,0) ; return 0; } EOF -if { (eval echo configure:7586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 7589 "configure" +#line 7595 "configure" #include "confdefs.h" int main() { int x=tigetstr("") ; return 0; } EOF -if { (eval echo configure:7596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_termlib=terminfo else @@ -7614,7 +7620,7 @@ else # HP-UX 9.x terminfo has setupterm, but no tigetstr. if test "$cf_cv_termlib" = none; then echo $ac_n "checking for tigetstr in -ltermlib""... $ac_c" 1>&6 -echo "configure:7618: checking for tigetstr in -ltermlib" >&5 +echo "configure:7624: checking for tigetstr in -ltermlib" >&5 ac_lib_var=`echo termlib'_'tigetstr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7622,7 +7628,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermlib $LIBS" cat > conftest.$ac_ext <<EOF -#line 7626 "configure" +#line 7632 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7633,7 +7639,7 @@ int main() { tigetstr() ; return 0; } EOF -if { (eval echo configure:7637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7656,7 +7662,7 @@ fi fi if test "$cf_cv_termlib" = none; then echo $ac_n "checking for tgoto in -ltermlib""... $ac_c" 1>&6 -echo "configure:7660: checking for tgoto in -ltermlib" >&5 +echo "configure:7666: checking for tgoto in -ltermlib" >&5 ac_lib_var=`echo termlib'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7664,7 +7670,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermlib $LIBS" cat > conftest.$ac_ext <<EOF -#line 7668 "configure" +#line 7674 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7675,7 +7681,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:7679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7699,7 +7705,7 @@ fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 -echo "configure:7703: checking for initscr in -lcurses" >&5 +echo "configure:7709: checking for initscr in -lcurses" >&5 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7707,7 +7713,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 7711 "configure" +#line 7717 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7718,7 +7724,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7739,7 +7745,7 @@ else fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:7743: checking for tgoto in -ltermcap" >&5 +echo "configure:7749: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7747,7 +7753,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 7751 "configure" +#line 7757 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7758,7 +7764,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:7762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7781,7 +7787,7 @@ fi fi if test "$cf_cv_termlib" = none; then echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:7785: checking for tgoto in -ltermcap" >&5 +echo "configure:7791: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7789,7 +7795,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 7793 "configure" +#line 7799 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7800,7 +7806,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:7804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7823,7 +7829,7 @@ fi fi if test "$cf_cv_termlib" = none; then echo $ac_n "checking for tgoto in -lncurses""... $ac_c" 1>&6 -echo "configure:7827: checking for tgoto in -lncurses" >&5 +echo "configure:7833: checking for tgoto in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7831,7 +7837,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 7835 "configure" +#line 7841 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7842,7 +7848,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:7846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7874,12 +7880,12 @@ fi cf_slang_LIBS2="$LIBS" echo $ac_n "checking for acos""... $ac_c" 1>&6 -echo "configure:7878: checking for acos" >&5 +echo "configure:7884: checking for acos" >&5 if eval "test \"`echo '$''{'ac_cv_func_acos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7883 "configure" +#line 7889 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char acos(); below. */ @@ -7902,7 +7908,7 @@ acos(); ; return 0; } EOF -if { (eval echo configure:7906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_acos=yes" else @@ -7921,7 +7927,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for acos in -lm""... $ac_c" 1>&6 -echo "configure:7925: checking for acos in -lm" >&5 +echo "configure:7931: checking for acos in -lm" >&5 ac_lib_var=`echo m'_'acos | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7929,7 +7935,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 7933 "configure" +#line 7939 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7940,7 +7946,7 @@ int main() { acos() ; return 0; } EOF -if { (eval echo configure:7944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7980,12 +7986,12 @@ fi cf_cv_have_lib_slang=no cf_libdir="" echo $ac_n "checking for SLtt_get_screen_size""... $ac_c" 1>&6 -echo "configure:7984: checking for SLtt_get_screen_size" >&5 +echo "configure:7990: checking for SLtt_get_screen_size" >&5 if eval "test \"`echo '$''{'ac_cv_func_SLtt_get_screen_size'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7989 "configure" +#line 7995 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char SLtt_get_screen_size(); below. */ @@ -8008,7 +8014,7 @@ SLtt_get_screen_size(); ; return 0; } EOF -if { (eval echo configure:8012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_SLtt_get_screen_size=yes" else @@ -8028,17 +8034,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6 -echo "configure:8032: checking for SLtt_get_screen_size in -lslang" >&5 +echo "configure:8038: checking for SLtt_get_screen_size in -lslang" >&5 LIBS="-lslang $LIBS" cat > conftest.$ac_ext <<EOF -#line 8035 "configure" +#line 8041 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:8042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_slang=yes @@ -8061,21 +8067,22 @@ test "$prefix" != "$exec_prefix" && cf_search="$cf_search $prefix/lib $prefix/li fi test "$prefix" != /usr/local && cf_search="$cf_search /usr/local/lib /usr/local/lib/slang" test "$prefix" != /usr && cf_search="$cf_search /usr/lib /usr/lib/slang" +test "$prefix" != /opt && cf_search="$cf_search /opt/lib /opt/lib/slang" for cf_libdir in $cf_search do echo $ac_n "checking for -lslang in $cf_libdir""... $ac_c" 1>&6 -echo "configure:8069: checking for -lslang in $cf_libdir" >&5 +echo "configure:8076: checking for -lslang in $cf_libdir" >&5 LIBS="-L$cf_libdir -lslang $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 8072 "configure" +#line 8079 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:8079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_slang=yes @@ -8106,7 +8113,7 @@ esac cf_slang_LIBS3="$LIBS" echo $ac_n "checking if we can link slang without termcap""... $ac_c" 1>&6 -echo "configure:8110: checking if we can link slang without termcap" >&5 +echo "configure:8117: checking if we can link slang without termcap" >&5 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s@$cf_slang_LIBS1@@" -e 's@^.@@'` else @@ -8114,14 +8121,14 @@ else fi LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s@$cf_exclude@@" -e 's@^.@@'` cat > conftest.$ac_ext <<EOF -#line 8118 "configure" +#line 8125 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:8125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -8141,7 +8148,7 @@ eval cf_libdir=$libdir cf_libdir=`echo $cf_libdir | sed -e s@'^NONE/'@$prefix/@ -e s@'^NONE/'@$ac_default_prefix/@` echo $ac_n "checking for location of config-file""... $ac_c" 1>&6 -echo "configure:8145: checking for location of config-file" >&5 +echo "configure:8152: checking for location of config-file" >&5 LYNX_CFG_FILE=$cf_libdir/lynx.cfg cat >> confdefs.h <<EOF #define LYNX_CFG_FILE "$LYNX_CFG_FILE" @@ -8151,12 +8158,12 @@ echo "$ac_t""$LYNX_CFG_FILE" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:8155: checking for ANSI C header files" >&5 +echo "configure:8162: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8160 "configure" +#line 8167 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -8164,7 +8171,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8181,7 +8188,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 8185 "configure" +#line 8192 "configure" #include "confdefs.h" #include <string.h> EOF @@ -8199,7 +8206,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 8203 "configure" +#line 8210 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -8220,7 +8227,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 8224 "configure" +#line 8231 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -8231,7 +8238,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:8235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8255,12 +8262,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:8259: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:8266: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8264 "configure" +#line 8271 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -8269,7 +8276,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:8273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -8294,12 +8301,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:8298: checking for $ac_hdr that defines DIR" >&5 +echo "configure:8305: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8303 "configure" +#line 8310 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -8307,7 +8314,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:8311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -8332,7 +8339,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:8336: checking for opendir in -ldir" >&5 +echo "configure:8343: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8340,7 +8347,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 8344 "configure" +#line 8351 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8351,7 +8358,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:8355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8373,7 +8380,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:8377: checking for opendir in -lx" >&5 +echo "configure:8384: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8381,7 +8388,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 8385 "configure" +#line 8392 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8392,7 +8399,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:8396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8431,17 +8438,17 @@ for ac_hdr in \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8435: checking for $ac_hdr" >&5 +echo "configure:8442: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8440 "configure" +#line 8447 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8469,13 +8476,13 @@ done echo $ac_n "checking termio.h and termios.h""... $ac_c" 1>&6 -echo "configure:8473: checking termio.h and termios.h" >&5 +echo "configure:8480: checking termio.h and termios.h" >&5 if eval "test \"`echo '$''{'cf_cv_termio_and_termios'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8479 "configure" +#line 8486 "configure" #include "confdefs.h" #if HAVE_TERMIO_H @@ -8488,7 +8495,7 @@ int main() { putchar (0x0a) ; return 0; } EOF -if { (eval echo configure:8492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_termio_and_termios=yes else @@ -8507,21 +8514,63 @@ EOF +echo $ac_n "checking for sigaction and structs""... $ac_c" 1>&6 +echo "configure:8519: checking for sigaction and structs" >&5 +if eval "test \"`echo '$''{'cf_cv_func_sigaction'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + +cat > conftest.$ac_ext <<EOF +#line 8525 "configure" +#include "confdefs.h" + +#include <sys/types.h> +#include <signal.h> +int main() { +struct sigaction act; + act.sa_handler = SIG_DFL; +#ifdef SA_RESTART + act.sa_flags |= SA_RESTART; +#endif /* SA_RESTART */ + sigaction(1, &act, 0); + +; return 0; } +EOF +if { (eval echo configure:8540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cf_cv_func_sigaction=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cf_cv_func_sigaction=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$cf_cv_func_sigaction" 1>&6 +test "$cf_cv_func_sigaction" = yes && cat >> confdefs.h <<\EOF +#define HAVE_SIGACTION 1 +EOF + + + for ac_hdr in sys/wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8515: checking for $ac_hdr" >&5 +echo "configure:8564: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8520 "configure" +#line 8569 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8558,17 +8607,17 @@ for ac_hdr in wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8562: checking for $ac_hdr" >&5 +echo "configure:8611: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8567 "configure" +#line 8616 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8598,17 +8647,17 @@ for ac_hdr in waitstatus.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8602: checking for $ac_hdr" >&5 +echo "configure:8651: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8607 "configure" +#line 8656 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8649,13 +8698,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:8653: checking for union wait" >&5 +echo "configure:8702: checking for union wait" >&5 if eval "test \"`echo '$''{'cf_cv_type_unionwait'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8659 "configure" +#line 8708 "configure" #include "confdefs.h" $cf_wait_headers int main() { @@ -8666,7 +8715,7 @@ int x; ; return 0; } EOF -if { (eval echo configure:8670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&5 @@ -8677,7 +8726,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 8681 "configure" +#line 8730 "configure" #include "confdefs.h" $cf_wait_headers int main() { @@ -8692,7 +8741,7 @@ union wait x; ; return 0; } EOF -if { (eval echo configure:8696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&5 @@ -8719,20 +8768,20 @@ EOF if test $cf_cv_type_unionwait = yes; then echo $ac_n "checking if union wait can be used as wait-arg""... $ac_c" 1>&6 -echo "configure:8723: checking if union wait can be used as wait-arg" >&5 +echo "configure:8772: checking if union wait can be used as wait-arg" >&5 if eval "test \"`echo '$''{'cf_cv_arg_union_wait'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8729 "configure" +#line 8778 "configure" #include "confdefs.h" $cf_wait_headers int main() { union wait x; wait(&x) ; return 0; } EOF -if { (eval echo configure:8736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_arg_union_wait=yes else @@ -8752,20 +8801,20 @@ EOF echo $ac_n "checking if union wait can be used as waitpid-arg""... $ac_c" 1>&6 -echo "configure:8756: checking if union wait can be used as waitpid-arg" >&5 +echo "configure:8805: checking if union wait can be used as waitpid-arg" >&5 if eval "test \"`echo '$''{'cf_cv_arg_union_waitpid'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8762 "configure" +#line 8811 "configure" #include "confdefs.h" $cf_wait_headers int main() { union wait x; waitpid(0, &x, 0) ; return 0; } EOF -if { (eval echo configure:8769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_arg_union_waitpid=yes else @@ -8791,17 +8840,17 @@ for ac_hdr in stdarg.h varargs.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8795: checking for $ac_hdr" >&5 +echo "configure:8844: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8800 "configure" +#line 8849 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8828,13 +8877,13 @@ fi done echo $ac_n "checking for standard varargs""... $ac_c" 1>&6 -echo "configure:8832: checking for standard varargs" >&5 +echo "configure:8881: checking for standard varargs" >&5 if eval "test \"`echo '$''{'cf_cv_ansi_varargs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8838 "configure" +#line 8887 "configure" #include "confdefs.h" #if HAVE_STDARG_H @@ -8849,7 +8898,7 @@ int main() { return 0;} int foo(char *fmt,...){va_list args;va_start(args,fmt);va_end(args) ; return 0; } EOF -if { (eval echo configure:8853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_varargs=yes else @@ -8869,12 +8918,12 @@ EOF echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:8873: checking for uid_t in sys/types.h" >&5 +echo "configure:8922: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8878 "configure" +#line 8927 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -8903,7 +8952,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:8907: checking type of array argument to getgroups" >&5 +echo "configure:8956: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8911,7 +8960,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <<EOF -#line 8915 "configure" +#line 8964 "configure" #include "confdefs.h" /* Thanks to Mike Rendell for this test. */ @@ -8936,7 +8985,7 @@ main() } EOF -if { (eval echo configure:8940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -8950,7 +8999,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext <<EOF -#line 8954 "configure" +#line 9003 "configure" #include "confdefs.h" #include <unistd.h> EOF @@ -8974,12 +9023,12 @@ EOF echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:8978: checking for pid_t" >&5 +echo "configure:9027: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8983 "configure" +#line 9032 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -9007,12 +9056,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:9011: checking for uid_t in sys/types.h" >&5 +echo "configure:9060: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9016 "configure" +#line 9065 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -9041,12 +9090,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:9045: checking for mode_t" >&5 +echo "configure:9094: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9050 "configure" +#line 9099 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -9077,17 +9126,17 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:9081: checking for vfork.h" >&5 +echo "configure:9130: checking for vfork.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9086 "configure" +#line 9135 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9112,18 +9161,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:9116: checking for working vfork" >&5 +echo "configure:9165: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:9122: checking for vfork" >&5 +echo "configure:9171: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9127 "configure" +#line 9176 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vfork(); below. */ @@ -9146,7 +9195,7 @@ vfork(); ; return 0; } EOF -if { (eval echo configure:9150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -9168,7 +9217,7 @@ fi ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext <<EOF -#line 9172 "configure" +#line 9221 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -9263,7 +9312,7 @@ main() { } } EOF -if { (eval echo configure:9267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -9287,13 +9336,13 @@ fi echo $ac_n "checking if we should use fcntl or ioctl""... $ac_c" 1>&6 -echo "configure:9291: checking if we should use fcntl or ioctl" >&5 +echo "configure:9340: checking if we should use fcntl or ioctl" >&5 if eval "test \"`echo '$''{'cf_cv_fionbio'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9297 "configure" +#line 9346 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9305,7 +9354,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_fionbio=ioctl else @@ -9314,7 +9363,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9318 "configure" +#line 9367 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9331,7 +9380,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_fionbio=fcntl else @@ -9354,20 +9403,20 @@ EOF echo $ac_n "checking for broken/missing definition of remove""... $ac_c" 1>&6 -echo "configure:9358: checking for broken/missing definition of remove" >&5 +echo "configure:9407: checking for broken/missing definition of remove" >&5 if eval "test \"`echo '$''{'cf_cv_baddef_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9364 "configure" +#line 9413 "configure" #include "confdefs.h" #include <stdio.h> int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:9371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_baddef_remove=no else @@ -9375,7 +9424,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9379 "configure" +#line 9428 "configure" #include "confdefs.h" #include <stdio.h> int __unlink(name) { return unlink(name); } @@ -9383,7 +9432,7 @@ int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:9387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_baddef_remove=yes else @@ -9407,13 +9456,13 @@ EOF echo $ac_n "checking for lstat""... $ac_c" 1>&6 -echo "configure:9411: checking for lstat" >&5 +echo "configure:9460: checking for lstat" >&5 if eval "test \"`echo '$''{'ac_cv_func_lstat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9417 "configure" +#line 9466 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9422,7 +9471,7 @@ int main() { lstat(".", (struct stat *)0) ; return 0; } EOF -if { (eval echo configure:9426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_lstat=yes else @@ -9458,12 +9507,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9462: checking for $ac_func" >&5 +echo "configure:9511: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9467 "configure" +#line 9516 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9486,7 +9535,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:9490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9516,12 +9565,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9520: checking for $ac_func" >&5 +echo "configure:9569: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9525 "configure" +#line 9574 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9544,7 +9593,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:9548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9575,12 +9624,12 @@ for ac_func in strstr do echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6 -echo "configure:9579: checking for $ac_func declaration" >&5 +echo "configure:9628: checking for $ac_func declaration" >&5 if eval "test \"`echo '$''{'ac_cv_func_decl_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9584 "configure" +#line 9633 "configure" #include "confdefs.h" #include <string.h> int main() { @@ -9589,11 +9638,11 @@ extern int ${ac_func}(); #endif ; return 0; } EOF -if { (eval echo configure:9593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9597 "configure" +#line 9646 "configure" #include "confdefs.h" #include <string.h> int main() { @@ -9602,7 +9651,7 @@ int (*p)() = ${ac_func}; #endif ; return 0; } EOF -if { (eval echo configure:9606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_decl_$ac_func=yes" @@ -9644,12 +9693,12 @@ for ac_func in getgrgid getgrnam do echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6 -echo "configure:9648: checking for $ac_func declaration" >&5 +echo "configure:9697: checking for $ac_func declaration" >&5 if eval "test \"`echo '$''{'ac_cv_func_decl_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9653 "configure" +#line 9702 "configure" #include "confdefs.h" #include <stdio.h> @@ -9660,11 +9709,11 @@ extern int ${ac_func}(); #endif ; return 0; } EOF -if { (eval echo configure:9664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9668 "configure" +#line 9717 "configure" #include "confdefs.h" #include <stdio.h> @@ -9675,7 +9724,7 @@ int (*p)() = ${ac_func}; #endif ; return 0; } EOF -if { (eval echo configure:9679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_decl_$ac_func=yes" @@ -9717,13 +9766,13 @@ done echo $ac_n "checking if TRUE/FALSE are defined""... $ac_c" 1>&6 -echo "configure:9721: checking if TRUE/FALSE are defined" >&5 +echo "configure:9770: checking if TRUE/FALSE are defined" >&5 if eval "test \"`echo '$''{'cf_cv_bool_defs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9727 "configure" +#line 9776 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -9732,7 +9781,7 @@ int main() { int x = TRUE, y = FALSE ; return 0; } EOF -if { (eval echo configure:9736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_bool_defs=yes else @@ -9759,13 +9808,13 @@ fi echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6 -echo "configure:9763: checking if external errno is declared" >&5 +echo "configure:9812: checking if external errno is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9769 "configure" +#line 9818 "configure" #include "confdefs.h" #if HAVE_STDLIB_H @@ -9778,7 +9827,7 @@ int main() { long x = (long) errno ; return 0; } EOF -if { (eval echo configure:9782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_dcl_'errno'=yes' else @@ -9809,13 +9858,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external errno exists""... $ac_c" 1>&6 -echo "configure:9813: checking if external errno exists" >&5 +echo "configure:9862: checking if external errno exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9819 "configure" +#line 9868 "configure" #include "confdefs.h" #undef errno @@ -9825,7 +9874,7 @@ int main() { errno = 2 ; return 0; } EOF -if { (eval echo configure:9829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval 'cf_cv_have_'errno'=yes' else @@ -9857,20 +9906,20 @@ fi echo $ac_n "checking for setlocale()""... $ac_c" 1>&6 -echo "configure:9861: checking for setlocale()" >&5 +echo "configure:9910: checking for setlocale()" >&5 if eval "test \"`echo '$''{'cf_cv_locale'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9867 "configure" +#line 9916 "configure" #include "confdefs.h" #include <locale.h> int main() { setlocale(LC_ALL, "") ; return 0; } EOF -if { (eval echo configure:9874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_locale=yes else @@ -9891,13 +9940,13 @@ EOF echo $ac_n "checking if NGROUPS is defined""... $ac_c" 1>&6 -echo "configure:9895: checking if NGROUPS is defined" >&5 +echo "configure:9944: checking if NGROUPS is defined" >&5 if eval "test \"`echo '$''{'cf_cv_ngroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9901 "configure" +#line 9950 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -9911,7 +9960,7 @@ int main() { int x = NGROUPS ; return 0; } EOF -if { (eval echo configure:9915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=yes else @@ -9919,7 +9968,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9923 "configure" +#line 9972 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -9933,7 +9982,7 @@ int main() { int x = NGROUPS_MAX ; return 0; } EOF -if { (eval echo configure:9937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=NGROUPS_MAX else @@ -9967,13 +10016,13 @@ for cf_name in sys_nerr sys_errlist do echo $ac_n "checking if external $cf_name is declared""... $ac_c" 1>&6 -echo "configure:9971: checking if external $cf_name is declared" >&5 +echo "configure:10020: checking if external $cf_name is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_$cf_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9977 "configure" +#line 10026 "configure" #include "confdefs.h" #if HAVE_STDLIB_H @@ -9986,7 +10035,7 @@ int main() { long x = (long) $cf_name ; return 0; } EOF -if { (eval echo configure:9990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_dcl_'$cf_name'=yes' else @@ -10017,13 +10066,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external $cf_name exists""... $ac_c" 1>&6 -echo "configure:10021: checking if external $cf_name exists" >&5 +echo "configure:10070: checking if external $cf_name exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_$cf_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10027 "configure" +#line 10076 "configure" #include "confdefs.h" #undef $cf_name @@ -10033,7 +10082,7 @@ int main() { $cf_name = 2 ; return 0; } EOF -if { (eval echo configure:10037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval 'cf_cv_have_'$cf_name'=yes' else @@ -10066,13 +10115,13 @@ done echo $ac_n "checking if struct utmp is declared""... $ac_c" 1>&6 -echo "configure:10070: checking if struct utmp is declared" >&5 +echo "configure:10119: checking if struct utmp is declared" >&5 if eval "test \"`echo '$''{'cf_cv_have_utmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10076 "configure" +#line 10125 "configure" #include "confdefs.h" #include <sys/types.h> @@ -10081,7 +10130,7 @@ int main() { struct utmp x; char *y = &x.ut_host[0] ; return 0; } EOF -if { (eval echo configure:10085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=yes else @@ -10089,14 +10138,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 10093 "configure" +#line 10142 "configure" #include "confdefs.h" #include <utmpx.h> int main() { struct utmpx x; char *y = &x.ut_host[0] ; return 0; } EOF -if { (eval echo configure:10100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=utmpx else @@ -10124,13 +10173,13 @@ EOF echo $ac_n "checking if external h_errno exists""... $ac_c" 1>&6 -echo "configure:10128: checking if external h_errno exists" >&5 +echo "configure:10177: checking if external h_errno exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_h_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10134 "configure" +#line 10183 "configure" #include "confdefs.h" #undef h_errno @@ -10140,7 +10189,7 @@ int main() { h_errno = 2 ; return 0; } EOF -if { (eval echo configure:10144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval 'cf_cv_have_'h_errno'=yes' else @@ -10171,13 +10220,13 @@ fi echo $ac_n "checking if character set is EBCDIC""... $ac_c" 1>&6 -echo "configure:10175: checking if character set is EBCDIC" >&5 +echo "configure:10224: checking if character set is EBCDIC" >&5 if eval "test \"`echo '$''{'cf_cv_ebcdic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10181 "configure" +#line 10230 "configure" #include "confdefs.h" int main() { @@ -10190,7 +10239,7 @@ make an error "Character set is not EBCDIC" #endif ; return 0; } EOF -if { (eval echo configure:10194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # TryCompile action if true cf_cv_ebcdic=yes @@ -10224,7 +10273,7 @@ esac if test $cf_cv_screen != slang ; then echo $ac_n "checking if curses supports alternate-character set""... $ac_c" 1>&6 -echo "configure:10228: checking if curses supports alternate-character set" >&5 +echo "configure:10277: checking if curses supports alternate-character set" >&5 if eval "test \"`echo '$''{'cf_cv_alt_char_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10232,7 +10281,7 @@ else for mapname in acs_map _acs_map do cat > conftest.$ac_ext <<EOF -#line 10236 "configure" +#line 10285 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10241,7 +10290,7 @@ int main() { chtype x = $mapname['l']; $mapname['m'] = 0 ; return 0; } EOF -if { (eval echo configure:10245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_alt_char_set=$mapname break @@ -10264,13 +10313,13 @@ EOF echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6 -echo "configure:10268: checking if curses supports fancy attributes" >&5 +echo "configure:10317: checking if curses supports fancy attributes" >&5 if eval "test \"`echo '$''{'cf_cv_fancy_curses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10274 "configure" +#line 10323 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10283,7 +10332,7 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE); ; return 0; } EOF -if { (eval echo configure:10287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_fancy_curses=yes else @@ -10303,7 +10352,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:10307: checking for ncurses version" >&5 +echo "configure:10356: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10328,7 +10377,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:10332: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:10381: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's@^Autoconf @@' -e 's@^[^"]*"@@' -e 's@".*@@'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -10337,7 +10386,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 10341 "configure" +#line 10390 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10360,7 +10409,7 @@ int main() exit(0); } EOF -if { (eval echo configure:10364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -10380,13 +10429,13 @@ echo "$ac_t""$cf_cv_ncurses_version" 1>&6 if test "$cf_cv_ncurses_version" != no ; then echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6 -echo "configure:10384: checking for obsolete/broken version of ncurses" >&5 +echo "configure:10433: checking for obsolete/broken version of ncurses" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10390 "configure" +#line 10439 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10400,7 +10449,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -10425,13 +10474,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:10429: checking if curses supports color attributes" >&5 +echo "configure:10478: checking if curses supports color attributes" >&5 if eval "test \"`echo '$''{'cf_cv_color_curses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10435 "configure" +#line 10484 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10446,7 +10495,7 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:10450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_color_curses=yes else @@ -10473,7 +10522,7 @@ fi echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:10477: checking declaration of size-change" >&5 +echo "configure:10526: checking declaration of size-change" >&5 if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10487,7 +10536,7 @@ do CFLAGS="$cf_save_CFLAGS" test -n "$cf_opts" && CFLAGS="$CFLAGS -D$cf_opts" cat > conftest.$ac_ext <<EOF -#line 10491 "configure" +#line 10540 "configure" #include "confdefs.h" #include <sys/types.h> #if HAVE_TERMIOS_H @@ -10526,7 +10575,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -10558,20 +10607,20 @@ EOF echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6 -echo "configure:10562: checking if ttytype is declared in curses library" >&5 +echo "configure:10611: checking if ttytype is declared in curses library" >&5 if eval "test \"`echo '$''{'cf_cv_have_ttytype'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10568 "configure" +#line 10617 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { char *x = &ttytype[1]; *x = 1 ; return 0; } EOF -if { (eval echo configure:10575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_ttytype=yes else @@ -10594,17 +10643,17 @@ EOF cbreak \ define_key \ keypad \ + resizeterm \ use_default_colors \ - wborder \ - + wborder do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10603: checking for $ac_func" >&5 +echo "configure:10652: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10608 "configure" +#line 10657 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -10627,7 +10676,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:10631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10657,7 +10706,7 @@ fi echo $ac_n "checking if configuration info should be browsable""... $ac_c" 1>&6 -echo "configure:10661: checking if configuration info should be browsable" >&5 +echo "configure:10710: checking if configuration info should be browsable" >&5 # Check whether --enable-config-info or --disable-config-info was given. if test "${enable_config_info+set}" = set; then @@ -10681,7 +10730,7 @@ EOF echo $ac_n "checking if new-style forms-based options screen should be used""... $ac_c" 1>&6 -echo "configure:10685: checking if new-style forms-based options screen should be used" >&5 +echo "configure:10734: checking if new-style forms-based options screen should be used" >&5 # Check whether --enable-forms-options or --disable-forms-options was given. if test "${enable_forms_options+set}" = set; then @@ -10705,7 +10754,7 @@ EOF echo $ac_n "checking if old-style options menu should be used""... $ac_c" 1>&6 -echo "configure:10709: checking if old-style options menu should be used" >&5 +echo "configure:10758: checking if old-style options menu should be used" >&5 # Check whether --enable-menu-options or --disable-menu-options was given. if test "${enable_menu_options+set}" = set; then @@ -10729,7 +10778,7 @@ EOF echo $ac_n "checking if experimental address-list page should be used""... $ac_c" 1>&6 -echo "configure:10733: checking if experimental address-list page should be used" >&5 +echo "configure:10782: checking if experimental address-list page should be used" >&5 # Check whether --enable-addrlist-page or --disable-addrlist-page was given. if test "${enable_addrlist_page+set}" = set; then @@ -10752,8 +10801,32 @@ test $use_addrlist_page != no && cat >> confdefs.h <<\EOF EOF +echo $ac_n "checking if experimental CJK logic should be used""... $ac_c" 1>&6 +echo "configure:10806: checking if experimental CJK logic should be used" >&5 + +# Check whether --enable-cjk or --disable-cjk was given. +if test "${enable_cjk+set}" = set; then + enableval="$enable_cjk" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + use_cjk=$enableval + else + use_cjk=no + fi +else + enableval=no + use_cjk=no + +fi + +echo "$ac_t""$use_cjk" 1>&6 +test $use_cjk != no && cat >> confdefs.h <<\EOF +#define CJK_EX 1 +EOF + + echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6 -echo "configure:10757: checking if color-style code should be used" >&5 +echo "configure:10830: checking if color-style code should be used" >&5 # Check whether --enable-color-style or --disable-color-style was given. if test "${enable_color_style+set}" = set; then @@ -10801,7 +10874,7 @@ EOF echo "$ac_t""yes" 1>&6 echo $ac_n "checking for location of style-sheet file""... $ac_c" 1>&6 -echo "configure:10805: checking for location of style-sheet file" >&5 +echo "configure:10878: checking for location of style-sheet file" >&5 LYNX_LSS_FILE=$cf_libdir/lynx.lss cat >> confdefs.h <<EOF #define LYNX_LSS_FILE "$LYNX_LSS_FILE" @@ -10819,7 +10892,7 @@ test ".$ac_cv_func_use_default_colors" = ".yes" && use_dft_colors=maybe if test "$use_dft_colors" != no ; then echo $ac_n "checking if you want to use default-colors""... $ac_c" 1>&6 -echo "configure:10823: checking if you want to use default-colors" >&5 +echo "configure:10896: checking if you want to use default-colors" >&5 # Check whether --enable-default-colors or --disable-default-colors was given. if test "${enable_default_colors+set}" = set; then @@ -10844,7 +10917,7 @@ EOF fi echo $ac_n "checking if experimental file-upload logic should be used""... $ac_c" 1>&6 -echo "configure:10848: checking if experimental file-upload logic should be used" >&5 +echo "configure:10921: checking if experimental file-upload logic should be used" >&5 # Check whether --enable-file-upload or --disable-file-upload was given. if test "${enable_file_upload+set}" = set; then @@ -10867,8 +10940,32 @@ test $use_file_upload != no && cat >> confdefs.h <<\EOF EOF +echo $ac_n "checking if experimental element-justification logic should be used""... $ac_c" 1>&6 +echo "configure:10945: checking if experimental element-justification logic should be used" >&5 + +# Check whether --enable-justify-elts or --disable-justify-elts was given. +if test "${enable_justify_elts+set}" = set; then + enableval="$enable_justify_elts" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + use_exp_justify_elts=$enableval + else + use_exp_justify_elts=no + fi +else + enableval=no + use_exp_justify_elts=no + +fi + +echo "$ac_t""$use_exp_justify_elts" 1>&6 +test $use_exp_justify_elts != no && cat >> confdefs.h <<\EOF +#define EXP_JUSTIFY_ELTS 1 +EOF + + echo $ac_n "checking if experimental keyboard-layout logic should be used""... $ac_c" 1>&6 -echo "configure:10872: checking if experimental keyboard-layout logic should be used" >&5 +echo "configure:10969: checking if experimental keyboard-layout logic should be used" >&5 # Check whether --enable-kbd-layout or --disable-kbd-layout was given. if test "${enable_kbd_layout+set}" = set; then @@ -10892,7 +10989,7 @@ EOF echo $ac_n "checking if experimental JavaScript support should be used""... $ac_c" 1>&6 -echo "configure:10896: checking if experimental JavaScript support should be used" >&5 +echo "configure:10993: checking if experimental JavaScript support should be used" >&5 # Check whether --enable-libjs or --disable-libjs was given. if test "${enable_libjs+set}" = set; then @@ -10916,7 +11013,7 @@ EOF echo $ac_n "checking if html source should be colorized""... $ac_c" 1>&6 -echo "configure:10920: checking if html source should be colorized" >&5 +echo "configure:11017: checking if html source should be colorized" >&5 # Check whether --enable-prettysrc or --disable-prettysrc was given. if test "${enable_prettysrc+set}" = set; then @@ -10939,8 +11036,32 @@ test $use_prettysrc != no && cat >> confdefs.h <<\EOF EOF +echo $ac_n "checking if read-progress message should show ETA""... $ac_c" 1>&6 +echo "configure:11041: checking if read-progress message should show ETA" >&5 + +# Check whether --enable-read-eta or --disable-read-eta was given. +if test "${enable_read_eta+set}" = set; then + enableval="$enable_read_eta" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + use_read_eta=$enableval + else + use_read_eta=no + fi +else + enableval=no + use_read_eta=no + +fi + +echo "$ac_t""$use_read_eta" 1>&6 +test $use_read_eta != no && cat >> confdefs.h <<\EOF +#define EXP_READPROGRESS 1 +EOF + + echo $ac_n "checking if source caching should be used""... $ac_c" 1>&6 -echo "configure:10944: checking if source caching should be used" >&5 +echo "configure:11065: checking if source caching should be used" >&5 # Check whether --enable-source-cache or --disable-source-cache was given. if test "${enable_source_cache+set}" = set; then @@ -10967,7 +11088,7 @@ EOF echo $ac_n "checking if alternative line-edit bindings should be used""... $ac_c" 1>&6 -echo "configure:10971: checking if alternative line-edit bindings should be used" >&5 +echo "configure:11092: checking if alternative line-edit bindings should be used" >&5 # Check whether --enable-alt-bindings or --disable-alt-bindings was given. if test "${enable_alt_bindings+set}" = set; then @@ -10991,7 +11112,7 @@ EOF echo $ac_n "checking if you want to use extended HTML DTD logic""... $ac_c" 1>&6 -echo "configure:10995: checking if you want to use extended HTML DTD logic" >&5 +echo "configure:11116: checking if you want to use extended HTML DTD logic" >&5 # Check whether --enable-extended-dtd or --disable-extended-dtd was given. if test "${enable_extended_dtd+set}" = set; then @@ -11015,7 +11136,7 @@ EOF echo $ac_n "checking if partial-display should be used""... $ac_c" 1>&6 -echo "configure:11019: checking if partial-display should be used" >&5 +echo "configure:11140: checking if partial-display should be used" >&5 # Check whether --enable-partial or --disable-partial was given. if test "${enable_partial+set}" = set; then @@ -11039,7 +11160,7 @@ EOF echo $ac_n "checking if you want to use external commands""... $ac_c" 1>&6 -echo "configure:11043: checking if you want to use external commands" >&5 +echo "configure:11164: checking if you want to use external commands" >&5 # Check whether --enable-externs or --disable-externs was given. if test "${enable_externs+set}" = set; then @@ -11063,7 +11184,7 @@ EOF echo $ac_n "checking if you want to use setfont support""... $ac_c" 1>&6 -echo "configure:11067: checking if you want to use setfont support" >&5 +echo "configure:11188: checking if you want to use setfont support" >&5 # Check whether --enable-font-switch or --disable-font-switch was given. if test "${enable_font_switch+set}" = set; then @@ -11087,7 +11208,7 @@ EOF echo $ac_n "checking if you want cgi-link support""... $ac_c" 1>&6 -echo "configure:11091: checking if you want cgi-link support" >&5 +echo "configure:11212: checking if you want cgi-link support" >&5 # Check whether --enable-cgi-links or --disable-cgi-links was given. if test "${enable_cgi_links+set}" = set; then @@ -11106,7 +11227,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you want change-exec support""... $ac_c" 1>&6 -echo "configure:11110: checking if you want change-exec support" >&5 +echo "configure:11231: checking if you want change-exec support" >&5 # Check whether --enable-change-exec or --disable-change-exec was given. if test "${enable_change_exec+set}" = set; then @@ -11125,7 +11246,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you want exec-links support""... $ac_c" 1>&6 -echo "configure:11129: checking if you want exec-links support" >&5 +echo "configure:11250: checking if you want exec-links support" >&5 # Check whether --enable-exec-links or --disable-exec-links was given. if test "${enable_exec_links+set}" = set; then @@ -11144,7 +11265,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you want exec-scripts support""... $ac_c" 1>&6 -echo "configure:11148: checking if you want exec-scripts support" >&5 +echo "configure:11269: checking if you want exec-scripts support" >&5 # Check whether --enable-exec-scripts or --disable-exec-scripts was given. if test "${enable_exec_scripts+set}" = set; then @@ -11163,7 +11284,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you want internal-links feature""... $ac_c" 1>&6 -echo "configure:11167: checking if you want internal-links feature" >&5 +echo "configure:11288: checking if you want internal-links feature" >&5 # Check whether --enable-internal-links or --disable-internal-links was given. if test "${enable_internal_links+set}" = set; then @@ -11187,7 +11308,7 @@ EOF echo $ac_n "checking if you want to fork NSL requests""... $ac_c" 1>&6 -echo "configure:11191: checking if you want to fork NSL requests" >&5 +echo "configure:11312: checking if you want to fork NSL requests" >&5 # Check whether --enable-nsl-fork or --disable-nsl-fork was given. if test "${enable_nsl_fork+set}" = set; then @@ -11211,7 +11332,7 @@ EOF echo $ac_n "checking if you want to log URL requests via syslog""... $ac_c" 1>&6 -echo "configure:11215: checking if you want to log URL requests via syslog" >&5 +echo "configure:11336: checking if you want to log URL requests via syslog" >&5 # Check whether --enable-syslog or --disable-syslog was given. if test "${enable_syslog+set}" = set; then @@ -11235,7 +11356,7 @@ EOF echo $ac_n "checking if persistent-cookie logic should be used""... $ac_c" 1>&6 -echo "configure:11239: checking if persistent-cookie logic should be used" >&5 +echo "configure:11360: checking if persistent-cookie logic should be used" >&5 # Check whether --enable-persistent-cookies or --disable-persistent-cookies was given. if test "${enable_persistent_cookies+set}" = set; then @@ -11259,7 +11380,7 @@ EOF echo $ac_n "checking if you want to underline links""... $ac_c" 1>&6 -echo "configure:11263: checking if you want to underline links" >&5 +echo "configure:11384: checking if you want to underline links" >&5 # Check whether --enable-underlines or --disable-underlines was given. if test "${enable_underlines+set}" = set; then @@ -11283,7 +11404,7 @@ EOF echo $ac_n "checking if help files should be gzip'ed""... $ac_c" 1>&6 -echo "configure:11287: checking if help files should be gzip'ed" >&5 +echo "configure:11408: checking if help files should be gzip'ed" >&5 # Check whether --enable-gzip-help or --disable-gzip-help was given. if test "${enable_gzip_help+set}" = set; then @@ -11312,7 +11433,7 @@ fi echo $ac_n "checking if you want to use zlib for decompression of some gzip files""... $ac_c" 1>&6 -echo "configure:11316: checking if you want to use zlib for decompression of some gzip files" >&5 +echo "configure:11437: checking if you want to use zlib for decompression of some gzip files" >&5 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -11329,12 +11450,12 @@ if test ".$use_zlib" != ".no" ; then cf_cv_have_lib_z=no cf_libdir="" echo $ac_n "checking for gzopen""... $ac_c" 1>&6 -echo "configure:11333: checking for gzopen" >&5 +echo "configure:11454: checking for gzopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_gzopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11338 "configure" +#line 11459 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gzopen(); below. */ @@ -11357,7 +11478,7 @@ gzopen(); ; return 0; } EOF -if { (eval echo configure:11361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gzopen=yes" else @@ -11377,17 +11498,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6 -echo "configure:11381: checking for gzopen in -lz" >&5 +echo "configure:11502: checking for gzopen in -lz" >&5 LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 11384 "configure" +#line 11505 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:11391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_z=yes @@ -11410,21 +11531,22 @@ test "$prefix" != "$exec_prefix" && cf_search="$cf_search $prefix/lib $prefix/li fi test "$prefix" != /usr/local && cf_search="$cf_search /usr/local/lib /usr/local/lib/z" test "$prefix" != /usr && cf_search="$cf_search /usr/lib /usr/lib/z" +test "$prefix" != /opt && cf_search="$cf_search /opt/lib /opt/lib/z" for cf_libdir in $cf_search do echo $ac_n "checking for -lz in $cf_libdir""... $ac_c" 1>&6 -echo "configure:11418: checking for -lz in $cf_libdir" >&5 +echo "configure:11540: checking for -lz in $cf_libdir" >&5 LIBS="-L$cf_libdir -lz $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 11421 "configure" +#line 11543 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:11428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_z=yes @@ -11460,7 +11582,7 @@ EOF fi echo $ac_n "checking if you want to exclude FINGER code""... $ac_c" 1>&6 -echo "configure:11464: checking if you want to exclude FINGER code" >&5 +echo "configure:11586: checking if you want to exclude FINGER code" >&5 # Check whether --enable-finger or --disable-finger was given. if test "${enable_finger+set}" = set; then @@ -11484,7 +11606,7 @@ EOF echo $ac_n "checking if you want to exclude GOPHER code""... $ac_c" 1>&6 -echo "configure:11488: checking if you want to exclude GOPHER code" >&5 +echo "configure:11610: checking if you want to exclude GOPHER code" >&5 # Check whether --enable-gopher or --disable-gopher was given. if test "${enable_gopher+set}" = set; then @@ -11508,7 +11630,7 @@ EOF echo $ac_n "checking if you want to exclude NEWS code""... $ac_c" 1>&6 -echo "configure:11512: checking if you want to exclude NEWS code" >&5 +echo "configure:11634: checking if you want to exclude NEWS code" >&5 # Check whether --enable-news or --disable-news was given. if test "${enable_news+set}" = set; then @@ -11532,7 +11654,7 @@ EOF echo $ac_n "checking if you want to exclude FTP code""... $ac_c" 1>&6 -echo "configure:11536: checking if you want to exclude FTP code" >&5 +echo "configure:11658: checking if you want to exclude FTP code" >&5 # Check whether --enable-ftp or --disable-ftp was given. if test "${enable_ftp+set}" = set; then @@ -11561,7 +11683,7 @@ EOF # All DirEd functions that were enabled on compilation can be disabled # or modified at run time via DIRED_MENU symbols in lynx.cfg. echo $ac_n "checking if directory-editor code should be used""... $ac_c" 1>&6 -echo "configure:11565: checking if directory-editor code should be used" >&5 +echo "configure:11687: checking if directory-editor code should be used" >&5 # Check whether --enable-dired or --disable-dired was given. if test "${enable_dired+set}" = set; then @@ -11587,7 +11709,7 @@ EOF echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6 -echo "configure:11591: checking if you wish to allow extracting from archives via DirEd" >&5 +echo "configure:11713: checking if you wish to allow extracting from archives via DirEd" >&5 # Check whether --enable-dired-archive or --disable-dired-archive was given. if test "${enable_dired_archive+set}" = set; then @@ -11606,7 +11728,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow users to redefine DirEd keys""... $ac_c" 1>&6 -echo "configure:11610: checking if you wish to allow users to redefine DirEd keys" >&5 +echo "configure:11732: checking if you wish to allow users to redefine DirEd keys" >&5 # Check whether --enable-dired-override or --disable-dired-override was given. if test "${enable_dired_override+set}" = set; then @@ -11632,7 +11754,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow permissions commands via DirEd""... $ac_c" 1>&6 -echo "configure:11636: checking if you wish to allow permissions commands via DirEd" >&5 +echo "configure:11758: checking if you wish to allow permissions commands via DirEd" >&5 # Check whether --enable-dired-permit or --disable-dired-permit was given. if test "${enable_dired_permit+set}" = set; then @@ -11658,7 +11780,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow executable-permission commands via DirEd""... $ac_c" 1>&6 -echo "configure:11662: checking if you wish to allow executable-permission commands via DirEd" >&5 +echo "configure:11784: checking if you wish to allow executable-permission commands via DirEd" >&5 # Check whether --enable-dired-xpermit or --disable-dired-xpermit was given. if test "${enable_dired_xpermit+set}" = set; then @@ -11677,7 +11799,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "tar" commands from DirEd""... $ac_c" 1>&6 -echo "configure:11681: checking if you wish to allow "tar" commands from DirEd" >&5 +echo "configure:11803: checking if you wish to allow "tar" commands from DirEd" >&5 # Check whether --enable-dired-tar or --disable-dired-tar was given. if test "${enable_dired_tar+set}" = set; then @@ -11703,7 +11825,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "uudecode" commands from DirEd""... $ac_c" 1>&6 -echo "configure:11707: checking if you wish to allow "uudecode" commands from DirEd" >&5 +echo "configure:11829: checking if you wish to allow "uudecode" commands from DirEd" >&5 # Check whether --enable-dired-uudecode or --disable-dired-uudecode was given. if test "${enable_dired_uudecode+set}" = set; then @@ -11729,7 +11851,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "zip" and "unzip" commands from DirEd""... $ac_c" 1>&6 -echo "configure:11733: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5 +echo "configure:11855: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5 # Check whether --enable-dired-zip or --disable-dired-zip was given. if test "${enable_dired_zip+set}" = set; then @@ -11755,7 +11877,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "gzip" and "gunzip" commands from DirEd""... $ac_c" 1>&6 -echo "configure:11759: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5 +echo "configure:11881: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5 # Check whether --enable-dired-gzip or --disable-dired-gzip was given. if test "${enable_dired_gzip+set}" = set; then @@ -11782,7 +11904,7 @@ fi fi echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6 -echo "configure:11786: checking if you want long-directory listings" >&5 +echo "configure:11908: checking if you want long-directory listings" >&5 # Check whether --enable-long-list or --disable-long-list was given. if test "${enable_long_list+set}" = set; then @@ -11808,7 +11930,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6 -echo "configure:11812: checking if parent-directory references are permitted" >&5 +echo "configure:11934: checking if parent-directory references are permitted" >&5 # Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given. if test "${enable_parent_dir_refs+set}" = set; then @@ -11828,7 +11950,7 @@ echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if we can include termio.h with curses""... $ac_c" 1>&6 -echo "configure:11832: checking if we can include termio.h with curses" >&5 +echo "configure:11954: checking if we can include termio.h with curses" >&5 if eval "test \"`echo '$''{'cf_cv_termio_and_curses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11837,7 +11959,7 @@ else CFLAGS="$CFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation" touch lynx_cfg.h cat > conftest.$ac_ext <<EOF -#line 11841 "configure" +#line 11963 "configure" #include "confdefs.h" #include <LYCurses.h> @@ -11846,7 +11968,7 @@ int main() { putchar(0x0a) ; return 0; } EOF -if { (eval echo configure:11850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_termio_and_curses=yes else diff --git a/configure.in b/configure.in index 721a1a2c..842e0fad 100644 --- a/configure.in +++ b/configure.in @@ -464,6 +464,7 @@ AC_CHECK_HEADERS( \ unistd.h \ ) CF_TERMIO_AND_TERMIOS +CF_FUNC_SIGACTION CF_FUNC_WAIT CF_VARARGS AC_TYPE_GETGROUPS @@ -529,9 +530,9 @@ if test $cf_cv_screen != slang ; then cbreak \ define_key \ keypad \ + resizeterm \ use_default_colors \ - wborder \ - ) + wborder ) fi dnl -------------------------------------------------------------------------- @@ -573,6 +574,14 @@ CF_ARG_ENABLE(addrlist-page, AC_MSG_RESULT($use_addrlist_page) test $use_addrlist_page != no && AC_DEFINE(EXP_ADDRLIST_PAGE) +AC_MSG_CHECKING(if experimental CJK logic should be used) +CF_ARG_ENABLE(cjk, +[ --enable-cjk use experimental CJK logic], + [use_cjk=$enableval], + [use_cjk=no]) +AC_MSG_RESULT($use_cjk) +test $use_cjk != no && AC_DEFINE(CJK_EX) + AC_MSG_CHECKING(if color-style code should be used) CF_ARG_ENABLE(color-style, [ --enable-color-style use optional/experimental color style], @@ -630,6 +639,14 @@ CF_ARG_ENABLE(file-upload, AC_MSG_RESULT($use_file_upload) test $use_file_upload != no && AC_DEFINE(EXP_FILE_UPLOAD) +AC_MSG_CHECKING(if experimental element-justification logic should be used) +CF_ARG_ENABLE(justify-elts, +[ --enable-justify-elts use experimental element-justification logic], + [use_exp_justify_elts=$enableval], + [use_exp_justify_elts=no]) +AC_MSG_RESULT($use_exp_justify_elts) +test $use_exp_justify_elts != no && AC_DEFINE(EXP_JUSTIFY_ELTS) + AC_MSG_CHECKING(if experimental keyboard-layout logic should be used) CF_ARG_ENABLE(kbd-layout, [ --enable-kbd-layout use experimental keyboard-layout support], @@ -654,6 +671,14 @@ CF_ARG_ENABLE(prettysrc, AC_MSG_RESULT($use_prettysrc) test $use_prettysrc != no && AC_DEFINE(USE_PSRC) +AC_MSG_CHECKING(if read-progress message should show ETA) +CF_ARG_ENABLE(read-eta, +[ --enable-read-eta experimental read-progress message shows ETA], + [use_read_eta=$enableval], + [use_read_eta=no]) +AC_MSG_RESULT($use_read_eta) +test $use_read_eta != no && AC_DEFINE(EXP_READPROGRESS) + AC_MSG_CHECKING(if source caching should be used) CF_ARG_ENABLE(source-cache, [ --enable-source-cache cache HTML source for parse mode changes], diff --git a/install.sh b/install.sh index ab74c882..a9611d9e 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh # # install - install a program, script, or datafile # This comes from X11R5. @@ -103,7 +103,7 @@ fi if [ x"$dir_arg" != x ]; then dst=$src src="" - + if [ -d $dst ]; then instcmd=: else @@ -112,7 +112,7 @@ if [ x"$dir_arg" != x ]; then else # Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad +# might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. if [ -f $src -o -d $src ] @@ -122,7 +122,7 @@ else echo "install: $src does not exist" exit 1 fi - + if [ x"$dst" = x ] then echo "install: no destination specified" @@ -189,17 +189,17 @@ else # If we're going to rename the final executable, determine the name now. - if [ x"$transformarg" = x ] + if [ x"$transformarg" = x ] then dstfile=`basename $dst` else - dstfile=`basename $dst $transformbasename | + dstfile=`basename $dst $transformbasename | sed $transformarg`$transformbasename fi # don't allow the sed command to completely eliminate the filename - if [ x"$dstfile" = x ] + if [ x"$dstfile" = x ] then dstfile=`basename $dst` else @@ -230,7 +230,7 @@ else # Now rename the file to the real destination. $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile + $doit $mvcmd $dsttmp $dstdir/$dstfile fi && diff --git a/lynx.cfg b/lynx.cfg index b89068e0..d6a5759c 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -2226,3 +2226,13 @@ MINIMAL_COMMENTS:TRUE # has no influence on CJK text rendering. # #JUSTIFY:TRUE + +# STICKY_INPUTS - Input +# This option controls whether all text inputs are sticky. If input is not +# sticky, then it won't intercept any keyboard input until user activated it +# (as usual link). Making inputs non-sticky can be desired for users that +# actively use alphanumeric keys for navigation (as ' ', 'b', INS, DEL, etc). +# Default is TRUE - i.e., all inputs are sticky, this is old lynx behavior. +# +#STICKY_INPUTS:TRUE + diff --git a/lynx.hlp b/lynx.hlp index ba3ebe18..2125fcc2 100644 --- a/lynx.hlp +++ b/lynx.hlp @@ -243,7 +243,7 @@ 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 @@ -253,25 +253,25 @@ number of articles in chunked news listings. -newsmaxchunk=NUMBER - maximum news articles in listings before chunking. + maximum news articles in listings before chunking. -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 @@ -281,10 +281,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 @@ -317,23 +317,23 @@ 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 + send form data from stdin using POST method and dump results. -preparsed - show HTML source preparsed and reformatted when + show HTML source preparsed and reformatted when used with -source or in source view. -prettysrc - show HTML source view with lexical elements and + show HTML source view with lexical elements and tags in color. -print enable print functions. (default) @@ -341,8 +341,8 @@ -pseudo_inlines toggles pseudo-ALTs for inlines with no ALT string. - -raw toggles default setting of 8-bit character - translations or CJK mode for the startup character + -raw toggles default setting of 8-bit character + translations or CJK mode for the startup character set. -realm restricts access to URLs in the starting realm. @@ -352,32 +352,33 @@ document affected). -restrictions=[option][,option][,option]... - allows a list of services to be disabled + allows a list of services to be disabled selectively. Dashes and underscores in option names can be intermixed. The following list is printed if no options are specified. all - restricts all options listed below. - bookmark - disallow changing the location of the + bookmark - disallow changing the location of the bookmark file. - bookmark_exec - disallow execution links via the + bookmark_exec - disallow execution links via the bookmark file. - change_exec_perms - disallow changing the eXecute - permission on files (but still allow it for + change_exec_perms - disallow changing the eXecute + permission on files (but still allow it for directories) when local file management is enabled. - default - same as command line option -anonymous. + default - same as command line option -anonymous. + Disables default services for anonymous users. Set - to all restricted, except for: inside_telnet, - outside_telnet, inside_ftp, outside_ftp, + to all restricted, except for: inside_telnet, + outside_telnet, inside_ftp, outside_ftp, inside_rlogin, outside_rlogin, inside_news, outside_news, telnet_port, jump, mail, print, exec, - and goto. The settings for these, as well as - additional goto restrictions for specific URL - schemes that are also applied, are derived from + and goto. The settings for these, as well as + additional goto restrictions for specific URL + schemes that are also applied, are derived from definitions within userdefs.h. dired_support - disallow local file management. @@ -385,43 +386,43 @@ disk_save - disallow saving to disk in the download and print menus. - dotfiles - disallow access to, or creation of, + dotfiles - disallow access to, or creation of, hidden (dot) files. - download - disallow some downloaders in the - download menu (does not imply disk_save + download - disallow some downloaders in the + download menu (does not imply disk_save restriction). editor - disallow external editing. exec - disable execution scripts. - exec_frozen - disallow the user from changing the + exec_frozen - disallow the user from changing the local execution option. - externals - disallow some "EXTERNAL" configuration - lines if support for passing URLs to external - applications (with the EXTERN command) is compiled + externals - disallow some "EXTERNAL" configuration + lines if support for passing URLs to external + applications (with the EXTERN command) is compiled in. - file_url - disallow using G)oto, served links or + file_url - disallow using G)oto, served links or bookmarks for file: URLs. goto - disable the 'g' (goto) command. - inside_ftp - disallow ftps for people coming from + inside_ftp - disallow ftps for people coming from inside your domain (utmp required for selectivity). - inside_news - disallow USENET news posting for - people coming from inside your domain (utmp + inside_news - disallow USENET news posting for + people coming from inside your domain (utmp required for selectivity). - inside_rlogin - disallow rlogins for people coming - from inside your domain (utmp required for + inside_rlogin - disallow rlogins for people coming + from inside your domain (utmp required for selectivity). - inside_telnet - disallow telnets for people coming - from inside your domain (utmp required for + inside_telnet - disallow telnets for people coming + from inside your domain (utmp required for selectivity). jump - disable the 'j' (jump) command. @@ -432,45 +433,45 @@ news_post - disallow USENET News posting. - options_save - disallow saving options in .lynxrc. + options_save - disallow saving options in .lynxrc. - outside_ftp - disallow ftps for people coming from - outside your domain (utmp required for + outside_ftp - disallow ftps for people coming from + outside your domain (utmp required for selectivity). - outside_news - disallow USENET news reading and - posting for people coming from outside your domain - (utmp required for selectivity). This restriction - applies to "news", "nntp", "newspost", and - "newsreply" URLs, but not to "snews", "snewspost", + outside_news - disallow USENET news reading and + posting for people coming from outside your domain + (utmp required for selectivity). This restriction + applies to "news", "nntp", "newspost", and + "newsreply" URLs, but not to "snews", "snewspost", or "snewsreply" in case they are supported. outside_rlogin - disallow rlogins for people coming - from outside your domain (utmp required for + from outside your domain (utmp required for selectivity). outside_telnet - disallow telnets for people coming - from outside your domain (utmp required for + from outside your domain (utmp required for selectivity). print - disallow most print options. - shell - disallow shell escapes and lynxexec or + shell - disallow shell escapes and lynxexec or lynxprog G)oto's. - suspend - disallow Unix Control-Z suspends with + suspend - disallow Unix Control-Z suspends with escape to shell. - telnet_port - disallow specifying a port in telnet + telnet_port - disallow specifying a port in telnet G)oto's. - useragent - disallow modifications of the User- + useragent - disallow modifications of the User- Agent header. -resubmit_posts - toggles forced resubmissions (no-cache) of forms - with method POST when the documents they returned - are sought with the PREV_DOC command or from the + toggles forced resubmissions (no-cache) of forms + with method POST when the documents they returned + are sought with the PREV_DOC command or from the History List. -rlogin @@ -479,32 +480,42 @@ -selective require .www_browsable files to browse directories. + -short_url + show very long URLs in the status line with "___" + to represent the portion which cannot be displayed. + The begining and end of the URL are displayed, + rather than suppressing the end. + -show_cursor - If enabled the cursor will not be hidden in the + If enabled the cursor will not be hidden in the right hand corner but will instead be positioned at - the start of the currently selected link. Show - cursor is the default for systems without + the start of the currently selected link. Show + cursor is the default for systems without FANCY_CURSES capabilities. The default configuration can be changed in userdefs.h or - lynx.cfg. The command line switch toggles the + lynx.cfg. The command line switch toggles the default. -soft_dquotes - toggles emulation of the old Netscape and Mosaic + toggles emulation of the old Netscape and Mosaic bug which treated '>' as a co-terminator for double-quotes and tags. -source - works the same as dump but outputs HTML source + works the same as dump but outputs HTML source instead of formatted text. -stack_dump disable SIGINT cleanup handler -startfile_ok - allow non-http startfile and homepage with + allow non-http startfile and homepage with -validate. + -sticky_inputs + don't require activating inputs in order to edit + them. + -tagsoup initialize parser, using Tag Soup DTD rather than SortaSGML. @@ -539,7 +550,6 @@ turn on mouse support, if available. Clicking the left mouse button on a link traverses it. Clicking the right mouse button pops back. Click on the top - line to scroll up. Click on the bottom line to scroll down. The first few positions in the top and bottom line may invoke additional functions. @@ -649,7 +659,6 @@ NEWS_ORGANIZATION This variable, if set, provides the string used in the Organization: header of USENET news postings. It - will override the setting of the ORGANIZATION environment variable, if it is also set (and, on UNIX, the @@ -743,6 +752,7 @@ 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 URL" under VMS. @@ -758,7 +768,6 @@ being used to invoke Lynx. If, however, it is unset at startup time (or has the value "unknown"), or if - the -term command-line option is used (see OPTIONS section above), Lynx will set or modify its value to the user @@ -919,3 +928,4 @@ Foteos Macrides Worcester Foundation for Biomedical Research Shrewsbury, Massachusetts 01545 + diff --git a/lynx.man b/lynx.man index 0f33cac9..f3fcc8a4 100644 --- a/lynx.man +++ b/lynx.man @@ -54,7 +54,7 @@ or \fB"H"\fR while running \fILynx\fR. Then follow the link titled, "Help on URLs." \fILynx\fR uses only long option names. Option -names can begin with double dash as well, +names can begin with double dash as well, underscores and dashes can be intermixed in option names (in the reference below options are with one dash before them and with underscores). @@ -298,10 +298,10 @@ disable the link list feature in dumps. disable mailing of error messages to document owners. .TP .B -nonrestarting_sigwinch -This flag is not available on all systems, +This flag is not available on all systems, Lynx needs to be compiled with HAVE_SIGACTION defined. If available, this flag \fImay\fR cause Lynx to react -more immediately to window changes when run within +more immediately to window changes when run within an \fBxterm\fR. .TP .B -nopause @@ -401,7 +401,7 @@ inside_news, outside_news, telnet_port, jump, mail, print, exec, and goto. The settings for these, as well as additional goto restrictions for -specific URL schemes that are also applied, +specific URL schemes that are also applied, are derived from definitions within userdefs.h. .I dired_support @@ -518,6 +518,11 @@ disable recognition of rlogin commands. .B -selective require .www_browsable files to browse directories. .TP +.B -short_url +show very long URLs in the status line with "___" to represent the +portion which cannot be displayed. +The begining and end of the URL are displayed, rather than suppressing the end. +.TP .B -show_cursor If enabled the cursor will not be hidden in the right hand corner but will instead be positioned at the start of the @@ -540,6 +545,9 @@ disable SIGINT cleanup handler .B -startfile_ok allow non-http startfile and homepage with -validate. .TP +.B -sticky_inputs +don't require activating inputs in order to edit them. +.TP .B -tagsoup initialize parser, using Tag Soup DTD rather than SortaSGML. .TP diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html index a4750ce5..2853d578 100644 --- a/lynx_help/Lynx_users_guide.html +++ b/lynx_help/Lynx_users_guide.html @@ -19,7 +19,7 @@ well as files on remote systems running <em>http</em>, <em>gopher</em>, logins to <em>telnet</em>, <em>tn3270</em> or <em>rlogin</em> accounts (see <a href="lynx_url_support.html">URL Schemes Supported by Lynx</a>). <a href="#Hist">Current</a> versions of Lynx run on Unix, VMS, -Windows95/NT, 386DOS and OS/2 EMX. +Windows3.x/9x/NT, 386DOS and OS/2 EMX. <p>Lynx can be used to access information on the <em>WWW</em>, or to build information systems intended primarily for local access. For example, Lynx diff --git a/lynx_help/about_lynx.html b/lynx_help/about_lynx.html index 053ec674..5b85658b 100644 --- a/lynx_help/about_lynx.html +++ b/lynx_help/about_lynx.html @@ -13,11 +13,11 @@ <h1><em>About Lynx</em></h1> -Lynx is a fully featured World-Wide Web browser for users on both Unix and -VMS platforms who are connected to those systems via cursor-addressable, -character-cell terminals or emulators. That includes VT100 terminals, -and desktop-based software packages emulating VT100 terminals (e.g., -Kermit, Procomm, etc.). +Lynx is a fully-featured <em>World Wide Web</em> (<em>WWW</em>) browser +for users on Unix, VMS, and other platforms running cursor-addressable, +character-cell terminals or emulators. That includes vt100 terminals, +other character-cell displays, and vt100 emulators such as Kermit or +Procomm running on PCs or Macs. <P>For information on how to use Lynx see the <A HREF="../lynx_help/Lynx_users_guide.html">Lynx User's Guide</A>, or the diff --git a/makefile.w32 b/makefile.w32 deleted file mode 100644 index a0960a0b..00000000 --- a/makefile.w32 +++ /dev/null @@ -1,744 +0,0 @@ -# -# Borland C++ IDE generated makefile -# -.AUTODEPEND - - -# -# Borland C++ tools -# -IMPLIB = Implib -BCC32 = Bcc32 +BccW32.cfg -TLINK32 = TLink32 -TLIB = TLib -BRC32 = Brc32 -TASM32 = Tasm32 -# -# IDE macros -# - - -# -# Options -# -IDE_LFLAGS32 = -LD:\BC45\LIB -LLATC32_lynxdexe = -LCURSES;D:\BC45\LIB -wdpl -wdup -Tpe -ap -c -RLATC32_lynxdexe = -k -w32 -BLATC32_lynxdexe = -CNIEAT_lynxdexe = -I.\;CURSES;SRC;WWW\LIBRARY\IMPLEMENTATION;D:\BC45\INCLUDE;SRC\CHRTRANS -DNO_UNISTD_H;_WINDOWS;XMOSAIC_HACK;ACCESS_AUTH;NO_UTMP;NO_CUSERID;NO_TTYTYPE;NOSIGHUP;DOSPATH;NOUSERS;NCURSES;FANCY_CURSES;COLOR_CURSES;HAVE_KEYPAD;VC="2.14FM";NCURSES_VERSION;DISP_PARTIAL;SOURCE_CACHE;USE_PSRC -LNIEAT_lynxdexe = -x -LEAT_lynxdexe = $(LLATC32_lynxdexe) -REAT_lynxdexe = $(RLATC32_lynxdexe) -BEAT_lynxdexe = $(BLATC32_lynxdexe) -CLATW16_cursesbpdcursesdlib = -LLATW16_cursesbpdcursesdlib = -RLATW16_cursesbpdcursesdlib = -BLATW16_cursesbpdcursesdlib = -CEAT_cursesbpdcursesdlib = $(CEAT_lynxdexe) $(CLATW16_cursesbpdcursesdlib) -CNIEAT_cursesbpdcursesdlib = -I.\;CURSES;SRC;WWW\LIBRARY\IMPLEMENTATION;D:\BC45\INCLUDE;SRC\CHRTRANS -DNO_UNISTD_H;_WINDOWS;XMOSAIC_HACK;ACCESS_AUTH;NO_UTMP;NO_CUSERID;NO_TTYTYPE;NOSIGHUP;DOSPATH;NOUSERS;NCURSES;FANCY_CURSES;COLOR_CURSES;HAVE_KEYPAD;VC="2.14FM";NCURSES_VERSION -LNIEAT_cursesbpdcursesdlib = -x -LEAT_cursesbpdcursesdlib = $(LEAT_lynxdexe) $(LLATW16_cursesbpdcursesdlib) -REAT_cursesbpdcursesdlib = $(REAT_lynxdexe) $(RLATW16_cursesbpdcursesdlib) -BEAT_cursesbpdcursesdlib = $(BEAT_lynxdexe) $(BLATW16_cursesbpdcursesdlib) - -# -# Dependency List -# -Dep_lynx = \ - lynx.exe - -lynx : BccW32.cfg $(Dep_lynx) - echo MakeNode - -Dep_lynxdexe = \ - OBJ\htdos.obj\ - curses\pdcurses.lib\ - OBJ\ucauto.obj\ - OBJ\ucaux.obj\ - OBJ\ucdomap.obj\ - OBJ\htalert.obj\ - OBJ\htfwrite.obj\ - OBJ\htinit.obj\ - OBJ\httcp.obj\ - OBJ\crypt.obj\ - OBJ\crypt_ut.obj\ - OBJ\getline.obj\ - OBJ\htaabrow.obj\ - OBJ\htaafile.obj\ - OBJ\htaaprot.obj\ - OBJ\htaaserv.obj\ - OBJ\htaautil.obj\ - OBJ\htaccess.obj\ - OBJ\htacl.obj\ - OBJ\htanchor.obj\ - OBJ\htassoc.obj\ - OBJ\htatom.obj\ - OBJ\htauth.obj\ - OBJ\htbtree.obj\ - OBJ\htchunk.obj\ - OBJ\htfile.obj\ - OBJ\htfinger.obj\ - OBJ\htformat.obj\ - OBJ\htftp.obj\ - OBJ\htgopher.obj\ - OBJ\htgroup.obj\ - OBJ\hthistor.obj\ - OBJ\htlex.obj\ - OBJ\htlist.obj\ - OBJ\htmime.obj\ - OBJ\htmldtd.obj\ - OBJ\htmlgen.obj\ - OBJ\htnews.obj\ - OBJ\htparse.obj\ - OBJ\htpasswd.obj\ - OBJ\htplain.obj\ - OBJ\htrules.obj\ - OBJ\htstring.obj\ - OBJ\htstyle.obj\ - OBJ\httelnet.obj\ - OBJ\http.obj\ - OBJ\htuu.obj\ - OBJ\htwriter.obj\ - OBJ\htwsrc.obj\ - OBJ\sgml.obj\ - OBJ\defaults.obj\ - OBJ\gridtext.obj\ - OBJ\html.obj\ - OBJ\lybookma.obj\ - OBJ\lycgi.obj\ - OBJ\lycharse.obj\ - OBJ\lycharut.obj\ - OBJ\lyclean.obj\ - OBJ\lycookie.obj\ - OBJ\lycurses.obj\ - OBJ\lydownlo.obj\ - OBJ\lyedit.obj\ - OBJ\lyeditma.obj\ - OBJ\lyexit.obj\ - OBJ\lyforms.obj\ - OBJ\lygetfil.obj\ - OBJ\lyhistor.obj\ - OBJ\lyjump.obj\ - OBJ\lykeymap.obj\ - OBJ\lyleaks.obj\ - OBJ\lylist.obj\ - OBJ\lylocal.obj\ - OBJ\lymail.obj\ - OBJ\lymain.obj\ - OBJ\lymainlo.obj\ - OBJ\lymap.obj\ - OBJ\lynews.obj\ - OBJ\lyoption.obj\ - OBJ\lypretty.obj\ - OBJ\lyprint.obj\ - OBJ\lyrcfile.obj\ - OBJ\lyreadcf.obj\ - OBJ\lysearch.obj\ - OBJ\lyshowin.obj\ - OBJ\lystring.obj\ - OBJ\lytraver.obj\ - OBJ\lyupload.obj\ - OBJ\lyutils.obj - -lynx.exe : $(Dep_lynxdexe) - $(TLINK32) @&&| - /v $(IDE_LFLAGS32) $(LEAT_lynxdexe) $(LNIEAT_lynxdexe) + -D:\BC45\LIB\c0x32.obj+ -OBJ\htdos.obj+ -OBJ\ucauto.obj+ -OBJ\ucaux.obj+ -OBJ\ucdomap.obj+ -OBJ\htalert.obj+ -OBJ\htfwrite.obj+ -OBJ\htinit.obj+ -OBJ\httcp.obj+ -OBJ\crypt.obj+ -OBJ\crypt_ut.obj+ -OBJ\getline.obj+ -OBJ\htaabrow.obj+ -OBJ\htaafile.obj+ -OBJ\htaaprot.obj+ -OBJ\htaaserv.obj+ -OBJ\htaautil.obj+ -OBJ\htaccess.obj+ -OBJ\htacl.obj+ -OBJ\htanchor.obj+ -OBJ\htassoc.obj+ -OBJ\htatom.obj+ -OBJ\htauth.obj+ -OBJ\htbtree.obj+ -OBJ\htchunk.obj+ -OBJ\htfile.obj+ -OBJ\htfinger.obj+ -OBJ\htformat.obj+ -OBJ\htftp.obj+ -OBJ\htgopher.obj+ -OBJ\htgroup.obj+ -OBJ\hthistor.obj+ -OBJ\htlex.obj+ -OBJ\htlist.obj+ -OBJ\htmime.obj+ -OBJ\htmldtd.obj+ -OBJ\htmlgen.obj+ -OBJ\htnews.obj+ -OBJ\htparse.obj+ -OBJ\htpasswd.obj+ -OBJ\htplain.obj+ -OBJ\htrules.obj+ -OBJ\htstring.obj+ -OBJ\htstyle.obj+ -OBJ\httelnet.obj+ -OBJ\http.obj+ -OBJ\htuu.obj+ -OBJ\htwriter.obj+ -OBJ\htwsrc.obj+ -OBJ\sgml.obj+ -OBJ\defaults.obj+ -OBJ\gridtext.obj+ -OBJ\html.obj+ -OBJ\lybookma.obj+ -OBJ\lycgi.obj+ -OBJ\lycharse.obj+ -OBJ\lycharut.obj+ -OBJ\lyclean.obj+ -OBJ\lycookie.obj+ -OBJ\lycurses.obj+ -OBJ\lydownlo.obj+ -OBJ\lyedit.obj+ -OBJ\lyeditma.obj+ -OBJ\lyexit.obj+ -OBJ\lyforms.obj+ -OBJ\lygetfil.obj+ -OBJ\lyhistor.obj+ -OBJ\lyjump.obj+ -OBJ\lykeymap.obj+ -OBJ\lyleaks.obj+ -OBJ\lylist.obj+ -OBJ\lylocal.obj+ -OBJ\lymail.obj+ -OBJ\lymain.obj+ -OBJ\lymainlo.obj+ -OBJ\lymap.obj+ -OBJ\lynews.obj+ -OBJ\lyoption.obj+ -OBJ\lypretty.obj+ -OBJ\lyprint.obj+ -OBJ\lyrcfile.obj+ -OBJ\lyreadcf.obj+ -OBJ\lysearch.obj+ -OBJ\lyshowin.obj+ -OBJ\lystring.obj+ -OBJ\lytraver.obj+ -OBJ\lyupload.obj+ -OBJ\lyutils.obj -$<,$* -curses\pdcurses.lib+ -D:\BC45\LIB\bidsf.lib+ -D:\BC45\LIB\import32.lib+ -D:\BC45\LIB\cw32.lib - -| - -OBJ\htdos.obj : www\library\implemen\htdos.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htdos.c -| - -OBJ\ucauto.obj : src\ucauto.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\ucauto.c -| - -OBJ\ucaux.obj : src\ucaux.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\ucaux.c -| - -OBJ\ucdomap.obj : src\ucdomap.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\ucdomap.c -| - -OBJ\htalert.obj : src\htalert.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\htalert.c -| - -OBJ\htfwrite.obj : src\htfwrite.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\htfwrite.c -| - -OBJ\htinit.obj : src\htinit.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\htinit.c -| - -OBJ\httcp.obj : www\library\implemen\httcp.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\httcp.c -| - -OBJ\crypt.obj : www\library\implemen\crypt.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\crypt.c -| - -OBJ\crypt_ut.obj : www\library\implemen\crypt_ut.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\crypt_ut.c -| - -OBJ\getline.obj : www\library\implemen\getline.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\getline.c -| - -OBJ\htaabrow.obj : www\library\implemen\htaabrow.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htaabrow.c -| - -OBJ\htaafile.obj : www\library\implemen\htaafile.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htaafile.c -| - -OBJ\htaaprot.obj : www\library\implemen\htaaprot.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htaaprot.c -| - -OBJ\htaaserv.obj : www\library\implemen\htaaserv.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htaaserv.c -| - -OBJ\htaautil.obj : www\library\implemen\htaautil.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htaautil.c -| - -OBJ\htaccess.obj : www\library\implemen\htaccess.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htaccess.c -| - -OBJ\htacl.obj : www\library\implemen\htacl.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htacl.c -| - -OBJ\htanchor.obj : www\library\implemen\htanchor.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htanchor.c -| - -OBJ\htassoc.obj : www\library\implemen\htassoc.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htassoc.c -| - -OBJ\htatom.obj : www\library\implemen\htatom.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htatom.c -| - -OBJ\htauth.obj : www\library\implemen\htauth.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htauth.c -| - -OBJ\htbtree.obj : www\library\implemen\htbtree.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htbtree.c -| - -OBJ\htchunk.obj : www\library\implemen\htchunk.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htchunk.c -| - -OBJ\htfile.obj : www\library\implemen\htfile.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htfile.c -| - -OBJ\htfinger.obj : www\library\implemen\htfinger.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htfinger.c -| - -OBJ\htformat.obj : www\library\implemen\htformat.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htformat.c -| - -OBJ\htftp.obj : www\library\implemen\htftp.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htftp.c -| - -OBJ\htgopher.obj : www\library\implemen\htgopher.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htgopher.c -| - -OBJ\htgroup.obj : www\library\implemen\htgroup.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htgroup.c -| - -OBJ\hthistor.obj : www\library\implemen\hthistor.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\hthistor.c -| - -OBJ\htlex.obj : www\library\implemen\htlex.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htlex.c -| - -OBJ\htlist.obj : www\library\implemen\htlist.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htlist.c -| - -OBJ\htmime.obj : www\library\implemen\htmime.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htmime.c -| - -OBJ\htmldtd.obj : www\library\implemen\htmldtd.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htmldtd.c -| - -OBJ\htmlgen.obj : www\library\implemen\htmlgen.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htmlgen.c -| - -OBJ\htnews.obj : www\library\implemen\htnews.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htnews.c -| - -OBJ\htparse.obj : www\library\implemen\htparse.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htparse.c -| - -OBJ\htpasswd.obj : www\library\implemen\htpasswd.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htpasswd.c -| - -OBJ\htplain.obj : www\library\implemen\htplain.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htplain.c -| - -OBJ\htrules.obj : www\library\implemen\htrules.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htrules.c -| - -OBJ\htstring.obj : www\library\implemen\htstring.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htstring.c -| - -OBJ\htstyle.obj : www\library\implemen\htstyle.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htstyle.c -| - -OBJ\httelnet.obj : www\library\implemen\httelnet.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\httelnet.c -| - -OBJ\http.obj : www\library\implemen\http.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\http.c -| - -OBJ\htuu.obj : www\library\implemen\htuu.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htuu.c -| - -OBJ\htwriter.obj : www\library\implemen\htwriter.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htwriter.c -| - -OBJ\htwsrc.obj : www\library\implemen\htwsrc.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\htwsrc.c -| - -OBJ\sgml.obj : www\library\implemen\sgml.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ www\library\implemen\sgml.c -| - -OBJ\defaults.obj : src\defaults.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\defaults.c -| - -OBJ\gridtext.obj : src\gridtext.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\gridtext.c -| - -OBJ\html.obj : src\html.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\html.c -| - -OBJ\lybookma.obj : src\lybookma.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lybookma.c -| - -OBJ\lycgi.obj : src\lycgi.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lycgi.c -| - -OBJ\lycharse.obj : src\lycharse.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lycharse.c -| - -OBJ\lycharut.obj : src\lycharut.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lycharut.c -| - -OBJ\lyclean.obj : src\lyclean.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lyclean.c -| - -OBJ\lycookie.obj : src\lycookie.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lycookie.c -| - -OBJ\lycurses.obj : src\lycurses.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lycurses.c -| - -OBJ\lydownlo.obj : src\lydownlo.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lydownlo.c -| - -OBJ\lyedit.obj : src\lyedit.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lyedit.c -| - -OBJ\lyeditma.obj : src\lyeditma.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lyeditma.c -| - -OBJ\lyexit.obj : src\lyexit.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lyexit.c -| - -OBJ\lyforms.obj : src\lyforms.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lyforms.c -| - -OBJ\lygetfil.obj : src\lygetfil.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lygetfil.c -| - -OBJ\lyhistor.obj : src\lyhistor.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lyhistor.c -| - -OBJ\lyjump.obj : src\lyjump.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lyjump.c -| - -OBJ\lykeymap.obj : src\lykeymap.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lykeymap.c -| - -OBJ\lyleaks.obj : src\lyleaks.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lyleaks.c -| - -OBJ\lylist.obj : src\lylist.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lylist.c -| - -OBJ\lylocal.obj : src\lylocal.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lylocal.c -| - -OBJ\lymail.obj : src\lymail.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lymail.c -| - -OBJ\lymain.obj : src\lymain.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lymain.c -| - -OBJ\lymainlo.obj : src\lymainlo.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lymainlo.c -| - -OBJ\lymap.obj : src\lymap.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lymap.c -| - -OBJ\lynews.obj : src\lynews.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lynews.c -| - -OBJ\lyoption.obj : src\lyoption.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lyoption.c -| - -OBJ\lypretty.obj : src\lypretty.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lypretty.c -| - -OBJ\lyprint.obj : src\lyprint.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lyprint.c -| - -OBJ\lyrcfile.obj : src\lyrcfile.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lyrcfile.c -| - -OBJ\lyreadcf.obj : src\lyreadcf.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lyreadcf.c -| - -OBJ\lysearch.obj : src\lysearch.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lysearch.c -| - -OBJ\lyshowin.obj : src\lyshowin.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lyshowin.c -| - -OBJ\lystring.obj : src\lystring.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lystring.c -| - -OBJ\lytraver.obj : src\lytraver.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lytraver.c -| - -OBJ\lyupload.obj : src\lyupload.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lyupload.c -| - -OBJ\lyutils.obj : src\lyutils.c - $(BCC32) -P- -c @&&| - $(CEAT_lynxdexe) $(CNIEAT_lynxdexe) -o$@ src\lyutils.c -| - -# Compiler configuration file -BccW32.cfg : - Copy &&| --R --v --vi --H --H=lynx.csm --w- --A- --wcpt --wrpt --wrng --w-voi --w-ret --w-sus --w-dup --w-big --w-ext --w-zdi --w-bei --w-obi --w-ofp --w-eas --w-hid --w-ncf --w-ibc --w-dsz --w-nst --w-mpc --w-mpd --w-ntd --w-nvf --w-hch --w-inl --w-lin --w-lvc --wpia --w-def --w-nod --w-pro --w-rvl --wccc --w-aus --w-par --w-rch --w-eff --w-ill --w-ias --w-msg --Ot --d- --K --a- --w-stu --wbbf --w-dpu --wcln --wsig --wucp --g255 --H- --v- --WC --wamb -| $@ - - diff --git a/makew32.bat b/makew32.bat new file mode 100644 index 00000000..84465db8 --- /dev/null +++ b/makew32.bat @@ -0,0 +1,4 @@ +@echo off +make.exe %1 %2 -m -c -f makefile.bcb +REM make.exe -m -c -f makefile.deb +REM make.exe -f makefile.win diff --git a/mkdirs.sh b/mkdirs.sh index 9a20f822..b7cadefb 100755 --- a/mkdirs.sh +++ b/mkdirs.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh # mkinstalldirs --- make directory hierarchy # Author: Noah Friedman <friedman@prep.ai.mit.edu> # Created: 1993-05-16 diff --git a/po/lynx.pot b/po/lynx.pot index 1229cee7..c6f68b48 100644 --- a/po/lynx.pot +++ b/po/lynx.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-07-11 09:46-0400\n" +"POT-Creation-Date: 1999-07-30 06:46-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -29,2045 +29,2044 @@ msgstr "" #. * #. * http://www.crl.com/~subir/lynx.html #. * -#. * Because the gettext facility is only recently (with release 2.8.2) -#. * introduced, these alternate definitions are given as variants on this -#. * file. Use them as a starting point to construct a new message -#. * library as needed. (see po/readme). +#. * See ABOUT-NLS and po/readme for details and location of contributed +#. * translations. When no translation is available, the English default is +#. * used. #. -#: LYMessages.c:30 +#: LYMessages.c:29 #, c-format msgid "Alert!: %s" msgstr "" -#: LYMessages.c:31 +#: LYMessages.c:30 msgid "Welcome" msgstr "" -#: LYMessages.c:32 LYMessages.c:33 +#: LYMessages.c:31 LYMessages.c:32 msgid "Are you sure you want to quit?" msgstr "" -#: LYMessages.c:35 LYMessages.c:36 +#: LYMessages.c:34 LYMessages.c:35 msgid "Really exit from Lynx?" msgstr "" -#: LYMessages.c:38 +#: LYMessages.c:37 msgid "Connection interrupted." msgstr "" -#: LYMessages.c:39 +#: LYMessages.c:38 msgid "Data transfer interrupted." msgstr "" -#: LYMessages.c:40 +#: LYMessages.c:39 msgid "Cancelled!!!" msgstr "" -#: LYMessages.c:41 +#: LYMessages.c:40 msgid "Cancelling!" msgstr "" -#: LYMessages.c:42 +#: LYMessages.c:41 msgid "Excellent!!!" msgstr "" -#: LYMessages.c:43 +#: LYMessages.c:42 msgid "Done!" msgstr "" -#: LYMessages.c:44 +#: LYMessages.c:43 msgid "Bad request!" msgstr "" -#: LYMessages.c:45 +#: LYMessages.c:44 msgid "previous" msgstr "" -#: LYMessages.c:46 +#: LYMessages.c:45 msgid "next screen" msgstr "" -#: LYMessages.c:47 +#: LYMessages.c:46 msgid "HELP!" msgstr "" -#: LYMessages.c:48 +#: LYMessages.c:47 msgid ", help on " msgstr "" #. #define HELP -#: LYMessages.c:50 +#: LYMessages.c:49 msgid "" "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back." msgstr "" #. #define MOREHELP -#: LYMessages.c:52 +#: LYMessages.c:51 msgid "" "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit." msgstr "" -#: LYMessages.c:53 +#: LYMessages.c:52 msgid "-- press space for next page --" msgstr "" #. Forms messages #. #define FORM_LINK_FILE_UNM_MSG -#: LYMessages.c:57 +#: LYMessages.c:56 msgid "" "UNMODIFIABLE file entry field. Use UP or DOWN arrows or tab to move off." msgstr "" #. #define FORM_LINK_FILE_MESSAGE -#: LYMessages.c:59 +#: LYMessages.c:58 msgid "" "(File entry field) Enter filename. Use UP or DOWN arrows or tab to move off." msgstr "" #. #define FORM_LINK_TEXT_MESSAGE -#: LYMessages.c:61 +#: LYMessages.c:60 msgid "" "(Text entry field) Enter text. Use UP or DOWN arrows or tab to move off." msgstr "" #. #define FORM_LINK_TEXTAREA_MESSAGE -#: LYMessages.c:63 +#: LYMessages.c:62 msgid "" "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (^Ve for " "editor)." msgstr "" #. #define FORM_LINK_TEXT_UNM_MSG -#: LYMessages.c:65 +#: LYMessages.c:64 msgid "" "UNMODIFIABLE form text field. Use UP or DOWN arrows or tab to move off." msgstr "" #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE -#: LYMessages.c:67 +#: LYMessages.c:66 msgid "(Form field) Enter text. Use <return> to submit (^Vx for no cache)." msgstr "" #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE -#: LYMessages.c:69 +#: LYMessages.c:68 msgid "" "(Form field) Enter text. Use <return> to submit, arrows or tab to move off." msgstr "" #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG -#: LYMessages.c:71 +#: LYMessages.c:70 msgid "UNMODIFIABLE form field. Use UP or DOWN arrows or tab to move off." msgstr "" #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG -#: LYMessages.c:73 +#: LYMessages.c:72 msgid "" "(mailto form field) Enter text. Use <return> to submit, arrows to move off." msgstr "" #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG -#: LYMessages.c:75 +#: LYMessages.c:74 msgid "(mailto form field) Mail is disallowed so you cannot submit." msgstr "" #. #define FORM_LINK_PASSWORD_MESSAGE -#: LYMessages.c:77 +#: LYMessages.c:76 msgid "" "(Password entry field) Enter text. Use UP or DOWN arrows or tab to move off." msgstr "" #. #define FORM_LINK_PASSWORD_UNM_MSG -#: LYMessages.c:79 +#: LYMessages.c:78 msgid "UNMODIFIABLE form password. Use UP or DOWN arrows or tab to move off." msgstr "" #. #define FORM_LINK_CHECKBOX_MESSAGE -#: LYMessages.c:81 +#: LYMessages.c:80 msgid "(Checkbox Field) Use right-arrow or <return> to toggle." msgstr "" #. #define FORM_LINK_CHECKBOX_UNM_MSG -#: LYMessages.c:83 +#: LYMessages.c:82 msgid "UNMODIFIABLE form checkbox. Use UP or DOWN arrows or tab to move off." msgstr "" #. #define FORM_LINK_RADIO_MESSAGE -#: LYMessages.c:85 +#: LYMessages.c:84 msgid "(Radio Button) Use right-arrow or <return> to toggle." msgstr "" #. #define FORM_LINK_RADIO_UNM_MSG -#: LYMessages.c:87 +#: LYMessages.c:86 msgid "" "UNMODIFIABLE form radio button. Use UP or DOWN arrows or tab to move off." msgstr "" #. #define FORM_LINK_SUBMIT_PREFIX -#: LYMessages.c:89 +#: LYMessages.c:88 msgid "Submit ('x' for no cache) to " msgstr "" #. #define FORM_LINK_RESUBMIT_PREFIX -#: LYMessages.c:91 +#: LYMessages.c:90 msgid "Submit to " msgstr "" #. #define FORM_LINK_SUBMIT_MESSAGE -#: LYMessages.c:93 +#: LYMessages.c:92 msgid "" "(Form submit button) Use right-arrow or <return> to submit ('x' for no " "cache)." msgstr "" #. #define FORM_LINK_RESUBMIT_MESSAGE -#: LYMessages.c:95 +#: LYMessages.c:94 msgid "(Form submit button) Use right-arrow or <return> to submit." msgstr "" #. #define FORM_LINK_SUBMIT_DIS_MSG -#: LYMessages.c:97 +#: LYMessages.c:96 msgid "DISABLED form submit button. Use UP or DOWN arrows or tab to move off." msgstr "" #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX -#: LYMessages.c:99 +#: LYMessages.c:98 msgid "Submit mailto form to " msgstr "" #. #define FORM_LINK_SUBMIT_MAILTO_MSG -#: LYMessages.c:101 +#: LYMessages.c:100 msgid "(mailto form submit button) Use right-arrow or <return> to submit." msgstr "" #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG -#: LYMessages.c:103 +#: LYMessages.c:102 msgid "(mailto form submit button) Mail is disallowed so you cannot submit." msgstr "" #. #define FORM_LINK_RESET_MESSAGE -#: LYMessages.c:105 +#: LYMessages.c:104 msgid "" "(Form reset button) Use right-arrow or <return> to reset form to defaults." msgstr "" #. #define FORM_LINK_RESET_DIS_MSG -#: LYMessages.c:107 +#: LYMessages.c:106 msgid "DISABLED form reset button. Use UP or DOWN arrows or tab to move off." msgstr "" #. #define FORM_LINK_OPTION_LIST_MESSAGE -#: LYMessages.c:109 +#: LYMessages.c:108 msgid "" "(Option list) Hit return and use arrow keys and return to select option." msgstr "" #. #define CHOICE_LIST_MESSAGE -#: LYMessages.c:111 +#: LYMessages.c:110 msgid "" "(Choice list) Hit return and use arrow keys and return to select option." msgstr "" #. #define FORM_LINK_OPTION_LIST_UNM_MSG -#: LYMessages.c:113 +#: LYMessages.c:112 msgid "UNMODIFIABLE option list. Use return or arrow keys to review or leave." msgstr "" #. #define CHOICE_LIST_UNM_MSG -#: LYMessages.c:115 +#: LYMessages.c:114 msgid "UNMODIFIABLE choice list. Use return or arrow keys to review or leave." msgstr "" -#: LYMessages.c:116 +#: LYMessages.c:115 msgid "Submitting form..." msgstr "" -#: LYMessages.c:117 +#: LYMessages.c:116 msgid "Resetting form..." msgstr "" #. #define RELOADING_FORM -#: LYMessages.c:119 +#: LYMessages.c:118 msgid "Reloading document. Any form entries will be lost!" msgstr "" -#: LYMessages.c:120 +#: LYMessages.c:119 #, c-format msgid "Warning: Cannot transcode form data to charset %s!" msgstr "" #. #define NORMAL_LINK_MESSAGE -#: LYMessages.c:123 +#: LYMessages.c:122 msgid "(NORMAL LINK) Use right-arrow or <return> to activate." msgstr "" -#: LYMessages.c:124 +#: LYMessages.c:123 msgid "The resource requested is not available at this time." msgstr "" -#: LYMessages.c:125 +#: LYMessages.c:124 msgid "Enter Lynx keystroke command: " msgstr "" -#: LYMessages.c:126 +#: LYMessages.c:125 msgid "Looking up " msgstr "" -#: LYMessages.c:127 +#: LYMessages.c:126 #, c-format msgid "Getting %s" msgstr "" -#: LYMessages.c:128 +#: LYMessages.c:127 #, c-format msgid "Skipping %s" msgstr "" -#: LYMessages.c:129 +#: LYMessages.c:128 #, c-format msgid "Using %s" msgstr "" -#: LYMessages.c:130 +#: LYMessages.c:129 #, c-format msgid "Illegal URL: %s" msgstr "" -#: LYMessages.c:131 +#: LYMessages.c:130 #, c-format msgid "Badly formed address %s" msgstr "" -#: LYMessages.c:132 +#: LYMessages.c:131 #, c-format msgid "URL: %s" msgstr "" -#: LYMessages.c:133 +#: LYMessages.c:132 msgid "Unable to access WWW file!!!" msgstr "" -#: LYMessages.c:134 +#: LYMessages.c:133 #, c-format msgid "This is a searchable index. Use %s to search." msgstr "" #. #define WWW_INDEX_MORE_MESSAGE -#: LYMessages.c:136 +#: LYMessages.c:135 #, c-format msgid "--More-- This is a searchable index. Use %s to search." msgstr "" -#: LYMessages.c:137 +#: LYMessages.c:136 msgid "You have entered an invalid link number." msgstr "" #. #define SOURCE_HELP -#: LYMessages.c:139 +#: LYMessages.c:138 msgid "" "Currently viewing document source. Press '\\' to return to rendered version." msgstr "" #. #define NOVICE_LINE_ONE -#: LYMessages.c:141 +#: LYMessages.c:140 msgid "" " Arrow keys: Up and Down to move. Right to follow a link; Left to go back. " " \n" msgstr "" #. #define NOVICE_LINE_TWO -#: LYMessages.c:143 +#: LYMessages.c:142 msgid "" " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list " "\n" msgstr "" #. #define NOVICE_LINE_TWO_A -#: LYMessages.c:145 +#: LYMessages.c:144 msgid "" " O)ther cmds H)elp K)eymap G)oto P)rint M)ain screen o)ptions Q)uit " "\n" msgstr "" #. #define NOVICE_LINE_TWO_B -#: LYMessages.c:147 +#: LYMessages.c:146 msgid "" " O)ther cmds B)ack E)dit D)ownload ^R)eload ^W)ipe screen search doc: / " "\n" msgstr "" #. #define NOVICE_LINE_TWO_C -#: LYMessages.c:149 +#: LYMessages.c:148 msgid "" " O)ther cmds C)omment History: <delete> Bookmarks: V)iew, A)dd, R)emove " "\n" msgstr "" #. #define FORM_NOVICELINE_ONE -#: LYMessages.c:151 +#: LYMessages.c:150 msgid "" " Enter text into the field by typing on the keyboard " msgstr "" #. #define FORM_NOVICELINE_TWO -#: LYMessages.c:153 +#: LYMessages.c:152 msgid "" " Ctrl-U to delete all text in field, [Backspace] to delete a character " msgstr "" #. mailto -#: LYMessages.c:156 +#: LYMessages.c:155 msgid "Malformed mailto form submission! Cancelled!" msgstr "" -#: LYMessages.c:157 +#: LYMessages.c:156 msgid "Warning! Control codes in mail address replaced by ?" msgstr "" -#: LYMessages.c:158 +#: LYMessages.c:157 msgid "Mail disallowed! Cannot submit." msgstr "" -#: LYMessages.c:159 +#: LYMessages.c:158 msgid "Mailto form submission failed!" msgstr "" -#: LYMessages.c:160 +#: LYMessages.c:159 msgid "Mailto form submission Cancelled!!!" msgstr "" -#: LYMessages.c:161 +#: LYMessages.c:160 msgid "Sending form content..." msgstr "" -#: LYMessages.c:162 +#: LYMessages.c:161 msgid "No email address is present in mailto URL!" msgstr "" #. #define MAILTO_URL_TEMPOPEN_FAILED -#: LYMessages.c:164 +#: LYMessages.c:163 msgid "Unable to open temporary file for mailto URL!" msgstr "" -#: LYMessages.c:165 +#: LYMessages.c:164 msgid "Comment request cancelled!!!" msgstr "" #. #define INC_ORIG_MSG_PROMPT -#: LYMessages.c:167 +#: LYMessages.c:166 msgid "Do you wish to include the original message?" msgstr "" #. #define INC_PREPARSED_MSG_PROMPT -#: LYMessages.c:169 +#: LYMessages.c:168 msgid "Do you wish to include the preparsed source?" msgstr "" #. #define SPAWNING_EDITOR_FOR_MAIL -#: LYMessages.c:171 +#: LYMessages.c:170 msgid "Spawning your selected editor to edit mail message" msgstr "" #. #define ERROR_SPAWNING_EDITOR -#: LYMessages.c:173 +#: LYMessages.c:172 msgid "Error spawning editor, check your editor definition in the options menu" msgstr "" -#: LYMessages.c:174 +#: LYMessages.c:173 msgid "Send this comment?" msgstr "" -#: LYMessages.c:175 +#: LYMessages.c:174 msgid "Send this message?" msgstr "" -#: LYMessages.c:176 +#: LYMessages.c:175 msgid "Sending your message..." msgstr "" -#: LYMessages.c:177 +#: LYMessages.c:176 msgid "Sending your comment:" msgstr "" #. textarea -#: LYMessages.c:180 +#: LYMessages.c:179 msgid "Not in a TEXTAREA; cannot use external editor." msgstr "" -#: LYMessages.c:181 +#: LYMessages.c:180 msgid "Not in a TEXTAREA; cannot use command." msgstr "" -#: LYMessages.c:184 +#: LYMessages.c:183 msgid "file: ACTIONs are disallowed!" msgstr "" #. #define FILE_SERVED_LINKS_DISALLOWED -#: LYMessages.c:186 +#: LYMessages.c:185 msgid "file: URLs via served links are disallowed!" msgstr "" -#: LYMessages.c:187 +#: LYMessages.c:186 msgid "Access to local files denied." msgstr "" -#: LYMessages.c:188 +#: LYMessages.c:187 msgid "file: URLs via bookmarks are disallowed!" msgstr "" #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED -#: LYMessages.c:190 +#: LYMessages.c:189 msgid "This special URL is not allowed in external documents!" msgstr "" -#: LYMessages.c:191 +#: LYMessages.c:190 msgid "Press <return> to return to Lynx." msgstr "" #. #define SPAWNING_MSG -#: LYMessages.c:194 +#: LYMessages.c:193 msgid "Spawning DCL subprocess. Use 'logout' to return to Lynx.\n" msgstr "" #. #define SPAWNING_MSG -#: LYMessages.c:198 +#: LYMessages.c:197 msgid "Type EXIT to return to Lynx.\n" msgstr "" #. #define SPAWNING_MSG -#: LYMessages.c:201 +#: LYMessages.c:200 msgid "Spawning your default shell. Use 'exit' to return to Lynx.\n" msgstr "" -#: LYMessages.c:204 +#: LYMessages.c:203 msgid "Spawning is currently disabled." msgstr "" -#: LYMessages.c:205 +#: LYMessages.c:204 msgid "The 'd'ownload command is currently disabled." msgstr "" -#: LYMessages.c:206 +#: LYMessages.c:205 msgid "You cannot download an input field." msgstr "" -#: LYMessages.c:207 +#: LYMessages.c:206 msgid "Form has a mailto action! Cannot download." msgstr "" -#: LYMessages.c:208 +#: LYMessages.c:207 msgid "You cannot download a mailto: link." msgstr "" -#: LYMessages.c:209 +#: LYMessages.c:208 msgid "You cannot download cookies." msgstr "" -#: LYMessages.c:210 +#: LYMessages.c:209 msgid "You cannot download a printing option." msgstr "" -#: LYMessages.c:211 +#: LYMessages.c:210 msgid "You cannot download an upload option." msgstr "" -#: LYMessages.c:212 +#: LYMessages.c:211 msgid "You cannot download an permit option." msgstr "" -#: LYMessages.c:213 +#: LYMessages.c:212 msgid "This special URL cannot be downloaded!" msgstr "" -#: LYMessages.c:214 +#: LYMessages.c:213 msgid "Nothing to download." msgstr "" -#: LYMessages.c:215 +#: LYMessages.c:214 msgid "Trace ON!" msgstr "" -#: LYMessages.c:216 +#: LYMessages.c:215 msgid "Trace OFF!" msgstr "" #. #define CLICKABLE_IMAGES_ON -#: LYMessages.c:218 +#: LYMessages.c:217 msgid "Links will be included for all images! Reloading..." msgstr "" #. #define CLICKABLE_IMAGES_OFF -#: LYMessages.c:220 +#: LYMessages.c:219 msgid "Standard image handling restored! Reloading..." msgstr "" #. #define PSEUDO_INLINE_ALTS_ON -#: LYMessages.c:222 +#: LYMessages.c:221 msgid "" "Pseudo_ALTs will be inserted for inlines without ALT strings! Reloading..." msgstr "" #. #define PSEUDO_INLINE_ALTS_OFF -#: LYMessages.c:224 +#: LYMessages.c:223 msgid "Inlines without an ALT string specified will be ignored! Reloading..." msgstr "" -#: LYMessages.c:225 +#: LYMessages.c:224 msgid "Raw 8-bit or CJK mode toggled OFF! Reloading..." msgstr "" -#: LYMessages.c:226 +#: LYMessages.c:225 msgid "Raw 8-bit or CJK mode toggled ON! Reloading..." msgstr "" #. #define HEAD_D_L_OR_CANCEL -#: LYMessages.c:228 +#: LYMessages.c:227 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): " msgstr "" #. #define HEAD_D_OR_CANCEL -#: LYMessages.c:230 +#: LYMessages.c:229 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): " msgstr "" -#: LYMessages.c:231 +#: LYMessages.c:230 msgid "Sorry, the document is not an http URL." msgstr "" -#: LYMessages.c:232 +#: LYMessages.c:231 msgid "Sorry, the link is not an http URL." msgstr "" -#: LYMessages.c:233 +#: LYMessages.c:232 msgid "Sorry, the ACTION for this form is disabled." msgstr "" #. #define FORM_ACTION_NOT_HTTP_URL -#: LYMessages.c:235 +#: LYMessages.c:234 msgid "Sorry, the ACTION for this form is not an http URL." msgstr "" -#: LYMessages.c:236 +#: LYMessages.c:235 msgid "Not an http URL or form ACTION!" msgstr "" -#: LYMessages.c:237 +#: LYMessages.c:236 msgid "This special URL cannot be a form ACTION!" msgstr "" -#: LYMessages.c:238 +#: LYMessages.c:237 msgid "URL is not in starting realm!" msgstr "" -#: LYMessages.c:239 +#: LYMessages.c:238 msgid "News posting is disabled!" msgstr "" -#: LYMessages.c:240 +#: LYMessages.c:239 msgid "File management support is disabled!" msgstr "" -#: LYMessages.c:241 +#: LYMessages.c:240 msgid "No jump file is currently available." msgstr "" -#: LYMessages.c:242 +#: LYMessages.c:241 msgid "Jump to (use '?' for list): " msgstr "" -#: LYMessages.c:243 +#: LYMessages.c:242 msgid "Jumping to a shortcut URL is disallowed!" msgstr "" -#: LYMessages.c:244 +#: LYMessages.c:243 msgid "Random URL is disallowed! Use a shortcut." msgstr "" -#: LYMessages.c:245 +#: LYMessages.c:244 msgid "No random URLs have been used thus far." msgstr "" -#: LYMessages.c:246 +#: LYMessages.c:245 msgid "Bookmark features are currently disabled." msgstr "" -#: LYMessages.c:247 +#: LYMessages.c:246 msgid "Execution via bookmarks is disabled." msgstr "" #. #define BOOKMARK_FILE_NOT_DEFINED -#: LYMessages.c:249 +#: LYMessages.c:248 #, c-format msgid "Bookmark file is not defined. Use %s to see options." msgstr "" #. #define NO_TEMP_FOR_HOTLIST -#: LYMessages.c:251 +#: LYMessages.c:250 msgid "Unable to open tempfile for X Mosaic hotlist conversion." msgstr "" -#: LYMessages.c:252 +#: LYMessages.c:251 msgid "ERROR - unable to open bookmark file." msgstr "" #. #define BOOKMARK_OPEN_FAILED_FOR_DEL -#: LYMessages.c:254 +#: LYMessages.c:253 msgid "Unable to open bookmark file for deletion of link." msgstr "" #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL -#: LYMessages.c:256 +#: LYMessages.c:255 msgid "Unable to open scratch file for deletion of link." msgstr "" -#: LYMessages.c:258 +#: LYMessages.c:257 msgid "Error renaming scratch file." msgstr "" -#: LYMessages.c:260 +#: LYMessages.c:259 msgid "Error renaming temporary file." msgstr "" #. #define BOOKTEMP_COPY_FAIL -#: LYMessages.c:262 +#: LYMessages.c:261 msgid "Unable to copy temporary file for deletion of link." msgstr "" #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL -#: LYMessages.c:264 +#: LYMessages.c:263 msgid "Unable to reopen temporary file for deletion of link." msgstr "" #. #define BOOKMARK_LINK_NOT_ONE_LINE -#: LYMessages.c:267 +#: LYMessages.c:266 msgid "Link is not by itself all on one line in bookmark file." msgstr "" -#: LYMessages.c:268 +#: LYMessages.c:267 msgid "Bookmark deletion failed." msgstr "" #. #define BOOKMARKS_NOT_TRAVERSED -#: LYMessages.c:270 +#: LYMessages.c:269 msgid "Bookmark files cannot be traversed (only http URLs)." msgstr "" #. #define BOOKMARKS_NOT_OPEN -#: LYMessages.c:272 +#: LYMessages.c:271 msgid "Unable to open bookmark file, use 'a' to save a link first" msgstr "" -#: LYMessages.c:273 +#: LYMessages.c:272 msgid "There are no links in this bookmark file!" msgstr "" #. #define BOOK_D_L_OR_CANCEL -#: LYMessages.c:275 +#: LYMessages.c:274 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): " msgstr "" -#: LYMessages.c:276 +#: LYMessages.c:275 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): " msgstr "" -#: LYMessages.c:277 +#: LYMessages.c:276 msgid "Save L)ink to bookmark file or C)ancel? (l,c): " msgstr "" #. #define NOBOOK_POST_FORM -#: LYMessages.c:279 +#: LYMessages.c:278 msgid "Documents from forms with POST content cannot be saved as bookmarks." msgstr "" -#: LYMessages.c:280 +#: LYMessages.c:279 msgid "Cannot save form fields/links" msgstr "" #. #define NOBOOK_HSML -#: LYMessages.c:282 +#: LYMessages.c:281 msgid "History, showinfo, menu and list files cannot be saved as bookmarks." msgstr "" #. #define CONFIRM_BOOKMARK_DELETE -#: LYMessages.c:284 +#: LYMessages.c:283 msgid "Do you really want to delete this link from your bookmark file?" msgstr "" -#: LYMessages.c:285 +#: LYMessages.c:284 msgid "Malformed address." msgstr "" #. #define HISTORICAL_ON_MINIMAL_OFF -#: LYMessages.c:287 +#: LYMessages.c:286 msgid "Historical comment parsing ON (Minimal is overridden)!" msgstr "" #. #define HISTORICAL_OFF_MINIMAL_ON -#: LYMessages.c:289 +#: LYMessages.c:288 msgid "Historical comment parsing OFF (Minimal is in effect)!" msgstr "" #. #define HISTORICAL_ON_VALID_OFF -#: LYMessages.c:291 +#: LYMessages.c:290 msgid "Historical comment parsing ON (Valid is overridden)!" msgstr "" #. #define HISTORICAL_OFF_VALID_ON -#: LYMessages.c:293 +#: LYMessages.c:292 msgid "Historical comment parsing OFF (Valid is in effect)!" msgstr "" #. #define MINIMAL_ON_IN_EFFECT -#: LYMessages.c:295 +#: LYMessages.c:294 msgid "Minimal comment parsing ON (and in effect)!" msgstr "" #. #define MINIMAL_OFF_VALID_ON -#: LYMessages.c:297 +#: LYMessages.c:296 msgid "Minimal comment parsing OFF (Valid is in effect)!" msgstr "" #. #define MINIMAL_ON_BUT_HISTORICAL -#: LYMessages.c:299 +#: LYMessages.c:298 msgid "Minimal comment parsing ON (but Historical is in effect)!" msgstr "" #. #define MINIMAL_OFF_HISTORICAL_ON -#: LYMessages.c:301 +#: LYMessages.c:300 msgid "Minimal comment parsing OFF (Historical is in effect)!" msgstr "" -#: LYMessages.c:302 +#: LYMessages.c:301 msgid "Soft double-quote parsing ON!" msgstr "" -#: LYMessages.c:303 +#: LYMessages.c:302 msgid "Soft double-quote parsing OFF!" msgstr "" -#: LYMessages.c:304 +#: LYMessages.c:303 msgid "Now using TagSoup parsing of HTML." msgstr "" -#: LYMessages.c:305 +#: LYMessages.c:304 msgid "Now using SortaSGML parsing of HTML!" msgstr "" -#: LYMessages.c:306 +#: LYMessages.c:305 msgid "You are already at the end of this document." msgstr "" -#: LYMessages.c:307 +#: LYMessages.c:306 msgid "You are already at the beginning of this document." msgstr "" -#: LYMessages.c:308 +#: LYMessages.c:307 #, c-format msgid "You are already at page %d of this document." msgstr "" -#: LYMessages.c:309 +#: LYMessages.c:308 #, c-format msgid "Link number %d already is current." msgstr "" -#: LYMessages.c:310 +#: LYMessages.c:309 msgid "You are already at the first document" msgstr "" -#: LYMessages.c:311 +#: LYMessages.c:310 msgid "There are no links above this line of the document." msgstr "" -#: LYMessages.c:312 +#: LYMessages.c:311 msgid "There are no links below this line of the document." msgstr "" #. #define MAXLEN_REACHED_DEL_OR_MOV -#: LYMessages.c:314 +#: LYMessages.c:313 msgid "Maximum length reached! Delete text or move off field." msgstr "" #. #define NOT_ON_SUBMIT_OR_LINK -#: LYMessages.c:316 +#: LYMessages.c:315 msgid "You are not on a form submission button or normal link." msgstr "" #. #define NEED_CHECKED_RADIO_BUTTON -#: LYMessages.c:318 +#: LYMessages.c:317 msgid "One radio button must be checked at all times!" msgstr "" -#: LYMessages.c:319 +#: LYMessages.c:318 msgid "Do you want to go back to the previous document?" msgstr "" -#: LYMessages.c:320 +#: LYMessages.c:319 msgid "Use arrows or tab to move off of field." msgstr "" #. #define ENTER_TEXT_ARROWS_OR_TAB -#: LYMessages.c:322 +#: LYMessages.c:321 msgid "Enter text. Use arrows or tab to move off of field." msgstr "" -#: LYMessages.c:323 +#: LYMessages.c:322 msgid "** Bad HTML!! No form action defined. **" msgstr "" -#: LYMessages.c:324 +#: LYMessages.c:323 msgid "Bad HTML!! Unable to create popup window!" msgstr "" -#: LYMessages.c:325 +#: LYMessages.c:324 msgid "Unable to create popup window!" msgstr "" -#: LYMessages.c:326 +#: LYMessages.c:325 msgid "Goto a random URL is disallowed!" msgstr "" -#: LYMessages.c:327 +#: LYMessages.c:326 msgid "Goto a non-http URL is disallowed!" msgstr "" -#: LYMessages.c:328 +#: LYMessages.c:327 msgid "You are not allowed to goto \"cso:\" URLs" msgstr "" -#: LYMessages.c:329 +#: LYMessages.c:328 msgid "You are not allowed to goto \"file:\" URLs" msgstr "" -#: LYMessages.c:330 +#: LYMessages.c:329 msgid "You are not allowed to goto \"finger:\" URLs" msgstr "" -#: LYMessages.c:331 +#: LYMessages.c:330 msgid "You are not allowed to goto \"ftp:\" URLs" msgstr "" -#: LYMessages.c:332 +#: LYMessages.c:331 msgid "You are not allowed to goto \"gopher:\" URLs" msgstr "" -#: LYMessages.c:333 +#: LYMessages.c:332 msgid "You are not allowed to goto \"http:\" URLs" msgstr "" -#: LYMessages.c:334 +#: LYMessages.c:333 msgid "You are not allowed to goto \"https:\" URLs" msgstr "" -#: LYMessages.c:335 +#: LYMessages.c:334 msgid "You are not allowed to goto \"lynxcgi:\" URLs" msgstr "" -#: LYMessages.c:336 +#: LYMessages.c:335 msgid "You are not allowed to goto \"lynxexec:\" URLs" msgstr "" -#: LYMessages.c:337 +#: LYMessages.c:336 msgid "You are not allowed to goto \"lynxprog:\" URLs" msgstr "" -#: LYMessages.c:338 +#: LYMessages.c:337 msgid "You are not allowed to goto \"mailto:\" URLs" msgstr "" -#: LYMessages.c:339 +#: LYMessages.c:338 msgid "You are not allowed to goto \"news:\" URLs" msgstr "" -#: LYMessages.c:340 +#: LYMessages.c:339 msgid "You are not allowed to goto \"nntp:\" URLs" msgstr "" -#: LYMessages.c:341 +#: LYMessages.c:340 msgid "You are not allowed to goto \"rlogin:\" URLs" msgstr "" -#: LYMessages.c:342 +#: LYMessages.c:341 msgid "You are not allowed to goto \"snews:\" URLs" msgstr "" -#: LYMessages.c:343 +#: LYMessages.c:342 msgid "You are not allowed to goto \"telnet:\" URLs" msgstr "" -#: LYMessages.c:344 +#: LYMessages.c:343 msgid "You are not allowed to goto \"tn3270:\" URLs" msgstr "" -#: LYMessages.c:345 +#: LYMessages.c:344 msgid "You are not allowed to goto \"wais:\" URLs" msgstr "" -#: LYMessages.c:346 +#: LYMessages.c:345 msgid "This special URL is not allowed as a goto!" msgstr "" -#: LYMessages.c:347 +#: LYMessages.c:346 msgid "URL to open: " msgstr "" -#: LYMessages.c:348 +#: LYMessages.c:347 msgid "Edit the current Goto URL: " msgstr "" -#: LYMessages.c:349 +#: LYMessages.c:348 msgid "Edit the previous Goto URL: " msgstr "" -#: LYMessages.c:350 +#: LYMessages.c:349 msgid "Edit a previous Goto URL: " msgstr "" -#: LYMessages.c:351 +#: LYMessages.c:350 msgid "Current document has POST data." msgstr "" -#: LYMessages.c:352 +#: LYMessages.c:351 msgid "Edit this document's URL: " msgstr "" -#: LYMessages.c:353 +#: LYMessages.c:352 msgid "Edit the current link's URL: " msgstr "" -#: LYMessages.c:354 +#: LYMessages.c:353 msgid "You cannot edit File Management URLs" msgstr "" -#: LYMessages.c:355 +#: LYMessages.c:354 msgid "Enter a database query: " msgstr "" -#: LYMessages.c:356 +#: LYMessages.c:355 msgid "Enter a whereis query: " msgstr "" -#: LYMessages.c:357 +#: LYMessages.c:356 msgid "Edit the current query: " msgstr "" -#: LYMessages.c:358 +#: LYMessages.c:357 msgid "Edit the previous query: " msgstr "" -#: LYMessages.c:359 +#: LYMessages.c:358 msgid "Edit a previous query: " msgstr "" #. #define USE_C_R_TO_RESUB_CUR_QUERY -#: LYMessages.c:361 +#: LYMessages.c:360 msgid "Use Control-R to resubmit the current query." msgstr "" -#: LYMessages.c:362 +#: LYMessages.c:361 msgid "Edit the current shortcut: " msgstr "" -#: LYMessages.c:363 +#: LYMessages.c:362 msgid "Edit the previous shortcut: " msgstr "" -#: LYMessages.c:364 +#: LYMessages.c:363 msgid "Edit a previous shortcut: " msgstr "" -#: LYMessages.c:365 +#: LYMessages.c:364 #, c-format msgid "Key '%c' is not mapped to a jump file!" msgstr "" -#: LYMessages.c:366 +#: LYMessages.c:365 msgid "Cannot locate jump file!" msgstr "" -#: LYMessages.c:367 +#: LYMessages.c:366 msgid "Cannot open jump file!" msgstr "" -#: LYMessages.c:368 +#: LYMessages.c:367 msgid "Error reading jump file!" msgstr "" -#: LYMessages.c:369 +#: LYMessages.c:368 msgid "Out of memory reading jump file!" msgstr "" -#: LYMessages.c:370 +#: LYMessages.c:369 msgid "Out of memory reading jump table!" msgstr "" -#: LYMessages.c:371 +#: LYMessages.c:370 msgid "No index is currently available." msgstr "" #. #define CONFIRM_MAIN_SCREEN -#: LYMessages.c:373 +#: LYMessages.c:372 msgid "Do you really want to go to the Main screen?" msgstr "" -#: LYMessages.c:374 +#: LYMessages.c:373 msgid "You are already at main screen!" msgstr "" #. #define NOT_ISINDEX -#: LYMessages.c:376 +#: LYMessages.c:375 msgid "" "Not a searchable indexed document -- press '/' to search for a text string" msgstr "" #. #define NO_OWNER -#: LYMessages.c:378 +#: LYMessages.c:377 msgid "No owner is defined for this file so you cannot send a comment" msgstr "" -#: LYMessages.c:379 +#: LYMessages.c:378 #, c-format msgid "No owner is defined. Use %s?" msgstr "" -#: LYMessages.c:380 +#: LYMessages.c:379 msgid "Do you wish to send a comment?" msgstr "" -#: LYMessages.c:381 +#: LYMessages.c:380 msgid "Mail is disallowed so you cannot send a comment" msgstr "" -#: LYMessages.c:382 +#: LYMessages.c:381 msgid "The 'e'dit command is currently disabled." msgstr "" -#: LYMessages.c:383 +#: LYMessages.c:382 msgid "External editing is currently disabled." msgstr "" -#: LYMessages.c:384 +#: LYMessages.c:383 msgid "System error - failure to get status." msgstr "" -#: LYMessages.c:385 +#: LYMessages.c:384 msgid "No editor is defined!" msgstr "" -#: LYMessages.c:386 +#: LYMessages.c:385 msgid "The 'p'rint command is currently disabled." msgstr "" -#: LYMessages.c:387 +#: LYMessages.c:386 msgid "Document has no Toolbar links or Banner." msgstr "" -#: LYMessages.c:388 +#: LYMessages.c:387 msgid "Unable to open traversal file." msgstr "" -#: LYMessages.c:389 +#: LYMessages.c:388 msgid "Unable to open traversal found file." msgstr "" -#: LYMessages.c:390 +#: LYMessages.c:389 msgid "Unable to open reject file." msgstr "" -#: LYMessages.c:391 +#: LYMessages.c:390 msgid "Unable to open traversal errors output file" msgstr "" -#: LYMessages.c:392 +#: LYMessages.c:391 msgid "TRAVERSAL WAS INTERRUPTED" msgstr "" -#: LYMessages.c:393 +#: LYMessages.c:392 msgid "Follow link (or goto link or page) number: " msgstr "" -#: LYMessages.c:394 +#: LYMessages.c:393 msgid "Select option (or page) number: " msgstr "" -#: LYMessages.c:395 +#: LYMessages.c:394 msgid "Option choice (or page) number: " msgstr "" -#: LYMessages.c:396 +#: LYMessages.c:395 #, c-format msgid "Option number %d already is current." msgstr "" -#: LYMessages.c:397 +#: LYMessages.c:396 #, c-format msgid "Choice number %d already is current." msgstr "" #. #define ALREADY_AT_OPTION_END -#: LYMessages.c:399 +#: LYMessages.c:398 msgid "You are already at the end of this option list." msgstr "" #. #define ALREADY_AT_CHOICE_END -#: LYMessages.c:401 +#: LYMessages.c:400 msgid "You are already at the end of this choice list." msgstr "" #. #define ALREADY_AT_OPTION_BEGIN -#: LYMessages.c:403 +#: LYMessages.c:402 msgid "You are already at the beginning of this option list." msgstr "" #. #define ALREADY_AT_CHOICE_BEGIN -#: LYMessages.c:405 +#: LYMessages.c:404 msgid "You are already at the beginning of this choice list." msgstr "" #. #define ALREADY_AT_OPTION_PAGE -#: LYMessages.c:407 +#: LYMessages.c:406 #, c-format msgid "You are already at page %d of this option list." msgstr "" #. #define ALREADY_AT_CHOICE_PAGE -#: LYMessages.c:409 +#: LYMessages.c:408 #, c-format msgid "You are already at page %d of this choice list." msgstr "" -#: LYMessages.c:410 +#: LYMessages.c:409 msgid "You have entered an invalid option number." msgstr "" -#: LYMessages.c:411 +#: LYMessages.c:410 msgid "You have entered an invalid choice number." msgstr "" -#: LYMessages.c:412 +#: LYMessages.c:411 msgid "** Bad HTML!! Use -trace to diagnose. **" msgstr "" -#: LYMessages.c:413 +#: LYMessages.c:412 msgid "Give name of file to save in" msgstr "" -#: LYMessages.c:414 +#: LYMessages.c:413 msgid "Can't save data to file -- please run WWW locally" msgstr "" -#: LYMessages.c:415 +#: LYMessages.c:414 msgid "Can't open temporary file!" msgstr "" -#: LYMessages.c:416 +#: LYMessages.c:415 msgid "Can't open output file! Cancelling!" msgstr "" -#: LYMessages.c:417 +#: LYMessages.c:416 msgid "Execution is disabled." msgstr "" #. #define EXECUTION_DISABLED_FOR_FILE -#: LYMessages.c:419 +#: LYMessages.c:418 #, c-format msgid "Execution is not enabled for this file. See the Options menu (use %s)." msgstr "" #. #define EXECUTION_NOT_COMPILED -#: LYMessages.c:421 +#: LYMessages.c:420 msgid "Execution capabilities are not compiled into this version." msgstr "" -#: LYMessages.c:422 +#: LYMessages.c:421 msgid "This file cannot be displayed on this terminal." msgstr "" #. #define CANNOT_DISPLAY_FILE_D_OR_C -#: LYMessages.c:424 +#: LYMessages.c:423 msgid "This file cannot be displayed on this terminal: D)ownload, or C)ancel" msgstr "" -#: LYMessages.c:425 +#: LYMessages.c:424 #, c-format msgid "%s D)ownload, or C)ancel" msgstr "" -#: LYMessages.c:426 +#: LYMessages.c:425 msgid "Cancelling file." msgstr "" -#: LYMessages.c:427 +#: LYMessages.c:426 msgid "Retrieving file. - PLEASE WAIT -" msgstr "" -#: LYMessages.c:428 +#: LYMessages.c:427 msgid "Enter a filename: " msgstr "" -#: LYMessages.c:429 +#: LYMessages.c:428 msgid "Edit the previous filename: " msgstr "" -#: LYMessages.c:430 +#: LYMessages.c:429 msgid "Edit a previous filename: " msgstr "" -#: LYMessages.c:431 +#: LYMessages.c:430 msgid "Enter a new filename: " msgstr "" -#: LYMessages.c:432 +#: LYMessages.c:431 msgid "File name may not begin with a dot." msgstr "" -#: LYMessages.c:434 +#: LYMessages.c:433 msgid "File exists. Create higher version?" msgstr "" -#: LYMessages.c:436 +#: LYMessages.c:435 msgid "File exists. Overwrite?" msgstr "" -#: LYMessages.c:438 +#: LYMessages.c:437 msgid "Cannot write to file." msgstr "" -#: LYMessages.c:439 +#: LYMessages.c:438 msgid "ERROR! - download command is misconfigured." msgstr "" -#: LYMessages.c:440 +#: LYMessages.c:439 msgid "Unable to download file." msgstr "" -#: LYMessages.c:441 +#: LYMessages.c:440 msgid "Building directory listing..." msgstr "" -#: LYMessages.c:442 +#: LYMessages.c:441 msgid "Saving..." msgstr "" -#: LYMessages.c:443 +#: LYMessages.c:442 #, c-format msgid "Could not edit file '%s'." msgstr "" -#: LYMessages.c:444 +#: LYMessages.c:443 msgid "Could not access file." msgstr "" -#: LYMessages.c:445 +#: LYMessages.c:444 msgid "Could not access directory." msgstr "" -#: LYMessages.c:446 +#: LYMessages.c:445 msgid "Could not load data." msgstr "" #. #define CANNOT_EDIT_REMOTE_FILES -#: LYMessages.c:448 +#: LYMessages.c:447 msgid "Lynx cannot currently (e)dit remote WWW files." msgstr "" #. #define CANNOT_EDIT_FIELD -#: LYMessages.c:450 +#: LYMessages.c:449 msgid "This field cannot be (e)dited with an external editor." msgstr "" -#: LYMessages.c:451 +#: LYMessages.c:450 msgid "Bad rule" msgstr "" -#: LYMessages.c:452 +#: LYMessages.c:451 msgid "Insufficient operands:" msgstr "" -#: LYMessages.c:453 +#: LYMessages.c:452 msgid "You are not authorized to edit this file." msgstr "" -#: LYMessages.c:454 +#: LYMessages.c:453 msgid "Title: " msgstr "" -#: LYMessages.c:455 +#: LYMessages.c:454 msgid "Subject: " msgstr "" -#: LYMessages.c:456 +#: LYMessages.c:455 msgid "Username: " msgstr "" -#: LYMessages.c:457 +#: LYMessages.c:456 msgid "Password: " msgstr "" -#: LYMessages.c:458 +#: LYMessages.c:457 msgid "lynx: Username and Password required!!!" msgstr "" -#: LYMessages.c:459 +#: LYMessages.c:458 msgid "lynx: Password required!!!" msgstr "" -#: LYMessages.c:460 +#: LYMessages.c:459 msgid "Clear all authorization info for this session?" msgstr "" -#: LYMessages.c:461 +#: LYMessages.c:460 msgid "Authorization info cleared." msgstr "" -#: LYMessages.c:462 +#: LYMessages.c:461 msgid "Authorization failed. Retry?" msgstr "" -#: LYMessages.c:463 +#: LYMessages.c:462 msgid "cgi support has been disabled by system administrator." msgstr "" #. #define CGI_NOT_COMPILED -#: LYMessages.c:465 +#: LYMessages.c:464 msgid "Lynxcgi capabilities are not compiled into this version." msgstr "" -#: LYMessages.c:466 +#: LYMessages.c:465 #, c-format msgid "Sorry, no known way of converting %s to %s." msgstr "" -#: LYMessages.c:467 +#: LYMessages.c:466 msgid "Unable to set up connection." msgstr "" -#: LYMessages.c:468 +#: LYMessages.c:467 msgid "Unable to make connection" msgstr "" #. #define MALFORMED_EXEC_REQUEST -#: LYMessages.c:470 +#: LYMessages.c:469 msgid "Executable link rejected due to malformed request." msgstr "" #. #define BADCHAR_IN_EXEC_LINK -#: LYMessages.c:472 +#: LYMessages.c:471 #, c-format msgid "Executable link rejected due to `%c' character." msgstr "" #. #define RELPATH_IN_EXEC_LINK -#: LYMessages.c:474 +#: LYMessages.c:473 msgid "Executable link rejected due to relative path string ('../')." msgstr "" #. #define BADLOCPATH_IN_EXEC_LINK -#: LYMessages.c:476 +#: LYMessages.c:475 msgid "Executable link rejected due to location or path." msgstr "" -#: LYMessages.c:477 +#: LYMessages.c:476 msgid "Mail access is disabled!" msgstr "" #. #define ACCESS_ONLY_LOCALHOST -#: LYMessages.c:479 +#: LYMessages.c:478 msgid "Only files and servers on the local host can be accessed." msgstr "" -#: LYMessages.c:480 +#: LYMessages.c:479 msgid "Telnet access is disabled!" msgstr "" #. #define TELNET_PORT_SPECS_DISABLED -#: LYMessages.c:482 +#: LYMessages.c:481 msgid "Telnet port specifications are disabled." msgstr "" -#: LYMessages.c:483 +#: LYMessages.c:482 msgid "USENET news access is disabled!" msgstr "" -#: LYMessages.c:484 +#: LYMessages.c:483 msgid "Rlogin access is disabled!" msgstr "" -#: LYMessages.c:485 +#: LYMessages.c:484 msgid "Ftp access is disabled!" msgstr "" -#: LYMessages.c:486 +#: LYMessages.c:485 msgid "There are no references from this document." msgstr "" -#: LYMessages.c:487 +#: LYMessages.c:486 msgid "There are only hidden links from this document." msgstr "" -#: LYMessages.c:489 +#: LYMessages.c:488 msgid "Unable to open command file." msgstr "" -#: LYMessages.c:491 +#: LYMessages.c:490 msgid "News Post Cancelled!!!" msgstr "" #. #define SPAWNING_EDITOR_FOR_NEWS -#: LYMessages.c:493 +#: LYMessages.c:492 msgid "Spawning your selected editor to edit news message" msgstr "" -#: LYMessages.c:494 +#: LYMessages.c:493 msgid "Post this message?" msgstr "" -#: LYMessages.c:495 +#: LYMessages.c:494 #, c-format msgid "Append '%s'?" msgstr "" -#: LYMessages.c:496 +#: LYMessages.c:495 msgid "Posting to newsgroup(s)..." msgstr "" -#: LYMessages.c:498 +#: LYMessages.c:497 msgid "*** You have unread mail. ***" msgstr "" -#: LYMessages.c:500 +#: LYMessages.c:499 msgid "*** You have mail. ***" msgstr "" -#: LYMessages.c:502 +#: LYMessages.c:501 msgid "*** You have new mail. ***" msgstr "" -#: LYMessages.c:503 +#: LYMessages.c:502 msgid "File insert cancelled!!!" msgstr "" -#: LYMessages.c:504 +#: LYMessages.c:503 msgid "File does not exist." msgstr "" -#: LYMessages.c:505 +#: LYMessages.c:504 msgid "File does not exist - reenter or cancel:" msgstr "" -#: LYMessages.c:506 +#: LYMessages.c:505 msgid "File is not readable." msgstr "" -#: LYMessages.c:507 +#: LYMessages.c:506 msgid "File is not readable - reenter or cancel:" msgstr "" -#: LYMessages.c:508 +#: LYMessages.c:507 msgid "Nothing to insert - file is 0-length." msgstr "" -#: LYMessages.c:509 +#: LYMessages.c:508 msgid "Save request cancelled!!!" msgstr "" -#: LYMessages.c:510 +#: LYMessages.c:509 msgid "Mail request cancelled!!!" msgstr "" #. #define CONFIRM_MAIL_SOURCE_PREPARSED -#: LYMessages.c:512 +#: LYMessages.c:511 msgid "Viewing preparsed source. Are you sure you want to mail it?" msgstr "" -#: LYMessages.c:513 +#: LYMessages.c:512 msgid "Please wait..." msgstr "" -#: LYMessages.c:514 +#: LYMessages.c:513 msgid "Mailing file. Please wait..." msgstr "" -#: LYMessages.c:515 +#: LYMessages.c:514 msgid "ERROR - Unable to mail file" msgstr "" #. #define CONFIRM_LONG_SCREEN_PRINT -#: LYMessages.c:517 +#: LYMessages.c:516 #, c-format msgid "File is %d screens long. Are you sure you want to print?" msgstr "" -#: LYMessages.c:518 +#: LYMessages.c:517 msgid "Print request cancelled!!!" msgstr "" -#: LYMessages.c:519 +#: LYMessages.c:518 msgid "Press <return> to begin: " msgstr "" -#: LYMessages.c:520 +#: LYMessages.c:519 msgid "Press <return> to finish: " msgstr "" #. #define CONFIRM_LONG_PAGE_PRINT -#: LYMessages.c:522 +#: LYMessages.c:521 #, c-format msgid "File is %d pages long. Are you sure you want to print?" msgstr "" #. #define CHECK_PRINTER -#: LYMessages.c:524 +#: LYMessages.c:523 msgid "Be sure your printer is on-line. Press <return> to start printing:" msgstr "" -#: LYMessages.c:525 +#: LYMessages.c:524 msgid "ERROR - Unable to allocate file space!!!" msgstr "" -#: LYMessages.c:526 +#: LYMessages.c:525 msgid "Unable to open tempfile" msgstr "" -#: LYMessages.c:527 +#: LYMessages.c:526 msgid "Unable to open print options file" msgstr "" -#: LYMessages.c:528 +#: LYMessages.c:527 msgid "Printing file. Please wait..." msgstr "" -#: LYMessages.c:529 +#: LYMessages.c:528 msgid "Please enter a valid internet mail address: " msgstr "" -#: LYMessages.c:530 +#: LYMessages.c:529 msgid "ERROR! - printer is misconfigured!" msgstr "" -#: LYMessages.c:531 +#: LYMessages.c:530 msgid "Image map from POST response not available!" msgstr "" -#: LYMessages.c:532 +#: LYMessages.c:531 msgid "Misdirected client-side image MAP request!" msgstr "" -#: LYMessages.c:533 +#: LYMessages.c:532 msgid "Client-side image MAP is not accessible!" msgstr "" -#: LYMessages.c:534 +#: LYMessages.c:533 msgid "No client-side image MAPs are available!" msgstr "" -#: LYMessages.c:535 +#: LYMessages.c:534 msgid "Client-side image MAP is not available!" msgstr "" #. #define OPTION_SCREEN_NEEDS_24 -#: LYMessages.c:538 +#: LYMessages.c:537 msgid "Screen height must be at least 24 lines for the Options menu!" msgstr "" #. #define OPTION_SCREEN_NEEDS_23 -#: LYMessages.c:540 +#: LYMessages.c:539 msgid "Screen height must be at least 23 lines for the Options menu!" msgstr "" #. #define OPTION_SCREEN_NEEDS_22 -#: LYMessages.c:542 +#: LYMessages.c:541 msgid "Screen height must be at least 22 lines for the Options menu!" msgstr "" -#: LYMessages.c:544 +#: LYMessages.c:543 msgid "That key requires Advanced User mode." msgstr "" -#: LYMessages.c:545 +#: LYMessages.c:544 #, c-format msgid "Content-type: %s" msgstr "" -#: LYMessages.c:546 +#: LYMessages.c:545 msgid "Command: " msgstr "" -#: LYMessages.c:547 +#: LYMessages.c:546 msgid " Version " msgstr "" -#: LYMessages.c:548 +#: LYMessages.c:547 msgid " first." msgstr "" -#: LYMessages.c:549 +#: LYMessages.c:548 msgid ", guessing..." msgstr "" -#: LYMessages.c:550 +#: LYMessages.c:549 msgid "Permissions for " msgstr "" -#: LYMessages.c:551 +#: LYMessages.c:550 msgid "Select " msgstr "" -#: LYMessages.c:552 +#: LYMessages.c:551 msgid "capital letter" msgstr "" -#: LYMessages.c:553 +#: LYMessages.c:552 msgid " of option line," msgstr "" -#: LYMessages.c:554 +#: LYMessages.c:553 msgid " to save," msgstr "" -#: LYMessages.c:555 +#: LYMessages.c:554 msgid " to " msgstr "" -#: LYMessages.c:556 +#: LYMessages.c:555 msgid " or " msgstr "" -#: LYMessages.c:557 +#: LYMessages.c:556 msgid " index" msgstr "" -#: LYMessages.c:558 +#: LYMessages.c:557 msgid " to return to Lynx." msgstr "" -#: LYMessages.c:559 +#: LYMessages.c:558 msgid "Accept Changes" msgstr "" -#: LYMessages.c:560 +#: LYMessages.c:559 msgid "Reset Changes" msgstr "" -#: LYMessages.c:561 +#: LYMessages.c:560 msgid "Left Arrow cancels changes" msgstr "" -#: LYMessages.c:562 +#: LYMessages.c:561 msgid "Save options to disk" msgstr "" -#: LYMessages.c:563 +#: LYMessages.c:562 msgid "Hit RETURN to accept entered data." msgstr "" #. #define ACCEPT_DATA_OR_DEFAULT -#: LYMessages.c:565 +#: LYMessages.c:564 msgid "Hit RETURN to accept entered data. Delete data to invoke the default." msgstr "" -#: LYMessages.c:566 +#: LYMessages.c:565 msgid "Value accepted!" msgstr "" #. #define VALUE_ACCEPTED_WARNING_X -#: LYMessages.c:568 +#: LYMessages.c:567 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!" msgstr "" #. #define VALUE_ACCEPTED_WARNING_NONX -#: LYMessages.c:570 +#: LYMessages.c:569 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!" msgstr "" -#: LYMessages.c:571 +#: LYMessages.c:570 msgid "You are not allowed to change which editor to use!" msgstr "" -#: LYMessages.c:572 +#: LYMessages.c:571 msgid "Failed to set DISPLAY variable!" msgstr "" -#: LYMessages.c:573 +#: LYMessages.c:572 msgid "Failed to clear DISPLAY variable!" msgstr "" #. #define BOOKMARK_CHANGE_DISALLOWED -#: LYMessages.c:575 +#: LYMessages.c:574 msgid "You are not allowed to change the bookmark file!" msgstr "" -#: LYMessages.c:576 +#: LYMessages.c:575 msgid "Terminal does not support color" msgstr "" -#: LYMessages.c:577 +#: LYMessages.c:576 #, c-format msgid "Your '%s' terminal does not support color." msgstr "" -#: LYMessages.c:578 +#: LYMessages.c:577 msgid "Access to dot files is disabled!" msgstr "" #. #define UA_COPYRIGHT_WARNING -#: LYMessages.c:580 +#: LYMessages.c:579 msgid "" "WARNING: Misrepresentation of the User-Agent may be a copyright violation!" msgstr "" #. #define CHANGE_OF_SETTING_DISALLOWED -#: LYMessages.c:582 +#: LYMessages.c:581 msgid "You are not allowed to change this setting." msgstr "" -#: LYMessages.c:583 +#: LYMessages.c:582 msgid "Saving Options..." msgstr "" -#: LYMessages.c:584 +#: LYMessages.c:583 msgid "Options saved!" msgstr "" -#: LYMessages.c:585 +#: LYMessages.c:584 msgid "Unable to save Options!" msgstr "" -#: LYMessages.c:586 +#: LYMessages.c:585 msgid " 'r' to return to Lynx " msgstr "" -#: LYMessages.c:587 +#: LYMessages.c:586 msgid " '>' to save, or 'r' to return to Lynx " msgstr "" #. #define ANY_KEY_CHANGE_RET_ACCEPT -#: LYMessages.c:589 +#: LYMessages.c:588 msgid "Hit any key to change value; RETURN to accept." msgstr "" -#: LYMessages.c:590 +#: LYMessages.c:589 msgid "Error uncompressing temporary file!" msgstr "" -#: LYMessages.c:591 +#: LYMessages.c:590 msgid "Unsupported URL scheme!" msgstr "" -#: LYMessages.c:592 +#: LYMessages.c:591 msgid "Unsupported data: URL! Use SHOWINFO, for now." msgstr "" -#: LYMessages.c:593 +#: LYMessages.c:592 msgid "Redirection limit of 10 URL's reached." msgstr "" -#: LYMessages.c:594 +#: LYMessages.c:593 msgid "Illegal redirection URL received from server!" msgstr "" #. #define SERVER_ASKED_FOR_REDIRECTION -#: LYMessages.c:596 +#: LYMessages.c:595 #, c-format msgid "Server asked for %d redirection of POST content to" msgstr "" -#: LYMessages.c:597 +#: LYMessages.c:596 msgid "P)roceed, use G)ET or C)ancel " msgstr "" -#: LYMessages.c:598 +#: LYMessages.c:597 msgid "P)roceed, or C)ancel " msgstr "" #. #define ADVANCED_POST_GET_REDIRECT -#: LYMessages.c:600 +#: LYMessages.c:599 msgid "Redirection of POST content. P)roceed, see U)RL, use G)ET or C)ancel" msgstr "" #. #define ADVANCED_POST_REDIRECT -#: LYMessages.c:602 +#: LYMessages.c:601 msgid "Redirection of POST content. P)roceed, see U)RL, or C)ancel" msgstr "" #. #define CONFIRM_POST_RESUBMISSION -#: LYMessages.c:604 +#: LYMessages.c:603 msgid "Document from Form with POST content. Resubmit?" msgstr "" #. #define CONFIRM_POST_RESUBMISSION_TO -#: LYMessages.c:606 +#: LYMessages.c:605 #, c-format msgid "Resubmit POST content to %s ?" msgstr "" #. #define CONFIRM_POST_LIST_RELOAD -#: LYMessages.c:608 +#: LYMessages.c:607 #, c-format msgid "List from document with POST data. Reload %s ?" msgstr "" #. #define CONFIRM_POST_DOC_HEAD -#: LYMessages.c:610 +#: LYMessages.c:609 msgid "Document from POST action, HEAD may not be understood. Proceed?" msgstr "" #. #define CONFIRM_POST_LINK_HEAD -#: LYMessages.c:612 +#: LYMessages.c:611 msgid "Form submit action is POST, HEAD may not be understood. Proceed?" msgstr "" -#: LYMessages.c:613 +#: LYMessages.c:612 msgid "Proceed without a username and password?" msgstr "" -#: LYMessages.c:614 +#: LYMessages.c:613 #, c-format msgid "Proceed (%s)?" msgstr "" -#: LYMessages.c:615 +#: LYMessages.c:614 msgid "Cannot POST to this host." msgstr "" -#: LYMessages.c:616 +#: LYMessages.c:615 msgid "POST not supported for this URL - ignoring POST data!" msgstr "" -#: LYMessages.c:617 +#: LYMessages.c:616 msgid "Discarding POST data..." msgstr "" -#: LYMessages.c:618 +#: LYMessages.c:617 msgid "Document will not be reloaded!" msgstr "" -#: LYMessages.c:619 +#: LYMessages.c:618 msgid "Location: " msgstr "" -#: LYMessages.c:620 +#: LYMessages.c:619 #, c-format msgid "'%s' not found!" msgstr "" -#: LYMessages.c:621 +#: LYMessages.c:620 msgid "Default Bookmark File" msgstr "" -#: LYMessages.c:622 +#: LYMessages.c:621 msgid "Screen too small! (8x35 min)" msgstr "" -#: LYMessages.c:623 +#: LYMessages.c:622 msgid "Select destination or ^G to Cancel: " msgstr "" #. #define MULTIBOOKMARKS_SELECT -#: LYMessages.c:625 +#: LYMessages.c:624 msgid "Select subbookmark, '=' for menu, or ^G to cancel: " msgstr "" #. #define MULTIBOOKMARKS_SELF -#: LYMessages.c:627 +#: LYMessages.c:626 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): " msgstr "" -#: LYMessages.c:628 +#: LYMessages.c:627 msgid "Multiple bookmark support is not available." msgstr "" -#: LYMessages.c:629 +#: LYMessages.c:628 #, c-format msgid " Select Bookmark (screen %d of %d)" msgstr "" -#: LYMessages.c:630 +#: LYMessages.c:629 msgid " Select Bookmark" msgstr "" #. #define MULTIBOOKMARKS_EHEAD_MASK -#: LYMessages.c:632 +#: LYMessages.c:631 #, c-format msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)" msgstr "" #. #define MULTIBOOKMARKS_EHEAD -#: LYMessages.c:634 +#: LYMessages.c:633 msgid " Editing Bookmark DESCRIPTION and FILEPATH" msgstr "" -#: LYMessages.c:635 +#: LYMessages.c:634 msgid "Letter: " msgstr "" #. #define USE_PATH_OFF_HOME -#: LYMessages.c:638 +#: LYMessages.c:637 msgid "Use a filepath off your login directory in SHELL syntax!" msgstr "" -#: LYMessages.c:640 +#: LYMessages.c:639 msgid "Use a filepath off your home directory!" msgstr "" #. #define MAXLINKS_REACHED -#: LYMessages.c:643 +#: LYMessages.c:642 msgid "Maximum links per page exceeded! Use half-page or two-line scrolling." msgstr "" #. #define MAXHIST_REACHED -#: LYMessages.c:645 +#: LYMessages.c:644 msgid "History List maximum reached! Document not pushed." msgstr "" -#: LYMessages.c:646 +#: LYMessages.c:645 msgid "No previously visited links available!" msgstr "" -#: LYMessages.c:647 +#: LYMessages.c:646 msgid "Memory exhausted! Program aborted!" msgstr "" -#: LYMessages.c:648 +#: LYMessages.c:647 msgid "Memory exhausted! Aborting..." msgstr "" -#: LYMessages.c:649 +#: LYMessages.c:648 msgid "Directory/File Manager not available" msgstr "" -#: LYMessages.c:650 +#: LYMessages.c:649 msgid "HREF in BASE tag is not an absolute URL." msgstr "" -#: LYMessages.c:651 +#: LYMessages.c:650 msgid "Location URL is not absolute." msgstr "" -#: LYMessages.c:652 +#: LYMessages.c:651 msgid "Refresh URL is not absolute." msgstr "" #. #define SENDING_MESSAGE_WITH_BODY_TO -#: LYMessages.c:654 +#: LYMessages.c:653 msgid "" "You are sending a message with body to:\n" " " msgstr "" -#: LYMessages.c:655 +#: LYMessages.c:654 msgid "" "You are sending a comment to:\n" " " msgstr "" -#: LYMessages.c:656 +#: LYMessages.c:655 msgid "" "\n" " With copy to:\n" " " msgstr "" -#: LYMessages.c:657 +#: LYMessages.c:656 msgid "" "\n" " With copies to:\n" @@ -2075,7 +2074,7 @@ msgid "" msgstr "" #. #define CTRL_G_TO_CANCEL_SEND -#: LYMessages.c:659 +#: LYMessages.c:658 msgid "" "\n" "\n" @@ -2083,79 +2082,79 @@ msgid "" msgstr "" #. #define ENTER_NAME_OR_BLANK -#: LYMessages.c:661 +#: LYMessages.c:660 msgid "" "\n" " Please enter your name, or leave it blank to remain anonymous\n" msgstr "" #. #define ENTER_MAIL_ADDRESS_OR_OTHER -#: LYMessages.c:663 +#: LYMessages.c:662 msgid "" "\n" " Please enter a mail address or some other\n" msgstr "" #. #define MEANS_TO_CONTACT_FOR_RESPONSE -#: LYMessages.c:665 +#: LYMessages.c:664 msgid " means to contact you, if you desire a response.\n" msgstr "" -#: LYMessages.c:666 +#: LYMessages.c:665 msgid "" "\n" " Please enter a subject line.\n" msgstr "" #. #define ENTER_ADDRESS_FOR_CC -#: LYMessages.c:668 +#: LYMessages.c:667 msgid "" "\n" " Enter a mail address for a CC of your message.\n" msgstr "" -#: LYMessages.c:669 +#: LYMessages.c:668 msgid " (Leave blank if you don't want a copy.)\n" msgstr "" -#: LYMessages.c:670 +#: LYMessages.c:669 msgid "" "\n" " Please review the message body:\n" "\n" msgstr "" -#: LYMessages.c:671 +#: LYMessages.c:670 msgid "" "\n" "Press RETURN to continue: " msgstr "" -#: LYMessages.c:672 +#: LYMessages.c:671 msgid "" "\n" "Press RETURN to clean up: " msgstr "" -#: LYMessages.c:673 +#: LYMessages.c:672 msgid " Use Control-U to erase the default.\n" msgstr "" -#: LYMessages.c:674 +#: LYMessages.c:673 msgid "" "\n" " Please enter your message below." msgstr "" #. #define ENTER_PERIOD_WHEN_DONE_A -#: LYMessages.c:676 src/LYNews.c:331 +#: LYMessages.c:675 src/LYNews.c:381 msgid "" "\n" " When you are done, press enter and put a single period (.)" msgstr "" #. #define ENTER_PERIOD_WHEN_DONE_B -#: LYMessages.c:678 src/LYNews.c:332 +#: LYMessages.c:677 src/LYNews.c:382 msgid "" "\n" " on a line and press enter again." @@ -2163,498 +2162,498 @@ msgstr "" #. Cookies messages #. #define ADVANCED_COOKIE_CONFIRMATION -#: LYMessages.c:682 +#: LYMessages.c:681 #, c-format msgid "%s cookie: %.*s=%.*s Allow? (Y/N/Always/neVer)" msgstr "" #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION -#: LYMessages.c:684 +#: LYMessages.c:683 #, c-format msgid "Accept invalid cookie domain=%s for '%s'?" msgstr "" #. #define INVALID_COOKIE_PATH_CONFIRMATION -#: LYMessages.c:686 +#: LYMessages.c:685 #, c-format msgid "Accept invalid cookie path=%s as a prefix of '%s'?" msgstr "" -#: LYMessages.c:687 +#: LYMessages.c:686 msgid "Allowing this cookie." msgstr "" -#: LYMessages.c:688 +#: LYMessages.c:687 msgid "Rejecting this cookie." msgstr "" -#: LYMessages.c:689 +#: LYMessages.c:688 msgid "The Cookie Jar is empty." msgstr "" #. #define ACTIVATE_TO_GOBBLE -#: LYMessages.c:691 +#: LYMessages.c:690 msgid "Activate links to gobble up cookies or entire domains," msgstr "" -#: LYMessages.c:692 +#: LYMessages.c:691 msgid "or to change a domain's 'allow' setting." msgstr "" -#: LYMessages.c:693 +#: LYMessages.c:692 msgid "(Cookies never allowed.)" msgstr "" -#: LYMessages.c:694 +#: LYMessages.c:693 msgid "(Cookies always allowed.)" msgstr "" -#: LYMessages.c:695 +#: LYMessages.c:694 msgid "(Cookies allowed via prompt.)" msgstr "" -#: LYMessages.c:696 +#: LYMessages.c:695 msgid "(Persistent Cookies.)" msgstr "" -#: LYMessages.c:697 +#: LYMessages.c:696 msgid "(No title.)" msgstr "" -#: LYMessages.c:698 +#: LYMessages.c:697 msgid "(No name.)" msgstr "" -#: LYMessages.c:699 +#: LYMessages.c:698 msgid "(No value.)" msgstr "" -#: LYMessages.c:700 +#: LYMessages.c:699 msgid "None" msgstr "" -#: LYMessages.c:701 +#: LYMessages.c:700 msgid "(End of session.)" msgstr "" -#: LYMessages.c:702 +#: LYMessages.c:701 msgid "Delete this cookie?" msgstr "" -#: LYMessages.c:703 +#: LYMessages.c:702 msgid "The cookie has been eaten!" msgstr "" -#: LYMessages.c:704 +#: LYMessages.c:703 msgid "Delete this empty domain?" msgstr "" -#: LYMessages.c:705 +#: LYMessages.c:704 msgid "The domain has been eaten!" msgstr "" #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL -#: LYMessages.c:707 +#: LYMessages.c:706 msgid "" "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? " msgstr "" #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL -#: LYMessages.c:709 +#: LYMessages.c:708 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? " msgstr "" -#: LYMessages.c:710 +#: LYMessages.c:709 msgid "All cookies in the domain have been eaten!" msgstr "" -#: LYMessages.c:711 +#: LYMessages.c:710 #, c-format msgid "'A'lways allowing from domain '%s'." msgstr "" -#: LYMessages.c:712 +#: LYMessages.c:711 #, c-format msgid "ne'V'er allowing from domain '%s'." msgstr "" -#: LYMessages.c:713 +#: LYMessages.c:712 #, c-format msgid "'P'rompting to allow from domain '%s'." msgstr "" -#: LYMessages.c:714 +#: LYMessages.c:713 msgid "Delete all cookies in this domain?" msgstr "" -#: LYMessages.c:715 +#: LYMessages.c:714 msgid "All of the cookies in the jar have been eaten!" msgstr "" -#: LYMessages.c:717 +#: LYMessages.c:716 msgid "Port 19 not permitted in URLs." msgstr "" -#: LYMessages.c:718 +#: LYMessages.c:717 msgid "Port 25 not permitted in URLs." msgstr "" -#: LYMessages.c:719 +#: LYMessages.c:718 #, c-format msgid "Port %lu not permitted in URLs." msgstr "" -#: LYMessages.c:720 +#: LYMessages.c:719 msgid "URL has a bad port field." msgstr "" -#: LYMessages.c:721 +#: LYMessages.c:720 msgid "Maximum nesting of HTML elements exceeded." msgstr "" -#: LYMessages.c:722 +#: LYMessages.c:721 msgid "Bad partial reference! Stripping lead dots." msgstr "" -#: LYMessages.c:723 -msgid "Trace Log open failed. Trace off!." +#: LYMessages.c:722 +msgid "Trace Log open failed. Trace off!" msgstr "" -#: LYMessages.c:724 +#: LYMessages.c:723 msgid "Lynx Trace Log" msgstr "" -#: LYMessages.c:725 +#: LYMessages.c:724 msgid "No trace log has been started for this session." msgstr "" #. #define MAX_TEMPCOUNT_REACHED -#: LYMessages.c:727 +#: LYMessages.c:726 msgid "The maximum temporary file count has been reached!" msgstr "" #. #define FORM_VALUE_TOO_LONG -#: LYMessages.c:729 +#: LYMessages.c:728 msgid "Form field value exceeds buffer length! Trim the tail." msgstr "" #. #define FORM_TAIL_COMBINED_WITH_HEAD -#: LYMessages.c:731 +#: LYMessages.c:730 msgid "Modified tail combined with head of form field value." msgstr "" #. HTFile.c -#: LYMessages.c:734 +#: LYMessages.c:733 msgid "Directory" msgstr "" -#: LYMessages.c:735 +#: LYMessages.c:734 msgid "Directory browsing is not allowed." msgstr "" -#: LYMessages.c:736 +#: LYMessages.c:735 msgid "Selective access is not enabled for this directory" msgstr "" -#: LYMessages.c:737 +#: LYMessages.c:736 msgid "Multiformat: directory scan failed." msgstr "" -#: LYMessages.c:738 +#: LYMessages.c:737 msgid "This directory is not readable." msgstr "" -#: LYMessages.c:739 +#: LYMessages.c:738 msgid "Can't access requested file." msgstr "" -#: LYMessages.c:740 +#: LYMessages.c:739 msgid "Could not find suitable representation for transmission." msgstr "" -#: LYMessages.c:741 +#: LYMessages.c:740 msgid "Could not open file for decompression!" msgstr "" -#: LYMessages.c:742 +#: LYMessages.c:741 msgid "Files:" msgstr "" -#: LYMessages.c:743 +#: LYMessages.c:742 msgid "Subdirectories:" msgstr "" -#: LYMessages.c:744 +#: LYMessages.c:743 msgid " directory" msgstr "" -#: LYMessages.c:745 +#: LYMessages.c:744 msgid "Up to " msgstr "" -#: LYMessages.c:746 +#: LYMessages.c:745 msgid "Current directory is " msgstr "" #. HTGopher.c -#: LYMessages.c:749 +#: LYMessages.c:748 msgid "No response from server!" msgstr "" -#: LYMessages.c:750 +#: LYMessages.c:749 msgid "CSO index" msgstr "" -#: LYMessages.c:751 +#: LYMessages.c:750 msgid "" "\n" "This is a searchable index of a CSO database.\n" msgstr "" -#: LYMessages.c:752 +#: LYMessages.c:751 msgid "CSO Search Results" msgstr "" -#: LYMessages.c:753 +#: LYMessages.c:752 #, c-format msgid "Seek fail on %s\n" msgstr "" -#: LYMessages.c:754 +#: LYMessages.c:753 msgid "" "\n" "Press the 's' key and enter search keywords.\n" msgstr "" -#: LYMessages.c:755 +#: LYMessages.c:754 msgid "" "\n" "This is a searchable Gopher index.\n" msgstr "" -#: LYMessages.c:756 +#: LYMessages.c:755 msgid "Gopher index" msgstr "" -#: LYMessages.c:757 +#: LYMessages.c:756 msgid "Gopher Menu" msgstr "" -#: LYMessages.c:758 +#: LYMessages.c:757 msgid " Search Results" msgstr "" -#: LYMessages.c:759 +#: LYMessages.c:758 msgid "Sending CSO/PH request." msgstr "" -#: LYMessages.c:760 +#: LYMessages.c:759 msgid "Sending Gopher request." msgstr "" -#: LYMessages.c:761 +#: LYMessages.c:760 msgid "CSO/PH request sent; waiting for response." msgstr "" -#: LYMessages.c:762 +#: LYMessages.c:761 msgid "Gopher request sent; waiting for response." msgstr "" -#: LYMessages.c:763 +#: LYMessages.c:762 msgid "" "\n" "Please enter search keywords.\n" msgstr "" -#: LYMessages.c:764 +#: LYMessages.c:763 msgid "" "\n" "The keywords that you enter will allow you to search on a" msgstr "" -#: LYMessages.c:765 +#: LYMessages.c:764 msgid " person's name in the database.\n" msgstr "" #. HTNews.c -#: LYMessages.c:768 +#: LYMessages.c:767 msgid "Connection closed ???" msgstr "" -#: LYMessages.c:769 +#: LYMessages.c:768 msgid "Cannot open temporary file for news POST." msgstr "" -#: LYMessages.c:770 +#: LYMessages.c:769 msgid "This client does not contain support for posting to news with SSL." msgstr "" #. HTStyle.c -#: LYMessages.c:773 +#: LYMessages.c:772 #, c-format msgid "Style %d `%s' SGML:%s. Font %s %.1f point.\n" msgstr "" -#: LYMessages.c:774 +#: LYMessages.c:773 #, c-format msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n" msgstr "" -#: LYMessages.c:775 +#: LYMessages.c:774 #, c-format msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n" msgstr "" -#: LYMessages.c:776 +#: LYMessages.c:775 #, c-format msgid "\t\tTab kind=%d at %.0f\n" msgstr "" #. HTTP.c -#: LYMessages.c:779 +#: LYMessages.c:778 msgid "Can't proceed without a username and password." msgstr "" -#: LYMessages.c:780 +#: LYMessages.c:779 msgid "Can't retry with authorization! Contact the server's WebMaster." msgstr "" -#: LYMessages.c:781 +#: LYMessages.c:780 msgid "Can't retry with proxy authorization! Contact the server's WebMaster." msgstr "" -#: LYMessages.c:782 +#: LYMessages.c:781 msgid "Retrying with proxy authorization information." msgstr "" #. HTWAIS.c -#: LYMessages.c:785 +#: LYMessages.c:784 msgid "HTWAIS: Return message too large." msgstr "" -#: LYMessages.c:786 +#: LYMessages.c:785 msgid "Enter WAIS query: " msgstr "" #. Miscellaneous status -#: LYMessages.c:789 +#: LYMessages.c:788 msgid "Retrying as HTTP0 request." msgstr "" -#: LYMessages.c:790 +#: LYMessages.c:789 #, c-format msgid "Transferred %d bytes" msgstr "" -#: LYMessages.c:791 +#: LYMessages.c:790 msgid "Data transfer complete" msgstr "" -#: LYMessages.c:792 +#: LYMessages.c:791 #, c-format msgid "Error processing line %d of %s\n" msgstr "" #. Lynx internal page titles -#: LYMessages.c:795 +#: LYMessages.c:794 msgid "Address List Page" msgstr "" -#: LYMessages.c:796 +#: LYMessages.c:795 msgid "Bookmark file" msgstr "" -#: LYMessages.c:797 +#: LYMessages.c:796 msgid "Configuration Definitions" msgstr "" -#: LYMessages.c:798 +#: LYMessages.c:797 msgid "Cookie Jar" msgstr "" -#: LYMessages.c:799 +#: LYMessages.c:798 msgid "Current Key Map" msgstr "" -#: LYMessages.c:800 +#: LYMessages.c:799 msgid "File Management Options" msgstr "" -#: LYMessages.c:801 +#: LYMessages.c:800 msgid "Download Options" msgstr "" -#: LYMessages.c:802 +#: LYMessages.c:801 msgid "History Page" msgstr "" -#: LYMessages.c:803 +#: LYMessages.c:802 msgid "List Page" msgstr "" -#: LYMessages.c:804 +#: LYMessages.c:803 msgid "Lynx.cfg Information" msgstr "" -#: LYMessages.c:805 +#: LYMessages.c:804 msgid "Converted Mosaic Hotlist" msgstr "" -#: LYMessages.c:806 +#: LYMessages.c:805 msgid "Options Menu" msgstr "" -#: LYMessages.c:807 +#: LYMessages.c:806 msgid "File Permission Options" msgstr "" -#: LYMessages.c:808 +#: LYMessages.c:807 msgid "Printing Options" msgstr "" -#: LYMessages.c:809 +#: LYMessages.c:808 msgid "Information about the current document" msgstr "" -#: LYMessages.c:810 +#: LYMessages.c:809 msgid "Your recent statusline messages" msgstr "" -#: LYMessages.c:811 +#: LYMessages.c:810 msgid "Upload Options" msgstr "" -#: LYMessages.c:812 +#: LYMessages.c:811 msgid "Visited Links Page" msgstr "" #. CONFIG_DEF_TITLE subtitles -#: LYMessages.c:815 +#: LYMessages.c:814 msgid "See also" msgstr "" -#: LYMessages.c:816 +#: LYMessages.c:815 msgid "your" msgstr "" -#: LYMessages.c:817 +#: LYMessages.c:816 msgid "for runtime options" msgstr "" -#: LYMessages.c:818 +#: LYMessages.c:817 msgid "compile time options" msgstr "" -#: LYMessages.c:819 +#: LYMessages.c:818 msgid "latest release" msgstr "" -#: LYMessages.c:820 +#: LYMessages.c:819 msgid "development version" msgstr "" #. #define AUTOCONF_CONFIG_CACHE -#: LYMessages.c:822 +#: LYMessages.c:821 msgid "" "The following data were derived during the automatic configuration/build\n" "process of this copy of Lynx. When reporting a bug, please include a copy\n" @@ -2662,29 +2661,29 @@ msgid "" msgstr "" #. #define AUTOCONF_LYNXCFG_H -#: LYMessages.c:826 +#: LYMessages.c:825 msgid "" "The following data were used as automatically-configured compile-time\n" "definitions when this copy of Lynx was built." msgstr "" #. #define DIRED_NOVICELINE -#: LYMessages.c:831 +#: LYMessages.c:830 msgid "" " C)reate D)ownload E)dit F)ull menu M)odify R)emove T)ag U)pload " "\n" msgstr "" -#: LYMessages.c:832 +#: LYMessages.c:831 msgid "Failed to obtain status of current link!" msgstr "" #. #define INVALID_PERMIT_URL -#: LYMessages.c:835 +#: LYMessages.c:834 msgid "Special URL only valid from current File Permission menu!" msgstr "" -#: LYMessages.c:839 +#: LYMessages.c:838 msgid "External support is currently disabled." msgstr "" @@ -2717,29 +2716,29 @@ msgstr "" msgid "Access without authorization denied -- retrying" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:670 +#: WWW/Library/Implementation/HTAccess.c:679 msgid "Access forbidden by rule" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:772 +#: WWW/Library/Implementation/HTAccess.c:781 msgid "Document with POST content not found in cache. Resubmit?" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1006 +#: WWW/Library/Implementation/HTAccess.c:1015 msgid "Loading incomplete." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1036 +#: WWW/Library/Implementation/HTAccess.c:1045 msgid "" "**** HTAccess: socket or file number returned by obsolete load routine!\n" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1038 +#: WWW/Library/Implementation/HTAccess.c:1047 msgid "" -"**** HTAccess: Internal software error. Please mail lynx_dev@sig.net!\n" +"**** HTAccess: Internal software error. Please mail lynx-dev@sig.net!\n" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1039 +#: WWW/Library/Implementation/HTAccess.c:1048 #, c-format msgid "**** HTAccess: Status returned was: %d\n" msgstr "" @@ -2748,28 +2747,28 @@ msgstr "" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1045 src/LYMainLoop.c:6455 +#: WWW/Library/Implementation/HTAccess.c:1054 src/LYMainLoop.c:6843 msgid "Can't Access" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1053 +#: WWW/Library/Implementation/HTAccess.c:1062 msgid "Unable to access document." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:747 +#: WWW/Library/Implementation/HTFTP.c:749 #, c-format msgid "Enter password for user %s@%s:" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:775 +#: WWW/Library/Implementation/HTFTP.c:777 msgid "Unable to connect to FTP host." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:1035 +#: WWW/Library/Implementation/HTFTP.c:1037 msgid "close master socket" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:1075 +#: WWW/Library/Implementation/HTFTP.c:1077 msgid "socket for master socket" msgstr "" @@ -2778,29 +2777,34 @@ msgstr "" #. ** knowing if it is symbolic? I think so since #. ** it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1524 -#: WWW/Library/Implementation/HTFTP.c:2155 +#: WWW/Library/Implementation/HTFTP.c:1526 +#: WWW/Library/Implementation/HTFTP.c:2157 msgid "Symbolic Link" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:2508 +#: WWW/Library/Implementation/HTFTP.c:2510 msgid "Receiving FTP directory." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:2861 +#: WWW/Library/Implementation/HTFTP.c:2639 +#, c-format +msgid "Transferred %d bytes (%5d)" +msgstr "" + +#: WWW/Library/Implementation/HTFTP.c:2906 msgid "connect for data" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:3446 +#: WWW/Library/Implementation/HTFTP.c:3491 msgid "Receiving FTP file." msgstr "" #. lines counter -#: WWW/Library/Implementation/HTFile.c:1611 +#: WWW/Library/Implementation/HTFile.c:1620 msgid "Reading directory..." msgstr "" -#: WWW/Library/Implementation/HTFile.c:1693 +#: WWW/Library/Implementation/HTFile.c:1702 msgid "OK" msgstr "" @@ -2850,18 +2854,18 @@ msgstr "" msgid "Change password?" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1639 +#: WWW/Library/Implementation/HTNews.c:1708 #, c-format msgid "No matches for: %s" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1690 +#: WWW/Library/Implementation/HTNews.c:1759 msgid "" "\n" "No articles in this group.\n" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1703 +#: WWW/Library/Implementation/HTNews.c:1772 msgid "" "\n" "No articles in this range.\n" @@ -2870,16 +2874,16 @@ msgstr "" #. #. ** Set window title. #. -#: WWW/Library/Implementation/HTNews.c:1716 +#: WWW/Library/Implementation/HTNews.c:1785 #, c-format msgid "%s, Articles %d-%d" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1737 +#: WWW/Library/Implementation/HTNews.c:1806 msgid "Earlier articles" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1750 +#: WWW/Library/Implementation/HTNews.c:1819 #, c-format msgid "" "\n" @@ -2887,36 +2891,36 @@ msgid "" "\n" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1809 +#: WWW/Library/Implementation/HTNews.c:1878 msgid "All available articles in " msgstr "" -#: WWW/Library/Implementation/HTNews.c:2020 +#: WWW/Library/Implementation/HTNews.c:2091 msgid "Later articles" msgstr "" -#: WWW/Library/Implementation/HTNews.c:2044 +#: WWW/Library/Implementation/HTNews.c:2115 msgid "Post to " msgstr "" -#: WWW/Library/Implementation/HTNews.c:2221 +#: WWW/Library/Implementation/HTNews.c:2292 msgid "This client does not contain support for SNEWS URLs." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2402 +#: WWW/Library/Implementation/HTNews.c:2473 msgid "No target for raw text!" msgstr "" -#: WWW/Library/Implementation/HTNews.c:2432 +#: WWW/Library/Implementation/HTNews.c:2503 msgid "Connecting to NewsHost ..." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2466 +#: WWW/Library/Implementation/HTNews.c:2537 #, c-format msgid "Could not access %s." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2513 +#: WWW/Library/Implementation/HTNews.c:2584 #, c-format msgid "Can't read news info. News host %.20s responded: %.200s" msgstr "" @@ -2924,26 +2928,30 @@ msgstr "" #. #. ** List available newsgroups. - FM #. -#: WWW/Library/Implementation/HTNews.c:2709 +#: WWW/Library/Implementation/HTNews.c:2787 msgid "Reading list of available newsgroups." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2731 +#: WWW/Library/Implementation/HTNews.c:2809 msgid "Reading list of articles in newsgroup." msgstr "" #. #. ** Get an article from a news group. - FM #. -#: WWW/Library/Implementation/HTNews.c:2737 +#: WWW/Library/Implementation/HTNews.c:2815 msgid "Reading news article." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1295 +#: WWW/Library/Implementation/HTNews.c:2845 +msgid "Sorry, could not load requested news." +msgstr "" + +#: WWW/Library/Implementation/HTTCP.c:1316 msgid "Address length looks invalid" msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1453 +#: WWW/Library/Implementation/HTTCP.c:1474 #, c-format msgid "Looking up %s." msgstr "" @@ -2952,63 +2960,63 @@ msgstr "" #. * immediately; but not HTAlert, because typically #. * there will be other alerts from the callers. - kw #. -#: WWW/Library/Implementation/HTTCP.c:1463 +#: WWW/Library/Implementation/HTTCP.c:1484 #: WWW/Library/Implementation/HTTelnet.c:99 #, c-format msgid "Invalid hostname %s" msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1466 +#: WWW/Library/Implementation/HTTCP.c:1487 #, c-format msgid "Unable to locate remote host %s." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1476 +#: WWW/Library/Implementation/HTTCP.c:1497 #, c-format msgid "Making %s connection to %s." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1486 +#: WWW/Library/Implementation/HTTCP.c:1507 msgid "socket failed." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1505 +#: WWW/Library/Implementation/HTTCP.c:1526 msgid "Could not make connection non-blocking." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1566 +#: WWW/Library/Implementation/HTTCP.c:1587 msgid "Connection failed for 180,000 tries." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1734 +#: WWW/Library/Implementation/HTTCP.c:1759 msgid "Could not restore socket to blocking." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1788 +#: WWW/Library/Implementation/HTTCP.c:1821 msgid "Socket read failed for 180,000 tries." msgstr "" -#: WWW/Library/Implementation/HTTP.c:166 +#: WWW/Library/Implementation/HTTP.c:343 msgid "This client does not contain support for HTTPS URLs." msgstr "" -#: WWW/Library/Implementation/HTTP.c:183 +#: WWW/Library/Implementation/HTTP.c:367 msgid "Unable to connect to remote host." msgstr "" -#: WWW/Library/Implementation/HTTP.c:612 +#: WWW/Library/Implementation/HTTP.c:796 msgid "Sending HTTP request." msgstr "" -#: WWW/Library/Implementation/HTTP.c:645 +#: WWW/Library/Implementation/HTTP.c:829 msgid "Unexpected network write error; connection aborted." msgstr "" -#: WWW/Library/Implementation/HTTP.c:651 +#: WWW/Library/Implementation/HTTP.c:835 msgid "HTTP request sent; waiting for response." msgstr "" -#: WWW/Library/Implementation/HTTP.c:713 +#: WWW/Library/Implementation/HTTP.c:899 msgid "Unexpected network read error; connection aborted." msgstr "" @@ -3022,7 +3030,7 @@ msgstr "" #. ** so we'll deal with them by showing the full #. ** header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:909 +#: WWW/Library/Implementation/HTTP.c:1096 msgid "Got unexpected Informational Status." msgstr "" @@ -3033,7 +3041,7 @@ msgstr "" #. * user to do that, and restore the current #. * document. - FM #. -#: WWW/Library/Implementation/HTTP.c:944 +#: WWW/Library/Implementation/HTTP.c:1131 msgid "Request fulfilled. Reset Content." msgstr "" @@ -3044,35 +3052,35 @@ msgstr "" #. * with it by showing the full header to the user #. * as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1034 +#: WWW/Library/Implementation/HTTP.c:1221 msgid "Got unexpected 304 Not Modified status." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1103 +#: WWW/Library/Implementation/HTTP.c:1290 msgid "Redirection of POST content requires user approval." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1146 +#: WWW/Library/Implementation/HTTP.c:1333 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1370 +#: WWW/Library/Implementation/HTTP.c:1557 msgid "Got redirection with a bad Location header." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1469 +#: WWW/Library/Implementation/HTTP.c:1656 msgid "Got redirection with no Location header." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1524 +#: WWW/Library/Implementation/HTTP.c:1711 msgid "Retrying with access authorization information." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1529 +#: WWW/Library/Implementation/HTTP.c:1716 msgid "Show the 401 message body?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1574 +#: WWW/Library/Implementation/HTTP.c:1761 msgid "Show the 407 message body?" msgstr "" @@ -3081,7 +3089,7 @@ msgstr "" #. ** Take a chance and hope there is #. ** something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1679 +#: WWW/Library/Implementation/HTTP.c:1866 msgid "Unknown status reply from server!" msgstr "" @@ -3259,143 +3267,168 @@ msgstr "" msgid "Host" msgstr "" -#: src/GridText.c:382 +#: src/GridText.c:465 msgid "Memory exhausted, display interrupted!" msgstr "" -#: src/GridText.c:387 +#: src/GridText.c:470 msgid "Memory exhausted, will interrupt transfer!" msgstr "" -#: src/GridText.c:2504 +#: src/GridText.c:2954 msgid " *** MEMORY EXHAUSTED ***" msgstr "" -#: src/GridText.c:3986 src/GridText.c:3993 src/LYList.c:260 +#: src/GridText.c:4561 src/GridText.c:4568 src/LYList.c:260 msgid "unknown field or link" msgstr "" -#: src/GridText.c:4002 +#: src/GridText.c:4577 msgid "text entry field" msgstr "" -#: src/GridText.c:4005 +#: src/GridText.c:4580 msgid "password entry field" msgstr "" -#: src/GridText.c:4008 +#: src/GridText.c:4583 msgid "checkbox" msgstr "" -#: src/GridText.c:4011 +#: src/GridText.c:4586 msgid "radio button" msgstr "" -#: src/GridText.c:4014 +#: src/GridText.c:4589 msgid "submit button" msgstr "" -#: src/GridText.c:4017 +#: src/GridText.c:4592 msgid "reset button" msgstr "" -#: src/GridText.c:4020 +#: src/GridText.c:4595 msgid "popup menu" msgstr "" -#: src/GridText.c:4023 +#: src/GridText.c:4598 msgid "hidden form field" msgstr "" -#: src/GridText.c:4026 +#: src/GridText.c:4601 msgid "text entry area" msgstr "" -#: src/GridText.c:4029 +#: src/GridText.c:4604 msgid "range entry field" msgstr "" -#: src/GridText.c:4032 +#: src/GridText.c:4607 msgid "file entry field" msgstr "" -#: src/GridText.c:4035 +#: src/GridText.c:4610 msgid "text-submit field" msgstr "" -#: src/GridText.c:4038 +#: src/GridText.c:4613 msgid "image-submit button" msgstr "" -#: src/GridText.c:4041 +#: src/GridText.c:4616 msgid "keygen field" msgstr "" -#: src/GridText.c:4044 +#: src/GridText.c:4619 msgid "unknown form field" msgstr "" -#: src/GridText.c:8879 +#: src/GridText.c:9546 #, c-format msgid "Submitting %s" msgstr "" -#: src/HTAlert.c:160 src/LYShowInfo.c:297 +#: src/HTAlert.c:189 src/HTAlert.c:391 src/LYShowInfo.c:297 msgid "bytes" msgstr "" -#: src/HTAlert.c:164 +#: src/HTAlert.c:190 src/HTAlert.c:395 msgid "KB" msgstr "" -#: src/HTAlert.c:171 +#: src/HTAlert.c:339 #, c-format -msgid "Read %ld of %ld %s of data" +msgid "Read %s of %s of data" msgstr "" -#: src/HTAlert.c:173 +#: src/HTAlert.c:341 #, c-format -msgid "Read %ld %s of data" +msgid "Read %s of data" msgstr "" -#: src/HTAlert.c:176 +#: src/HTAlert.c:343 #, c-format -msgid ", %ld %s/sec." +msgid ", %s/sec" +msgstr "" + +#: src/HTAlert.c:345 +#, c-format +msgid " (stalled for %ld sec)" +msgstr "" + +#: src/HTAlert.c:347 +#, c-format +msgid ", ETA %ld sec" msgstr "" -#: src/HTAlert.c:181 +#: src/HTAlert.c:350 src/HTAlert.c:412 msgid " (Press 'z' to abort)" msgstr "" -#: src/HTAlert.c:210 +#: src/HTAlert.c:402 +#, c-format +msgid "Read %ld of %ld %s of data" +msgstr "" + +#: src/HTAlert.c:404 +#, c-format +msgid "Read %ld %s of data" +msgstr "" + +#: src/HTAlert.c:407 +#, c-format +msgid ", %ld %s/sec." +msgstr "" + +#: src/HTAlert.c:443 msgid "yes" msgstr "" -#: src/HTAlert.c:211 +#: src/HTAlert.c:444 msgid "no" msgstr "" -#: src/HTML.c:5886 +#: src/HTML.c:6010 msgid "Description:" msgstr "" -#: src/HTML.c:5891 +#: src/HTML.c:6015 msgid "(none)" msgstr "" -#: src/HTML.c:5895 +#: src/HTML.c:6019 msgid "Filepath:" msgstr "" -#: src/HTML.c:5900 +#: src/HTML.c:6024 msgid "(unknown)" msgstr "" -#: src/HTML.c:7194 +#: src/HTML.c:7330 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "" -#: src/LYBookmark.c:154 +#: src/LYBookmark.c:157 msgid "" " This file is an HTML representation of the X Mosaic hotlist file.\n" " Outdated or invalid links may be removed by using the\n" @@ -3403,20 +3436,26 @@ msgid "" " been remapped by you or your system administrator." msgstr "" -#: src/LYBookmark.c:340 +#: src/LYBookmark.c:388 +msgid "" +" You can delete links by the 'R' key<br>\n" +"<ol>\n" +msgstr "" + +#: src/LYBookmark.c:391 msgid "" " You can delete links using the remove bookmark command. It is usually\n" " the 'R' key but may have been remapped by you or your system\n" " administrator." msgstr "" -#: src/LYBookmark.c:344 +#: src/LYBookmark.c:395 msgid "" " This file also may be edited with a standard text editor to delete\n" " outdated or invalid links, or to change their order." msgstr "" -#: src/LYBookmark.c:347 +#: src/LYBookmark.c:398 msgid "" "Note: if you edit this file manually\n" " you should not change the format within the lines\n" @@ -3432,19 +3471,19 @@ msgstr "" msgid "Unable to access cgi script" msgstr "" -#: src/LYCgi.c:650 src/LYCgi.c:653 +#: src/LYCgi.c:657 src/LYCgi.c:660 msgid "Good Advice" msgstr "" -#: src/LYCgi.c:656 +#: src/LYCgi.c:663 msgid "An excellent http server for VMS is available via" msgstr "" -#: src/LYCgi.c:663 +#: src/LYCgi.c:670 msgid "this link" msgstr "" -#: src/LYCgi.c:667 +#: src/LYCgi.c:674 msgid "It provides state of the art CGI script support.\n" msgstr "" @@ -3453,58 +3492,58 @@ msgid "Exiting via interrupt:" msgstr "" #. not used any more - kw -#: src/LYCookie.c:2218 +#: src/LYCookie.c:2224 msgid "(From Cookie Jar)" msgstr "" -#: src/LYCookie.c:2644 +#: src/LYCookie.c:2650 msgid "(from a previous session)" msgstr "" -#: src/LYCookie.c:2704 +#: src/LYCookie.c:2710 msgid "Maximum Gobble Date:" msgstr "" -#: src/LYCookie.c:2749 +#: src/LYCookie.c:2755 msgid "Internal" msgstr "" -#: src/LYCookie.c:2750 +#: src/LYCookie.c:2756 msgid "cookie_domain_flag_set error, aborting program" msgstr "" -#: src/LYCurses.c:791 +#: src/LYCurses.c:797 msgid "Terminal initialisation failed - unknown terminal type?" msgstr "" -#: src/LYCurses.c:1045 +#: src/LYCurses.c:1069 msgid "Terminal =" msgstr "" -#: src/LYCurses.c:1050 +#: src/LYCurses.c:1074 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "" -#: src/LYCurses.c:1128 +#: src/LYCurses.c:1152 msgid "Your Terminal type is unknown!" msgstr "" -#: src/LYCurses.c:1129 +#: src/LYCurses.c:1153 msgid "Enter a terminal type:" msgstr "" -#: src/LYCurses.c:1142 +#: src/LYCurses.c:1166 msgid "TERMINAL TYPE IS SET TO" msgstr "" -#: src/LYCurses.c:1385 +#: src/LYCurses.c:1417 #, c-format msgid "" "\n" "A Fatal error has occurred in %s Ver. %s\n" msgstr "" -#: src/LYCurses.c:1387 +#: src/LYCurses.c:1419 msgid "" "\n" "Please notify your system administrator to confirm a bug, and if\n" @@ -3514,35 +3553,35 @@ msgid "" "TRACEBACK if it can be captured, and any other relevant information.\n" msgstr "" -#: src/LYDownload.c:515 +#: src/LYDownload.c:527 msgid "Downloaded link:" msgstr "" -#: src/LYDownload.c:520 +#: src/LYDownload.c:532 msgid "Suggested file name:" msgstr "" -#: src/LYDownload.c:525 +#: src/LYDownload.c:537 msgid "Standard download options:" msgstr "" -#: src/LYDownload.c:526 +#: src/LYDownload.c:538 msgid "Download options:" msgstr "" -#: src/LYDownload.c:540 +#: src/LYDownload.c:552 msgid "Save to disk" msgstr "" -#: src/LYDownload.c:542 +#: src/LYDownload.c:554 msgid "Save to disk disabled." msgstr "" -#: src/LYDownload.c:546 src/LYPrint.c:1309 +#: src/LYDownload.c:558 src/LYPrint.c:1356 msgid "Local additions:" msgstr "" -#: src/LYDownload.c:555 src/LYUpload.c:226 +#: src/LYDownload.c:567 src/LYUpload.c:226 msgid "No Name Given" msgstr "" @@ -3639,323 +3678,323 @@ msgstr "" msgid "The selected item is not a file or a directory! Request ignored." msgstr "" -#: src/LYLocal.c:354 +#: src/LYLocal.c:359 #, c-format msgid "move %s to %s" msgstr "" -#: src/LYLocal.c:375 +#: src/LYLocal.c:381 msgid "There is already a directory with that name! Request ignored." msgstr "" -#: src/LYLocal.c:377 +#: src/LYLocal.c:383 msgid "There is already a file with that name! Request ignored." msgstr "" -#: src/LYLocal.c:379 +#: src/LYLocal.c:385 msgid "The specified name is already in use! Request ignored." msgstr "" -#: src/LYLocal.c:390 +#: src/LYLocal.c:396 msgid "Destination has different owner! Request denied." msgstr "" -#: src/LYLocal.c:393 +#: src/LYLocal.c:399 msgid "Destination is not a valid directory! Request denied." msgstr "" -#: src/LYLocal.c:416 +#: src/LYLocal.c:422 msgid "Remove all tagged files and directories?" msgstr "" -#: src/LYLocal.c:437 +#: src/LYLocal.c:443 #, c-format msgid "remove %s" msgstr "" -#: src/LYLocal.c:479 +#: src/LYLocal.c:485 msgid "Enter new location for tagged items: " msgstr "" -#: src/LYLocal.c:548 +#: src/LYLocal.c:554 msgid "Path too long" msgstr "" -#: src/LYLocal.c:579 +#: src/LYLocal.c:585 msgid "Source and destination are the same location - request ignored!" msgstr "" -#: src/LYLocal.c:638 +#: src/LYLocal.c:644 msgid "Enter new name for directory: " msgstr "" -#: src/LYLocal.c:640 +#: src/LYLocal.c:646 msgid "Enter new name for file: " msgstr "" -#: src/LYLocal.c:651 +#: src/LYLocal.c:657 msgid "Illegal character (path-separator) found! Request ignored." msgstr "" -#: src/LYLocal.c:698 +#: src/LYLocal.c:704 msgid "Enter new location for directory: " msgstr "" -#: src/LYLocal.c:700 +#: src/LYLocal.c:706 msgid "Enter new location for file: " msgstr "" -#: src/LYLocal.c:726 +#: src/LYLocal.c:732 msgid "Unexpected failure - unable to find trailing path separator" msgstr "" -#: src/LYLocal.c:745 +#: src/LYLocal.c:751 msgid "Source and destination are the same location! Request ignored!" msgstr "" -#: src/LYLocal.c:791 +#: src/LYLocal.c:797 msgid "Modify name, location, or permission (n, l, or p): " msgstr "" -#: src/LYLocal.c:793 -msgid "Modify name, or location (n or l): " +#: src/LYLocal.c:799 +msgid "Modify name or location (n or l): " msgstr "" #. #. * Code for changing ownership needed here. #. -#: src/LYLocal.c:823 +#: src/LYLocal.c:829 msgid "This feature not yet implemented!" msgstr "" -#: src/LYLocal.c:841 +#: src/LYLocal.c:847 msgid "Enter name of file to create: " msgstr "" -#: src/LYLocal.c:851 src/LYLocal.c:899 +#: src/LYLocal.c:857 src/LYLocal.c:905 msgid "Illegal redirection \"//\" found! Request ignored." msgstr "" -#: src/LYLocal.c:866 +#: src/LYLocal.c:872 #, c-format msgid "create %s" msgstr "" -#: src/LYLocal.c:889 +#: src/LYLocal.c:895 msgid "Enter name for new directory: " msgstr "" -#: src/LYLocal.c:940 +#: src/LYLocal.c:946 msgid "Create file or directory (f or d): " msgstr "" -#: src/LYLocal.c:982 +#: src/LYLocal.c:988 #, c-format msgid "Remove '%s' and all of its contents?" msgstr "" -#: src/LYLocal.c:985 +#: src/LYLocal.c:991 msgid "Remove directory and all of its contents?" msgstr "" -#: src/LYLocal.c:989 +#: src/LYLocal.c:995 #, c-format msgid "Remove file '%s'?" msgstr "" -#: src/LYLocal.c:991 +#: src/LYLocal.c:997 msgid "Remove file?" msgstr "" -#: src/LYLocal.c:996 +#: src/LYLocal.c:1002 #, c-format msgid "Remove symbolic link '%s'?" msgstr "" -#: src/LYLocal.c:998 +#: src/LYLocal.c:1004 msgid "Remove symbolic link?" msgstr "" -#: src/LYLocal.c:1094 +#: src/LYLocal.c:1100 msgid "Sorry, don't know how to permit non-UNIX files yet." msgstr "" -#: src/LYLocal.c:1124 +#: src/LYLocal.c:1130 msgid "Unable to open permit options file" msgstr "" -#: src/LYLocal.c:1151 +#: src/LYLocal.c:1157 msgid "Specify permissions below:" msgstr "" -#: src/LYLocal.c:1152 src/LYShowInfo.c:179 +#: src/LYLocal.c:1158 src/LYShowInfo.c:179 msgid "Owner:" msgstr "" -#: src/LYLocal.c:1168 +#: src/LYLocal.c:1174 msgid "Group" msgstr "" -#: src/LYLocal.c:1184 +#: src/LYLocal.c:1190 msgid "Others:" msgstr "" -#: src/LYLocal.c:1202 +#: src/LYLocal.c:1208 msgid "form to permit" msgstr "" -#: src/LYLocal.c:1304 +#: src/LYLocal.c:1310 msgid "Invalid mode format." msgstr "" -#: src/LYLocal.c:1308 +#: src/LYLocal.c:1314 msgid "Invalid syntax format." msgstr "" -#: src/LYLocal.c:1462 +#: src/LYLocal.c:1468 msgid "NULL URL pointer" msgstr "" -#: src/LYLocal.c:1562 +#: src/LYLocal.c:1568 msgid "Warning! UUDecoded file will exist in the directory you started Lynx." msgstr "" -#: src/LYLocal.c:1674 +#: src/LYLocal.c:1680 #, c-format msgid "Executing %s " msgstr "" -#: src/LYLocal.c:1677 +#: src/LYLocal.c:1683 msgid "Executing system command. This might take a while." msgstr "" -#: src/LYLocal.c:1722 +#: src/LYLocal.c:1728 msgid "Unable to open file management menu file." msgstr "" -#: src/LYLocal.c:1753 +#: src/LYLocal.c:1759 msgid "Current directory:" msgstr "" -#: src/LYLocal.c:1756 src/LYLocal.c:1774 +#: src/LYLocal.c:1762 src/LYLocal.c:1780 msgid "Current selection:" msgstr "" -#: src/LYLocal.c:1760 +#: src/LYLocal.c:1766 msgid "Nothing currently selected." msgstr "" -#: src/LYLocal.c:1775 +#: src/LYLocal.c:1781 msgid "tagged item:" msgstr "" -#: src/LYLocal.c:1775 +#: src/LYLocal.c:1781 msgid "tagged items:" msgstr "" -#: src/LYLocal.c:1874 src/LYLocal.c:1885 +#: src/LYLocal.c:1880 src/LYLocal.c:1891 msgid "Illegal filename; request ignored." msgstr "" -#: src/LYLocal.c:2030 +#: src/LYLocal.c:2036 msgid "The selected item is not a directory! Request ignored." msgstr "" #. directory not writable -#: src/LYLocal.c:2034 +#: src/LYLocal.c:2040 msgid "Install in the selected directory not permitted." msgstr "" -#: src/LYLocal.c:2039 +#: src/LYLocal.c:2045 msgid "Just a moment, ..." msgstr "" -#: src/LYLocal.c:2056 +#: src/LYLocal.c:2062 msgid "Error buiding install args" msgstr "" -#: src/LYLocal.c:2071 src/LYLocal.c:2103 +#: src/LYLocal.c:2077 src/LYLocal.c:2109 #, c-format msgid "Source and target are the same: %s" msgstr "" -#: src/LYLocal.c:2081 src/LYLocal.c:2113 +#: src/LYLocal.c:2087 src/LYLocal.c:2119 #, c-format msgid "Already in target directory: %s" msgstr "" -#: src/LYLocal.c:2130 +#: src/LYLocal.c:2136 msgid "Installation complete" msgstr "" -#: src/LYLocal.c:2303 +#: src/LYLocal.c:2309 msgid "Temporary URL or list would be too long." msgstr "" -#: src/LYLocal.c:2354 +#: src/LYLocal.c:2360 #, c-format msgid "Unable to %s due to system error!" msgstr "" #. error return -#: src/LYLocal.c:2383 +#: src/LYLocal.c:2389 #, c-format msgid "Probable failure to %s due to system error!" msgstr "" -#: src/LYMail.c:769 +#: src/LYMail.c:906 #, c-format msgid "The link %s :?: %s \n" msgstr "" -#: src/LYMail.c:771 +#: src/LYMail.c:908 #, c-format msgid "called \"%s\"\n" msgstr "" -#: src/LYMail.c:772 +#: src/LYMail.c:909 #, c-format msgid "in the file \"%s\" called \"%s\"\n" msgstr "" -#: src/LYMail.c:773 +#: src/LYMail.c:910 msgid "was requested but was not available." msgstr "" -#: src/LYMail.c:774 +#: src/LYMail.c:911 msgid "Thought you might want to know." msgstr "" -#: src/LYMail.c:776 +#: src/LYMail.c:913 msgid "This message was automatically generated by" msgstr "" -#: src/LYMail.c:777 +#: src/LYMail.c:914 #, c-format msgid "Lynx ver. %s" msgstr "" -#: src/LYMail.c:1378 +#: src/LYMail.c:1534 msgid "Personal_name: " msgstr "" -#: src/LYMail.c:1380 +#: src/LYMail.c:1536 msgid "X_Personal_name: " msgstr "" -#: src/LYMail.c:1383 +#: src/LYMail.c:1539 msgid "Personal Name: " msgstr "" -#: src/LYMain.c:705 +#: src/LYMain.c:787 msgid "No Winsock found, sorry." msgstr "" -#: src/LYMain.c:861 +#: src/LYMain.c:978 msgid "You MUST define a valid TMP or TEMP area!\n" msgstr "" -#: src/LYMain.c:1256 +#: src/LYMain.c:1380 #, c-format msgid "" "\n" @@ -3963,21 +4002,21 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1272 +#: src/LYMain.c:1396 msgid "" "\n" "Lynx character sets not declared.\n" "\n" msgstr "" -#: src/LYMain.c:1296 +#: src/LYMain.c:1420 msgid "" "\n" "Lynx edit map not declared.\n" "\n" msgstr "" -#: src/LYMain.c:1339 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -3985,109 +4024,121 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1977 +#: src/LYMain.c:2115 msgid "persistent cookies state will be changed in next session only." msgstr "" -#: src/LYMain.c:2651 +#: src/LYMain.c:2790 #, c-format msgid "" "\n" "%s Version %s (%.*s)\n" msgstr "" -#: src/LYMain.c:2663 +#: src/LYMain.c:2802 #, c-format msgid "Built on %s %s %s\n" msgstr "" -#: src/LYMain.c:2667 +#: src/LYMain.c:2806 msgid "" "Copyrights held by the University of Kansas, CERN, and other contributors.\n" msgstr "" -#: src/LYMain.c:2669 +#: src/LYMain.c:2808 msgid "Distributed under the GNU General Public License.\n" msgstr "" -#: src/LYMain.c:2671 +#: src/LYMain.c:2810 msgid "" "See http://lynx.browser.org/ and the online help for more information.\n" "\n" msgstr "" -#: src/LYMain.c:3206 +#: src/LYMain.c:3426 #, c-format msgid "USAGE: %s [options] [file]\n" msgstr "" -#: src/LYMain.c:3207 +#: src/LYMain.c:3427 msgid "Options are:\n" msgstr "" -#: src/LYMain.c:3424 +#: src/LYMain.c:3659 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "" -#: src/LYMainLoop.c:249 +#: src/LYMainLoop.c:361 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "" -#: src/LYMainLoop.c:346 src/LYMainLoop.c:4065 +#: src/LYMainLoop.c:498 src/LYMainLoop.c:4437 msgid "Entry into main screen" msgstr "" -#: src/LYMainLoop.c:1305 +#: src/LYMainLoop.c:1461 msgid "Reparsing document under current settings..." msgstr "" -#: src/LYMainLoop.c:1497 src/LYMainLoop.c:1501 +#: src/LYMainLoop.c:1724 src/LYMainLoop.c:1728 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "" -#: src/LYMainLoop.c:3175 +#: src/LYMainLoop.c:3511 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "" #. #. * Make a name for this new URL. #. -#: src/LYMainLoop.c:3977 +#: src/LYMainLoop.c:4344 msgid "A URL specified by the user" msgstr "" #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:4021 +#: src/LYMainLoop.c:4388 msgid "Help Screen" msgstr "" -#: src/LYMainLoop.c:4046 +#: src/LYMainLoop.c:4418 msgid "System Index" msgstr "" -#: src/LYMainLoop.c:5761 +#: src/LYMainLoop.c:6151 msgid "charset for this document specified explicitely, sorry..." msgstr "" -#: src/LYMainLoop.c:6450 +#: src/LYMainLoop.c:6762 src/LYMainLoop.c:6895 +msgid "-index-" +msgstr "" + +#: src/LYMainLoop.c:6803 +msgid "Inactive text input, activate to edit (e.g., press ENTER)" +msgstr "" + +#: src/LYMainLoop.c:6838 msgid "lynx: Can't access startfile" msgstr "" -#: src/LYMainLoop.c:6463 +#: src/LYMainLoop.c:6851 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "" -#: src/LYMainLoop.c:6464 +#: src/LYMainLoop.c:6852 msgid " Exiting..." msgstr "" +#: src/LYMainLoop.c:6893 +msgid "-more-" +msgstr "" + #. Enable scrolling. -#: src/LYNews.c:180 +#: src/LYNews.c:189 msgid "You will be posting to:" msgstr "" @@ -4095,7 +4146,7 @@ msgstr "" #. * Get the mail address for the From header, #. * offering personal_mail_address as default. #. -#: src/LYNews.c:189 +#: src/LYNews.c:198 msgid "" "\n" "\n" @@ -4107,14 +4158,14 @@ msgstr "" #. * document's title as the default if this is a #. * followup rather than a new post. - FM #. -#: src/LYNews.c:208 +#: src/LYNews.c:217 msgid "" "\n" "\n" " Please provide or edit the Subject: header\n" msgstr "" -#: src/LYNews.c:258 +#: src/LYNews.c:308 msgid "" "\n" "\n" @@ -4124,14 +4175,14 @@ msgstr "" #. #. * Use the built in line editior. #. -#: src/LYNews.c:330 +#: src/LYNews.c:380 msgid "" "\n" "\n" " Please enter your message below." msgstr "" -#: src/LYNews.c:364 +#: src/LYNews.c:414 msgid "Message has no original text!" msgstr "" @@ -4147,77 +4198,77 @@ msgstr "" msgid "Left mouse button or return to select, arrow keys to scroll." msgstr "" -#: src/LYOptions.c:4154 +#: src/LYOptions.c:4171 msgid "Personal Preferences" msgstr "" #. Cookies: SELECT -#: src/LYOptions.c:4157 +#: src/LYOptions.c:4174 msgid "Cookies" msgstr "" #. Editor: INPUT -#: src/LYOptions.c:4171 +#: src/LYOptions.c:4188 msgid "Editor" msgstr "" #. Emacs keys: ON/OFF -#: src/LYOptions.c:4176 +#: src/LYOptions.c:4193 msgid "Emacs keys" msgstr "" #. Keypad Mode: SELECT -#: src/LYOptions.c:4182 +#: src/LYOptions.c:4199 msgid "Keypad mode" msgstr "" #. Mail Address: INPUT -#: src/LYOptions.c:4212 +#: src/LYOptions.c:4229 msgid "Personal mail address" msgstr "" #. Search Type: SELECT -#: src/LYOptions.c:4217 +#: src/LYOptions.c:4234 msgid "Searching type" msgstr "" -#: src/LYOptions.c:4229 +#: src/LYOptions.c:4246 msgid "Show color" msgstr "" #. Show cursor: ON/OFF -#: src/LYOptions.c:4268 +#: src/LYOptions.c:4285 msgid "Show cursor" msgstr "" #. User Mode: SELECT -#: src/LYOptions.c:4274 +#: src/LYOptions.c:4291 msgid "User mode" msgstr "" #. VI Keys: ON/OFF -#: src/LYOptions.c:4280 +#: src/LYOptions.c:4297 msgid "VI keys" msgstr "" #. Display Character Set: SELECT -#: src/LYOptions.c:4286 +#: src/LYOptions.c:4303 msgid "Display character set" msgstr "" #. X Display: INPUT -#: src/LYOptions.c:4299 +#: src/LYOptions.c:4316 msgid "X Display" msgstr "" #. #. * Document Layout #. -#: src/LYOptions.c:4305 +#: src/LYOptions.c:4322 msgid "Document Layout" msgstr "" -#: src/LYOptions.c:4322 +#: src/LYOptions.c:4339 msgid "Assumed document character set" msgstr "" @@ -4226,153 +4277,157 @@ msgstr "" #. * we split the header to make it more readable: #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others. #. -#: src/LYOptions.c:4339 +#: src/LYOptions.c:4356 msgid "CJK mode" msgstr "" -#: src/LYOptions.c:4341 +#: src/LYOptions.c:4358 msgid "Raw 8-bit" msgstr "" #. HTML error recovery: SELECT -#: src/LYOptions.c:4348 +#: src/LYOptions.c:4366 msgid "HTML error recovery" msgstr "" #. Select Popups: ON/OFF -#: src/LYOptions.c:4354 +#: src/LYOptions.c:4373 msgid "Popups for select fields" msgstr "" #. Show Images: SELECT -#: src/LYOptions.c:4360 +#: src/LYOptions.c:4379 msgid "Show images" msgstr "" #. Verbose Images: ON/OFF -#: src/LYOptions.c:4374 +#: src/LYOptions.c:4393 msgid "Verbose images" msgstr "" #. #. * Bookmark Options #. -#: src/LYOptions.c:4382 +#: src/LYOptions.c:4401 msgid "Bookmark Options" msgstr "" -#: src/LYOptions.c:4386 +#: src/LYOptions.c:4405 msgid "Multi-bookmarks" msgstr "" -#: src/LYOptions.c:4403 +#: src/LYOptions.c:4422 msgid "Review/edit Bookmarks files" msgstr "" -#: src/LYOptions.c:4405 +#: src/LYOptions.c:4424 msgid "Goto multi-bookmark menu" msgstr "" -#: src/LYOptions.c:4408 +#: src/LYOptions.c:4427 msgid "Bookmarks file" msgstr "" #. FTP sort: SELECT -#: src/LYOptions.c:4419 +#: src/LYOptions.c:4438 msgid "FTP sort criteria" msgstr "" #. Local Directory Sort: SELECT -#: src/LYOptions.c:4426 +#: src/LYOptions.c:4445 msgid "Local directory sort criteria" msgstr "" -#: src/LYOptions.c:4434 +#: src/LYOptions.c:4453 msgid "Show dot files" msgstr "" -#: src/LYOptions.c:4442 +#: src/LYOptions.c:4461 msgid "Execution links" msgstr "" #. #. * Headers transferred to remote server #. -#: src/LYOptions.c:4463 +#: src/LYOptions.c:4482 msgid "Headers transferred to remote server" msgstr "" #. Preferred Document Character Set: INPUT -#: src/LYOptions.c:4466 +#: src/LYOptions.c:4485 msgid "Preferred document character set" msgstr "" #. Preferred Document Language: INPUT -#: src/LYOptions.c:4471 +#: src/LYOptions.c:4490 msgid "Preferred document language" msgstr "" -#: src/LYOptions.c:4477 +#: src/LYOptions.c:4496 msgid "User-Agent header" msgstr "" -#: src/LYPrint.c:769 +#: src/LYPrint.c:785 msgid "Sending" msgstr "" -#: src/LYPrint.c:1267 +#: src/LYPrint.c:966 +msgid " Print job complete.\n" +msgstr "" + +#: src/LYPrint.c:1314 msgid "Document:" msgstr "" -#: src/LYPrint.c:1268 +#: src/LYPrint.c:1315 msgid "Number of lines:" msgstr "" -#: src/LYPrint.c:1269 +#: src/LYPrint.c:1316 msgid "Number of pages:" msgstr "" -#: src/LYPrint.c:1270 +#: src/LYPrint.c:1317 msgid "pages" msgstr "" -#: src/LYPrint.c:1270 +#: src/LYPrint.c:1317 msgid "page" msgstr "" -#: src/LYPrint.c:1271 +#: src/LYPrint.c:1318 msgid "(approximately)" msgstr "" -#: src/LYPrint.c:1276 +#: src/LYPrint.c:1323 msgid "Some print functions have been disabled!" msgstr "" -#: src/LYPrint.c:1280 +#: src/LYPrint.c:1327 msgid "Standard print options:" msgstr "" -#: src/LYPrint.c:1281 +#: src/LYPrint.c:1328 msgid "Print options:" msgstr "" -#: src/LYPrint.c:1287 +#: src/LYPrint.c:1334 msgid "Save to a local file" msgstr "" -#: src/LYPrint.c:1289 +#: src/LYPrint.c:1336 msgid "Save to disk disabled" msgstr "" -#: src/LYPrint.c:1295 +#: src/LYPrint.c:1342 msgid "Mail the file" msgstr "" -#: src/LYPrint.c:1301 +#: src/LYPrint.c:1348 msgid "Print to the screen" msgstr "" -#: src/LYPrint.c:1305 +#: src/LYPrint.c:1352 msgid "Print out on a printer attached to your vt100 terminal" msgstr "" @@ -4415,38 +4470,38 @@ msgstr "" msgid "(no name)" msgstr "" -#: src/LYReadCFG.c:1340 +#: src/LYReadCFG.c:1369 #, c-format msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n" msgstr "" -#: src/LYReadCFG.c:1342 +#: src/LYReadCFG.c:1371 #, c-format msgid "Last attempted include was '%s',\n" msgstr "" -#: src/LYReadCFG.c:1343 +#: src/LYReadCFG.c:1372 #, c-format msgid "included from '%s'.\n" msgstr "" -#: src/LYReadCFG.c:1792 src/LYReadCFG.c:1805 src/LYReadCFG.c:1833 +#: src/LYReadCFG.c:1832 src/LYReadCFG.c:1845 src/LYReadCFG.c:1873 msgid "The following is read from your lynx.cfg file." msgstr "" -#: src/LYReadCFG.c:1793 src/LYReadCFG.c:1806 +#: src/LYReadCFG.c:1833 src/LYReadCFG.c:1846 msgid "Please read the distribution" msgstr "" -#: src/LYReadCFG.c:1799 src/LYReadCFG.c:1809 +#: src/LYReadCFG.c:1839 src/LYReadCFG.c:1849 msgid "for more comments." msgstr "" -#: src/LYReadCFG.c:1815 +#: src/LYReadCFG.c:1855 msgid "RELOAD THE CHANGES" msgstr "" -#: src/LYReadCFG.c:1824 +#: src/LYReadCFG.c:1864 msgid "Your primary configuration" msgstr "" @@ -4634,7 +4689,7 @@ msgstr "" msgid "No Links on the current page" msgstr "" -#: src/LYStyle.c:170 +#: src/LYStyle.c:191 #, c-format msgid "" "Syntax Error parsing style in lss file:\n" @@ -4677,19 +4732,19 @@ msgstr "" msgid "Upload options:" msgstr "" -#: src/LYUtils.c:2922 +#: src/LYUtils.c:2966 msgid "Unexpected access protocol for this URL scheme." msgstr "" -#: src/LYUtils.c:3862 +#: src/LYUtils.c:4034 msgid "No restrictions set.\n" msgstr "" -#: src/LYUtils.c:3865 +#: src/LYUtils.c:4037 msgid "Restrictions set:\n" msgstr "" -#: src/LYUtils.c:5125 +#: src/LYUtils.c:5399 msgid "Ignoring invalid HOME" msgstr "" diff --git a/src/GridText.c b/src/GridText.c index f50cac68..54631f8a 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -103,7 +103,6 @@ extern HTCJKlang HTCJK; #ifdef CJK_EX PUBLIC HTkcode last_kcode = NOKANJI; /* 1997/11/14 (Fri) 09:09:26 */ -extern char *str_kcode(HTkcode code); #define CHAR_WIDTH 6 #else #define CHAR_WIDTH 1 @@ -210,6 +209,7 @@ struct _HText { BOOLEAN minimal_comments; BOOLEAN soft_dquotes; BOOLEAN old_dtd; + int keypad_mode; int lines; /* Screen size */ int cols; #endif @@ -276,6 +276,7 @@ PUBLIC int wait_for_this_stacked_elt;/* -1 if can justify contents of the ok_justify ==FALSE or in psrcview. */ PUBLIC BOOL form_in_htext;/*to indicate that we are in form (since HTML_FORM is not stacked in the HTML.c */ +PUBLIC BOOL in_DT = FALSE; #ifdef DEBUG_JUSTIFY PUBLIC BOOL can_justify_stack_depth;/* can be 0 or 1 if all code is correct*/ #endif @@ -300,8 +301,18 @@ static int justified_text_map[MAX_LINE]; /* this is a map - for each index i PUBLIC void ht_justify_cleanup NOARGS { + wait_for_this_stacked_elt = !ok_justify +# ifdef USE_PSRC + || psrc_view +# endif + ? 30000/*MAX_NESTING*/+2 /*some unreachable value*/ : -1; + can_justify_here = TRUE; + can_justify_this_line = TRUE; + form_in_htext = FALSE; + last_anchor_of_previous_line = NULL; this_line_was_splitted = FALSE; + in_DT = FALSE; } PUBLIC void mark_justify_start_position ARGS1(void*,text) @@ -314,7 +325,7 @@ PUBLIC void mark_justify_start_position ARGS1(void*,text) #define REALLY_CAN_JUSTIFY(text) ( (wait_for_this_stacked_elt<0) && \ ( text->style->alignment == HT_LEFT || \ text->style->alignment == HT_JUSTIFY) && \ - HTCJK == NOCJK && \ + HTCJK == NOCJK && !in_DT && \ can_justify_here && can_justify_this_line && !form_in_htext ) #endif /* EXP_JUSTIFY_ELTS */ @@ -523,6 +534,8 @@ PUBLIC HText * HText_new ARGS1( if (!self) return self; + CTRACE(tfp, "GridText: start HText_new\n"); + #if defined(VMS) && defined (VAXC) && !defined(__DECC) status = lib$stat_vm(&VMType, &VMTotal); CTRACE(tfp, "GridText: VMTotal = %d\n", VMTotal); @@ -595,6 +608,7 @@ PUBLIC HText * HText_new ARGS1( self->minimal_comments = minimal_comments; self->soft_dquotes = soft_dquotes; self->old_dtd = Old_DTD; + self->keypad_mode = keypad_mode; self->lines = LYlines; self->cols = LYcols; #endif @@ -691,8 +705,9 @@ PUBLIC HText * HText_new ARGS1( self->last_lineno_last_disp_partial = -1; #endif - CTRACE(tfp, "GridText: start HText_new\n"); - +#ifdef EXP_JUSTIFY_ELTS + ht_justify_cleanup(); +#endif return self; } @@ -1193,8 +1208,20 @@ PRIVATE void display_title ARGS1( * account the possibility that multibyte * characters might be present. - FM */ +#ifdef SH_EX /* 1999/06/15 (Tue) 10:17:28 */ + int last; + last = (int)strlen(percent) + CHAR_WIDTH; + if (LYcols - 3 >= last) { + title[(LYcols - 3) - last] = '.'; + title[(LYcols - 2) - last] = '.'; + title[(LYcols - 1) - last] = '\0'; + } else { + title[(LYcols - 1) - last] = '\0'; + } +#else if ((i = ((LYcols - 2) - strlen(percent)) - CHAR_WIDTH) >= 0) title[i] = '\0'; +#endif move(0, CHAR_WIDTH); } addstr(title); @@ -2579,8 +2606,7 @@ PRIVATE void split_line ARGS2( for (i=0; i<j; ++i) *jdata++ = ' '; } - *m++ = justify_start_position + total_cell_len + - spare + ht_num_runs - 1; /*map the end*/ + *m++ = previous->size + spare; /*map the end */ text->chars += spare; @@ -2600,10 +2626,16 @@ PRIVATE void split_line ARGS2( /* now copy and fix colorstyles */ for(i = 0; i < jline->numstyles; ++i) { + int hpos = previous->styles[i].horizpos; + jline->styles[i].style = previous->styles[i].style; jline->styles[i].direction = previous->styles[i].direction; jline->styles[i].previous = previous->styles[i].previous; - jline->styles[i].horizpos = justified_text_map[previous->styles[i].horizpos]; + + /*there are stylechanges with hpos > line length */ + jline->styles[i].horizpos = (hpos > previous->size) + ? previous->size + spare + : justified_text_map[hpos]; } #endif /* we have to fix anchors*/ @@ -2652,7 +2684,7 @@ PRIVATE void split_line ARGS2( } else { /* This is the anchor that was started on previous - * line. Its .line_pos and .start were updated. + * line. Its .line_pos and .start were updated. * So we have to update only extent. If anchor * text is longer than two lines, we don't bother * setting it to correct value. @@ -6782,6 +6814,14 @@ PUBLIC BOOLEAN HTreparse_document NOARGS HTMainAnchor->source_cache_file); /* + * This magic FREE(anchor->UCStages) call + * stolen from HTuncache_current_document() above. + */ + if (!(HTOutputFormat && HTOutputFormat == WWW_SOURCE)) { + FREE(HTMainAnchor->UCStages); + } + + /* * This is more or less copied out of HTLoadFile(), except we don't * get a content encoding. This may be overkill. -dsb */ @@ -6828,6 +6868,14 @@ PUBLIC BOOLEAN HTreparse_document NOARGS (void *)HTMainAnchor->source_cache_chunk); /* + * This magic FREE(anchor->UCStages) call + * stolen from HTuncache_current_document() above. + */ + if (!(HTOutputFormat && HTOutputFormat == WWW_SOURCE)) { + FREE(HTMainAnchor->UCStages); + } + + /* * This is only done to make things aligned with SOURCE_CACHE_NONE and * SOURCE_CACHE_FILE when switching to source mode since the original * document's charset will be LYPushAssumed() and then LYPopAssumed(). @@ -6936,6 +6984,8 @@ PUBLIC BOOLEAN HTdocument_settings_changed NOARGS trace_setting_change("SOFT_DQUOTES", HTMainText->soft_dquotes, soft_dquotes); trace_setting_change("OLD_DTD", HTMainText->old_dtd, Old_DTD); + trace_setting_change("KEYPAD_MODE", + HTMainText->keypad_mode, keypad_mode); if (HTMainText->lines != LYlines || HTMainText->cols != LYcols) CTRACE(tfp, "HTdocument_settings_changed: Screen size has changed (was %dx%d, now %dx%d)\n", @@ -6944,12 +6994,13 @@ PUBLIC BOOLEAN HTdocument_settings_changed NOARGS return (HTMainText->clickable_images != clickable_images || HTMainText->pseudo_inline_alts != pseudo_inline_alts || - HTMainText->verbose_img != verbose_img || + HTMainText->verbose_img != verbose_img || HTMainText->raw_mode != LYUseDefaultRawMode || HTMainText->historical_comments != historical_comments || HTMainText->minimal_comments != minimal_comments || HTMainText->soft_dquotes != soft_dquotes || HTMainText->old_dtd != Old_DTD || + HTMainText->keypad_mode != keypad_mode || HTMainText->lines != LYlines || HTMainText->cols != LYcols); } @@ -10684,7 +10735,6 @@ PUBLIC int HText_ExtEditForm ARGS1( int newlines = 0; int len; - CTRACE(tfp, "GridText: entered HText_ExtEditForm()\n"); ed_temp = (char *) malloc (LY_MAXPATH); @@ -10822,6 +10872,9 @@ PUBLIC int HText_ExtEditForm ARGS1( else len = strlen (lp); + if (len >= MAX_LINE - 1) + len = MAX_LINE - 1; + strncpy (line, lp, len); *(line + len) = '\0'; diff --git a/src/GridText.h b/src/GridText.h index b8705e7a..5fb73f07 100644 --- a/src/GridText.h +++ b/src/GridText.h @@ -47,13 +47,6 @@ #define NOCHOP 0 #define CHOP 1 -#define TABSTOP 8 -#define SPACES " " /* must be at least TABSTOP spaces long */ -#define SPLAT '.' - -#define NOCHOP 0 -#define CHOP 1 - /* just for information: US-ASCII control characters <32 which are not defined in Unicode standard =00 U+0000 NULL diff --git a/src/HTAlert.c b/src/HTAlert.c index 0730e8a5..2200a58a 100644 --- a/src/HTAlert.c +++ b/src/HTAlert.c @@ -174,6 +174,38 @@ PUBLIC void HTProgress ARGS1( #endif } +#ifdef EXP_READPROGRESS +PRIVATE char *sprint_bytes ARGS3( + char *, s, + long, n, + char *, was_units) +{ + static long kb_units = 1024; + static char *bunits; + static char *kbunits; + char *u; + + if (!bunits) { + bunits = gettext("bytes"); + kbunits = gettext("KB"); + } + + u = kbunits; + if (LYshow_kb_rate && (n >= 10 * kb_units)) + sprintf(s, "%ld", n/kb_units); + else if (LYshow_kb_rate && (n >= kb_units)) + sprintf(s, "%.2g", ((double)n)/kb_units); + else { + sprintf(s, "%ld", n); + u = bunits; + } + + if (!was_units || was_units != u) + sprintf(s + strlen(s), " %s", u); + return u; +} +#endif /* EXP_READPROGRESS */ + /* Issue a read-progress message. HTReadProgress() ** ------------------------------ */ @@ -239,9 +271,90 @@ PUBLIC void HTReadProgress ARGS2( if (total < -1) strcat(line, " (Press 'z' to abort)"); } - _HTProgress(line); + statusline(line); + } +#else /* !WIN_EX */ +#ifdef EXP_READPROGRESS + static long bytes_last, total_last; + static long transfer_rate = 0; + char line[300], bytesp[80], totalp[80], transferp[80]; + int renew = 0; + char *was_units; +#if HAVE_GETTIMEOFDAY + struct timeval tv; + int dummy = gettimeofday(&tv, (struct timezone *)0); + double now = tv.tv_sec + tv.tv_usec/1000000. ; + static double first, last, last_active; +#else + time_t now = time((time_t *)0); /* once per second */ + static time_t first, last, last_active; +#endif + + if (bytes == 0) { + first = last = last_active = now; + bytes_last = bytes; + line[0] = 0; + } else if (bytes < 0) { /* stalled */ + bytes = bytes_last; + total = total_last; } + if ((bytes > 0) && + (now != first)) + /* 1 sec delay for transfer_rate calculation without g-t-o-d */ { + if (transfer_rate <= 0) /* the very first time */ + transfer_rate = (bytes) / (now - first); /* bytes/sec */ + total_last = total; + + /* + * Optimal refresh time: every 0.2 sec, use interpolation. Transfer + * rate is not constant when we have partial content in a proxy, so + * interpolation lies - will check every second at least for sure. + */ +#if HAVE_GETTIMEOFDAY + if (now >= last + 0.2) + renew = 1; #else + if (((bytes - bytes_last) > (transfer_rate / 5)) || (now != last)) { + renew = 1; + bytes_last += (transfer_rate / 5); /* until we got next second */ + } +#endif + if (renew) { + if (now != last) { + last = now; + if (bytes_last != bytes) + last_active = now; + bytes_last = bytes; + transfer_rate = bytes / (now - first); /* more accurate here */ + } + + if (total > 0) + was_units = sprint_bytes(totalp, total, 0); + else + was_units = 0; + sprint_bytes(bytesp, bytes, was_units); + sprint_bytes(transferp, transfer_rate, 0); + + if (total > 0) + sprintf (line, gettext("Read %s of %s of data"), bytesp, totalp); + else + sprintf (line, gettext("Read %s of data"), bytesp); + if (transfer_rate > 0) + sprintf (line + strlen(line), gettext(", %s/sec"), transferp); + if (now - last_active >= 5) + sprintf (line + strlen(line), gettext(" (stalled for %ld sec)"), (long)(now - last_active)); + if (total > 0 && transfer_rate) + sprintf (line + strlen(line), gettext(", ETA %ld sec"), (long)((total - bytes)/transfer_rate)); + sprintf (line + strlen(line), "."); + if (total < -1) + strcat(line, gettext(" (Press 'z' to abort)")); + + /* do not store the message for history page. */ + statusline(line); + CTRACE(tfp, "%s\n", line); + } + } +#else /* !EXP_READPROGRESS */ static long kb_units = 1024; static time_t first, last; static long bytes_last; @@ -304,7 +417,8 @@ PUBLIC void HTReadProgress ARGS2( CTRACE(tfp, "%s\n", line); } } -#endif +#endif /* EXP_READPROGRESS */ +#endif /* WIN_EX */ } PRIVATE BOOL conf_cancelled = NO; /* used by HTConfirm only - kw */ diff --git a/src/HTFWriter.c b/src/HTFWriter.c index fd1f4bd5..68d4b1de 100644 --- a/src/HTFWriter.c +++ b/src/HTFWriter.c @@ -312,7 +312,7 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me) stop_curses(); #endif } -#ifdef _WIN_CC +#if _WIN_CC exec_command(me->end_command, FALSE); #else LYSystem(me->end_command); @@ -368,7 +368,7 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me) stop_curses(); #endif } -#ifdef _WIN_CC +#if _WIN_CC exec_command(me->end_command, FALSE); #else LYSystem(me->end_command); diff --git a/src/HTForms.h b/src/HTForms.h index 53cde123..eb746376 100644 --- a/src/HTForms.h +++ b/src/HTForms.h @@ -6,12 +6,22 @@ #endif /* LYSTRUCTS_H */ /* in LYForms.c */ + +/* change_form_link calls change_form_link_ex with all its args and FALSE as + last arg */ extern int change_form_link PARAMS((struct link *form_link, - document *newdoc, BOOLEAN *refresh_screen, + document *newdoc, BOOLEAN *refresh_screen, char *link_name, char *link_value, BOOLEAN use_last_tfpos, BOOLEAN immediate_submit)); +extern int change_form_link_ex PARAMS((struct link *form_link, + document *newdoc, BOOLEAN *refresh_screen, + char *link_name, char *link_value, + BOOLEAN use_last_tfpos, + BOOLEAN immediate_submit, + BOOLEAN draw_only)); + /* InputFieldData is used to pass the info between * HTML.c and Gridtext.c in HText_beginInput() */ @@ -29,15 +39,15 @@ typedef struct _InputFieldData { CONST char *maxlength; CONST char *md; CONST char *min; - CONST char *name; + CONST char *name; CONST char *size; CONST char *src; CONST char *type; char *value; CONST char *width; - int name_cs; /* charset handle for name */ - int value_cs; /* charset handle for value */ - CONST char *accept_cs; + int name_cs; /* charset handle for name */ + int value_cs; /* charset handle for value */ + CONST char *accept_cs; } InputFieldData; /* The OptionType structure is for a linked list of option entries @@ -68,18 +78,18 @@ typedef struct _FormInfo { int hrange; /* high numerical range */ int lrange; /* low numerical range */ OptionType * select_list; /* array of option choices */ - char * submit_action; /* form's action */ - int submit_method; /* form's method */ - char * submit_enctype; /* form's entype */ + char * submit_action; /* form's action */ + int submit_method; /* form's method */ + char * submit_enctype; /* form's entype */ char * submit_title; /* form's title */ BOOL no_cache; /* Always resubmit? */ char * cp_submit_value; /* option value to submit */ - char * orig_submit_value; /* original submit value */ + char * orig_submit_value; /* original submit value */ int size_l; /* The length of the option list */ int disabled; /* If YES, can't change values */ - int name_cs; - int value_cs; - char * accept_cs; + int name_cs; + int value_cs; + char * accept_cs; } FormInfo; /* @@ -95,12 +105,12 @@ typedef struct _PerFormInfo int number; /* form number, see GridText.c */ /* except for the last two, the followign fields aren't actually used.. */ int disabled; /* If YES, can't change values */ - struct _PerFormInfo * next; /* pointer to next form in doc */ - int nfields; /* number of fields */ - FormInfo * first_field; - FormInfo * last_field; /* pointer to last field in form */ - char * accept_cs; - char * thisacceptcs; /* used during submit */ + struct _PerFormInfo * next; /* pointer to next form in doc */ + int nfields; /* number of fields */ + FormInfo * first_field; + FormInfo * last_field; /* pointer to last field in form */ + char * accept_cs; + char * thisacceptcs; /* used during submit */ } PerFormInfo; #define HYPERTEXT_ANCHOR 1 diff --git a/src/HTML.c b/src/HTML.c index 6fda07e9..d6c0370a 100644 --- a/src/HTML.c +++ b/src/HTML.c @@ -526,6 +526,18 @@ PUBLIC void HTML_put_string ARGS2(HTStructured *, me, CONST char *, s) * by the cases above (HTML_PRE or similar may not be the * last element pushed on the style stack). - kw */ +#ifdef USE_PSRC + if (psrc_view) { + /* + * We do this so that a raw '\r' in the string will not be + * interpreted as an internal request to break a line - passing + * '\r' to HText_appendText is treated by it as a request to + * insert a blank line - VH + */ + for(; *s; ++s) + HTML_put_character(me, *s); + } else +#endif HText_appendText(me->text, s); break; } else { @@ -734,7 +746,7 @@ PRIVATE void HTMLSRC_apply_markup ARGS4( # define START TRUE # define STOP FALSE -#ifdef __STDC__ +#if defined(__STDC__) || _WIN_CC # define PSRCSTART(x) HTMLSRC_apply_markup(me,HTL_##x,START,tag_charset) # define PSRCSTOP(x) HTMLSRC_apply_markup(me,HTL_##x,STOP,tag_charset) #else @@ -1631,6 +1643,7 @@ PRIVATE void HTML_start_element ARGS6( if (me->inUnderline == FALSE) HText_appendCharacter(me->text, LY_UNDERLINE_END_CHAR); HTML_put_character(me, ' '); + me->in_word = NO; CHECK_ID(HTML_FRAME_ID); HText_beginAnchor(me->text, me->inUnderline, me->CurrentA); @@ -5709,12 +5722,19 @@ PRIVATE void HTML_start_element ARGS6( me->sp[0].style = me->new_style; /* Stack new style */ me->sp[0].tag_number = ElementNumber; #ifdef EXP_JUSTIFY_ELTS - if (wait_for_this_stacked_elt<0 && - HTML_dtd.tags[ElementNumber].can_justify==FALSE) - wait_for_this_stacked_elt=me->stack - me->sp; + if (wait_for_this_stacked_elt < 0 && + HTML_dtd.tags[ElementNumber].can_justify == FALSE) + wait_for_this_stacked_elt = me->stack - me->sp + MAX_NESTING; #endif } +#ifdef EXP_JUSTIFY_ELTS + if (in_DT && ElementNumber == HTML_DD) + in_DT = FALSE; + else if (ElementNumber == HTML_DT) + in_DT = TRUE; +#endif + #if defined(USE_COLOR_STYLE) /* end really empty tags straight away */ #define REALLY_EMPTY(e) ((HTML_dtd.tags[e].contents == SGML_EMPTY) && \ @@ -5889,8 +5909,8 @@ PRIVATE void HTML_end_element ARGS3( return; } else if (me->sp < (me->stack + MAX_NESTING - 1)) { #ifdef EXP_JUSTIFY_ELTS - if (wait_for_this_stacked_elt==me->stack-me->sp) - reached_awaited_stacked_elt=TRUE; + if (wait_for_this_stacked_elt == me->stack - me->sp + MAX_NESTING) + reached_awaited_stacked_elt = TRUE; #endif (me->sp)++; CTRACE(tfp, "HTML:end_element[%d]: Popped style off stack - %s\n", @@ -6271,6 +6291,10 @@ PRIVATE void HTML_end_element ARGS3( me->List_Nesting_Level--; CTRACE(tfp, "HTML_end_element: Reducing List Nesting Level to %d\n", me->List_Nesting_Level); +#ifdef EXP_JUSTIFY_ELTS + if (element_number == HTML_DL) + in_DT = FALSE; /*close the term that was without definition. */ +#endif change_paragraph_style(me, me->sp->style); /* Often won't really change */ UPDATE_STYLE; if (me->List_Nesting_Level >= 0) @@ -7832,19 +7856,6 @@ PUBLIC HTStructured* HTML_new ARGS3( me->outUCLYhndl, me->outUCI); #endif -#ifdef EXP_JUSTIFY_ELTS - wait_for_this_stacked_elt = !ok_justify -# ifdef USE_PSRC - || psrc_view -# endif - ? MAX_NESTING+2 /*some unreachable value*/ : -1; - can_justify_here = TRUE; - can_justify_this_line = TRUE; - form_in_htext = FALSE; - - ht_justify_cleanup(); -#endif - me->target = stream; if (stream) me->targetClass = *stream->isa; /* Copy pointers */ diff --git a/src/LYBookmark.c b/src/LYBookmark.c index 50ad92bd..e07799eb 100644 --- a/src/LYBookmark.c +++ b/src/LYBookmark.c @@ -281,10 +281,10 @@ PUBLIC void save_bookmark_link ARGS2( if (HTCJK == JAPANESE) { switch(kanji_code) { case EUC: - TO_EUC(title, tmp_buffer); + TO_EUC((CONST unsigned char *) title, (unsigned char *) tmp_buffer); break; case SJIS: - TO_SJIS(title, tmp_buffer); + TO_SJIS((CONST unsigned char *) title, (unsigned char *) tmp_buffer); break; default: break; @@ -316,13 +316,13 @@ PUBLIC void save_bookmark_link ARGS2( if (HTCJK == JAPANESE) { switch(kanji_code) { /* 1997/11/22 (Sat) 09:28:00 */ case EUC: - TO_EUC(string_buffer, tmp_buffer); + TO_EUC((CONST unsigned char *) string_buffer, (unsigned char *) tmp_buffer); break; case SJIS: - TO_SJIS(string_buffer, tmp_buffer); + TO_SJIS((CONST unsigned char *) string_buffer, (unsigned char *) tmp_buffer); break; default: - TO_JIS(string_buffer, tmp_buffer); + TO_JIS((CONST unsigned char *) string_buffer, (unsigned char *) tmp_buffer); break; } StrAllocCopy(Title, tmp_buffer); diff --git a/src/LYCookie.c b/src/LYCookie.c index a3640e32..ea5bd4d3 100644 --- a/src/LYCookie.c +++ b/src/LYCookie.c @@ -629,7 +629,9 @@ PRIVATE char * scan_cookie_sublist ARGS6( co = (cookie *)hl->object; next = hl->next; - if (co) { + if ((co) && /* speed-up host_matches() and limit trace output */ + (LYstrstr((char *)hostname, co->domain) != NULL)) + { CTRACE(tfp, "Checking cookie %p %s=%s\n", hl, (co->name ? co->name : "(no name)"), diff --git a/src/LYCurses.c b/src/LYCurses.c index 679c2f99..e554c2d7 100644 --- a/src/LYCurses.c +++ b/src/LYCurses.c @@ -938,14 +938,18 @@ PUBLIC void lynx_enable_mouse ARGS1(int,state) /* Inform ncurses which mouse events we're interested in. * We shouldn't need to include BUTTONn_PRESSED and BUTTONn_RELEASED * events, since ncurses should translate them to click events. - kw + * However, if we do not include them, then ncurses effectively + * ignores mouseinterval(), thus translates *any* sequence of + * press/release to a click, which leads to inconveniences. + * We special-case these events in LYStrings.c. */ mousemask(BUTTON_CTRL | BUTTON_ALT - /* | BUTTON1_PRESSED | BUTTON1_RELEASED */ + | BUTTON1_PRESSED | BUTTON1_RELEASED | BUTTON1_CLICKED | BUTTON1_DOUBLE_CLICKED | BUTTON1_TRIPLE_CLICKED - /* | BUTTON2_PRESSED | BUTTON2_RELEASED */ + | BUTTON2_PRESSED | BUTTON2_RELEASED | BUTTON2_CLICKED - /* | BUTTON3_PRESSED | BUTTON3_RELEASED */ + | BUTTON3_PRESSED | BUTTON3_RELEASED | BUTTON3_CLICKED | BUTTON3_DOUBLE_CLICKED | BUTTON3_TRIPLE_CLICKED, NULL); diff --git a/src/LYCurses.h b/src/LYCurses.h index 3b252afa..eefeeeaa 100644 --- a/src/LYCurses.h +++ b/src/LYCurses.h @@ -111,7 +111,11 @@ extern void LYsubwindow PARAMS((WINDOW * param)); # if defined(VMS) && defined(__GNUC__) # include <LYGCurses.h> # else -# include <curses.h> /* everything else */ +# ifdef PDCURSES /* 1999/07/15 (Thu) 08:27:48 */ +# include <pdcurses.h> /* for PDCurses */ +# else +# include <curses.h> /* everything else */ +# endif /* not PDCURSES */ # endif /* VMS && __GNUC__ */ #endif /* HAVE_CONFIG_H */ @@ -430,4 +434,14 @@ extern void lynx_stop_all_colors NOPARAMS; #define SetDefaultMode(mode) /* nothing */ #endif +/* + * Very old versions of curses cannot put the cursor on the lower right corner. + * Adjust our "hidden" cursor position accordingly. + */ +#if defined(FANCY_CURSES) || defined(USE_SLANG) +#define LYHideCursor() move((LYlines - 1), (LYcols - 1)) +#else +#define LYHideCursor() move((LYlines - 1), (LYcols - 2)) +#endif + #endif /* LYCURSES_H */ diff --git a/src/LYForms.c b/src/LYForms.c index 574a857a..282adc91 100644 --- a/src/LYForms.c +++ b/src/LYForms.c @@ -24,7 +24,8 @@ extern HTCJKlang HTCJK; PRIVATE int form_getstr PARAMS(( struct link * form_link, - BOOLEAN use_last_tfpos)); + BOOLEAN use_last_tfpos, + BOOLEAN redraw_only)); PRIVATE int popup_options PARAMS(( int cur_selection, OptionType * list, @@ -34,14 +35,16 @@ PRIVATE int popup_options PARAMS(( int i_length, int disabled)); -PUBLIC int change_form_link ARGS7( + +PUBLIC int change_form_link_ex ARGS8( struct link *, form_link, document *, newdoc, BOOLEAN *, refresh_screen, char *, link_name, char *, link_value, BOOLEAN, use_last_tfpos, - BOOLEAN, immediate_submit) + BOOLEAN, immediate_submit, + BOOLEAN, redraw_only) { FormInfo *form = form_link->form; int newdoc_changed = 0; @@ -179,7 +182,7 @@ PUBLIC int change_form_link ARGS7( case F_TEXT_TYPE: case F_TEXTAREA_TYPE: case F_PASSWORD_TYPE: - c = form_getstr(form_link, use_last_tfpos); + c = form_getstr(form_link, use_last_tfpos, redraw_only); if (form->type == F_PASSWORD_TYPE) form_link->hightext = STARS(strlen(form->value)); else @@ -194,8 +197,12 @@ PUBLIC int change_form_link ARGS7( break; case F_TEXT_SUBMIT_TYPE: + if (redraw_only) { + c = form_getstr(form_link, use_last_tfpos, TRUE); + break; + } if (!immediate_submit) - c = form_getstr(form_link, use_last_tfpos); + c = form_getstr(form_link, use_last_tfpos, FALSE); if (form->disabled == YES && (c == '\r' || c == '\n' || immediate_submit)) { if (peek_mouse_link() >= 0) @@ -300,6 +307,20 @@ PUBLIC int change_form_link ARGS7( return(c); } +PUBLIC int change_form_link ARGS7( + struct link *, form_link, + document *, newdoc, + BOOLEAN *, refresh_screen, + char *, link_name, + char *, link_value, + BOOLEAN, use_last_tfpos, + BOOLEAN, immediate_submit) +{ + /*pass all our args and FALSE as last arg*/ + return change_form_link_ex(form_link,newdoc,refresh_screen,link_name, + link_value,use_last_tfpos,immediate_submit, FALSE /*redraw_only*/ ); +} + PRIVATE int LastTFPos = -1; /* remember last text field position */ PRIVATE void LYSetLastTFPos ARGS1( @@ -307,16 +328,11 @@ PRIVATE void LYSetLastTFPos ARGS1( { LastTFPos = pos; } -#if 0 -PRIVATE int LYLastTFPos NOARGS -{ - return(LastTFPos); -} -#endif /* 0 */ -PRIVATE int form_getstr ARGS2( +PRIVATE int form_getstr ARGS3( struct link *, form_link, - BOOLEAN, use_last_tfpos) + BOOLEAN, use_last_tfpos, + BOOLEAN, redraw_only) { FormInfo *form = form_link->form; char *value = form->value; @@ -363,33 +379,6 @@ PRIVATE int form_getstr ARGS2( */ HTUserMsg(FORM_VALUE_TOO_LONG); show_formlink_statusline(form); -#if 0 /* using function above instead */ - switch(form->type) { - case F_PASSWORD_TYPE: - statusline(FORM_LINK_PASSWORD_MESSAGE); - break; - case F_TEXT_SUBMIT_TYPE: - if (form->submit_method == URL_MAIL_METHOD) { - statusline(FORM_LINK_TEXT_SUBMIT_MAILTO_MSG); - } else if (form->no_cache) { - statusline(FORM_LINK_TEXT_RESUBMIT_MESSAGE); - } else { - statusline(FORM_LINK_TEXT_SUBMIT_MESSAGE); - } - break; - case F_FILE_TYPE: - statusline(FORM_LINK_FILE_MESSAGE); - break; - case F_TEXT_TYPE: - statusline(FORM_LINK_TEXT_MESSAGE); - break; - case F_TEXTAREA_TYPE: - statusline(FORM_LINK_TEXTAREA_MESSAGE); - break; - default: - break; - } -#endif /* 0 - using function instead */ move(startline, startcol); } } @@ -413,6 +402,8 @@ PRIVATE int form_getstr ARGS2( MyEdit.pos = 0; } LYRefreshEdit(&MyEdit); + if (redraw_only) + return 0; /*return value won't be analysed*/ /* * And go for it! @@ -420,7 +411,7 @@ PRIVATE int form_getstr ARGS2( for (;;) { again: repeat = -1; - get_mouse_link(); /* Reset mouse_link. */ + get_mouse_link(); /* Reset mouse_link. */ ch = LYgetch_for(FOR_INPUT); #ifdef SUPPORT_MULTIBYTE_EDIT diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h index 2bbe13f1..5f3c0da9 100644 --- a/src/LYGlobalDefs.h +++ b/src/LYGlobalDefs.h @@ -118,70 +118,71 @@ extern BOOLEAN LYUseFormsOptions; /* use Forms-based options menu */ #else #define LYUseFormsOptions FALSE /* simplify ifdef'ing in LYMainLoop.c */ #endif + +extern BOOLEAN LYCursesON; /* start_curses()->TRUE, stop_curses()->FALSE */ +extern BOOLEAN LYJumpFileURL; /* URL from the jump file shortcuts? */ +extern BOOLEAN LYNewsPosting; /* News posting supported if TRUE */ extern BOOLEAN LYShowCursor; /* Show the cursor or hide it? */ -extern BOOLEAN verbose_img; /* display filenames of images? */ extern BOOLEAN LYUseDefShoCur; /* Command line -show_cursor toggle */ -extern BOOLEAN LYCursesON; /* start_curses()->TRUE, stop_curses()->FALSE */ extern BOOLEAN LYUserSpecifiedURL; /* URL from a goto or document? */ -extern BOOLEAN LYJumpFileURL; /* URL from the jump file shortcuts? */ -extern BOOLEAN jump_buffer; /* TRUE if offering default shortcut */ +extern BOOLEAN LYforce_HTML_mode; +extern BOOLEAN LYforce_no_cache; +extern BOOLEAN LYinternal_flag; /* don't need fresh copy, was internal link */ +extern BOOLEAN LYoverride_no_cache; /* don't need fresh copy, from history */ +extern BOOLEAN LYresubmit_posts; +extern BOOLEAN LYshow_kb_rate; /* show KB/sec in HTReadProgress */ +extern BOOLEAN bold_H1; +extern BOOLEAN bold_headers; +extern BOOLEAN bold_name_anchors; +extern BOOLEAN case_sensitive; /* TRUE to turn on case sensitive search */ +extern BOOLEAN check_mail; /* TRUE to report unread/new mail messages */ +extern BOOLEAN child_lynx; /* TRUE to exit with an arrow */ +extern BOOLEAN dump_output_immediately; +extern BOOLEAN emacs_keys; /* TRUE to turn on emacs-like key movement */ +extern BOOLEAN error_logging; /* TRUE to mail error messages */ +extern BOOLEAN ftp_ok; extern BOOLEAN goto_buffer; /* TRUE if offering default goto URL */ -extern char *LYRequestTitle; /* newdoc.title in calls to getfile() */ -extern char *jumpprompt; /* The default jump statusline prompt */ -extern int more; /* is there more document to display? */ -extern int display_lines; /* number of lines in the display */ -extern int www_search_result; -extern char *checked_box; /* form boxes */ -extern char *unchecked_box; /* form boxes */ -extern char *checked_radio; /* form radio buttons */ -extern char *unchecked_radio; /* form radio buttons */ -extern char *empty_string; +extern BOOLEAN is_www_index; +extern BOOLEAN jump_buffer; /* TRUE if offering default shortcut */ +extern BOOLEAN long_url_ok; +extern BOOLEAN lynx_mode; +extern BOOLEAN news_ok; +extern BOOLEAN recent_sizechange; +extern BOOLEAN rlogin_ok; +extern BOOLEAN system_editor; /* True if locked-down editor */ +extern BOOLEAN telnet_ok; +extern BOOLEAN verbose_img; /* display filenames of images? */ +extern BOOLEAN vi_keys; /* TRUE to turn on vi-like key movement */ +extern char *LYRequestTitle; /* newdoc.title in calls to getfile() */ extern char *LynxHome; -extern char *original_dir; -extern char *startfile; +extern char *LynxSigFile; /* Signature file, in or off home */ +extern char *checked_box; /* form boxes */ +extern char *checked_radio; /* form radio buttons */ +extern char *empty_string; extern char *helpfile; extern char *helpfilepath; +extern char *jumpprompt; /* The default jump statusline prompt */ +extern char *language; +extern char *lynx_cfg_file; /* location of active lynx.cfg file */ +extern char *lynx_save_space; +extern char *lynx_temp_space; extern char *lynxjumpfile; -extern char *lynxlistfile; extern char *lynxlinksfile; -extern char *x_display; -extern char *language; +extern char *lynxlistfile; +extern char *original_dir; extern char *pref_charset; /* Lynx's preferred character set - MM */ -extern BOOLEAN LYNewsPosting; /* News posting supported if TRUE */ -extern char *LynxSigFile; /* Signature file, in or off home */ +extern char *startfile; extern char *system_mail; extern char *system_mail_flags; -extern char *lynx_cfg_file; /* location of active lynx.cfg file */ -extern char *lynx_temp_space; -extern char *lynx_save_space; -extern BOOLEAN LYforce_HTML_mode; -extern BOOLEAN LYforce_no_cache; -extern BOOLEAN LYoverride_no_cache; /* don't need fresh copy, from history */ -extern BOOLEAN LYinternal_flag; /* don't need fresh copy, was internal link */ -extern BOOLEAN LYresubmit_posts; -extern BOOLEAN LYshow_kb_rate; /* show KB/sec in HTReadProgress */ -extern int user_mode; /* novice or advanced */ -extern BOOLEAN is_www_index; -extern BOOLEAN dump_output_immediately; +extern char *unchecked_box; /* form boxes */ +extern char *unchecked_radio; /* form radio buttons */ +extern char *x_display; +extern int display_lines; /* number of lines in the display */ extern int dump_output_width; -extern BOOLEAN lynx_mode; -extern BOOLEAN bold_headers; -extern BOOLEAN bold_H1; -extern BOOLEAN bold_name_anchors; -extern BOOLEAN recent_sizechange; -extern BOOLEAN telnet_ok; -extern BOOLEAN news_ok; -extern BOOLEAN ftp_ok; -extern BOOLEAN rlogin_ok; -extern BOOLEAN system_editor; /* True if locked-down editor */ -extern BOOLEAN child_lynx; /* TRUE to exit with an arrow */ -extern BOOLEAN error_logging; /* TRUE to mail error messages */ -extern BOOLEAN check_mail; /* TRUE to report unread/new mail messages */ -extern BOOLEAN vi_keys; /* TRUE to turn on vi-like key movement */ -extern BOOLEAN emacs_keys; /* TRUE to turn on emacs-like key movement */ -extern int keypad_mode; /* is set to either NUMBERS_AS_ARROWS * - * or LINKS_ARE_NUMBERED */ -extern BOOLEAN case_sensitive; /* TRUE to turn on case sensitive search */ +extern int keypad_mode; /* NUMBERS_AS_ARROWS or LINKS_ARE_NUMBERED */ +extern int more; /* is there more document to display? */ +extern int user_mode; /* novice or advanced */ +extern int www_search_result; extern BOOLEAN had_restrictions_default; /* flags to note whether we have... */ extern BOOLEAN had_restrictions_all; /* parsed these restriction options */ @@ -398,6 +399,12 @@ extern BOOLEAN with_backspaces; extern BOOL force_empty_hrefless_a; #endif +#ifndef NO_NONSTICKY_INPUTS +extern BOOL sticky_inputs; +extern BOOL textinput_drawn; +#endif + + #ifndef VMS extern BOOLEAN LYNoCore; extern BOOLEAN restore_sigpipe_for_children; diff --git a/src/LYJustify.h b/src/LYJustify.h index fb800bc2..7ecbd840 100644 --- a/src/LYJustify.h +++ b/src/LYJustify.h @@ -17,6 +17,10 @@ extern BOOL can_justify_this_line; extern int wait_for_this_stacked_elt; extern BOOL form_in_htext; + /*this is the element with SGML_EMPTY content, so it won't + get on the stack, so we can't trap it with wait_for_this_stacked_elt */ +extern BOOL in_DT; + /*disabled by default*/ /*#define DEBUG_JUSTIFY*/ #ifdef DEBUG_JUSTIFY diff --git a/src/LYLocal.c b/src/LYLocal.c index 58eacbfb..f2616fb1 100644 --- a/src/LYLocal.c +++ b/src/LYLocal.c @@ -796,7 +796,7 @@ PUBLIC BOOLEAN local_modify ARGS2( #ifdef OK_PERMIT _statusline(gettext("Modify name, location, or permission (n, l, or p): ")); #else - _statusline(gettext("Modify name, or location (n or l): ")); + _statusline(gettext("Modify name or location (n or l): ")); #endif /* OK_PERMIT */ c = LYgetch(); ans = TOUPPER(c); @@ -1359,7 +1359,7 @@ PUBLIC void tagflag ARGS2( #if defined(FANCY_CURSES) || defined(USE_SLANG) if (!LYShowCursor) - move((LYlines - 1), (LYcols - 1)); /* get cursor out of the way */ + LYHideCursor(); /* get cursor out of the way */ else #endif /* FANCY CURSES || USE_SLANG */ /* diff --git a/src/LYMain.c b/src/LYMain.c index 84a9ab1c..b2a82c6b 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -197,6 +197,7 @@ PUBLIC BOOLEAN telnet_ok = TRUE; PUBLIC BOOLEAN news_ok = TRUE; #endif PUBLIC BOOLEAN rlogin_ok = TRUE; +PUBLIC BOOLEAN long_url_ok = TRUE; PUBLIC BOOLEAN ftp_ok = TRUE; PUBLIC BOOLEAN system_editor = FALSE; @@ -443,6 +444,10 @@ PUBLIC BOOLEAN with_backspaces = FALSE; PUBLIC BOOL force_empty_hrefless_a = FALSE; #endif +#ifndef NO_NONSTICKY_INPUTS +PUBLIC BOOL sticky_inputs = TRUE; +#endif + #ifdef DISP_PARTIAL PUBLIC BOOLEAN display_partial_flag = TRUE; /* Display document during download */ PUBLIC BOOLEAN debug_display_partial = FALSE; /* Show with MessageSecs delay */ @@ -2066,7 +2071,8 @@ PUBLIC void reload_read_cfg NOARGS /* set few safe flags: */ #ifdef EXP_PERSISTENT_COOKIES BOOLEAN persistent_cookies_flag = persistent_cookies; - char * LYCookieFile_flag = LYCookieFile; + char * LYCookieFile_flag = NULL; + StrAllocCopy(LYCookieFile_flag, LYCookieFile); #endif free_lynx_cfg(); /* free downloaders, printers, not always environments */ @@ -2104,14 +2110,15 @@ PUBLIC void reload_read_cfg NOARGS */ #ifdef EXP_PERSISTENT_COOKIES /* restore old settings */ - if (persistent_cookies != persistent_cookies_flag) { - persistent_cookies = persistent_cookies_flag; - HTAlert(gettext("persistent cookies state will be changed in next session only.")); - } - if (strcmp(LYCookieFile, LYCookieFile_flag)) { - StrAllocCopy(LYCookieFile, LYCookieFile_flag); - CTRACE(tfp, "cookies file can be changed in next session only, restored.\n"); - } + if (persistent_cookies != persistent_cookies_flag) { + persistent_cookies = persistent_cookies_flag; + HTAlert(gettext("persistent cookies state will be changed in next session only.")); + } + if (strcmp(LYCookieFile, LYCookieFile_flag)) { + StrAllocCopy(LYCookieFile, LYCookieFile_flag); + CTRACE(tfp, "cookies file can be changed in next session only, restored.\n"); + } + FREE(LYCookieFile_flag); #endif } @@ -3239,6 +3246,10 @@ with the PREV_DOC command or from the History List" "selective", FUNCTION_ARG, selective_fun, "require .www_browsable files to browse directories" ), + PARSE_SET( + "short_url", UNSET_ARG, &long_url_ok, + "enables examination of beginning and end of long URL in status line" + ), #ifdef SH_EX PARSE_SET( "show_cfg", SET_ARG, &show_cfg, @@ -3266,6 +3277,12 @@ treated '>' as a co-terminator for double-quotes and tags" "startfile_ok", SET_ARG, &startfile_ok, "allow non-http startfile and homepage with -validate" ), +#ifndef NO_NONSTICKY_INPUTS + PARSE_SET( + "sticky_inputs", SET_ARG, &sticky_inputs, + "don't require activating inputs in order to edit them" + ), +#endif #ifndef VMS #ifdef SYSLOG_REQUESTED_URLS PARSE_STR( diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c index 3d7a737f..3de3a451 100644 --- a/src/LYMainLoop.c +++ b/src/LYMainLoop.c @@ -46,6 +46,7 @@ extern char *string_short(char *str, int cut_pos); /* LYExtern.c */ #define CHARSET_TRANS 14 /* "Transparent" in LYCharSets.c */ +#ifdef SH_EX PRIVATE char *str_sjis(char *to, char *from) { if (!LYRawMode) { @@ -59,6 +60,7 @@ PRIVATE char *str_sjis(char *to, char *from) } return to; } +#endif PUBLIC char *str_kcode(HTkcode code) { @@ -110,12 +112,14 @@ PUBLIC char *str_kcode(HTkcode code) } -PUBLIC void set_ws_title(char * str) +#ifdef SH_EX +PRIVATE void set_ws_title(char * str) { #ifdef WIN_EX SetConsoleTitle(str); #endif } +#endif /* 1998/10/30 (Fri) 10:06:47 */ @@ -125,7 +129,7 @@ PRIVATE int str_n_cmp(const char *p, const char *q, int n) { if (n == 0) return 0; - + if (p == NULL) return NOT_EQU; @@ -158,6 +162,7 @@ PRIVATE int str_n_cmp(const char *p, const char *q, int n) PRIVATE void exit_immediately_with_error_message PARAMS((int state, BOOLEAN first_file)); +PRIVATE void status_link PARAMS((char *curlink_name, BOOLEAN show_more, BOOLEAN show_indx)); PRIVATE void show_main_statusline PARAMS((CONST linkstruct curlink)); PRIVATE BOOL confirm_post_resub PARAMS(( CONST char* address, @@ -199,6 +204,12 @@ PRIVATE document curdoc; PRIVATE char *traversal_host = NULL; PRIVATE char *traversal_link_to_add = NULL; +#ifndef NO_NONSTICKY_INPUTS +PRIVATE BOOL textinput_activated = FALSE; +PUBLIC BOOL textinput_drawn = FALSE; + /*must be public since used in highlight(..)*/ +#endif + #ifdef LY_FIND_LEAKS /* * Function for freeing allocated mainloop() variables. - FM @@ -358,6 +369,36 @@ PRIVATE int do_change_link ARGS1( return(0); /* indicates OK */ } +PRIVATE int find_link_near_col ARGS2( + int, col, + int, delta) +{ + int i; + + for (i = curdoc.link; delta > 0 ? (i < nlinks) : (i >= 0); i += delta) { + if ( (links[i].ly - links[curdoc.link].ly) * delta > 0 ) { + int cy = links[i].ly, best = -1, dist = 1000000; + + while ((delta > 0 ? (i < nlinks) : (i >= 0)) && cy == links[i].ly) { + int cx = links[i].lx; + + if (links[i].hightext) + cx += strlen(links[i].hightext)/2; + cx -= col; + if (cx < 0) + cx = -cx; + if (cx < dist) { + dist = cx; + best = i; + } + i += delta; + } + return(best); + } + } + return(-1); +} + /* * Here's where we do all the work. * mainloop is basically just a big switch dependent on the users input. @@ -412,6 +453,7 @@ int mainloop NOARGS unsigned int len; int i; int n; + int follow_col = -1; #ifdef DIRED_SUPPORT char *tp = NULL; @@ -530,7 +572,7 @@ initialize: force_load = FALSE; /* done */ if (TRACE && LYCursesON) { - move(LYlines-1, LYcols-1); /* make sure cursor is down */ + LYHideCursor(); /* make sure cursor is down */ #ifdef USE_SLANG addstr("\n"); #endif /* USE_SLANG */ @@ -742,6 +784,10 @@ try_again: getresult = getfile(&newdoc); #endif /* TRACK_INTERNAL_LINKS */ +#ifndef NO_NOSTICKY_INPUTS + textinput_drawn = FALSE; /* for sure */ +#endif + switch(getresult) { case NOT_FOUND: @@ -1265,7 +1311,7 @@ try_again: * WINDOW structures are already filled based on the old size. * So we notify the ncurses library directly here. - kw */ -#if defined(NCURSES_VERSION) && !defined(PDCURSES) /* FIXME: check for specific version? */ +#if defined(HAVE_RESIZETERM) resizeterm(LYlines, LYcols); #else stop_curses(); @@ -1453,7 +1499,9 @@ try_again: * All display_partial calls ends here for final redraw. */ if (curdoc.line != Newline) { - +#ifndef NO_NONSTICKY_INPUTS + textinput_drawn = FALSE; +#endif refresh_screen = FALSE; HText_pageDisplay(Newline, prev_target); @@ -1644,11 +1692,12 @@ try_again: if (!(nlinks > 0 && links[curdoc.link].type == WWW_FORM_LINK_TYPE && (links[curdoc.link].form->type == F_TEXT_TYPE || - links[curdoc.link].form->type == F_TEXTAREA_TYPE))) + links[curdoc.link].form->type == F_TEXTAREA_TYPE))) { /* * Highlight current link. */ highlight(ON, curdoc.link, prev_target); + } if (traversal) { /* @@ -1688,6 +1737,9 @@ try_again: * Normal, non-traversal handling. */ if (nlinks > 0 && +#ifndef NO_NONSTICKY_INPUTS + (textinput_activated || !textinput_drawn) && +#endif links[curdoc.link].type == WWW_FORM_LINK_TYPE && (links[curdoc.link].form->type == F_TEXT_TYPE || links[curdoc.link].form->type == F_TEXT_SUBMIT_TYPE || @@ -1695,6 +1747,23 @@ try_again: links[curdoc.link].form->type == F_TEXTAREA_TYPE)) { BOOLEAN use_last_tfpos; + use_last_tfpos = (real_cmd == LYK_LPOS_PREV_LINK || + real_cmd == LYK_LPOS_NEXT_LINK); + +#ifndef NO_NONSTICKY_INPUTS + if (!sticky_inputs && !textinput_activated) { + /*draw the text entry, but don't activate it*/ + change_form_link_ex(&links[curdoc.link], + &newdoc, &refresh_screen, + links[curdoc.link].form->name, + links[curdoc.link].form->value, + use_last_tfpos, FALSE, TRUE); + c = DO_NOTHING; + textinput_drawn = TRUE; + } else +#endif + { + /* * Replace novice lines if in NOVICE_MODE. */ @@ -1704,13 +1773,15 @@ try_again: move(LYlines-1,0); clrtoeol(); addstr(FORM_NOVICELINE_TWO); } - use_last_tfpos = (real_cmd==LYK_LPOS_PREV_LINK || - real_cmd==LYK_LPOS_NEXT_LINK); real_c = change_form_link(&links[curdoc.link], &newdoc, &refresh_screen, links[curdoc.link].form->name, links[curdoc.link].form->value, use_last_tfpos, FALSE); +#ifndef NO_NONSTICKY_INPUTS + textinput_activated = FALSE; + textinput_drawn = FALSE; +#endif c = (real_c==LKC_DONE) ? DO_NOTHING : LKC_TO_C(real_c); if (c != DO_NOTHING && @@ -1782,6 +1853,13 @@ try_again: newdoc.link++; } } +#ifndef NO_NONSTICKY_INPUTS + if (!sticky_inputs) { + textinput_activated = TRUE; + textinput_drawn = TRUE; + }; +#endif + } #endif /* AUTOGROW */ @@ -1794,9 +1872,11 @@ try_again: c = LAC_TO_LKC0(LYK_NEXT_LINK); break; default: + if (old_c != c && old_c != real_c && c != real_c) real_c = c; } + } /* !(!sticky_inputs && !textinput_activated)*/ } else { /* * Get a keystroke from the user. @@ -1930,7 +2010,7 @@ new_keyboard_input: #ifdef WIN_EX if (c == DO_NOTHING) cmd = LYK_DO_NOTHING; - else + else #endif cmd = LKC_TO_LAC(keymap,c); /* adds 1 to map EOF to 0 */ @@ -1949,6 +2029,9 @@ new_cmd: /* force_old_UCLYhndl_on_reload = FALSE; CTRACE_FLUSH(tfp); + if (cmd != LYK_UP_LINK && cmd != LYK_DOWN_LINK) + follow_col = -1; + switch(cmd) { case 0: /* unmapped character */ default: @@ -1958,7 +2041,7 @@ new_cmd: /* links[curdoc.link].form->type == F_TEXT_SUBMIT_TYPE || links[curdoc.link].form->type == F_PASSWORD_TYPE || links[curdoc.link].form->type == F_TEXTAREA_TYPE)) - + show_main_statusline(links[curdoc.link]); else if (more) HTInfoMsg(MOREHELP); @@ -2966,13 +3049,16 @@ new_cmd: /* !HText_LinksInLines(HTMainText, 1, Newline - 1))) { /* more links before this on screen, and first of them on a different line or no previous links before this screen? */ - int newlink = -1; - for (i = curdoc.link; i >= 0; i--) { - if (links[i].ly < links[curdoc.link].ly) { - newlink = i; - break; - } + int newlink; + + if (follow_col == -1) { + follow_col = links[curdoc.link].lx; + + if (links[curdoc.link].hightext) + follow_col += strlen(links[curdoc.link].hightext)/2; } + + newlink = find_link_near_col(follow_col, -1); if (newlink > -1) { highlight(OFF, curdoc.link, prev_target); curdoc.link = newlink; @@ -3021,13 +3107,16 @@ new_cmd: /* case LYK_DOWN_LINK: if (curdoc.link < (nlinks-1)) { /* more links? */ - int newlink = -1; - for (i = curdoc.link; i < nlinks; i++) - if (links[i].ly > links[curdoc.link].ly) { - newlink = i; - break; - } + int newlink; + if (follow_col == -1) { + follow_col = links[curdoc.link].lx; + + if (links[curdoc.link].hightext) + follow_col += strlen(links[curdoc.link].hightext)/2; + } + + newlink = find_link_near_col(follow_col, 1); if (newlink > -1) { highlight(OFF, curdoc.link, prev_target); curdoc.link = newlink; @@ -3118,7 +3207,7 @@ new_cmd: /* * Pop the file afterwards to prevent multiple copies. */ if (TRACE && !LYUseTraceLog && LYCursesON) { - move(LYlines-1, LYcols-1); /* make sure cursor is down */ + LYHideCursor(); /* make sure cursor is down */ #ifdef USE_SLANG addstr("\n"); #endif /* USE_SLANG */ @@ -3279,6 +3368,21 @@ new_cmd: /* case LYK_ACTIVATE: /* follow a link */ case LYK_SUBMIT: /* follow a link, submit TEXT_SUBMIT input */ +#ifndef NO_NONSTICKY_INPUTS + if (nlinks > 0 && + links[curdoc.link].type == WWW_FORM_LINK_TYPE && + (links[curdoc.link].form->type == F_TEXT_TYPE || + links[curdoc.link].form->type == F_TEXT_SUBMIT_TYPE || + links[curdoc.link].form->type == F_PASSWORD_TYPE || + links[curdoc.link].form->type == F_TEXTAREA_TYPE)) { + + textinput_activated = TRUE; + textinput_drawn = FALSE; + if (!sticky_inputs) + show_main_statusline(links[curdoc.link]); + break; + } +#endif if (do_change_link(prev_target) == -1) { LYforce_no_cache = FALSE; reloading = FALSE; @@ -3438,7 +3542,7 @@ new_cmd: /* links[curdoc.link].form->type == F_TEXTAREA_TYPE) { show_formlink_statusline(links[curdoc.link].form); } - + c = change_form_link(&links[curdoc.link], &newdoc, &refresh_screen, links[curdoc.link].form->name, @@ -4537,7 +4641,7 @@ if (!LYUseFormsOptions) { /* * Make sure cursor is down. */ - move(LYlines-1, LYcols-1); + LYHideCursor(); #ifdef USE_SLANG addstr("\n"); #endif /* USE_SLANG */ @@ -5156,7 +5260,7 @@ if (!LYUseFormsOptions) { } break; } - + n = HText_InsertFile (&links[curdoc.link]); /* @@ -6655,9 +6759,10 @@ PRIVATE void show_main_statusline ARGS1( * Let them know if it's an index -- very rare. */ if (is_www_index) { - move(LYlines-1, LYcols-8); + char *indx = gettext("-index-"); + move(LYlines-1, LYcols - strlen(indx) - 1); start_reverse(); - addstr("-index-"); + addstr(indx); stop_reverse(); } @@ -6666,23 +6771,14 @@ PRIVATE void show_main_statusline ARGS1( * Show the URL or, for some internal links, the fragment */ char *cp = NULL; + if (curlink.type == WWW_INTERN_LINK_TYPE && strncmp(curlink.lname, "LYNXIMGMAP:", 11)) { cp = strchr(curlink.lname, '#'); } if (!cp) cp = curlink.lname; - if (more) { - if (is_www_index) - _user_message("-more- -index- %s", cp); - else - _user_message("-more- %s", cp); - } else { - if (is_www_index) - _user_message("-index- %s", cp); - else - statusline(cp); - } + status_link(cp, more, is_www_index); } else if (is_www_index && more) { char buf[128]; @@ -6701,8 +6797,14 @@ PRIVATE void show_main_statusline ARGS1( } else { _statusline(HELP); } + +#ifndef NO_NOSTICKY_INPUTS + if (textinput_drawn) { + _statusline(gettext("Inactive text input, activate to edit (e.g., press ENTER)")); + } +#endif /* turn off cursor since now it's probably on statusline -HV */ - move((LYlines - 1), (LYcols - 1)); + LYHideCursor(); } /* @@ -6773,3 +6875,72 @@ PRIVATE void exit_immediately_with_error_message ARGS2( } /* else: return(-1) in mainloop */ } + + +PRIVATE void status_link ARGS3( + char *, curlink_name, + BOOLEAN, show_more, + BOOLEAN, show_indx) +{ +#define MAX_STATUS (LYcols - 2) +#define MIN_STATUS MAX_STATUS / 2 + char format[MAX_LINE]; + int prefix; + int length; + + *format = 0; + if (show_more) + sprintf(format, "%s ", gettext("-more-")); + if (show_indx) + sprintf(format + strlen(format), "%s ", gettext("-index-")); + prefix = strlen(format); + length = strlen(curlink_name); + + if (prefix > MAX_STATUS) { + _user_message("%s", format); /* no room for url */ + } else { + sprintf(format + prefix, "%%.%ds", MAX_STATUS - prefix); + + if ((length + prefix > MAX_STATUS) && long_url_ok) { + char *buf = NULL; + int j; + int k; + int cut_position; + int link_position; + + StrAllocCopy(buf, curlink_name); + + /* Scan to find the final leaf of the url, put it in 'k'. + * Ignore trailing '/'. + */ + for (j = length; (j > 0) && buf[j] != '/'; --j) + ; + if (j >= (length - 3)) { + for (k = j - 1; (k > 0) && buf[k] != '/'; --k) + ; + } else { + k = j; + } + + /* We assume that one can recognize the link from at least + * MIN_STATUS characters. + */ + cut_position = MAX_STATUS - prefix - (length - k); + if (cut_position < MIN_STATUS){ + cut_position = MIN_STATUS; + link_position = length - MIN_STATUS + 3; + } else { + link_position = k; + } + for (j = 0; j < 3; j++) + buf[cut_position++] = '_'; + if (cut_position < link_position) + while ((buf[cut_position++] = buf[link_position++]) != 0) + ; + _user_message(format, buf); + FREE(buf); + } else { /* show (possibly truncated) url */ + _user_message(format, curlink_name); + } + } +} diff --git a/src/LYNews.c b/src/LYNews.c index 538f1287..75bd26d2 100644 --- a/src/LYNews.c +++ b/src/LYNews.c @@ -121,7 +121,12 @@ PUBLIC char *LYNewsPost ARGS2( * Open a temporary file for the headers * and message body. - FM */ - if ((fd = LYOpenTemp(my_tempfile, HTML_SUFFIX, "w")) == NULL) { +#ifdef __DJGPP__ + if ((fd = LYOpenTemp(my_tempfile, HTML_SUFFIX, "wb")) == NULL) +#else + if ((fd = LYOpenTemp(my_tempfile, HTML_SUFFIX, "w")) == NULL) +#endif /* __DJGPP__ */ + { HTAlert(CANNOT_OPEN_TEMP); return(postfile); } diff --git a/src/LYOptions.c b/src/LYOptions.c index 3028c965..563dfd8c 100644 --- a/src/LYOptions.c +++ b/src/LYOptions.c @@ -3663,6 +3663,11 @@ PUBLIC int postoptions ARGS1( && keypad_mode != newval) { keypad_mode = newval; need_reload = TRUE; + if (keypad_mode == NUMBERS_AS_ARROWS) { + set_numbers_as_arrows(); + } else { + reset_numbers_as_arrows(); + } } } diff --git a/src/LYPrint.c b/src/LYPrint.c index 9a80ede4..4fa44c02 100644 --- a/src/LYPrint.c +++ b/src/LYPrint.c @@ -480,7 +480,7 @@ PRIVATE void send_file_to_mail ARGS3( char hdrfile[LY_MAXPATH]; char my_temp[LY_MAXPATH]; #endif -#if defined(DOSPATH) || defined(WIN_EX) +#if defined(DOSPATH) char my_temp[LY_MAXPATH]; #endif @@ -656,19 +656,19 @@ PRIVATE void send_file_to_mail ARGS3( } stop_curses(); -#ifdef SH_EX - SetOutputMode(O_TEXT); -#endif + SetOutputMode( O_TEXT ); printf(MAILING_FILE); LYSystem(buffer); sleep(AlertSecs); start_curses(); + SetOutputMode( O_BINARY ); + if (isPMDF) LYRemoveTemp(hdrfile); LYRemoveTemp(my_temp); #else /* !VMS (Unix or DOS) */ -#if defined(DOSPATH) || defined(WIN_EX) +#if defined(DOSPATH) outfile_fp = LYOpenTemp(my_temp, ".txt", "w"); #else HTSprintf0(&buffer, "%s %s", system_mail, system_mail_flags); @@ -779,19 +779,17 @@ PRIVATE void send_file_to_mail ARGS3( HTSprintf0(&buffer, "%s -t \"%s\" -F %s", system_mail, user_response, my_temp); LYCloseTempFP(outfile_fp); /* Close the tmpfile. */ + stop_curses(); -#ifdef SH_EX SetOutputMode(O_TEXT); -#endif printf("%s\n\n$ %s\n\n%s", gettext("Sending"), buffer, PLEASE_WAIT); LYSystem(buffer); sleep(MessageSecs); start_curses(); -#ifdef SH_EX SetOutputMode( O_BINARY ); -#endif + LYRemoveTemp(my_temp); /* Delete the tmpfile. */ -#else +#else /* !WIN_EX */ pclose(outfile_fp); #endif #endif /* VMS */ @@ -934,9 +932,7 @@ check_again: stop_curses(); CTRACE(tfp, "command: %s\n", the_command); -#ifdef SH_EX SetOutputMode( O_TEXT ); -#endif printf(PRINTING_FILE); /* * Set various bits of document information as environment variables, for @@ -967,10 +963,10 @@ check_again: signal(SIGINT, cleanup_sig); #endif /* !VMS */ #ifdef SH_EX - fprintf(stdout," Print job complite.\n"); + fprintf(stdout, gettext(" Print job complete.\n")); fflush(stdout); - SetOutputMode( O_BINARY ); #endif + SetOutputMode( O_BINARY ); sleep(MessageSecs); start_curses(); @@ -1000,9 +996,7 @@ PRIVATE void send_file_to_screen ARGS3( outfile_fp = stdout; stop_curses(); -#ifdef SH_EX SetOutputMode( O_TEXT ); -#endif #ifndef VMS signal(SIGINT, SIG_IGN); @@ -1047,8 +1041,8 @@ PRIVATE void send_file_to_screen ARGS3( } #ifdef SH_EX fprintf(stdout,"\n"); - SetOutputMode( O_BINARY ); #endif + SetOutputMode( O_BINARY ); start_curses(); done: /* send_file_to_screen() */ diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c index 68c5450c..3a765e6c 100644 --- a/src/LYReadCFG.c +++ b/src/LYReadCFG.c @@ -957,7 +957,7 @@ static int parse_html_src_spec ARGS3( return 0; } -#ifdef __STDC__ +#if defined(__STDC__) || defined(_WIN_CC) #define defHTSRC_parse_fun(x) static int html_src_set_##x ARGS1( char*,str) \ { parse_html_src_spec(HTL_##x,str,#x); return 0; } #else @@ -1224,6 +1224,9 @@ static Config_Type Config_Table [] = PARSE_SET("source_cache", CONF_FUN, source_cache_fun), #endif PARSE_STR("startfile", CONF_STR, &startfile), +#ifndef NO_NONSTICKY_INPUTS + PARSE_SET("sticky_inputs", CONF_BOOL, &sticky_inputs), +#endif PARSE_SET("strip_dotdot_urls", CONF_BOOL, &LYStripDotDotURLs), PARSE_SET("substitute_underscores", CONF_BOOL, &use_underscore), PARSE_FUN("suffix", CONF_FUN, suffix_fun), diff --git a/src/LYStrings.c b/src/LYStrings.c index a26e4c58..db33de8f 100644 --- a/src/LYStrings.c +++ b/src/LYStrings.c @@ -157,7 +157,7 @@ PUBLIC int fancy_mouse ARGS3( cmd = LYX_TOGGLE; #endif } else if (BUTTON_STATUS(1) & (BUTTON_ALT | BUTTON_SHIFT | BUTTON_CTRL)) { - /* Probably some unrelated activity, such as selecting some text. + /* Probably some unrelated activity, such as selecting some text. * Select, but do nothing else. */ *position += delta; @@ -271,7 +271,9 @@ PRIVATE int XYdist ARGS5( xerr = 0; if (yerr < 0) yerr = -yerr; - return xerr + yerr; + if (xerr < 3 && yerr) /* x-distance of 3 better than y-dist of 1 */ + return yerr + 1; + return (xerr + 2)/3 + yerr; /* Subjective factor of distance */ } /* Given X and Y coordinates of a mouse event, set mouse_link to the @@ -304,7 +306,7 @@ PRIVATE int set_clicked_link ARGS4( else if (x > right) c = '\b'; else c = PGUP; } else { - int mouse_err = 3, /* must be closer than this for approx stuff */ + int mouse_err = 4, /* subjctv-dist better than this for approx stuff */ cur_err; /* Loop over the links and see if we can get a match */ @@ -685,7 +687,7 @@ static SLKeyMap_List_Type *Keymap_List; # ifdef VMS # define EXTERN_KEY(string,string1,lynx,curses) {string,lynx} # else -# define EXTERN_KEY(string,string1,lynx,curses) {string1,lynx} +# define EXTERN_KEY(string,string1,lynx,curses) {string,lynx},{string1,lynx} # endif # define INTERN_KEY(string,lynx,curses) {string,lynx} #else @@ -915,7 +917,7 @@ PUBLIC int map_string_to_keysym ARGS2(char*, str, int*,keysym) #ifndef USE_SLANG if (*keysym > 255) *keysym |= LKC_ISLKC; /* caller should remove this flag - kw */ -#endif +#endif } } else { Keysym_String_List *k; @@ -975,19 +977,32 @@ PRIVATE int setkey_cmd (char *parse) int keysym; char buf[BUFSIZ]; + CTRACE(tfp, "KEYMAP(PA): in=%s", parse); /* \n-terminated */ if ((s = skip_keysym(parse)) != 0) { if (isspace(*s)) { *s++ = '\0'; s = LYSkipBlanks(s); - if ((t = skip_keysym(s)) == 0) + if ((t = skip_keysym(s)) == 0) { + CTRACE(tfp, "KEYMAP(SKIP) no key expansion found\n"); return -1; + } if (t != s) *t = '\0'; if (map_string_to_keysym (s, &keysym) >= 0 && unescape_string(parse, buf)) { + CTRACE(tfp, "KEYMAP(DEF) keysym=%#x, seq='%s'\n", keysym, buf); return define_key(buf, keysym); } + else { + CTRACE(tfp, "KEYMAP(SKIP) could not map to keysym\n"); + } } + else { + CTRACE(tfp, "KEYMAP(SKIP) junk after key description: '%s'\n", s); + } + } + else { + CTRACE(tfp, "KEYMAP(SKIP) no key description\n"); } return -1; } @@ -1587,6 +1602,9 @@ re_read: current_modifier = LKC_MOD2; c &= LKC_MASK; } + if (c >= 0 && (c&LKC_ISLAC)) { + done_esc = TRUE; /* already a lynxactioncode, skip keypad switches - iz */ + } #endif if (done_esc) { /* don't do keypad() switches below, we already got it - kw */ @@ -1789,11 +1807,15 @@ re_read: case KEY_MOUSE: if (code == FOR_CHOICE) { c = MOUSE_KEY; /* Will be processed by the caller */ - } else if (code == FOR_SINGLEKEY) { + } +#if !defined(_WINDOWS) /* 1999/07/15 (Thu) 08:40:18 */ + else if (code == FOR_SINGLEKEY) { MEVENT event; getmouse(&event); /* Completely ignore event - kw */ c = DO_NOTHING; - } else { + } +#endif + else { #if !defined(WIN_EX) MEVENT event; int err; @@ -1827,7 +1849,12 @@ re_read: lac = LYK_SUBMIT; } else if (event.bstate & BUTTON3_CLICKED) { c = LAC_TO_LKC0(LYK_PREV_DOC); - } else if (code == FOR_PROMPT) { + } else if (code == FOR_PROMPT + /* Cannot ignore: see LYCurses.c */ + || (event.bstate & + ( BUTTON1_PRESSED | BUTTON1_RELEASED + | BUTTON2_PRESSED | BUTTON2_RELEASED + | BUTTON3_PRESSED | BUTTON3_RELEASED))) { /* Completely ignore - don't return anything, to avoid canceling the prompt - kw */ goto re_read; @@ -1908,7 +1935,7 @@ re_read: c = PGUP; p = "PGUP"; } } else { - c = set_clicked_link(MOUSE_X_POS, MOUSE_Y_POS, FOR_PANEL); + c = set_clicked_link(MOUSE_X_POS, MOUSE_Y_POS, FOR_PANEL, 1); } } } else { @@ -1946,7 +1973,7 @@ re_read: c = PGUP; p = "PGUP"; } } else { - c = set_clicked_link(MOUSE_X_POS, MOUSE_Y_POS, FOR_PANEL); + c = set_clicked_link(MOUSE_X_POS, MOUSE_Y_POS, FOR_PANEL, 1); } } if (p && c != -1) { @@ -2067,6 +2094,8 @@ re_read: } #endif /* USE_SLANG && __DJGPP__ && !DJGPP_KEYHANDLER && !USE_KEYMAPS */ + if (c&LKC_ISLAC) + return(c); if ((c+1) >= KEYMAP_SIZE) { /* * Don't return raw values for KEYPAD symbols which we may have @@ -2090,8 +2119,9 @@ PUBLIC int LYgetch NOARGS * Convert a null-terminated string to lowercase */ PUBLIC void LYLowerCase ARGS1( - unsigned char *, buffer) + char *, arg_buffer) { + register unsigned char *buffer = (unsigned char *) arg_buffer; size_t i; for (i = 0; buffer[i]; i++) #ifdef SUPPORT_MULTIBYTE_EDIT /* 1998/11/23 (Mon) 17:04:55 */ @@ -2114,8 +2144,9 @@ PUBLIC void LYLowerCase ARGS1( * Convert a null-terminated string to uppercase */ PUBLIC void LYUpperCase ARGS1( -unsigned char *, buffer) + char *, arg_buffer) { + register unsigned char *buffer = (unsigned char *) arg_buffer; size_t i; for (i = 0; buffer[i]; i++) #ifdef SUPPORT_MULTIBYTE_EDIT /* 1998/11/23 (Mon) 17:05:10 */ @@ -2336,7 +2367,7 @@ PRIVATE int prev_pos ARGS2( while (i < pos - 1) { int c; c = Buf[i]; - + if (!(isascii(c) || IS_KANA(c))) { i++; } @@ -2428,7 +2459,7 @@ PUBLIC int LYEdit1 ARGS4( ch &= 0xFF; if (ch + 64 >= LYlowest_eightbit[current_char_set]) ch += 64; - + if (Pos <= (MaxLen) && StrLen < (MaxLen)) { #ifdef ENHANCED_LINEEDIT if (Mark > Pos) @@ -2990,7 +3021,7 @@ again: LYRefreshEdit(&MyEdit); #endif /* SUPPORT_MULTIBYTE_EDIT */ ch = LYgetch_for(FOR_PROMPT); -#ifdef SUPPORT_MULTIBYTE_EDIT +#ifdef SUPPORT_MULTIBYTE_EDIT #ifdef CJK_EX /* for SJIS code */ if (!refresh && (EditBinding(ch) != LYE_CHAR)) diff --git a/src/LYStrings.h b/src/LYStrings.h index c61ab0c7..e6bf1ac0 100644 --- a/src/LYStrings.h +++ b/src/LYStrings.h @@ -247,9 +247,9 @@ extern int map_string_to_keysym PARAMS((char * src, int *lec)); #endif extern void LYLowerCase PARAMS(( - unsigned char * buffer)); + char * buffer)); extern void LYUpperCase PARAMS(( - unsigned char * buffer)); + char * buffer)); extern void LYRemoveBlanks PARAMS(( char * buffer)); extern char * LYSkipBlanks PARAMS(( diff --git a/src/LYStyle.c b/src/LYStyle.c index 062c2715..75bfeccb 100644 --- a/src/LYStyle.c +++ b/src/LYStyle.c @@ -1,6 +1,6 @@ /* character level styles for Lynx * (c) 1996 Rob Partington -- donated to the Lyncei (if they want it :-) - * $Id: LYStyle.c,v 1.22 1999/07/14 16:44:55 tom Exp $ + * $Id: LYStyle.c,v 1.23 1999/07/30 16:06:54 tom Exp $ */ #include <HTUtils.h> #include <HTML.h> @@ -67,8 +67,9 @@ PUBLIC int s_alink = NOSTYLE, s_a = NOSTYLE, s_status = NOSTYLE, s_whereis= NOSTYLE; /* start somewhere safe */ +#define MAX_COLOR 8 PRIVATE int colorPairs = 0; -PRIVATE int last_fA = COLOR_WHITE, last_bA = COLOR_BLACK; +PRIVATE unsigned char our_pairs[2][MAX_COLOR][MAX_COLOR]; /* icky parsing of the style options */ PRIVATE void parse_attributes ARGS5(char*,mono,char*,fg,char*,bg,int,style,char*,element) @@ -118,6 +119,13 @@ PRIVATE void parse_attributes ARGS5(char*,mono,char*,fg,char*,bg,int,style,char* fA = check_color(fg, default_fg); bA = check_color(bg, default_bg); + + if (style == -1) { /* default */ + CTRACE(tfp, "CSS(DEF):default_fg=%d, default_bg=%d\n", fA, bA); + default_fg = fA; + default_bg = bA; + return; + } if (fA == NO_COLOR) { bA = NO_COLOR; } else if (COLORS) { @@ -139,19 +147,31 @@ PRIVATE void parse_attributes ARGS5(char*,mono,char*,fg,char*,bg,int,style,char* */ if (lynx_has_color && colorPairs < COLOR_PAIRS-1 && fA != NO_COLOR) { - if (colorPairs <= 0 || fA != last_fA || bA != last_bA) { - colorPairs++; - init_pair(colorPairs, fA, bA); - last_fA = fA; - last_bA = bA; + int curPair; + + if (fA < MAX_COLOR + && bA < MAX_COLOR + && our_pairs[cA == A_BOLD][fA][bA]) + curPair = our_pairs[cA == A_BOLD][fA][bA] - 1; + else { + curPair = ++colorPairs; + init_pair(curPair, fA, bA); + if (fA < MAX_COLOR + && bA < MAX_COLOR + && curPair < 255) + our_pairs[cA == A_BOLD][fA][bA] = curPair + 1; } + CTRACE(tfp, "CSS(CURPAIR):%d\n", colorPairs); if (style < DSTYLE_ELEMENTS) - setStyle(style, COLOR_PAIR(colorPairs)|cA, cA, mA); - setHashStyle(newstyle, COLOR_PAIR(colorPairs)|cA, cA, mA, element); + setStyle(style, COLOR_PAIR(curPair)|cA, cA, mA); + setHashStyle(newstyle, COLOR_PAIR(curPair)|cA, cA, mA, element); } else { - /* only mono is set */ + if (lynx_has_color && fA != NO_COLOR) { + CTRACE(tfp, "CSS(NC): maximum of %d colorpairs exhausted\n", COLOR_PAIRS - 1); + } + /* only mono is set */ if (style < DSTYLE_ELEMENTS) setStyle(style, -1, -1, mA); setHashStyle(newstyle, -1, -1, mA, element); @@ -218,7 +238,11 @@ where OBJECT is one of EM,STRONG,B,I,U,BLINK etc.\n\n"), buffer); /* * We use some pseudo-elements, so catch these first */ - if (!strncasecomp(element, "alink", 5)) /* active link */ + if (!strncasecomp(element, "default", 7)) /* default fg/bg */ + { + parse_attributes(mono,fg,bg,-1,"default"); + } + else if (!strncasecomp(element, "alink", 5)) /* active link */ { parse_attributes(mono,fg,bg,DSTYLE_ALINK,"alink"); } @@ -396,7 +420,7 @@ PUBLIC void style_defaultStyleSheet NOARGS HStyle_addStyle(default_stylesheet[i]); } -PUBLIC int style_readFromFile ARGS1(char*, file) +PRIVATE int style_readFromFileREC ARGS2(char*, file, int, toplevel) { FILE *fh; char *buffer = NULL; @@ -413,15 +437,19 @@ PUBLIC int style_readFromFile ARGS1(char*, file) return -1; } - style_initialiseHashTable(); - style_deleteStyleList(); + if (toplevel) { + style_initialiseHashTable(); + style_deleteStyleList(); + } while (LYSafeGets(&buffer, fh) != NULL) { LYTrimTrailing(buffer); LYTrimTail(buffer); LYTrimHead(buffer); - if (buffer[0] != '#' && (len = strlen(buffer)) > 0) + if (!strncasecomp(buffer,"include:",8)) + style_readFromFileREC(buffer+8, 0); + else if (buffer[0] != '#' && (len = strlen(buffer)) > 0) HStyle_addStyle(buffer); } /* the default styles are added after the user styles in order @@ -430,11 +458,16 @@ PUBLIC int style_readFromFile ARGS1(char*, file) /* style_defaultStyleSheet(); */ fclose (fh); - if (LYCursesON) + if (toplevel && LYCursesON) parse_userstyles(); return 0; } +PUBLIC int style_readFromFile ARGS1(char*, file) +{ + return style_readFromFileREC(file, 1); +} + /* Used in HTStructured methods: - kw */ PUBLIC void TrimColorClass ARGS3( diff --git a/src/LYUtils.c b/src/LYUtils.c index 84b4037f..9e5b4548 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -145,6 +145,10 @@ PUBLIC void highlight ARGS3( */ if (cur < 0) cur = 0; +#ifndef NO_NONSTICKY_INPUTS + if (flag == OFF) + textinput_drawn = FALSE; +#endif if (nlinks > 0) { #if defined(USE_COLOR_STYLE) && !defined(NO_HILIT_FIX) @@ -1748,7 +1752,7 @@ highlight_search_done: /* * Get cursor out of the way. */ - move((LYlines - 1), (LYcols - 1)); + LYHideCursor(); else #endif /* FANCY CURSES || USE_SLANG */ /* @@ -1914,7 +1918,7 @@ PUBLIC void statusline ARGS1( else TO_SJIS((CONST unsigned char *)text_buff, temp); #else - strcpy(temp, text_buff); + strcpy((char *) temp, text_buff); #endif } else { for (i = 0, j = 0; text_buff[i]; i++) { @@ -3146,6 +3150,53 @@ PUBLIC void LYExtSignal ARGS2( } #endif /* HAVE_SIGACTION */ +#if defined(SIGTSTP) && !defined(USE_SLANG) +#if HAVE_SIGACTION +/* + * For switching a signal's handling between SIG_DFL and something + * (possibly) different that may have been set up by lynx code or + * e.g. by curses library. Uses sigaction to preserve / restore as + * much state as possible. + * Second arg is where to save or restore from. + * Third arg to_dfl specifies what to do: + * 1 Save current state in where, set handling to SIG_DFL + * 0 Restore current state to previously saved one in where + * + * Currently only used for SIGTSTP without SLANG, to prevent (n)curses + * signal handler from running while lynx is waiting in system() for + * an interactive command like an editor. - kw + */ +PRIVATE BOOLEAN LYToggleSigDfl ARGS3( + int, sig, + struct sigaction *, where, + int, to_dfl) +{ + int rv = -1; + struct sigaction oact; + + if (to_dfl == 1) { + rv = sigaction(sig, NULL, &oact); + if (rv == 0) { + if (oact.sa_handler != SIG_DFL) { + oact.sa_handler = SIG_DFL; + rv = sigaction(sig, &oact, where); + } else if (where) { + memcpy(where, &oact, sizeof(oact)); + rv = 0; + } + } + } else { + rv = sigaction(sig, where, NULL); + } + if (rv != 0) { + CTRACE(tfp, "Error in LYToggleSigDfl: %s\n", LYStrerror(errno)); + return FALSE; + } else + return TRUE; +} +#endif /* HAVE_SIGACTION */ +#endif /* SIGTSTP && !USE_SLANG */ + /************** ** This bit of code catches window size change signals **/ @@ -5298,7 +5349,11 @@ PUBLIC CONST char * Home_Dir NOARGS if (homedir == NULL) { if ((cp = getenv("HOME")) == NULL || *cp == '\0' #ifdef UNIX - || *cp != '/' + || !(LYIsPathSep(*cp) +# ifdef __EMX__ + || (*cp && cp[1] == ':' && LYIsPathSep(cp[2])) +# endif + ) #endif /* UNIX */ ) { #if defined (DOSPATH) || defined (__EMX__) /* BAD! WSB */ @@ -7048,6 +7103,11 @@ PUBLIC int LYSystem ARGS1( { int code; int do_free = 0; +#if HAVE_SIGACTION && defined(SIGTSTP) && !defined(USE_SLANG) + struct sigaction saved_sigtstp_act; + BOOLEAN sigtstp_saved = FALSE; +#endif + int saved_errno = 0; fflush(stdout); fflush(stderr); @@ -7141,7 +7201,16 @@ PUBLIC int LYSystem ARGS1( #else if (restore_sigpipe_for_children) signal(SIGPIPE, SIG_DFL); /* Some commands expect the default */ +#if HAVE_SIGACTION && defined(SIGTSTP) && !defined(USE_SLANG) + if (!dump_output_immediately && !LYCursesON && !no_suspend) + sigtstp_saved = LYToggleSigDfl(SIGTSTP, &saved_sigtstp_act, 1); +#endif code = system(command); + saved_errno = errno; +#if HAVE_SIGACTION && defined(SIGTSTP) && !defined(USE_SLANG) + if (sigtstp_saved) + LYToggleSigDfl(SIGTSTP, &saved_sigtstp_act, 0); +#endif if (restore_sigpipe_for_children) signal(SIGPIPE, SIG_IGN); /* Ignore it again - kw */ #endif @@ -7157,6 +7226,9 @@ PUBLIC int LYSystem ARGS1( if (do_free) FREE(command); +#if !defined(UCX) || !defined(VAXC) /* errno not modifiable ?? */ + errno = saved_errno; /* may have been clobbered */ +#endif return code; } diff --git a/src/LYUtils.h b/src/LYUtils.h index 9d962a7c..6c07b971 100644 --- a/src/LYUtils.h +++ b/src/LYUtils.h @@ -33,7 +33,7 @@ #define LYIsPipeCommand(s) ((s)[0] == '|') -#ifdef DOSPATH +#if defined(DOSPATH) || defined(__EMX__) #define LYIsPathSep(ch) ((ch) == '/' || (ch) == '\\') #else #define LYIsPathSep(ch) ((ch) == '/') diff --git a/src/Xsystem.c b/src/Xsystem.c index e82cc5a4..7a759c92 100644 --- a/src/Xsystem.c +++ b/src/Xsystem.c @@ -1,9 +1,12 @@ -/* $Id: Xsystem.c,v 1.1 1999/07/14 16:44:55 tom Exp $ +/* $Id: Xsystem.c,v 1.2 1999/07/30 16:06:54 tom Exp $ * like system("cmd") but return with exit code of "cmd" * for Turbo-C/MS-C/LSI-C * This code is in the public domain. * * $Log: Xsystem.c,v $ + * Revision 1.2 1999/07/30 16:06:54 tom + * 2.8.3dev.3 + * * Revision 1.1 1999/07/14 16:44:55 tom * Initial revision * @@ -344,7 +347,7 @@ prog_go(PRO * p, int flag) ep = getenv("PATH"); strcpy(cmdb, p->cmd); for (;;) { - if (extp) { /* has extention */ + if (extp) { /* has extension */ if ((rc = open(cmdb, O_RDONLY)) >= 0) { close(rc); rc = spawnl(flag, cmdb, cmdb, p->arg, (char *) 0); @@ -372,7 +375,7 @@ prog_go(PRO * p, int flag) } } } else { /* has PATH or Drive */ - if (extp) { /* has extention */ + if (extp) { /* has extension */ if ((rc = open(p->cmd, O_RDONLY)) >= 0) { close(rc); return spawnl(flag, p->cmd, p->cmd, p->arg, (char *) 0); diff --git a/src/chrtrans/makefile.bcb b/src/chrtrans/makefile.bcb new file mode 100644 index 00000000..95eb33f7 --- /dev/null +++ b/src/chrtrans/makefile.bcb @@ -0,0 +1,114 @@ +# +# Borland C++ IDE generated makefile +# +# 1997/11/09 (Sun) 14:29:50 +# +.AUTODEPEND + + +# +# Borland C++ tools +# +IMPLIB = Implib +BCC32 = Bcc32 +BccW32.cfg +TLINK32 = TLink32 +TLIB = TLib +BRC32 = Brc32 +TASM32 = Tasm32 +# +# macros +# +BCB = $(MAKEDIR)/.. +BCC_INC = $(BCB)/INCLUDE + +# +# Options +# + +INCLUDES = -I.;../..;../../WWW/LIBRARY/IMPLEMENTATION;$(BCC_INC) +DEFS =-DNO_FILIO_H;NO_UNISTD_H;_WINDOWS;DOSPATH +LNIEAT_dbmakeuctbdexe = -x + +# +# Dependency List +# +Dep_char = .\makeuctb.exe + +char : BccW32.cfg $(Dep_char) + echo MakeNode + +Dep_dbmakeuctbdexe = .\makeuctb.obj + +.\makeuctb.exe : $(Dep_dbmakeuctbdexe) + $(BCC32) makeuctb.obj + +### +.\makeuctb.obj : makeuctb.c + $(BCC32) -P- -c $(DEFS) $(INCLUDES) -o$@ makeuctb.c + +# Compiler configuration file +BccW32.cfg : + Copy &&| +-R +-v +-vi +-H +-H=lynx.csm +-w- +-A- +-wcpt +-wrpt +-wrng +-w-voi +-w-ret +-w-sus +-w-dup +-w-big +-w-ext +-w-zdi +-w-bei +-w-obi +-w-ofp +-w-eas +-w-hid +-w-ncf +-w-ibc +-w-dsz +-w-nst +-w-mpc +-w-mpd +-w-ntd +-w-nvf +-w-hch +-w-inl +-w-lin +-w-lvc +-w-pia +-w-def +-w-nod +-w-pro +-w-rvl +-w-ccc +-w-aus +-w-par +-w-rch +-w-eff +-w-ill +-w-ias +-w-msg +-WC +-Ot +-d- +-K +-a- +-w-stu +-wbbf +-w-dpu +-wcln +-wsig +-wucp +-g200 +-H- +-v- +| $@ + diff --git a/src/chrtrans/makefile.w32 b/src/chrtrans/makefile.w32 deleted file mode 100644 index 4968995f..00000000 --- a/src/chrtrans/makefile.w32 +++ /dev/null @@ -1,129 +0,0 @@ -# -# Borland C++ IDE generated makefile -# -.AUTODEPEND - - -# -# Borland C++ tools -# -IMPLIB = Implib -BCC32 = Bcc32 +BccW32.cfg -TLINK32 = TLink32 -TLIB = TLib -BRC32 = Brc32 -TASM32 = Tasm32 -# -# IDE macros -# - - -# -# Options -# -IDE_LFLAGS32 = -LD:\BC45\LIB -LLATC32_dbmakeuctbdexe = -LCURSES;D:\BC45\LIB -Tpe -ap -c -wdpl -wdup -RLATC32_dbmakeuctbdexe = -w32 -k -BLATC32_dbmakeuctbdexe = -CNIEAT_dbmakeuctbdexe = -I.\;..\..\CURSES;..;..\..\WWW\LIBRARY\IMPLEMENTATION;D:\BC45\INCLUDE -DNO_UNISTD_H;_WINDOWS;NCURSES;FANCY_CURSES;XMOSAIC_HACK;ACCESS_AUTH;NO_UTMP;NO_CUSERID;NO_TTYTYPE;NOSIGHUP;DOSPATH;NOUSERS -LNIEAT_dbmakeuctbdexe = -x -LEAT_dbmakeuctbdexe = $(LLATC32_dbmakeuctbdexe) -REAT_dbmakeuctbdexe = $(RLATC32_dbmakeuctbdexe) -BEAT_dbmakeuctbdexe = $(BLATC32_dbmakeuctbdexe) - -# -# Dependency List -# -Dep_char = \ - .\makeuctb.exe - -char : BccW32.cfg $(Dep_char) - echo MakeNode - -Dep_dbmakeuctbdexe = \ - .\makeuctb.obj - -.\makeuctb.exe : $(Dep_dbmakeuctbdexe) - $(TLINK32) @&&| - /v $(IDE_LFLAGS32) $(LEAT_dbmakeuctbdexe) $(LNIEAT_dbmakeuctbdexe) + -D:\BC45\LIB\c0x32.obj+ -.\makeuctb.obj -$<,$* -D:\BC45\LIB\bidsf.lib+ -D:\BC45\LIB\import32.lib+ -D:\BC45\LIB\cw32.lib - -| - -.\makeuctb.obj : makeuctb.c - $(BCC32) -P- -c @&&| - $(CEAT_dbmakeuctbdexe) $(CNIEAT_dbmakeuctbdexe) -o$@ makeuctb.c -| - -# Compiler configuration file -BccW32.cfg : - Copy &&| --R --v --vi --H --H=lynx.csm --w- --A- --wcpt --wrpt --wrng --w-voi --w-ret --w-sus --w-dup --w-big --w-ext --w-zdi --w-bei --w-obi --w-ofp --w-eas --w-hid --w-ncf --w-ibc --w-dsz --w-nst --w-mpc --w-mpd --w-ntd --w-nvf --w-hch --w-inl --w-lin --w-lvc --w-pia --w-def --w-nod --w-pro --w-rvl --w-ccc --w-aus --w-par --w-rch --w-eff --w-ill --w-ias --w-msg --WC --Ot --d- --K --a- --w-stu --wbbf --w-dpu --wcln --wsig --wucp --g200 --H- --v- -| $@ - - diff --git a/src/chrtrans/makew32.bat b/src/chrtrans/makew32.bat index 47b8ae69..e0e28bc4 100644 --- a/src/chrtrans/makew32.bat +++ b/src/chrtrans/makew32.bat @@ -1,7 +1,7 @@ @echo If .tbl files are added or removed you will need to hand edit @echo this batch file. -@echo . -make -f makefile.w32 +@echo off +make -l -f makefile.bcb makeuctb cp1250_uni.tbl > cp1250_uni.h makeuctb cp1251_uni.tbl > cp1251_uni.h makeuctb cp1252_uni.tbl > cp1252_uni.h @@ -21,7 +21,7 @@ makeuctb cp866u_uni.tbl > cp866u_uni.h makeuctb cp869_uni.tbl > cp869_uni.h makeuctb def7_uni.tbl > def7_uni.h makeuctb dmcs_uni.tbl > dmcs_uni.h -makeuctb hp_uni.tbl > hp_uni.h +makeuctb hp_uni.tbl > hp_uni.h makeuctb iso01_uni.tbl > iso01_uni.h makeuctb iso02_uni.tbl > iso02_uni.h makeuctb iso03_uni.tbl > iso03_uni.h @@ -32,7 +32,7 @@ makeuctb iso07_uni.tbl > iso07_uni.h makeuctb iso08_uni.tbl > iso08_uni.h makeuctb iso09_uni.tbl > iso09_uni.h makeuctb iso10_uni.tbl > iso10_uni.h -makeuctb iso15_uni.tbl > iso15_uni.h +makeuctb iso15_uni.tbl > iso15_uni.h makeuctb koi8r_uni.tbl > koi8r_uni.h makeuctb koi8u_uni.tbl > koi8u_uni.h makeuctb mac_uni.tbl > mac_uni.h diff --git a/userdefs.h b/userdefs.h index 2676cbe9..8dfbb130 100644 --- a/userdefs.h +++ b/userdefs.h @@ -1255,12 +1255,12 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8.3dev.4" +#define LYNX_VERSION "2.8.3dev.5" #define LYNX_WWW_HOME "http://lynx.browser.org/" #define LYNX_WWW_DIST "http://www.slcc.edu/lynx/current/" #define LYNX_RELEASE FALSE /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ -#define LYNX_DATE "Wed, 14 Jul 1999 10:25:26 -0600" +#define LYNX_DATE "Fri, 30 Jul 1999 09:39:54 -0600" #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ #define LYNX_RELEASE_DATE "1999" |