diff options
62 files changed, 1715 insertions, 2011 deletions
diff --git a/CHANGES b/CHANGES index df4db0a7..c12f5d15 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,36 @@ Changes since Lynx 2.8 release =============================================================================== +2000-03-12 (2.8.3dev.22) +* modify Home_Dir() so that on DOS & Windows, if the $HOMEDRIVE variable is + set, it may be used to specify the drive on which $HOME is located -TD +* add configure option --enable-htmlized-cfg to install the htmlized lynx.cfg + in the help directory (request by LP) -TD +* suppress sleep's in crawl or traversal mode (request by LV) -TD +* cleanup LYrcFile.c a little, using new functions putBool, getBool, putEnum + and getEnum -TD +* change default mode for visited-links-page to match original behavior, add + visited_links to .lynxrc file (requests by KD, LP) -TD +* update documentation to reflect move from sol.slcc.edu to lynx.isc.org -PG +* remove obsolete files: WWW/Copyright.txt (replaced by FreeOfCharge.html) and + WWW/README.txt (recommended by DK) -TD +* clean up some of the loose ends, primarily in documentation. A Russian user + pointed out that the DOS binary was ignoring character 0xe0. This turned out + to be a bug in the PDCurses code for DOS. I modified the INSTALLATION file + to reflect the patch to PDCurses. Also include the file for the public + domain release of the CERN wwwlib code (FreeOfCharge.html). Other changes + fix dead links, Y2K changes, and reflect newer versions of other programs -DK +* comment-out/disable NO_ANONYMOUS_EMAIL definition in userdefs.h -DK +* change optimization level to -O1 in makefile.dos -DK +* use macro set_errno() to hide some of the clutter in HTTCP.c as well as make + it simpler to build with threaded libraries -TD +* ifdef'd out a "QUIT" command sent to the FTP server immediately after opening + a data connection in HTFTPLoad(), since this makes the ftp.wku.edu server + close the connection prematurely -TD +* combine redundant HTMake_VMS_name() with HTVMS_name() -TD +* review use of "%s" in sprintf, to guard against buffer overflows, modified + some to use HTSprintf0 or StrAllocCopy, others to use specific lengths + (KW noted a related problem in HTTP.c) -TD 2000-02-25 (2.8.3dev.21) * modify check for empty news-posting to warn but allow user to override if it contains nonspace characters -TD diff --git a/INSTALLATION b/INSTALLATION index cf91699a..93242681 100644 --- a/INSTALLATION +++ b/INSTALLATION @@ -364,6 +364,10 @@ II. Compile instructions -- UNIX --enable-gzip-help Install the lynx help files in gzip'd format [*.gz] to save space. + --enable-htmlized-cfg + generate an HTMLized copy of lynx.cfg which will be installed with + the other help files. + --enable-justify-elts (define EXP_JUSTIFY_ELTS) use experimental element-justification logic. @@ -722,13 +726,16 @@ V. Compile instructions -- 386 DOS and either type the command: "stubedit cc1.exe bufsize=63k minstack=2M", or edit interactively with: "stubedit cc1.exe". + The requirements for compiling with optimization using DJGPP 2.03 + and GCC 2.95.2 have not yet been fully investigated. The above + should serve as a guide. Unpack the source code using a DOS program like UNZIP386. If you are using PKUNZIP to unpack the .zip archive, you must use the -d command line switch to restore the directory structure contained in the archive, i.e., do "pkunzip -d lynx-cur.zip". No switch is required if you use unzip386 or unzip. If you are trying to compile the 386DOS port under a - Win95/NT DOS shell, be sure to unpack the source with a DOS program so + WinNT DOS shell, be sure to unpack the source with a DOS program so that all directories will be adjusted to the DOS 8.3 file format necessary for compiling with DJGPP. Do NOT use Winzip, because that will create long filenames that will not be recognized by DJGPP tools. @@ -745,41 +752,43 @@ V. Compile instructions -- 386 DOS is available at "http://www.bgnett.no/~giva/". You can also use slang ("ftp://space.mit.edu/pub/davis/slang") as your curses library. You need to compile these before you go any further. If - you wish to use PDCurses 2.3, you need to first apply the following + you wish to use PDCurses 2.4, you need to first apply the following patch: -*** curses.h Fri Jul 10 11:24:28 1998 ---- curses.h.new Mon Dec 6 22:46:08 1999 -*************** -*** 1802,1807 **** ---- 1802,1809 ---- - #define getbegx(w) (w)->_begx - #define getbegy(w) (w)->_begy - #define getbegyx(w,y,x) ( y = (w)->_begy, x = (w)->_begx ) -+ #define getbkgd(w) ((w)->_bkgd) -+ #define getattrs(win) ((win)->_attrs) - #define getch() wgetch(stdscr) - #define getmaxx(w) (w)->_maxx - #define getmaxy(w) (w)->_maxy -*** dos/pdckbd.c Sat Jul 12 17:10:12 1997 ---- dos/pdckbd.c.new Thu Apr 15 20:52:16 1999 -*************** -*** 443,449 **** - _watch_breaks(); - #else - # ifdef GO32 -! (void*)signal(SIGINT,(setting ? SIG_DFL : SIG_IGN)); - /* __djgpp_set_ctrl_c(setting);*/ - setcbrk(setting); - # else ---- 443,449 ---- - _watch_breaks(); - #else - # ifdef GO32 -! /* (void*)signal(SIGINT,(setting ? SIG_DFL : SIG_IGN)); */ - /* __djgpp_set_ctrl_c(setting);*/ - setcbrk(setting); - # else + --- curses.h.ori Mon Jan 17 13:35:36 2000 + +++ curses.h Fri Mar 3 00:18:30 2000 + @@ -1949,9 +1949,11 @@ + #define echochar(c) (addch((chtype)c)==ERR?ERR:refresh()) + #define erase() werase( stdscr ) + #define fixterm() reset_prog_mode() + +#define getattrs(w) (w)->_attrs + #define getbegx(w) (w)->_begx + #define getbegy(w) (w)->_begy + #define getbegyx(w,y,x) ( y = (w)->_begy, x = (w)->_begx ) + +#define getbkgd(w) (w)->_bkgd + #define getch() wgetch(stdscr) + #define getmaxx(w) (w)->_maxx + #define getmaxy(w) (w)->_maxy + --- dos/pdckbd.c.ori Sun Dec 26 23:15:04 1999 + +++ dos/pdckbd.c Fri Mar 3 00:20:14 2000 + @@ -336,7 +336,7 @@ + || (scan == 0x4e && ascii == 0x2b) /* Plus */ + || (scan == 0xe0 && ascii == 0x2f)) /* Slash */ + return ((int) ((ascii & 0x0f) | 0xf0) << 8); + - if (ascii == 0x00 || ascii == 0xe0) + + if (ascii == 0x00 || (ascii == 0xe0 && scan != 0x00)) + return ((int) (scan << 8)); + return ((int) (ascii)); + } + @@ -496,7 +496,7 @@ + _watch_breaks(); + #else + # ifdef GO32 + - (void*)signal(SIGINT,(setting ? SIG_DFL : SIG_IGN)); + +/* (void*)signal(SIGINT,(setting ? SIG_DFL : SIG_IGN)); */ + /* __djgpp_set_ctrl_c(setting);*/ + setcbrk(setting); + # else If you have trouble applying the patch, try using the "patch" program, ("http://www.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu/pat25b.zip"). @@ -810,7 +819,7 @@ V. Compile instructions -- 386 DOS If you wish to compile with support for internationalization of messages, you first need to install the DOS port of the GNU gettext package, available from any DJGPP mirror site. You may wish to recompile with DJGPP - 2.02. Then uncomment the lines for INTLFLAGS in src/makefile.dsl and in + 2.03. Then uncomment the lines for INTLFLAGS in src/makefile.dsl and in WWW/Library/djgpp/makefile.sla, and remove the "#" from the LIBS line in src/makefile.dsl. Make similar changes if using one of the other DOS makefiles. See the gettext documentation for information on creating and @@ -823,7 +832,7 @@ V. Compile instructions -- 386 DOS method is to use a null packet driver that just allows Lynx to start up, but doesn't do anything else. One such executable driver has been posted, uuencoded, to the lynx-dev mailing list: - "http://www.flora.org/lynx-dev/html/month0198/msg00057.html". + "http://www.flora.org/lynx-dev/html/month011998/msg00057.html". Start the dummy packet driver with "nullpkt 0x60", and take it out of memory with "nullpkt -u". You can also use slip8250.com. See the CRYNWR package "http://www.simtel.net/pub/simtelnet/msdos/pktdrvr/pktd11.zip". @@ -838,7 +847,7 @@ V. Compile instructions -- 386 DOS "http://mvmpc9.ciw.uni-karlsruhe.de/c:/user/toni/dosppp/dosppp06.zip", "http://personal.redestb.es/tonilop/dosppp/dosppp06.zip", or "ftp://ftp.agate.net/users/01935/internet/dosppp06.zip"; - "ftp://ftp.klos.com/demo/pppshare.exe".) + "http://www.klos.com/get.pppshare.html") File access looks like this: @@ -849,17 +858,18 @@ V. Compile instructions -- 386 DOS file://localhost/c:/dos file://localhost/c:/dos/command.com - See "http://www.fdisk.com/doslynx/lynxport.htm" for more hints and some - precompiled libraries. One problem you can run into is when editing - userdefs.h and lynx.cfg, which have unix-style end of lines. You would be - well advised to use an editor that can handle end of lines terminated with - a single LF character. You can also unpack the source code using unzip386 - or unzip with the -a switch to convert unix LF to dos CRLF. That will make - texts more readable under DOS. If you compile lynx regularly, you may - automate the procedure by creating a batch file such as the following. + See "http://www.fdisk.com/doslynx/lynxport.htm" for more hints and + some precompiled libraries. One problem you can encounter is editing + userdefs.h and lynx.cfg, which have unix-style end of lines. You would + be well advised to use an editor that can handle end of lines terminated + with a single LF character. You can also unpack the source code using + unzip386 or unzip with the -a switch to convert unix LF to dos CRLF. + That will make texts more readable under DOS. If you compile lynx + regularly, you may automate the procedure by creating a batch file such + as the following. cd djgpp\watt32\src - build djgpp + configur djgpp make -f djgpp.mak cd ..\..\..\www\library\djgpp make @@ -874,18 +884,18 @@ V. Compile instructions -- 386 DOS lynx2-* directory. Place a copy of this batch file, named "djgpp.bat", in the lynx2-* directory, move to that directory and type "djgpp". A more complete batch file with error checking and annotation can be found at: - "http://www.flora.org/lynx-dev/html/month1197/msg00250.html". + "http://www.flora.org/lynx-dev/html/month111997/msg00250.html". -- 1997/9/29 - D. Kaufman <dkaufman@rahul.net> -- 1997/10/3 - B. Schiavo <Wschiavo@concentric.net> --- Last update - 2000/01/15 +-- Last update - 2000/03/03 VI. General installation instructions Once you have compiled Lynx, test it out first on a local file. Be sure Lynx can find lynx.cfg. A _sample_ test command line would be: - `lynx -cfg=/usr/local/lib/lynx.cfg .`. Once you are satisfied that + 'lynx -cfg=/usr/local/lib/lynx.cfg .'. Once you are satisfied that Lynx works, go ahead and install it. For Unix, type "make install". For VMS, you need to have the executable in a public place, make it @@ -932,7 +942,7 @@ VII. Setting environment variables before running Lynx (optional) setting in config.sys. In addition, lynx looks for a "SHELL" environment variable when shelling to DOS. If you wish to preserve the environment space when shelling, put a line like this in your AUTOEXEC.BAT file also - "SET SHELL=C:\COMMAND.COM /E:2048". It should match CONFIG.SYS. + "SET SHELL=C:\COMMAND.COM /E:4096". It should match CONFIG.SYS. HOME Where to keep the bookmark file and personal config files. TEMP or TMP Bookmarks are kept here with no HOME. Temp files here. diff --git a/README b/README index d07b95ec..5c60b575 100644 --- a/README +++ b/README @@ -33,9 +33,10 @@ WHAT IS LYNX? HOW TO GET LYNX For the latest release of Lynx goto: - <URL: http://www.slcc.edu/lynx/release>; + <URL: http://lynx.isc.org/release>; + <URL: ftp://lynx.isc.org/release>; the latest development version is at: - <URL: http://sol.slcc.edu/lynx/current>. + <URL: http://lynx.isc.org/current>. The Lynx homepage is <URL: http://lynx.browser.org/>. The on-line help page (enter `h') has links to many useful things. @@ -49,7 +50,7 @@ LICENSE Certain portions of the Lynx source distribution were originally created by CERN and have been modified during the development of - Lynx. See WWW/Copyright.txt for copyright info regarding CERN + Lynx. See WWW/FreeOfCharge.html for copyright info regarding CERN products used in Lynx. YEAR 2000 COMPLIANCE diff --git a/WWW/BUILD b/WWW/BUILD deleted file mode 100644 index 5fda9e0e..00000000 --- a/WWW/BUILD +++ /dev/null @@ -1,42 +0,0 @@ -#! /bin/csh -# Build all WWW Code for this platform -# -# Figure out what sort of unix this is -# (NeXT machines don't have uname!) - -set UNAME=NeXT -if (-e /usr/bin/uname) set UNAME=`/usr/bin/uname` -if (-e /bin/uname) set UNAME=`/bin/uname` -if (-e /usr/apollo/bin) set UNAME=`ver sys5.3 /bin/uname` -if ( $UNAME == "" ) then - if (-r /NextApps ) set UNAME=next -endif -# -setenv UNAME $UNAME -# For apollo, must use bsd mode. Also, WWW_MACH not inherited through make! -if ($UNAME == "DomainOS") setenv WWW_MACH apollo_m68k -if ($UNAME == next) setenv WWW_MACH next -if ($UNAME == "HP-UX") setenv WWW_MACH snake -if ($UNAME == "IRIX") setenv WWW_MACH sgi -if ($UNAME == "SunOS") setenv WWW_MACH sun4 -if ($UNAME == "ULTRIX") setenv WWW_MACH decstation -if ($UNAME == "AIX") setenv WWW_MACH rs6000 -if ($UNAME == "OSF1") setenv WWW_MACH osf1 - -if ($WWW_MACH == "") then - echo "Please edit BUILD file to include your machine OS" - echo "and mail differences back to www-bug@info.cern.ch - exit -99 -endif -echo "________________________________________________________________" -echo "WWW build for machine type: " $WWW_MACH - -# Now go do build - -# We don't want SHELL set to something funny to screw up make - -(cd All/Implementation; unsetenv SHELL; make) -set stat = $status -echo -echo "WWW build for " $WWW_MACH " done. status = " $stat -exit $stat diff --git a/WWW/Copyright.txt b/WWW/Copyright.txt deleted file mode 100644 index 3d7397bb..00000000 --- a/WWW/Copyright.txt +++ /dev/null @@ -1,22 +0,0 @@ - Copyright -- /hypertext - COPYRIGHT CERN 1990-1993 - - Except where specifically placed in the public domain, the information (of - all forms) in these directories is the intellectual property of the European - Laboratory for Particle Physics (known as CERN). No guarantee whatsoever is - provided by CERN. No liability whatsoever is accepted for any loss or damage - of any kind resulting from any defect or inaccuracy in this information or - code. - - The conditions for public domain and other access to the code are defined in - distribution conditions of WWW code[1] - - Tim Berners-Lee[2] - - CERN - - 1211 Geneva 23, Switzerland - - Tel +41(22)767 3755, Fax +41(22)767 7155, Email: tbl@cernvax.cern.ch - - diff --git a/WWW/FreeofCharge.html b/WWW/FreeofCharge.html new file mode 100644 index 00000000..67cb3f20 --- /dev/null +++ b/WWW/FreeofCharge.html @@ -0,0 +1,26 @@ +<!-- X-URL: http://www.w3.org/History/1993/WWW/Conditions/old/FreeofCharge.html --> +<BASE HREF="http://www.w3.org/History/1993/WWW/Conditions/old/FreeofCharge.html"> + +<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> + +<HTML><HEAD><TITLE> +CERN WWW software freely available</TITLE><NEXTID N="z9"></HEAD><BODY><H1> +Software freely available</H1>The following CERN software is hereby put into +the public domain. +<UL> +<LI>WWW basic ("line-mode") client <LI>WWW basic server <LI>WWW Library of +common code.</UL>CERN relinquishes all intellectual property rights to this +code, both source and binary form and permission is granted for anyone to use, +duplicate, +modify and redistribute it.<P>CERN provides absolutely NO WARRANTY OF ANY KIND +with respect to this software. +The entire risk as to the quality and performance of this software is with the +user. +IN NO EVENT WILL CERN BE LIABLE TO ANYONE FOR ANY DAMAGES ARISING OUT THE USE +OF THIS SOFTWARE, INCLUDING, WITHOUT LIMITATION, +DAMAGES RESULTING FROM LOST DATA OR LOST PROFITS, OR FOR ANY SPECIAL, +INCIDENTAL OR CONSEQUENTIAL DAMAGES.<P>This is part of the <A +HREF="Introduction.html" NAME="z8"> +CERN WWW</A> distribution condidtions.<P>Declaration to this effect signed by +the CERN directors of Administration (H. Weber) and Research (W. +Hoogland), May 1993.</BODY></HTML> diff --git a/WWW/Library/Implementation/HTAnchor.c b/WWW/Library/Implementation/HTAnchor.c index e9ebe1f3..42dcb4dc 100644 --- a/WWW/Library/Implementation/HTAnchor.c +++ b/WWW/Library/Implementation/HTAnchor.c @@ -860,13 +860,8 @@ PUBLIC char * HTAnchor_address ARGS1( !((HTChildAnchor *)me)->tag) { /* it's an adult or no tag */ StrAllocCopy(addr, me->parent->address); } else { /* it's a named child */ - addr = malloc(2 + - strlen(me->parent->address) + - strlen(((HTChildAnchor *)me)->tag)); - if (addr == NULL) - outofmem(__FILE__, "HTAnchor_address"); - sprintf(addr, "%s#%s", - me->parent->address, ((HTChildAnchor *)me)->tag); + HTSprintf0(&addr, "%s#%s", + me->parent->address, ((HTChildAnchor *)me)->tag); } } return(addr); diff --git a/WWW/Library/Implementation/HTDOS.c b/WWW/Library/Implementation/HTDOS.c index bbdd36e1..68a5c82d 100644 --- a/WWW/Library/Implementation/HTDOS.c +++ b/WWW/Library/Implementation/HTDOS.c @@ -5,6 +5,10 @@ #include <HTUtils.h> #include <HTDOS.h> +#ifdef WIN_EX +#include <LYGlobalDefs.h> +#endif + /* * Make a copy of the source argument in the result, allowing some extra * space so we can append directly onto the result without reallocating. @@ -114,7 +118,8 @@ char * HTDOS_name ARGS1(char *, wwwname) #ifdef _WINDOWS /* 1998/04/02 (Thu) 08:59:48 */ if (strchr(result, '\\') && strchr(result, ':')==NULL) { - sprintf(temp_buff, "%s\\%s", windows_drive, result); + sprintf(temp_buff, "%.3s\\%.*s", windows_drive, + (int)(sizeof(temp_buff) - sizeof(windows_drive) - 2), result); ret = NULL; StrAllocCopy(ret, temp_buff); free(cp_url); diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c index a4418474..b2ceeadb 100644 --- a/WWW/Library/Implementation/HTFTP.c +++ b/WWW/Library/Implementation/HTFTP.c @@ -79,9 +79,6 @@ BUGS: @@@ Limit connection cache size! #define LAST_TCP_PORT 5999 #define LINE_LENGTH 256 -#define COMMAND_LENGTH 256 - -#define INFINITY 512 #include <HTParse.h> #include <HTAnchor.h> @@ -208,7 +205,7 @@ PRIVATE void free_FTPGlobals NOARGS } #endif /* LY_FIND_LEAKS */ -/* PUBLIC HTMake_VMS_name() +/* PUBLIC HTVMS_name() ** CONVERTS WWW name into a VMS name ** ON ENTRY: ** nn Node Name (optional) @@ -219,7 +216,7 @@ PRIVATE void free_FTPGlobals NOARGS ** ** Bug: Returns pointer to static -- non-reentrant */ -PUBLIC char * HTMake_VMS_name ARGS2( +PUBLIC char * HTVMS_name ARGS2( CONST char *, nn, CONST char *, fn) { @@ -231,7 +228,7 @@ PUBLIC char * HTMake_VMS_name ARGS2( ** The node is assumed to be local if the hostname WITHOUT DOMAIN ** matches the local one. @@@ */ - static char vmsname[INFINITY]; /* returned */ + static char *vmsname; char * filename = (char*)malloc(strlen(fn)+1); char * nodename = (char*)malloc(strlen(nn)+2+1); /* Copies to hack */ char *second; /* 2nd slash */ @@ -264,16 +261,16 @@ PUBLIC char * HTMake_VMS_name ARGS2( last = strrchr(filename, '/'); /* last slash */ if (!second) { /* Only one slash */ - sprintf(vmsname, "%s%s", nodename, filename + 1); + HTSprintf0(&vmsname, "%s%s", nodename, filename + 1); } else if (second == last) { /* Exactly two slashes */ *second = '\0'; /* Split filename from disk */ - sprintf(vmsname, "%s%s:%s", nodename, filename+1, second+1); + HTSprintf0(&vmsname, "%s%s:%s", nodename, filename+1, second+1); *second = '/'; /* restore */ } else { /* More than two slashes */ char * p; *second = '\0'; /* Split disk from directories */ *last = '\0'; /* Split dir from filename */ - sprintf(vmsname, "%s%s:[%s]%s", + HTSprintf0(&vmsname, "%s%s:[%s]%s", nodename, filename+1, second+1, last+1); *second = *last = '/'; /* restore filename */ for (p = strchr(vmsname, '['); *p!=']'; p++) @@ -523,6 +520,7 @@ PRIVATE int response ARGS1( return result/100; } +#if 0 PRIVATE int send_cmd_nowait ARGS1(char *, verb) { char command[20]; @@ -530,6 +528,7 @@ PRIVATE int send_cmd_nowait ARGS1(char *, verb) sprintf(command, "%.*s%c%c", (int) sizeof(command)-4, verb, CR, LF); return write_cmd(command); } +#endif PRIVATE int send_cmd_1 ARGS1(char *, verb) { @@ -1266,8 +1265,7 @@ PRIVATE void set_years_and_date NOARGS } } i++; - sprintf(month, "%s%d", (i < 10 ? "0" : ""), i); - sprintf(date, "9999%.2s%.2s", month, day); + sprintf(date, "9999%02d%.2s", i, day); TheDate = atoi(date); strcpy(ThisYear, (char *)ctime(&NowTime)+20); ThisYear[4] = '\0'; @@ -1644,30 +1642,22 @@ PRIVATE void parse_vms_dir_entry ARGS2( isalpha(*(cpd+1)) && *(cpd+4) == '-') { /** Month **/ - *(cpd+4) = '\0'; *(cpd+2) = (char) TOLOWER(*(cpd+2)); *(cpd+3) = (char) TOLOWER(*(cpd+3)); - sprintf(date, "%s ", cpd+1); - *(cpd+4) = '-'; + sprintf(date, "%.3s ", cpd+1); /** Day **/ - *cpd = '\0'; if (isdigit(*(cpd-2))) - sprintf(date+4, "%s ", cpd-2); + sprintf(date+4, "%.2s ", cpd-2); else - sprintf(date+4, "%c%s ", HT_NON_BREAK_SPACE, cpd-1); - *cpd = '-'; + sprintf(date+4, "%c%.1s ", HT_NON_BREAK_SPACE, cpd-1); /** Time or Year **/ if (!strncmp(ThisYear, cpd+5, 4) && strlen(cpd) > 15 && *(cpd+12) == ':') { - *(cpd+15) = '\0'; - sprintf(date+7, "%s", cpd+10); - *(cpd+15) = ' '; + sprintf(date+7, "%.5s", cpd+10); } else { - *(cpd+9) = '\0'; - sprintf(date+7, " %s", cpd+5); - *(cpd+9) = ' '; + sprintf(date+7, " %.4s", cpd+5); } StrAllocCopy(entry_info->date, date); @@ -1768,10 +1758,10 @@ PRIVATE void parse_ms_windows_dir_entry ARGS2( *(cpd+17) = '\0'; /* Time */ if (strcmp(ThisYear, cpd+7)) /* Not this year, so show the year */ - sprintf(date, "%s %s", cpd, (cpd+7)); + sprintf(date, "%.6s %.4s", cpd, (cpd+7)); else /* Is this year, so show the time */ - sprintf(date, "%s %s", cpd, (cpd+12)); + sprintf(date, "%.6s %.5s", cpd, (cpd+12)); StrAllocCopy(entry_info->date, date); if (entry_info->date[4] == ' '|| entry_info->date[4] == '0') { entry_info->date[4] = HT_NON_BREAK_SPACE; @@ -1849,16 +1839,16 @@ PRIVATE void parse_windows_nt_dir_entry ARGS2( *(cp+2) = '\0'; /* Month */ i = atoi(cp) - 1; *(cp+5) = '\0'; /* Day */ - sprintf(date, "%s %s", months[i], (cp+3)); + sprintf(date, "%.3s %.2s", months[i], (cp+3)); if (date[4] == '0') date[4] = ' '; cp += 6; /* Year */ if (strcmp((ThisYear+2), cp)) { /* Not this year, so show the year */ if (atoi(cp) < 70) { - sprintf(&date[6], " 20%s", cp); + sprintf(&date[6], " 20%.2s", cp); } else { - sprintf(&date[6], " 19%s", cp); + sprintf(&date[6], " 19%.2s", cp); } } else { /* Is this year, so show the time */ @@ -1866,9 +1856,7 @@ PRIVATE void parse_windows_nt_dir_entry ARGS2( i = atoi(cpd); if (*(cpd+5) == 'P' || *(cpd+5) == 'p') i += 12; - *(cpd+5) = '\0'; - sprintf(&date[6], " %s%d:%s", - (i < 10 ? "0" : ""), i, (cpd+3)); + sprintf(&date[6], " %02d:%.2s", i, (cpd+3)); } StrAllocCopy(entry_info->date, date); if (entry_info->date[4] == ' '|| entry_info->date[4] == '0') { @@ -2007,23 +1995,22 @@ PRIVATE void parse_cms_dir_entry ARGS2( if (*cpd == ' ') *cpd = '0'; i = atoi(cpd) - 1; - sprintf(date, "%s %s", months[i], (cpd+3)); + sprintf(date, "%.3s %.2s", months[i], (cpd+3)); if (date[4] == '0') date[4] = ' '; cpd += 6; /* Year */ if (strcmp((ThisYear+2), cpd)) { /* Not this year, so show the year. */ if (atoi(cpd) < 70) { - sprintf(&date[6], " 20%s", cpd); + sprintf(&date[6], " 20%.2s", cpd); } else { - sprintf(&date[6], " 19%s", cpd); + sprintf(&date[6], " 19%.2s", cpd); } } else { /* Is this year, so show the time. */ *(cps+2) = '\0'; /* Hour */ i = atoi(cps); - sprintf(&date[6], " %s%d:%s", - (i < 10 ? "0" : ""), i, (cps+3)); + sprintf(&date[6], " %02d:%.2s", i, (cps+3)); } StrAllocCopy(entry_info->date, date); if (entry_info->date[4] == ' '|| entry_info->date[4] == '0') { @@ -2432,7 +2419,7 @@ PRIVATE int compare_EntryInfo_structs ARGS2( } } i++; - sprintf(month, "%s%d", (i < 10 ? "0" : ""), i); + sprintf(month, "%02d", i); strcat(date1, month); strncat(date1, &entry1->date[4], 2); date1[8] = '\0'; @@ -2467,7 +2454,7 @@ PRIVATE int compare_EntryInfo_structs ARGS2( } } i++; - sprintf(month, "%s%d", (i < 10 ? "0" : ""), i); + sprintf(month, "%02d", i); strcat(date2, month); strncat(date2, &entry2->date[4], 2); date2[8] = '\0'; @@ -2931,8 +2918,8 @@ PUBLIC int HTFTPLoad ARGS4( /* Open connection for data: */ - sprintf(command, - "ftp://%d.%d.%d.%d:%d/",h0,h1,h2,h3,passive_port); + sprintf(command, "ftp://%d.%d.%d.%d:%d/", + h0, h1, h2, h3, passive_port); status = HTDoConnect(name, "FTP", passive_port, &data_soc); if (status < 0) { @@ -2955,6 +2942,7 @@ PUBLIC int HTFTPLoad ARGS4( { char *filename = HTParse(name, "", PARSE_PATH + PARSE_PUNCTUATION); char *fname = filename; /** Save for subsequent free() **/ + char *vmsname = NULL; BOOL binary; char *type = NULL; char *cp; @@ -3133,13 +3121,10 @@ PUBLIC int HTFTPLoad ARGS4( filename[i] = filename[(i+1)]; filename[i] = '\0'; CTRACE((tfp, "HTFTP: Trimmed '%s'\n", filename)); - cp = HTMake_VMS_name("", filename); + cp = HTVMS_name("", filename); CTRACE((tfp, "HTFTP: VMSized '%s'\n", cp)); if ((cp1=strrchr(cp, ']')) != NULL) { - cp1++; - for (i = 0; cp1[i]; i++) - filename[i] = cp1[i]; - filename[i] = '\0'; + strcpy(filename, ++cp1); CTRACE((tfp, "HTFTP: Filename '%s'\n", filename)); *cp1 = '\0'; status = send_cwd(cp); @@ -3178,22 +3163,16 @@ PUBLIC int HTFTPLoad ARGS4( strchr(cp, ']') == NULL) { cp1++; if (*cp1 != '\0') { - for (i = 0; cp1[i]; i++) - filename[i] = cp1[i]; - filename[i] = '\0'; + strcpy(filename, cp1); CTRACE((tfp, "HTFTP: Filename '%s'\n", filename)); - *cp1 = '\0'; - strcat(cp, "["); - strcat(cp, filename); - strcat(cp, "]"); - status = send_cwd(cp); + HTSprintf0(&vmsname, "%.*s[%s]", cp1-cp, cp, filename); + status = send_cwd(vmsname); if (status != 2) { - *cp1 = '\0'; - strcat(cp, "[000000]"); - status = send_cwd(cp); + HTSprintf(&vmsname, "%.*s[000000]", cp1-cp, cp); + status = send_cwd(vmsname); if (status != 2) { - *cp1 = '\0'; - status = send_cwd(cp); + HTSprintf(&vmsname, "%.*s", cp1-cp, cp); + status = send_cwd(vmsname); if (status != 2) { FREE(fname); init_help_message_cache(); @@ -3203,15 +3182,15 @@ PUBLIC int HTFTPLoad ARGS4( } } } else { - strcpy(cp, "000000"); - filename = cp; + HTSprintf0(&vmsname, "000000"); + filename = vmsname; } } } else if (0==strcmp(cp, (filename+1))) { status = send_cwd(cp); if (status != 2) { - strcat(cp, ":"); - status = send_cwd(cp); + HTSprintf0(&vmsname, "%s:", cp); + status = send_cwd(vmsname); if (status != 2) { FREE(fname); init_help_message_cache(); /* to free memory */ @@ -3220,8 +3199,8 @@ PUBLIC int HTFTPLoad ARGS4( return ((status < 0) ? status : -status); } } - strcpy(cp, "000000"); - filename = cp; + HTSprintf0(&vmsname, "000000"); + filename = vmsname; } } /** Trim trailing slash if filename is not the top directory **/ @@ -3420,6 +3399,7 @@ PUBLIC int HTFTPLoad ARGS4( } } FREE(fname); + FREE(vmsname); if (status != 1) { init_help_message_cache(); /* to free memory */ NETCLOSE(control->socket); @@ -3454,8 +3434,11 @@ listen: data_soc = status; } /* !ftp_passive */ +#if 0 /* no - this makes the data connection go away too soon (2.8.3dev.22) */ if ((status = send_cmd_nowait("QUIT")) == 1) outstanding++; +#endif + if (isDirectory) { if (server_type == UNIX_SERVER && !unsure_type && !strcmp(response_text, diff --git a/WWW/Library/Implementation/HTFTP.h b/WWW/Library/Implementation/HTFTP.h index 4ef22f2d..60168b61 100644 --- a/WWW/Library/Implementation/HTFTP.h +++ b/WWW/Library/Implementation/HTFTP.h @@ -21,7 +21,7 @@ extern int HTfileSortMethod; /* specifies the method of sorting */ -/* PUBLIC HTMake_VMS_name() +/* PUBLIC HTVMS_name() ** CONVERTS WWW name into a VMS name ** ON ENTRY: ** nn Node Name (optional) @@ -32,7 +32,7 @@ extern int HTfileSortMethod; /* specifies the method of sorting */ ** ** Bug: Returns pointer to static -- non-reentrant */ -PUBLIC char * HTMake_VMS_name PARAMS(( +PUBLIC char * HTVMS_name PARAMS(( CONST char * nn, CONST char * fn)); diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c index 20cda536..e5596265 100644 --- a/WWW/Library/Implementation/HTFile.c +++ b/WWW/Library/Implementation/HTFile.c @@ -2210,7 +2210,7 @@ PUBLIC int HTLoadFile ARGS4( StrAllocCopy(anchor->content_encoding, "x-compress"); format = HTAtom_for("www/compressed"); } else if ((len > 3) && - !strcasecomp((char *)&vmsname[len - 2], "gz")) { + !strcasecomp(&vmsname[len - 2], "gz")) { if (vmsname[len - 3] == '.' || vmsname[len - 3] == '-' || vmsname[len - 3] == '_') { diff --git a/WWW/Library/Implementation/HTFinger.c b/WWW/Library/Implementation/HTFinger.c index f0255bb8..9f205e0c 100644 --- a/WWW/Library/Implementation/HTFinger.c +++ b/WWW/Library/Implementation/HTFinger.c @@ -107,7 +107,7 @@ PRIVATE void start_anchor ARGS1(CONST char *, href) PRIVATE int response ARGS5( - CONST char *, command, + char *, command, char *, sitename, HTParentAnchor *, anAnchor, HTFormat, format_out, diff --git a/WWW/Library/Implementation/HTGopher.c b/WWW/Library/Implementation/HTGopher.c index f92fcb49..389d1fd7 100644 --- a/WWW/Library/Implementation/HTGopher.c +++ b/WWW/Library/Implementation/HTGopher.c @@ -760,9 +760,7 @@ PRIVATE void interpret_cso_key ARGS5( if (0 == strncmp(key, "$(FID)", 6)) { sprintf(buf, "%d", fld->id); } else if (0 == strncmp(key, "$(FDESC)", 8)) { - sprintf(buf, "%s%s%s", fld->description, - ctx->public_override ? /***" "***/"" : "", - ctx->public_override ? /***fld->attributes***/"" : ""); + sprintf(buf, "%.2046s", fld->description); } else if (0 == strncmp(key, "$(FDEF)", 7)) { strcpy(buf, fld->defreturn ? " checked" : ""); } else if (0 == strncmp(key, "$(FNDX)", 7)) { diff --git a/WWW/Library/Implementation/HTLex.c b/WWW/Library/Implementation/HTLex.c index 64b113d8..dedf7bc9 100644 --- a/WWW/Library/Implementation/HTLex.c +++ b/WWW/Library/Implementation/HTLex.c @@ -119,10 +119,10 @@ PUBLIC char *lex_verbose ARGS1(LexItem, lex_item) case LEX_AT_SIGN: /* Address qualifier */ return "address qualifier '@'"; case LEX_ALPH_STR: /* Alphanumeric string */ - sprintf(msg, "alphanumeric string '%s'", HTlex_buffer); + sprintf(msg, "alphanumeric string '%.70s'", HTlex_buffer); return msg; case LEX_TMPL_STR: /* Template string */ - sprintf(msg, "template string '%s'", HTlex_buffer); + sprintf(msg, "template string '%.70s'", HTlex_buffer); return msg; default: return "UNKNOWN-LEX-ITEM"; diff --git a/WWW/Library/Implementation/HTNews.c b/WWW/Library/Implementation/HTNews.c index 68457ffd..dcde38a3 100644 --- a/WWW/Library/Implementation/HTNews.c +++ b/WWW/Library/Implementation/HTNews.c @@ -229,7 +229,7 @@ PRIVATE BOOL initialize NOARGS ** Negative status indicates transmission error, socket closed. ** Positive status is an NNTP status. */ -PRIVATE int response ARGS1(CONST char *,command) +PRIVATE int response ARGS1(char *,command) { int result; char * p = response_text; @@ -358,10 +358,7 @@ PRIVATE NNTPAuthResult HTHandleAuthInfo ARGS1( while (tries) { if (UserName == NULL) { - if ((msg = (char *)calloc(1, (strlen(host) + 30))) == NULL) { - outofmem(__FILE__, "HTHandleAuthInfo"); - } - sprintf(msg, gettext("Username for news host '%s':"), host); + HTSprintf0(&msg, gettext("Username for news host '%s':"), host); UserName = HTPrompt(msg, NULL); FREE(msg); if (!(UserName && *UserName)) { @@ -443,10 +440,7 @@ PRIVATE NNTPAuthResult HTHandleAuthInfo ARGS1( tries = 3; while (tries) { if (PassWord == NULL) { - if ((msg = (char *)calloc(1, (strlen(host) + 30))) == NULL) { - outofmem(__FILE__, "HTHandleAuthInfo"); - } - sprintf(msg, gettext("Password for news host '%s':"), host); + HTSprintf0(&msg, gettext("Password for news host '%s':"), host); PassWord = HTPromptPassword(msg); FREE(msg); if (!(PassWord && *PassWord)) { @@ -1698,10 +1692,12 @@ PRIVATE int read_list ARGS1(char *, arg) } /* if end of line */ } /* Loop over characters */ if (!listing) { + char *msg = NULL; START(HTML_DT); - sprintf(line, gettext("No matches for: %s"), arg); - PUTS(line); + HTSprintf0(&msg, gettext("No matches for: %s"), arg); + PUTS(msg); MAYBE_END(HTML_DT); + FREE(msg); } END(HTML_DLC); PUTC('\n'); @@ -2033,7 +2029,7 @@ PRIVATE int read_group ARGS3( } } } - sprintf(buffer, " [%s]", date); + sprintf(buffer, " [%.*s]", (int)(sizeof(buffer) - 4), date); PUTS(buffer); FREE(date); } @@ -2231,7 +2227,7 @@ PRIVATE int HTLoadNews ARGS4( StrAllocCopy(NewsHost, cp); } FREE(cp); - sprintf(command, "%s://%.*s/", + HTSprintf0(&NewsHREF, "%s://%.*s/", (post_wanted ? "newspost" : (reply_wanted ? @@ -2239,7 +2235,6 @@ PRIVATE int HTLoadNews ARGS4( (spost_wanted ? "snewspost" : "snewsreply"))), (int) sizeof(command) - 15, NewsHost); - StrAllocCopy(NewsHREF, command); /* ** If the SSL daemon is being used as a proxy, diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c index 505ed74f..0671371c 100644 --- a/WWW/Library/Implementation/HTTCP.c +++ b/WWW/Library/Implementation/HTTCP.c @@ -93,30 +93,12 @@ PUBLIC unsigned long socks_bind_remoteAddr; /* for long Rbind */ ** On return, ** returns a negative status in the Unix way. */ -#ifndef PCNFS - -#ifdef VMS -#include <perror.h> -#ifndef errno -extern int errno; -#endif /* !errno */ -#endif /* VMS */ - -#ifndef VM -#ifndef VMS -#ifndef THINK_C #ifdef DECL_SYS_ERRLIST extern char *sys_errlist[]; /* see man perror on cernvax */ extern int sys_nerr; #endif /* DECL_SYS_ERRLIST */ -#endif /* !THINK_C */ -#endif /* !VMS */ -#endif /* !VM */ - -#endif /* !PCNFS */ - #ifdef _WINDOWS_NSL char host[512]; struct hostent *phost; /* Pointer to host - See netdb.h */ @@ -167,7 +149,7 @@ PUBLIC int HTioctl ARGS3( } ioctl_desc; if ((sdc = vaxc$get_sdc (d)) == 0) { - errno = EBADF; + set_errno(EBADF); return -1; } ioctl_desc.opt = UCX$C_IOCTL; @@ -186,11 +168,11 @@ PUBLIC int HTioctl ARGS3( ioctl_comm.addr = (char *)argp; status = sys$qiow (0, sdc, fun, iosb, 0, 0, 0, 0, 0, 0, p5, p6); if (!(status & 01)) { - errno = status; + set_errno(status); return -1; } if (!(iosb[0] & 01)) { - errno = iosb[0]; + set_errno(iosb[0]); return -1; } return 0; @@ -206,6 +188,7 @@ PUBLIC int HTioctl ARGS3( PUBLIC int HTInetStatus ARGS1( char *, where) { + int saved_errno = errno; #ifdef VMS #ifdef MULTINET SOCKET_ERRNO = vmserrno; @@ -253,6 +236,8 @@ PUBLIC int HTInetStatus ARGS1( #endif /* MULTINET */ #endif /* VMS */ + set_errno(saved_errno); + #ifdef VMS /* ** uerrno and errno happen to be zero if vmserrno <> 0 @@ -833,7 +818,7 @@ PUBLIC struct hostent * LYGetHostByName ARGS1( /* to detect cases when it doesn't get set although it should */ h_errno = -2; #endif - errno = 0; + set_errno(0); phost = gethostbyname(host); statuses.child_errno = errno; statuses.child_h_errno = h_errno; @@ -952,7 +937,7 @@ PUBLIC struct hostent * LYGetHostByName ARGS1( readret = read(pfd[0], &statuses, sizeof(statuses)); if (readret == sizeof(statuses)) { h_errno = statuses.child_h_errno; - errno = statuses.child_errno; + set_errno(statuses.child_errno); #ifdef HAVE_H_ERRNO if (statuses.h_errno_valid) { lynx_nsl_status = HT_H_ERRNO_VALID; @@ -1585,11 +1570,7 @@ PUBLIC int HTDoConnect ARGS4( int tries=0; #ifdef SOCKET_DEBUG_TRACE - { - int saved_errno = SOCKET_ERRNO; - HTInetStatus("this socket's first connect"); - errno = saved_errno; /* I don't trust HTInetStatus */ - } + HTInetStatus("this socket's first connect"); #endif /* SOCKET_DEBUG_TRACE */ ret = 0; while (ret <= 0) { @@ -1622,24 +1603,20 @@ PUBLIC int HTDoConnect ARGS4( #ifdef SOCKET_DEBUG_TRACE if (tries == 1) { - int saved_errno = SOCKET_ERRNO; HTInetStatus("this socket's first select"); - errno = saved_errno; /* I don't trust HTInetStatus */ } #endif /* SOCKET_DEBUG_TRACE */ - /* - ** If we suspend, then it is possible that select will be - ** interrupted. Allow for this possibility. - JED - */ - if ((ret == -1) && (errno == EINTR)) - continue; + /* + ** If we suspend, then it is possible that select will be + ** interrupted. Allow for this possibility. - JED + */ + if ((ret == -1) && (errno == EINTR)) + continue; #ifdef SOCKET_DEBUG_TRACE - if (ret < 0) { - int saved_errno = SOCKET_ERRNO; - HTInetStatus("failed select"); - errno = saved_errno; /* I don't trust HTInetStatus */ - } + if (ret < 0) { + HTInetStatus("failed select"); + } #endif /* SOCKET_DEBUG_TRACE */ /* ** Again according to the Sun and Motorola man pages for connect: @@ -1687,9 +1664,7 @@ PUBLIC int HTDoConnect ARGS4( else { #ifdef SOCKET_DEBUG_TRACE if (status < 0) { - int saved_errno = SOCKET_ERRNO; HTInetStatus("confirm-ready connect"); - errno = saved_errno; } #endif /* SOCKET_DEBUG_TRACE */ break; @@ -1725,9 +1700,7 @@ PUBLIC int HTDoConnect ARGS4( #endif /* UCX */ (SOCKET_ERRNO != EISCONN)) { #ifdef SOCKET_DEBUG_TRACE - int saved_errno = SOCKET_ERRNO; HTInetStatus("confirm-not-ready connect"); - errno = saved_errno; #endif /* SOCKET_DEBUG_TRACE */ break; } @@ -1746,9 +1719,7 @@ PUBLIC int HTDoConnect ARGS4( } #ifdef SOCKET_DEBUG_TRACE else if (status < 0) { - int saved_errno = SOCKET_ERRNO; - HTInetStatus("this socket's first and only connect"); - errno = saved_errno; /* I don't trust HTInetStatus */ + HTInetStatus("this socket's first and only connect"); } #endif /* SOCKET_DEBUG_TRACE */ #endif /* !__DJGPP__ */ @@ -1891,7 +1862,6 @@ PUBLIC int HTDoRead ARGS3( #if !defined(UCX) || !defined(VAXC) #ifdef UNIX while ((nb = SOCKET_READ (fildes, buf, nbyte)) == -1) { - int saved_errno = errno; if (errno == EINTR) continue; #ifdef ERESTARTSYS @@ -1899,7 +1869,6 @@ PUBLIC int HTDoRead ARGS3( continue; #endif /* ERESTARTSYS */ HTInetStatus("read"); - errno = saved_errno; /* our caller may check it */ break; } return nb; @@ -1922,7 +1891,7 @@ PUBLIC int HTDoRead ARGS3( */ if ((nb <= 0) && (errno == EPIPE)) { nb = 0; - errno = 0; + set_errno(0); } return nb; #endif /* UCX, BSN */ diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c index 302fb7bf..f7a2dc9a 100644 --- a/WWW/Library/Implementation/HTTP.c +++ b/WWW/Library/Implementation/HTTP.c @@ -287,7 +287,7 @@ PRIVATE int HTLoadHTTP ARGS4 ( char *line_kept_clean; int real_length_of_line; BOOL extensions; /* Assume good HTTP server */ - char line[INIT_LINE_SIZE]; + char *linebuf = NULL; char temp[80]; BOOL first_Accept = TRUE; BOOL show_401 = FALSE; @@ -415,8 +415,7 @@ try_again: char * host = NULL; if ((host = HTParse(anAnchor->address, "", PARSE_HOST)) != NULL) { - sprintf(line, "Host: %s%c%c", host, CR,LF); - StrAllocCat(command, line); + HTSprintf(&command, "Host: %s%c%c", host, CR,LF); FREE(host); } @@ -446,53 +445,49 @@ try_again: } else { temp[0] = '\0'; } - sprintf(line, "%s%s%s", + HTSprintf0(&linebuf, "%s%s%s", (first_Accept ? "Accept: " : ", "), HTAtom_name(pres->rep), temp); - len += strlen(line); + len += strlen(linebuf); if (len > 252 && !first_Accept) { StrAllocCat(command, crlf); - sprintf(line, "Accept: %s%s", + HTSprintf0(&linebuf, "Accept: %s%s", HTAtom_name(pres->rep), temp); - len = strlen(line); + len = strlen(linebuf); } - StrAllocCat(command, line); + StrAllocCat(command, linebuf); first_Accept = FALSE; } } } - sprintf(line, "%s*/*;q=0.01%c%c", + HTSprintf(&command, "%s*/*;q=0.01%c%c", (first_Accept ? "Accept: " : ", "), CR, LF); - StrAllocCat(command, line); first_Accept = FALSE; len = 0; - sprintf(line, "Accept-Encoding: %s, %s%c%c", + HTSprintf(&command, "Accept-Encoding: %s, %s%c%c", "gzip", "compress", CR, LF); - StrAllocCat(command, line); if (language && *language) { - sprintf(line, "Accept-Language: %s%c%c", language, CR, LF); - StrAllocCat(command, line); + HTSprintf(&command, "Accept-Language: %s%c%c", language, CR, LF); } if (pref_charset && *pref_charset) { StrAllocCat(command, "Accept-Charset: "); - strcpy(line, pref_charset); - if (line[strlen(line)-1] == ',') - line[strlen(line)-1] = '\0'; - LYLowerCase(line); - if (strstr(line, "iso-8859-1") == NULL) - strcat(line, ", iso-8859-1;q=0.01"); - if (strstr(line, "us-ascii") == NULL) - strcat(line, ", us-ascii;q=0.01"); - StrAllocCat(command, line); - sprintf(line, "%c%c", CR, LF); - StrAllocCat(command, line); + StrAllocCopy(linebuf, pref_charset); + if (linebuf[strlen(linebuf)-1] == ',') + linebuf[strlen(linebuf)-1] = '\0'; + LYLowerCase(linebuf); + if (strstr(linebuf, "iso-8859-1") == NULL) + StrAllocCat(linebuf, ", iso-8859-1;q=0.01"); + if (strstr(linebuf, "us-ascii") == NULL) + StrAllocCat(linebuf, ", us-ascii;q=0.01"); + StrAllocCat(command, linebuf); + HTSprintf(&command, "%c%c", CR, LF); } #if 0 @@ -519,8 +514,7 @@ try_again: ** new-httpd@apache.org from Koen Holtman, Jan 1999. */ if (!do_post) { - sprintf(line, "Negotiate: trans%c%c", CR, LF); - StrAllocCat(command, line); + HTSprintf(&command, "Negotiate: trans%c%c", CR, LF); } #endif /* 0 */ @@ -531,29 +525,25 @@ try_again: ** Also send it as a Cache-Control header for HTTP/1.1. - FM */ if (reloading) { - sprintf(line, "Pragma: no-cache%c%c", CR, LF); - StrAllocCat(command, line); - sprintf(line, "Cache-Control: no-cache%c%c", CR, LF); - StrAllocCat(command, line); + HTSprintf(&command, "Pragma: no-cache%c%c", CR, LF); + HTSprintf(&command, "Cache-Control: no-cache%c%c", CR, LF); } if (LYUserAgent && *LYUserAgent) { char *cp = LYSkipBlanks(LYUserAgent); /* Won't send it at all if all blank - kw */ if (*cp != '\0') - sprintf(line, "User-Agent: %.*s%c%c", + HTSprintf(&command, "User-Agent: %.*s%c%c", INIT_LINE_SIZE-15, LYUserAgent, CR, LF); } else { - sprintf(line, "User-Agent: %s/%s libwww-FM/%s%c%c", + HTSprintf(&command, "User-Agent: %s/%s libwww-FM/%s%c%c", HTAppName ? HTAppName : "unknown", HTAppVersion ? HTAppVersion : "0.0", HTLibraryVersion, CR, LF); } - StrAllocCat(command, line); if (personal_mail_address && !LYNoFromHeader) { - sprintf(line, "From: %s%c%c", personal_mail_address, CR,LF); - StrAllocCat(command, line); + HTSprintf(&command, "From: %s%c%c", personal_mail_address, CR,LF); } if (!(LYUserSpecifiedURL || @@ -572,8 +562,7 @@ try_again: } else { StrAllocCat(command, cp); } - sprintf(line, "%c%c", CR, LF); - StrAllocCat(command, line); + HTSprintf(&command, "%c%c", CR, LF); } { @@ -635,8 +624,7 @@ try_again: ** If auth is not NULL nor zero-length, it's ** an Authorization header to be included. - FM */ - sprintf(line, "%s%c%c", auth, CR, LF); - StrAllocCat(command, line); + HTSprintf(&command, "%s%c%c", auth, CR, LF); CTRACE((tfp, "HTTP: Sending authorization: %s\n", auth)); } else if (auth && *auth == '\0') { /* @@ -727,8 +715,7 @@ try_again: ** an Authorization or Proxy-Authorization ** header to be included. - FM */ - sprintf(line, "%s%c%c", auth, CR, LF); - StrAllocCat(command, line); + HTSprintf(&command, "%s%c%c", auth, CR, LF); CTRACE((tfp, (auth_proxy ? "HTTP: Sending proxy authorization: %s\n" : "HTTP: Sending authorization: %s\n"), @@ -769,28 +756,24 @@ try_again: CTRACE((tfp, "HTTP: Doing post, content-type '%s'\n", anAnchor->post_content_type ? anAnchor->post_content_type : "lose")); - sprintf (line, "Content-type: %s%c%c", - anAnchor->post_content_type ? anAnchor->post_content_type - : "lose", CR, LF); - StrAllocCat(command, line); - { - int content_length; - if (!anAnchor->post_data) - content_length = 0; - else + HTSprintf(&command, "Content-type: %s%c%c", + anAnchor->post_content_type + ? anAnchor->post_content_type + : "lose", + CR, LF); /* * Ack! This assumes non-binary data! Icky! * */ - content_length = strlen (anAnchor->post_data); - sprintf (line, "Content-length: %d%c%c", - content_length, CR, LF); - StrAllocCat(command, line); - } + HTSprintf(&command, "Content-length: %d%c%c", + (anAnchor->post_data) + ? strlen (anAnchor->post_data) + : 0, + CR, LF); - StrAllocCat(command, crlf); /* Blank line means "end" of headers */ + StrAllocCat(command, crlf); /* Blank line means "end" of headers */ - StrAllocCat(command, anAnchor->post_data); + StrAllocCat(command, anAnchor->post_data); } else StrAllocCat(command, crlf); /* Blank line means "end" of headers */ @@ -810,6 +793,7 @@ try_again: #endif /* NOT_ASCII */ status = HTTP_NETWRITE(s, command, (int)strlen(command), handle); FREE(command); + FREE(linebuf); if (status <= 0) { if (status == 0) { CTRACE((tfp, "HTTP: Got status 0 in initial write\n")); @@ -1588,12 +1572,13 @@ try_again: sink, anAnchor); if (!target || target == NULL) { - char buffer[1024]; /* @@@@@@@@ */ + char *buffer = NULL; HTTP_NETCLOSE(s, handle); - sprintf(buffer, CANNOT_CONVERT_I_TO_O, + HTSprintf0(&buffer, CANNOT_CONVERT_I_TO_O, HTAtom_name(format_in), HTAtom_name(format_out)); _HTProgress (buffer); + FREE(buffer); status = -1; goto clean_up; } diff --git a/WWW/Library/Implementation/HTVMSUtils.c b/WWW/Library/Implementation/HTVMSUtils.c index d3333e5c..df8cda8a 100644 --- a/WWW/Library/Implementation/HTVMSUtils.c +++ b/WWW/Library/Implementation/HTVMSUtils.c @@ -299,78 +299,6 @@ int dir; } -/* PUBLIC HTVMS_name() -** CONVERTS WWW name into a VMS name -** ON ENTRY: -** nn Node Name (optional) -** fn WWW file name -** -** ON EXIT: -** returns vms file specification -** -** Bug: Returns pointer to static -- non-reentrant -*/ -PUBLIC char * HTVMS_name ARGS2( - CONST char *, nn, - CONST char *, fn) -{ - -/* We try converting the filename into Files-11 syntax. That is, we assume -** first that the file is, like us, on a VMS node. We try remote -** (or local) DECnet access. Files-11, VMS, VAX and DECnet -** are trademarks of Digital Equipment Corporation. -** The node is assumed to be local if the hostname WITHOUT DOMAIN -** matches the local one. @@@ -*/ - static char vmsname[INFINITY]; /* returned */ - char * filename = (char*)malloc(strlen(fn)+1); - char * nodename = (char*)malloc(strlen(nn)+2+1); /* Copies to hack */ - char *second; /* 2nd slash */ - char *last; /* last slash */ - - char * hostname = (char *)HTHostName(); - - if (!filename || !nodename) outofmem(__FILE__, "HTVMSname"); - strcpy(filename, fn); - strcpy(nodename, ""); /* On same node? Yes if node names match */ - if (strncmp(nn,"localhost",9)) { - char *p, *q; - for (p=hostname, q=(char *)nn; - *p && *p!='.' && *q && *q!='.'; p++, q++){ - if (TOUPPER(*p)!=TOUPPER(*q)) { - strcpy(nodename, nn); - q = strchr(nodename, '.'); /* Mismatch */ - if (q) *q=0; /* Chop domain */ - strcat(nodename, "::"); /* Try decnet anyway */ - break; - } - } - } - - second = strchr(filename+1, '/'); /* 2nd slash */ - last = strrchr(filename, '/'); /* last slash */ - - if (!second) { /* Only one slash */ - sprintf(vmsname, "%s%s", nodename, filename + 1); - } else if(second==last) { /* Exactly two slashes */ - *second = 0; /* Split filename from disk */ - sprintf(vmsname, "%s%s:%s", nodename, filename+1, second+1); - *second = '/'; /* restore */ - } else { /* More than two slashes */ - char * p; - *second = 0; /* Split disk from directories */ - *last = 0; /* Split dir from filename */ - sprintf(vmsname, "%s%s:[%s]%s", - nodename, filename+1, second+1, last+1); - *second = *last = '/'; /* restore filename */ - for (p=strchr(vmsname, '['); *p!=']'; p++) - if (*p=='/') *p='.'; /* Convert dir sep. to dots */ - } - FREE(nodename); - FREE(filename); - return vmsname; -} - /* ** The code below is for directory browsing by VMS Curses clients. ** It is based on the newer WWWLib's HTDirBrw.c. - Foteos Macrides @@ -797,7 +725,7 @@ PUBLIC int compare_VMSEntryInfo_structs ARGS2(VMSEntryInfo *,entry1, } } i++; - sprintf(month, "%s%d", (i < 10 ? "0" : ""), i); + sprintf(month, "%02d", i); strcat(date1, month); strncat(date1, (char *)&entry1->date[4], 2); date1[8] = '\0'; @@ -820,7 +748,7 @@ PUBLIC int compare_VMSEntryInfo_structs ARGS2(VMSEntryInfo *,entry1, } } i++; - sprintf(month, "%s%d", (i < 10 ? "0" : ""), i); + sprintf(month, "%02d", i); strcat(date2, month); strncat(date2, (char *)&entry2->date[4], 2); date2[8] = '\0'; @@ -1007,10 +935,7 @@ PUBLIC int HTVMSBrowseDir ARGS4( } FREE(header); if (parent) { - relative = (char*) malloc(strlen(tail) + 4); - if (relative == NULL) - outofmem(__FILE__, "HTVMSBrowseDir"); - sprintf(relative, "%s/..", tail); + HTSprintf0(&relative, "%s/..", tail); HTStartAnchor(target, "", relative); PUTS("Up to "); HTUnEscape(parent); diff --git a/WWW/Library/Implementation/HTVMSUtils.h b/WWW/Library/Implementation/HTVMSUtils.h index 9bcff503..6eb55ca6 100644 --- a/WWW/Library/Implementation/HTVMSUtils.h +++ b/WWW/Library/Implementation/HTVMSUtils.h @@ -89,21 +89,6 @@ PUBLIC BOOL HTVMS_checkAccess PARAMS(( PUBLIC char * HTVMS_wwwName PARAMS(( CONST char * vmsname)); -/* PUBLIC HTVMS_name() -** CONVERTS WWW name into a VMS name -** ON ENTRY: -** nn Node Name (optional) -** fn WWW file name -** -** ON EXIT: -** returns vms file specification -** -** Bug: Returns pointer to static -- non-reentrant -*/ -PUBLIC char * HTVMS_name PARAMS(( - CONST char * nn, - CONST char * fn)); - PUBLIC int HTStat PARAMS(( CONST char * filename, struct stat * info)); diff --git a/WWW/Library/Implementation/HTWAIS.c b/WWW/Library/Implementation/HTWAIS.c index 92a8b3b0..ad6f73ba 100644 --- a/WWW/Library/Implementation/HTWAIS.c +++ b/WWW/Library/Implementation/HTWAIS.c @@ -124,21 +124,22 @@ PRIVATE int fd_mosaic_connect_to_server ARGS3( long, port, long *, fd) { - /* - ** New version. - */ - char dummy[256]; + char *dummy = NULL; int status; + int result; - sprintf (dummy, "wais://%s:%d/", host_name, port); + HTSprintf0(&dummy, "wais://%s:%d/", host_name, port); status = HTDoConnect (dummy, "WAIS", 210, (int *)fd); if (status == HT_INTERRUPTED) { - return -1; + result = -1; + } else if (status < 0) { + result = 0; + } else { + result = 1; } - if (status < 0) - return 0; - return 1; + FREE(dummy); + return result; } /* Returns 1 on success, 0 on fail, -1 on interrupt. */ @@ -526,21 +527,24 @@ PRIVATE void display_search_response ARGS4( } else { /* Not archie */ docname = WWW_from_WAIS(docid); if (docname) { - char * dbname = HTEscape(database, URL_XPALPHAS); - sprintf(line, - "/%s/%s/%d/%s", /* W3 address */ - dbname, - head->Types ? head->Types[0] : "TEXT", - (int)(head->DocumentLength), - docname); - HTStartAnchor(target, NULL, - ((head->Types) && - (!strcmp(head->Types[0], "URL"))) - ? - headline : line); /* NT, Sep 93 */ + if ((head->Types) && + (!strcmp(head->Types[0], "URL"))) { + HTStartAnchor(target, NULL, headline); + } else{ + char * dbname = HTEscape(database, URL_XPALPHAS); + char * w3_address = NULL; + HTSprintf0(&w3_address, + "/%s/%s/%d/%s", + dbname, + head->Types ? head->Types[0] : "TEXT", + (int)(head->DocumentLength), + docname); + HTStartAnchor(target, NULL, w3_address); + FREE(w3_address); + FREE(dbname); + } PUTS(headline); END(HTML_A); - FREE(dbname); FREE(docname); } else { PUTS(gettext("(bad doc id)")); @@ -753,7 +757,7 @@ PUBLIC int HTLoadWAIS ARGS4( */ if (key && !*key) { /* I N D E X */ #ifdef CACHE_FILE_PREFIX - char filename[256]; + char * filename = NULL; FILE * fp; #endif HTStructured * target = HTML_new(anAnchor, format_out, sink); @@ -790,7 +794,7 @@ PUBLIC int HTLoadWAIS ARGS4( ** If we have seen a source file for this database, use that. */ #ifdef CACHE_FILE_PREFIX - sprintf(filename, "%sWSRC-%s:%s:%.100s.txt", + HTSprintf0(&filename, "%sWSRC-%s:%s:%.100s.txt", CACHE_FILE_PREFIX, server_name, service, www_database); @@ -807,6 +811,7 @@ PUBLIC int HTLoadWAIS ARGS4( END(HTML_PRE); fclose(fp); } + FREE(filename); #endif START(HTML_P); PUTS(gettext("\nEnter the 's'earch command and then specify search words.\n")); diff --git a/WWW/Library/Implementation/HTWSRC.c b/WWW/Library/Implementation/HTWSRC.c index 7e1d899c..4fca40ca 100644 --- a/WWW/Library/Implementation/HTWSRC.c +++ b/WWW/Library/Implementation/HTWSRC.c @@ -244,28 +244,32 @@ PRIVATE void WSRCParser_put_character ARGS2(HTStream*, me, char, c) PRIVATE BOOL write_cache ARGS1(HTStream *, me) { FILE * fp; - char cache_file_name[LY_MAXPATH]; + char * cache_file_name = NULL; char * www_database; + int result = NO; + if (!me->par_value[PAR_DATABASE_NAME] || !me->par_value[PAR_IP_NAME] ) return NO; www_database = HTEscape(me->par_value[PAR_DATABASE_NAME], URL_XALPHAS); - sprintf(cache_file_name, "%sWSRC-%s:%s:%.100s.txt", + HTSprintf0(&cache_file_name, "%sWSRC-%s:%s:%.100s.txt", CACHE_FILE_PREFIX, me->par_value[PAR_IP_NAME], me->par_value[PAR_TCP_PORT] ? me->par_value[PAR_TCP_PORT] : "210", www_database); + + if ((fp = fopen(cache_file_name, "w")) != 0) { + result = YES; + if (me->par_value[PAR_DESCRIPTION]) + fputs(me->par_value[PAR_DESCRIPTION], fp); + else + fputs("Description not available\n", fp); + fclose(fp); + } FREE(www_database); - fp = fopen(cache_file_name, "w"); - if (!fp) return NO; - - if (me->par_value[PAR_DESCRIPTION]) - fputs(me->par_value[PAR_DESCRIPTION], fp); - else - fputs("Description not available\n", fp); - fclose(fp); - return YES; + FREE(cache_file_name); + return result; } #endif @@ -329,11 +333,11 @@ PRIVATE void WSRC_gen_html ARGS2(HTStream *, me, BOOL, source_file) if (me->par_value[PAR_IP_NAME] && me->par_value[PAR_DATABASE_NAME]) { - char WSRC_address[256]; + char * WSRC_address = NULL; char * www_database; www_database = HTEscape(me->par_value[PAR_DATABASE_NAME], URL_XALPHAS); - sprintf(WSRC_address, "wais://%s%s%s/%s", + HTSprintf0(&WSRC_address, "wais://%s%s%s/%s", me->par_value[PAR_IP_NAME], me->par_value[PAR_TCP_PORT] ? ":" : "", me->par_value[PAR_TCP_PORT] ? me->par_value[PAR_TCP_PORT] :"", @@ -346,6 +350,7 @@ PRIVATE void WSRC_gen_html ARGS2(HTStream *, me, BOOL, source_file) PUTS(gettext(" (or via proxy server, if defined)")); FREE(www_database); + FREE(WSRC_address); } else { give_parameter(me, PAR_IP_NAME); diff --git a/WWW/Library/Implementation/www_tcp.h b/WWW/Library/Implementation/www_tcp.h index 4048d7cf..85ac581e 100644 --- a/WWW/Library/Implementation/www_tcp.h +++ b/WWW/Library/Implementation/www_tcp.h @@ -491,6 +491,11 @@ struct timeval { #endif /* __GNUC__ */ #endif /* VAXC && !DECC */ +#include <perror.h> +#ifndef errno +extern int errno; +#endif /* !errno */ + #endif /* VMS */ /* @@ -641,7 +646,7 @@ typedef int pid_t; #else -#if !(defined(VM) || defined(VMS) || defined(THINK_C) || defined(__MINGW32__)) +#if !(defined(VM) || defined(VMS) || defined(THINK_C) || defined(PCNFS) || defined(__MINGW32__)) #define DECL_SYS_ERRLIST 1 #endif @@ -771,5 +776,13 @@ typedef unsigned int fd_set; #endif /* !FD_SET */ #endif /* SELECT */ +/* + * Macro for setting errno - only define this if you really can do it. + */ +#if !defined(errno) && (!defined(VMS) || defined(UCX)) +#define set_errno(value) errno = value +#else +#define set_errno(value) /* we do not know how */ +#endif #endif /* TCP_H */ diff --git a/WWW/Makefile b/WWW/Makefile deleted file mode 100644 index 41a90056..00000000 --- a/WWW/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# Make basic WWW distribution -# -# See the README and the documentation on the web. -# When you have done BUILD you will have www so you will be able to -# read the documentation online. -# -all : - BUILD - diff --git a/WWW/README.txt b/WWW/README.txt deleted file mode 100644 index be7e3e96..00000000 --- a/WWW/README.txt +++ /dev/null @@ -1,208 +0,0 @@ - Read Me - WORLDWIDEWEB CERN-DISTRIBUTED CODE - - See the CERN copyright[1] . This is the README file which you get when you - unwrap one of our tar files. These files contain information about - hypertext, hypertext systems, and the WorldWideWeb project. If you have - taken this with a .tar file, you will have only a subset of the files. - - THIS FILE IS A VERY ABRIDGED VERSION OF THE INFORMATION AVAILABLE ON THE - WEB. IF IN DOUBT, READ THE WEB DIRECTLY. If you have not got ANY browser - installed yet, do this by telnet to info.cern.ch (no username or password). - - Files from info.cern.ch are also mirrored on ftp.ripe.net. - -Archive Directory structure - - Under /pub/www[2] , besides this README file, you'll find bin[3] , src[4] - and doc[5] directories. The main archives are as follows: - - bin/xxx/bbbb Executable binaries of program bbbb for system xxx. - Check what's there before you bother compiling. (Note - HP700/8800 series is "snake") - - bin/next/WorldWideWeb_v.vv.tar.Z - The Hypertext Browser/editor for the NeXT -- binary. - - src/WWWLibrary_v.vv.tar.Z - The W3 Library. All source, and Makefiles for - selected systems. - - src/WWWLineMode_v.vv.tar.Z - The Line mode browser - all source, and Makefiles for - selected systems. Requires the Library[6] . - - src/WWWDaemon_v.vv.tar.Z - The HTTP daemon, and WWW-WAIS gateway programs. - Source. Requires the Library. - - src/WWWMailRobot_v.vv.tar.Z - The Mail Robot. - - doc/WWWBook.tar.Z A snapshot of our internal documentation - we prefer - you to access this on line -- see warnings below. - -Basic WWW software installation from source - - This applies to the line mode client and the server. Below, $prod means - LineMode or Daemon depending on which you are building. - - GENERATED DIRECTORY STRUCTURE - - The tar files are all designed to be unwrapped in the same (this) directory. - They create different parts of a common directory tree under that directory. - There may be some duplication. They also generate a few files in this - directory: README.*, Copyright.*, and some installation instructions (.txt). - - The directory structure is, for product $prod and machine $WWW_MACH - - WWW/$prod/Implementation - Source files for a given product - - WWW/$prod/Implementation/CommonMakefile - The machine-independent parts of the Makefile for this - product - - - Read Me (65/66) - WWW/$prod/$WWW_MACH/ Area for compiling for a given system - - WWW/All/$WWW_MACH/Makefile.include - The machine-dependent parts of the makefile for any - product - - WWW/All/Implementation/Makefile.product - A makefile which includes both parts above and so can - be used from any product, any machine. - - COMPILATION ON ALREADY SUPPORTED PLATFORMS - - You must get the WWWLibrary tar file as well as the products you want and - unwrap them all from the same directory. - - You must define the environmant variable WWW_MACH to be the architecure of - your machine (sun4, decstation, rs6000, sgi, snake, etc) - - In directory WWW, type BUILD. - - COMPILATION ON NEW PLATFORMS - - If your machine is not on the list: - - Make up a new subdirectory of that name under WWW/$prod and WWW/All, - copying the contents of a basically similar architecture's directory. - - Check the WWW/All/$WWW_MACH/Makefile.include for suitable directory and - flag definitions. - - Check the file www_tcp.h for the system-specific include file - coordinates, etc. - - Send any changes you have to make back to www-request@info.cern.ch for - inclusion into future releases. - - Once you have this set up, type BUILD. - -NeXTStep Browser/Editor - - The browser for the NeXT is those files contained in the application - directory WWW/Next/Implementation/WorldWideWeb.app and is compiled. When you - install the app, you may want to configure the default page, - WorldWideWeb.app/default.html. These must point to some useful information! - You should keep it up to date with pointers to info on your site and - elsewhere. If you use the CERN home page note there is a link at the bottom - to the master copy on our server. You should set up the address of your - local news server with - - dwrite WorldWideWeb NewsHost news - - replacing the last word with the actual address of your news host. See - Installation instructions[7] . - -Line Mode browser - - Binaries of this for some systems are available in /pub/www/bin/ . The - binaries can be picked up, set executable, and run immediately. - - If there is no binary, see "Installation from source" above. - - (See Installation notes[8] ). Do the same thing (in the same directory) to - the WWWLibrary_v.cc.tar.Z file to get the common library. - - - Read Me (65/130) - You will have an ASCII printable manual in the file - WWW/LineMode/Defaults/line-mode-guide.txt which you can print out at this - stage. This is a frozen copy of some of the online documentation. - - Whe you install the browser, you may configure a default page. This is - /usr/local/lib/WWW/default.html for the line mode browser. This must point - to some useful information! You should keep it up to date with pointers to - info on your site and elsewhere. If you use the CERN home page note there is - a link at the bottom to the master copy on our server. - - Some basic documentation on the browser is delivered with the home page in - the directory WWW/LineMode/Defaults. A separate tar file of that directory - (WWWLineModeDefaults.tar.Z) is available if you just want to update that. - - The rest of the documentation is in hypertext, and so wil be readable most - easily with a browser. We suggest that after installing the browser, you - browse through the basic documentation so that you are aware of the options - and customisation possibilities for example. - -Server - - The server can be run very simply under the internet daemon, to export a - file directory tree as a browsable hypertext tree. Binaries are avilable - for some platofrms, otherwise follow instructions above for compiling and - then go on to " Installing the basic W3 server[9] ". - -XMosaic - - XMosaic is an X11/Motif W3 browser. - - The sources and binaries are distributed separately from - FTP.NCSA.UIUC.EDU[10] , in /Web/xmosaic[11] . Binaries are available for - some platforms. If you have to build from source, check the README in the - distribution. - - The binaries can be picked up, uncompressed, set "executable" and run - immediately. - -Viola browser for X11 - - Viola is an X11 application for reading global hypertext. If a binary is - available from your machine, in /pub/www/bin/.../viola*, then take that and - also the Viola "apps" tar file which contains the scripts you will need. - - To generate this from source, you will need both the W3 library and the - Viola source files. There is an Imakefile with the viola source directory. - You will need to generate the XPA and XPM libraries and the W3 library - befere you make viola itself. - -Documentation - - In the /pub/www/doc[12] directory are a number articles, preprints and - guides on the web. - - See the online WWW bibliography[13] for a list of these and other articles, - books, etc. and also the list of WWW Manuals[14] available in text and - postscript form. - -General - - Your comments will of course be most appreciated, on code, or information on - the web which is out of date or misleading. If you write your own hypertext - and make it available by anonymous ftp or using a server, tell us and we'll - put some pointers to it in ours. Thus spreads the web... - - Read Me (66/195) - Tim Berners-Lee - - WorldWideWeb project - - CERN, 1211 Geneva 23, Switzerland - - Tel: +41 22 767 3755; Fax: +41 22 767 7155; email: timbl@info.cern.ch - - diff --git a/configure b/configure index d4f1857a..87ffb633 100755 --- a/configure +++ b/configure @@ -216,6 +216,7 @@ EOF cat <<EOF --enable-default-colors enable use of default-colors (ncurses/slang) --enable-file-upload use experimental file-upload support + --enable-htmlized-cfg build experimental htmlized lynx.cfg --enable-justify-elts use experimental element-justification logic --enable-kbd-layout use experimental keyboard-layout support --enable-libjs use experimental JavaScript support (Mozilla libjs) @@ -225,9 +226,9 @@ cat <<EOF --enable-source-cache cache HTML source for parse mode changes Miscellaneous Options: --disable-alt-bindings disable alternative line-edit bindings - --disable-extended-dtd disable extended HTML DTD logic EOF cat <<EOF + --disable-extended-dtd disable extended HTML DTD logic --disable-partial use partial-display logic --enable-externs use external commands --enable-font-switch use Linux setfont for character-translation @@ -239,9 +240,9 @@ cat <<EOF --enable-nsl-fork fork NSL requests, allowing them to be aborted --enable-syslog log URL requests via syslog --disable-persistent-cookies disable persistent-cookie support - --enable-underlines underline links rather than using boldface EOF cat <<EOF + --enable-underlines underline links rather than using boldface --enable-gzip-help install gzip'ed help files --with-zlib use zlib for decompression of some gzip files --disable-finger disable FINGER logic @@ -253,9 +254,9 @@ Directory Editor Options: --disable-dired-archive disable dearchiving commands --disable-dired-override disable DirEd override keymap --disable-dired-permit disable chmod/attrib commands - --disable-dired-xpermit disable chmod/attrib commands EOF cat <<EOF + --disable-dired-xpermit disable chmod/attrib commands --disable-dired-tar disable "tar" command --disable-dired-uudecode disable "uudecode" command --disable-dired-zip disable "zip", "unzip" commands @@ -631,7 +632,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:635: checking host system type" >&5 +echo "configure:636: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -686,7 +687,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:690: checking for $ac_word" >&5 +echo "configure:691: 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 @@ -716,7 +717,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:720: checking for $ac_word" >&5 +echo "configure:721: 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 @@ -767,7 +768,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:771: checking for $ac_word" >&5 +echo "configure:772: 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 @@ -799,7 +800,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:803: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:804: 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. @@ -810,12 +811,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 814 "configure" +#line 815 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:820: \"$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 @@ -841,12 +842,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:845: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:846: 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:850: checking whether we are using GNU C" >&5 +echo "configure:851: 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 @@ -855,7 +856,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:859: \"$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:860: \"$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 @@ -874,7 +875,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:878: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:879: 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 @@ -906,7 +907,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:910: checking how to run the C preprocessor" >&5 +echo "configure:911: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -921,13 +922,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 925 "configure" +#line 926 "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:931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:932: \"$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 : @@ -938,13 +939,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 942 "configure" +#line 943 "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:948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:949: \"$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 : @@ -955,13 +956,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 959 "configure" +#line 960 "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:965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:966: \"$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 : @@ -986,7 +987,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:990: checking whether ln -s works" >&5 +echo "configure:991: 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 @@ -1009,7 +1010,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:1013: checking for $ac_word" >&5 +echo "configure:1014: 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 @@ -1037,7 +1038,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1041: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1042: 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 @@ -1075,7 +1076,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:1079: checking for a BSD compatible install" >&5 +echo "configure:1080: 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 @@ -1132,7 +1133,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:1136: checking for $ac_word" >&5 +echo "configure:1137: 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 @@ -1163,9 +1164,9 @@ done echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1167: checking for AIX" >&5 +echo "configure:1168: checking for AIX" >&5 cat > conftest.$ac_ext <<EOF -#line 1169 "configure" +#line 1170 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -1187,7 +1188,7 @@ rm -f conftest* echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1191: checking for POSIXized ISC" >&5 +echo "configure:1192: 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 @@ -1213,7 +1214,7 @@ fi echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:1217: checking if you want to see long compiling messages" >&5 +echo "configure:1218: 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 @@ -1261,7 +1262,7 @@ fi echo $ac_n "checking if you want to check memory-leaks""... $ac_c" 1>&6 -echo "configure:1265: checking if you want to check memory-leaks" >&5 +echo "configure:1266: 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 @@ -1285,7 +1286,7 @@ EOF echo $ac_n "checking if you want to enable debug-code""... $ac_c" 1>&6 -echo "configure:1289: checking if you want to enable debug-code" >&5 +echo "configure:1290: 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 @@ -1327,7 +1328,7 @@ else fi echo $ac_n "checking if you want to enable lynx trace code *recommended* ""... $ac_c" 1>&6 -echo "configure:1331: checking if you want to enable lynx trace code *recommended* " >&5 +echo "configure:1332: 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 @@ -1353,7 +1354,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:1357: checking if you want to turn on gcc warnings" >&5 +echo "configure:1358: 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 @@ -1393,9 +1394,9 @@ EOF if test -n "$GCC" then echo "checking for $CC __attribute__ directives" 1>&6 -echo "configure:1397: checking for $CC __attribute__ directives" >&5 +echo "configure:1398: checking for $CC __attribute__ directives" >&5 cat > conftest.$ac_ext <<EOF -#line 1399 "configure" +#line 1400 "configure" #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -1433,7 +1434,7 @@ EOF EOF ;; esac - if { (eval echo configure:1437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1438: \"$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 @@ -1450,11 +1451,11 @@ fi if test -n "$GCC" then cat > conftest.$ac_ext <<EOF -#line 1454 "configure" +#line 1455 "configure" int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } EOF echo "checking for $CC warning options" 1>&6 -echo "configure:1458: checking for $CC warning options" >&5 +echo "configure:1459: checking for $CC warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -1472,7 +1473,7 @@ echo "configure:1458: checking for $CC warning options" >&5 Wstrict-prototypes $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:1476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1477: \"$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" @@ -1490,12 +1491,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1494: checking for ANSI C header files" >&5 +echo "configure:1495: 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 1499 "configure" +#line 1500 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1503,7 +1504,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1507: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1508: \"$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* @@ -1520,7 +1521,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 1524 "configure" +#line 1525 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1538,7 +1539,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 1542 "configure" +#line 1543 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1559,7 +1560,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1563 "configure" +#line 1564 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1570,7 +1571,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1594,12 +1595,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1598: checking for working const" >&5 +echo "configure:1599: 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 1603 "configure" +#line 1604 "configure" #include "confdefs.h" int main() { @@ -1648,7 +1649,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:1652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1669,21 +1670,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1673: checking for inline" >&5 +echo "configure:1674: 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 1680 "configure" +#line 1681 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:1687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1709,12 +1710,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1713: checking for off_t" >&5 +echo "configure:1714: 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 1718 "configure" +#line 1719 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1742,12 +1743,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1746: checking for size_t" >&5 +echo "configure:1747: 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 1751 "configure" +#line 1752 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1777,19 +1778,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:1781: checking for working alloca.h" >&5 +echo "configure:1782: 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 1786 "configure" +#line 1787 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1794: \"$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 @@ -1810,12 +1811,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1814: checking for alloca" >&5 +echo "configure:1815: 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 1819 "configure" +#line 1820 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -1843,7 +1844,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:1847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1848: \"$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 @@ -1875,12 +1876,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1879: checking whether alloca needs Cray hooks" >&5 +echo "configure:1880: 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 1884 "configure" +#line 1885 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -1905,12 +1906,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:1909: checking for $ac_func" >&5 +echo "configure:1910: 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 1914 "configure" +#line 1915 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1933,7 +1934,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1938: \"$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 @@ -1960,7 +1961,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1964: checking stack direction for C alloca" >&5 +echo "configure:1965: 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 @@ -1968,7 +1969,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 1972 "configure" +#line 1973 "configure" #include "confdefs.h" find_stack_direction () { @@ -1987,7 +1988,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:1991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1992: \"$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 @@ -2012,17 +2013,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:2016: checking for $ac_hdr" >&5 +echo "configure:2017: 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 2021 "configure" +#line 2022 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2027: \"$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* @@ -2051,12 +2052,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2055: checking for $ac_func" >&5 +echo "configure:2056: 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 2060 "configure" +#line 2061 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2079,7 +2080,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2084: \"$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 @@ -2104,7 +2105,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2108: checking for working mmap" >&5 +echo "configure:2109: 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 @@ -2112,7 +2113,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 2116 "configure" +#line 2117 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -2252,7 +2253,7 @@ main() } EOF -if { (eval echo configure:2256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2257: \"$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 @@ -2280,17 +2281,17 @@ unistd.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:2284: checking for $ac_hdr" >&5 +echo "configure:2285: 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 2289 "configure" +#line 2290 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2295: \"$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* @@ -2320,12 +2321,12 @@ done strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2324: checking for $ac_func" >&5 +echo "configure:2325: 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 2329 "configure" +#line 2330 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2348,7 +2349,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2353: \"$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 @@ -2377,12 +2378,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2381: checking for $ac_func" >&5 +echo "configure:2382: 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 2386 "configure" +#line 2387 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2405,7 +2406,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2410: \"$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 @@ -2439,19 +2440,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2443: checking for LC_MESSAGES" >&5 +echo "configure:2444: 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 2448 "configure" +#line 2449 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:2455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2456: \"$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 @@ -2472,7 +2473,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2476: checking whether NLS is requested" >&5 +echo "configure:2477: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then @@ -2493,7 +2494,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2497: checking whether included gettext is requested" >&5 +echo "configure:2498: 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 @@ -2513,17 +2514,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2517: checking for libintl.h" >&5 +echo "configure:2518: 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 2522 "configure" +#line 2523 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2528: \"$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* @@ -2540,19 +2541,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:2544: checking for gettext in libc" >&5 +echo "configure:2545: 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 2549 "configure" +#line 2550 "configure" #include "confdefs.h" #include <libintl.h> int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:2556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2557: \"$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 @@ -2568,7 +2569,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:2572: checking for bindtextdomain in -lintl" >&5 +echo "configure:2573: 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 @@ -2576,7 +2577,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2580 "configure" +#line 2581 "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 @@ -2587,7 +2588,7 @@ int main() { bindtextdomain() ; return 0; } EOF -if { (eval echo configure:2591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2592: \"$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 @@ -2603,19 +2604,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:2607: checking for gettext in libintl" >&5 +echo "configure:2608: 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 2612 "configure" +#line 2613 "configure" #include "confdefs.h" int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:2619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2620: \"$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 @@ -2647,7 +2648,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:2651: checking for $ac_word" >&5 +echo "configure:2652: 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 @@ -2681,12 +2682,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2685: checking for $ac_func" >&5 +echo "configure:2686: 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 2690 "configure" +#line 2691 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2709,7 +2710,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2714: \"$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 @@ -2736,7 +2737,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:2740: checking for $ac_word" >&5 +echo "configure:2741: 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 @@ -2772,7 +2773,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:2776: checking for $ac_word" >&5 +echo "configure:2777: 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 @@ -2804,7 +2805,7 @@ else fi cat > conftest.$ac_ext <<EOF -#line 2808 "configure" +#line 2809 "configure" #include "confdefs.h" int main() { @@ -2812,7 +2813,7 @@ extern int _nl_msg_cat_cntr; return _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:2816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -2835,7 +2836,7 @@ fi if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:2839: checking whether catgets can be used" >&5 +echo "configure:2840: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then @@ -2849,7 +2850,7 @@ fi if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:2853: checking for main in -li" >&5 +echo "configure:2854: 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 @@ -2857,14 +2858,14 @@ else ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <<EOF -#line 2861 "configure" +#line 2862 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2869: \"$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 @@ -2892,12 +2893,12 @@ else fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:2896: checking for catgets" >&5 +echo "configure:2897: 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 2901 "configure" +#line 2902 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char catgets(); below. */ @@ -2920,7 +2921,7 @@ catgets(); ; return 0; } EOF -if { (eval echo configure:2924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2925: \"$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 @@ -2942,7 +2943,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:2946: checking for $ac_word" >&5 +echo "configure:2947: 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 @@ -2978,7 +2979,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:2982: checking for $ac_word" >&5 +echo "configure:2983: 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 @@ -3015,7 +3016,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:3019: checking for $ac_word" >&5 +echo "configure:3020: 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 @@ -3050,7 +3051,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:3054: checking for $ac_word" >&5 +echo "configure:3055: 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 @@ -3108,7 +3109,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:3112: checking for $ac_word" >&5 +echo "configure:3113: 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 @@ -3142,7 +3143,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:3146: checking for $ac_word" >&5 +echo "configure:3147: 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 @@ -3178,7 +3179,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:3182: checking for $ac_word" >&5 +echo "configure:3183: 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 @@ -3272,7 +3273,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:3276: checking for catalogs to be installed" >&5 +echo "configure:3277: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -3301,17 +3302,17 @@ echo "configure:3276: 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:3305: checking for linux/version.h" >&5 +echo "configure:3306: 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 3310 "configure" +#line 3311 "configure" #include "confdefs.h" #include <linux/version.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3316: \"$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* @@ -3426,7 +3427,7 @@ use_our_messages=no if test "$USE_NLS" = yes ; then if test -d $srcdir/po ; then echo $ac_n "checking if we should use included message-library""... $ac_c" 1>&6 -echo "configure:3430: checking if we should use included message-library" >&5 +echo "configure:3431: 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 @@ -3463,17 +3464,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:3467: checking for $ac_hdr" >&5 +echo "configure:3468: 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 3472 "configure" +#line 3473 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3478: \"$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* @@ -3543,7 +3544,7 @@ EOF fi echo $ac_n "checking if you want full utility pathnames""... $ac_c" 1>&6 -echo "configure:3547: checking if you want full utility pathnames" >&5 +echo "configure:3548: 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 @@ -3568,7 +3569,7 @@ EOF echo $ac_n "checking for system mailer""... $ac_c" 1>&6 -echo "configure:3572: checking for system mailer" >&5 +echo "configure:3573: 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 @@ -3595,7 +3596,7 @@ EOF echo $ac_n "checking system mail flags""... $ac_c" 1>&6 -echo "configure:3599: checking system mail flags" >&5 +echo "configure:3600: 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 @@ -3623,7 +3624,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:3627: checking for $ac_word" >&5 +echo "configure:3628: 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 @@ -3658,7 +3659,7 @@ fi else echo $ac_n "checking for chmod""... $ac_c" 1>&6 -echo "configure:3662: checking for chmod" >&5 +echo "configure:3663: checking for chmod" >&5 echo "$ac_t""$CHMOD" 1>&6 eval 'ac_cv_path_'CHMOD'="'chmod'"' fi @@ -3700,7 +3701,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:3704: checking for $ac_word" >&5 +echo "configure:3705: 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 @@ -3735,7 +3736,7 @@ fi else echo $ac_n "checking for compress""... $ac_c" 1>&6 -echo "configure:3739: checking for compress" >&5 +echo "configure:3740: checking for compress" >&5 echo "$ac_t""$COMPRESS" 1>&6 eval 'ac_cv_path_'COMPRESS'="'compress'"' fi @@ -3777,7 +3778,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:3781: checking for $ac_word" >&5 +echo "configure:3782: 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 @@ -3812,7 +3813,7 @@ fi else echo $ac_n "checking for cp""... $ac_c" 1>&6 -echo "configure:3816: checking for cp" >&5 +echo "configure:3817: checking for cp" >&5 echo "$ac_t""$COPY" 1>&6 eval 'ac_cv_path_'COPY'="'cp'"' fi @@ -3854,7 +3855,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:3858: checking for $ac_word" >&5 +echo "configure:3859: 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 @@ -3889,7 +3890,7 @@ fi else echo $ac_n "checking for gzip""... $ac_c" 1>&6 -echo "configure:3893: checking for gzip" >&5 +echo "configure:3894: checking for gzip" >&5 echo "$ac_t""$GZIP" 1>&6 eval 'ac_cv_path_'GZIP'="'gzip'"' fi @@ -3931,7 +3932,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:3935: checking for $ac_word" >&5 +echo "configure:3936: 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 @@ -3966,7 +3967,7 @@ fi else echo $ac_n "checking for mkdir""... $ac_c" 1>&6 -echo "configure:3970: checking for mkdir" >&5 +echo "configure:3971: checking for mkdir" >&5 echo "$ac_t""$MKDIR" 1>&6 eval 'ac_cv_path_'MKDIR'="'mkdir'"' fi @@ -4008,7 +4009,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:4012: checking for $ac_word" >&5 +echo "configure:4013: 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 @@ -4043,7 +4044,7 @@ fi else echo $ac_n "checking for mv""... $ac_c" 1>&6 -echo "configure:4047: checking for mv" >&5 +echo "configure:4048: checking for mv" >&5 echo "$ac_t""$MV" 1>&6 eval 'ac_cv_path_'MV'="'mv'"' fi @@ -4085,7 +4086,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:4089: checking for $ac_word" >&5 +echo "configure:4090: 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 @@ -4120,7 +4121,7 @@ fi else echo $ac_n "checking for rm""... $ac_c" 1>&6 -echo "configure:4124: checking for rm" >&5 +echo "configure:4125: checking for rm" >&5 echo "$ac_t""$RM" 1>&6 eval 'ac_cv_path_'RM'="'rm'"' fi @@ -4162,7 +4163,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:4166: checking for $ac_word" >&5 +echo "configure:4167: 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 @@ -4197,7 +4198,7 @@ fi else echo $ac_n "checking for tar""... $ac_c" 1>&6 -echo "configure:4201: checking for tar" >&5 +echo "configure:4202: checking for tar" >&5 echo "$ac_t""$TAR" 1>&6 eval 'ac_cv_path_'TAR'="'tar'"' fi @@ -4239,7 +4240,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:4243: checking for $ac_word" >&5 +echo "configure:4244: 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 @@ -4274,7 +4275,7 @@ fi else echo $ac_n "checking for touch""... $ac_c" 1>&6 -echo "configure:4278: checking for touch" >&5 +echo "configure:4279: checking for touch" >&5 echo "$ac_t""$TOUCH" 1>&6 eval 'ac_cv_path_'TOUCH'="'touch'"' fi @@ -4316,7 +4317,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:4320: checking for $ac_word" >&5 +echo "configure:4321: 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 @@ -4351,7 +4352,7 @@ fi else echo $ac_n "checking for gunzip""... $ac_c" 1>&6 -echo "configure:4355: checking for gunzip" >&5 +echo "configure:4356: checking for gunzip" >&5 echo "$ac_t""$UNCOMPRESS" 1>&6 eval 'ac_cv_path_'UNCOMPRESS'="'gunzip'"' fi @@ -4393,7 +4394,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:4397: checking for $ac_word" >&5 +echo "configure:4398: 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 @@ -4428,7 +4429,7 @@ fi else echo $ac_n "checking for unzip""... $ac_c" 1>&6 -echo "configure:4432: checking for unzip" >&5 +echo "configure:4433: checking for unzip" >&5 echo "$ac_t""$UNZIP" 1>&6 eval 'ac_cv_path_'UNZIP'="'unzip'"' fi @@ -4470,7 +4471,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:4474: checking for $ac_word" >&5 +echo "configure:4475: 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 @@ -4505,7 +4506,7 @@ fi else echo $ac_n "checking for bzip2""... $ac_c" 1>&6 -echo "configure:4509: checking for bzip2" >&5 +echo "configure:4510: checking for bzip2" >&5 echo "$ac_t""$BZIP2" 1>&6 eval 'ac_cv_path_'BZIP2'="'bzip2'"' fi @@ -4547,7 +4548,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:4551: checking for $ac_word" >&5 +echo "configure:4552: 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 @@ -4582,7 +4583,7 @@ fi else echo $ac_n "checking for uudecode""... $ac_c" 1>&6 -echo "configure:4586: checking for uudecode" >&5 +echo "configure:4587: checking for uudecode" >&5 echo "$ac_t""$UUDECODE" 1>&6 eval 'ac_cv_path_'UUDECODE'="'uudecode'"' fi @@ -4624,7 +4625,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:4628: checking for $ac_word" >&5 +echo "configure:4629: 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 @@ -4659,7 +4660,7 @@ fi else echo $ac_n "checking for zcat""... $ac_c" 1>&6 -echo "configure:4663: checking for zcat" >&5 +echo "configure:4664: checking for zcat" >&5 echo "$ac_t""$ZCAT" 1>&6 eval 'ac_cv_path_'ZCAT'="'zcat'"' fi @@ -4701,7 +4702,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:4705: checking for $ac_word" >&5 +echo "configure:4706: 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 @@ -4736,7 +4737,7 @@ fi else echo $ac_n "checking for zip""... $ac_c" 1>&6 -echo "configure:4740: checking for zip" >&5 +echo "configure:4741: checking for zip" >&5 echo "$ac_t""$ZIP" 1>&6 eval 'ac_cv_path_'ZIP'="'zip'"' fi @@ -4778,7 +4779,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:4782: checking for $ac_word" >&5 +echo "configure:4783: 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 @@ -4813,7 +4814,7 @@ fi else echo $ac_n "checking for telnet""... $ac_c" 1>&6 -echo "configure:4817: checking for telnet" >&5 +echo "configure:4818: checking for telnet" >&5 echo "$ac_t""$TELNET" 1>&6 eval 'ac_cv_path_'TELNET'="'telnet'"' fi @@ -4855,7 +4856,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:4859: checking for $ac_word" >&5 +echo "configure:4860: 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 @@ -4890,7 +4891,7 @@ fi else echo $ac_n "checking for tn3270""... $ac_c" 1>&6 -echo "configure:4894: checking for tn3270" >&5 +echo "configure:4895: checking for tn3270" >&5 echo "$ac_t""$TN3270" 1>&6 eval 'ac_cv_path_'TN3270'="'tn3270'"' fi @@ -4932,7 +4933,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:4936: checking for $ac_word" >&5 +echo "configure:4937: 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 @@ -4967,7 +4968,7 @@ fi else echo $ac_n "checking for rlogin""... $ac_c" 1>&6 -echo "configure:4971: checking for rlogin" >&5 +echo "configure:4972: checking for rlogin" >&5 echo "$ac_t""$RLOGIN" 1>&6 eval 'ac_cv_path_'RLOGIN'="'rlogin'"' fi @@ -5019,7 +5020,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:5023: checking for $ac_word" >&5 +echo "configure:5024: 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 @@ -5054,7 +5055,7 @@ fi else echo $ac_n "checking for install""... $ac_c" 1>&6 -echo "configure:5058: checking for install" >&5 +echo "configure:5059: checking for install" >&5 echo "$ac_t""$INSTALL" 1>&6 eval 'ac_cv_path_'INSTALL'="'install'"' fi @@ -5103,7 +5104,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:5107: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:5108: 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 @@ -5127,7 +5128,7 @@ for cf_arg in "-DCC_HAS_PROTOS" \ do CFLAGS="$cf_save_CFLAGS $cf_arg" cat > conftest.$ac_ext <<EOF -#line 5131 "configure" +#line 5132 "configure" #include "confdefs.h" #ifndef CC_HAS_PROTOS @@ -5143,7 +5144,7 @@ int main() { struct s2 {int (*f) (double a);}; ; return 0; } EOF -if { (eval echo configure:5147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -5171,12 +5172,12 @@ fi fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5175: checking for working const" >&5 +echo "configure:5176: 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 5180 "configure" +#line 5181 "configure" #include "confdefs.h" int main() { @@ -5225,7 +5226,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:5229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5267,7 +5268,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:5271: checking for strcmp in -lc_s" >&5 +echo "configure:5272: 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 @@ -5275,7 +5276,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 5279 "configure" +#line 5280 "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 @@ -5286,7 +5287,7 @@ int main() { strcmp() ; return 0; } EOF -if { (eval echo configure:5290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5291: \"$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 @@ -5379,7 +5380,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:5383: checking for $ac_word" >&5 +echo "configure:5384: 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 @@ -5424,17 +5425,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:5428: checking for $ac_hdr" >&5 +echo "configure:5429: 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 5433 "configure" +#line 5434 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5439: \"$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* @@ -5478,17 +5479,17 @@ ultrix*) do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5482: checking for $ac_hdr" >&5 +echo "configure:5483: 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 5487 "configure" +#line 5488 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5493: \"$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* @@ -5524,13 +5525,13 @@ esac echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 -echo "configure:5528: checking if we must define _GNU_SOURCE" >&5 +echo "configure:5529: checking if we must define _GNU_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5534 "configure" +#line 5535 "configure" #include "confdefs.h" #include <sys/types.h> int main() { @@ -5540,7 +5541,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:5544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -5550,7 +5551,7 @@ else cf_save="$CFLAGS" CFLAGS="$CFLAGS -D_GNU_SOURCE" cat > conftest.$ac_ext <<EOF -#line 5554 "configure" +#line 5555 "configure" #include "confdefs.h" #include <sys/types.h> int main() { @@ -5560,7 +5561,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:5564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -5585,16 +5586,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:5589: checking if we should use compile options $TRY_CFLAGS" >&5 +echo "configure:5590: checking if we should use compile options $TRY_CFLAGS" >&5 cat > conftest.$ac_ext <<EOF -#line 5591 "configure" +#line 5592 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *fp = stdin ; return 0; } EOF -if { (eval echo configure:5598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -5612,7 +5613,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:5616: checking if you want socks library" >&5 +echo "configure:5617: 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 @@ -5632,7 +5633,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:5636: checking if you want socks5 library" >&5 +echo "configure:5637: 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 @@ -5698,7 +5699,7 @@ cat >> confdefs.h <<\EOF EOF cat > conftest.$ac_ext <<EOF -#line 5702 "configure" +#line 5703 "configure" #include "confdefs.h" #include <stdio.h> @@ -5707,7 +5708,7 @@ int main() { accept((char *)0) ; return 0; } EOF -if { (eval echo configure:5711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -5737,9 +5738,9 @@ cat >> confdefs.h <<\EOF EOF echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6 -echo "configure:5741: checking if the socks library uses socks4 prefix" >&5 +echo "configure:5742: checking if the socks library uses socks4 prefix" >&5 cat > conftest.$ac_ext <<EOF -#line 5743 "configure" +#line 5744 "configure" #include "confdefs.h" #include <socks.h> @@ -5748,7 +5749,7 @@ int main() { Rinit((char *)0) ; return 0; } EOF -if { (eval echo configure:5752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5753: \"$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 @@ -5760,14 +5761,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 5764 "configure" +#line 5765 "configure" #include "confdefs.h" #include <socks.h> int main() { SOCKSinit((char *)0) ; return 0; } EOF -if { (eval echo configure:5771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_use_socks4=no else @@ -5836,7 +5837,7 @@ else cf_test_netlibs=no echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:5840: checking for network libraries" >&5 +echo "configure:5841: checking for network libraries" >&5 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5847,12 +5848,12 @@ cf_test_netlibs=yes for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5851: checking for $ac_func" >&5 +echo "configure:5852: 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 5856 "configure" +#line 5857 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5875,7 +5876,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5880: \"$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 @@ -5898,7 +5899,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:5902: checking for gethostname in -lnsl" >&5 +echo "configure:5903: 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 @@ -5906,7 +5907,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 5910 "configure" +#line 5911 "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 @@ -5917,7 +5918,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:5921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5922: \"$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 @@ -5950,7 +5951,7 @@ else echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:5954: checking for gethostname in -lsocket" >&5 +echo "configure:5955: 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 @@ -5958,7 +5959,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 5962 "configure" +#line 5963 "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 @@ -5969,7 +5970,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:5973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5974: \"$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 @@ -6014,7 +6015,7 @@ done # I don't know the entrypoints - 97/7/22 TD # AC_HAVE_LIBRARY(inet,cf_cv_netlibs="-linet $cf_cv_netlibs") echo $ac_n "checking for main in -linet""... $ac_c" 1>&6 -echo "configure:6018: checking for main in -linet" >&5 +echo "configure:6019: checking for main in -linet" >&5 ac_lib_var=`echo inet'_'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 @@ -6022,14 +6023,14 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <<EOF -#line 6026 "configure" +#line 6027 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6034: \"$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 @@ -6054,12 +6055,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:6058: checking for $ac_func" >&5 +echo "configure:6059: 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 6063 "configure" +#line 6064 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6082,7 +6083,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6087: \"$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 @@ -6105,7 +6106,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:6109: checking for socket in -lsocket" >&5 +echo "configure:6110: 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 @@ -6113,7 +6114,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6117 "configure" +#line 6118 "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 @@ -6124,7 +6125,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:6128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6129: \"$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 @@ -6157,7 +6158,7 @@ else echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:6161: checking for socket in -lbsd" >&5 +echo "configure:6162: 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 @@ -6165,7 +6166,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6169 "configure" +#line 6170 "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 @@ -6176,7 +6177,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:6180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6181: \"$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 @@ -6221,12 +6222,12 @@ fi for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6225: checking for $ac_func" >&5 +echo "configure:6226: 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 6230 "configure" +#line 6231 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6249,7 +6250,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6254: \"$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 @@ -6272,7 +6273,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:6276: checking for gethostbyname in -lnsl" >&5 +echo "configure:6277: 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 @@ -6280,7 +6281,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6284 "configure" +#line 6285 "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 @@ -6291,7 +6292,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:6295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6296: \"$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 @@ -6332,12 +6333,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6336: checking for $ac_func" >&5 +echo "configure:6337: 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 6341 "configure" +#line 6342 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6360,7 +6361,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6365: \"$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 @@ -6383,7 +6384,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:6387: checking for strcasecmp in -lresolv" >&5 +echo "configure:6388: 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 @@ -6391,7 +6392,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6395 "configure" +#line 6396 "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 @@ -6402,7 +6403,7 @@ int main() { strcasecmp() ; return 0; } EOF -if { (eval echo configure:6406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6407: \"$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 @@ -6448,13 +6449,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:6452: checking for inet_aton function" >&5 +echo "configure:6453: 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 6458 "configure" +#line 6459 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6465,7 +6466,7 @@ int main() { inet_aton(0, (struct in_addr *)0) ; return 0; } EOF -if { (eval echo configure:6469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6470: \"$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 @@ -6485,13 +6486,13 @@ EOF else echo $ac_n "checking for inet_addr function""... $ac_c" 1>&6 -echo "configure:6489: checking for inet_addr function" >&5 +echo "configure:6490: 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 6495 "configure" +#line 6496 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6502,7 +6503,7 @@ int main() { inet_addr(0) ; return 0; } EOF -if { (eval echo configure:6506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6507: \"$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 @@ -6517,7 +6518,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:6521: checking for library with inet_addr" >&5 +echo "configure:6522: 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 @@ -6527,7 +6528,7 @@ else do LIBS="$cf_save_LIBS $cf_inetlib" cat > conftest.$ac_ext <<EOF -#line 6531 "configure" +#line 6532 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6538,7 +6539,7 @@ int main() { inet_addr(0) ; return 0; } EOF -if { (eval echo configure:6542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6543: \"$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 @@ -6565,7 +6566,7 @@ fi echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:6569: checking for screen type" >&5 +echo "configure:6570: checking for screen type" >&5 if eval "test \"`echo '$''{'cf_cv_screen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6600,12 +6601,12 @@ case $cf_cv_screen in curses) echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:6604: checking for initscr" >&5 +echo "configure:6605: 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 6609 "configure" +#line 6610 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr(); below. */ @@ -6628,7 +6629,7 @@ initscr(); ; return 0; } EOF -if { (eval echo configure:6632: \"$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_func_initscr=yes" else @@ -6649,7 +6650,7 @@ else case $host_os in #(vi freebsd*) #(vi echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:6653: checking for tgoto in -lmytinfo" >&5 +echo "configure:6654: 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 @@ -6657,7 +6658,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 6661 "configure" +#line 6662 "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 @@ -6668,7 +6669,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:6672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6673: \"$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 @@ -6691,7 +6692,7 @@ fi ;; hpux10.*) echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:6695: checking for initscr in -lcur_colr" >&5 +echo "configure:6696: 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 @@ -6699,7 +6700,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcur_colr $LIBS" cat > conftest.$ac_ext <<EOF -#line 6703 "configure" +#line 6704 "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 @@ -6710,7 +6711,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6715: \"$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 @@ -6734,7 +6735,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:6738: checking for initscr in -lHcurses" >&5 +echo "configure:6739: 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 @@ -6742,7 +6743,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 6746 "configure" +#line 6747 "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 @@ -6753,7 +6754,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6758: \"$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 @@ -6802,12 +6803,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:6806: checking for tgoto" >&5 +echo "configure:6807: 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 6811 "configure" +#line 6812 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto(); below. */ @@ -6830,7 +6831,7 @@ tgoto(); ; return 0; } EOF -if { (eval echo configure:6834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6835: \"$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 @@ -6851,7 +6852,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:6855: checking for tgoto in -l$cf_term_lib" >&5 +echo "configure:6856: 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 @@ -6859,7 +6860,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_term_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 6863 "configure" +#line 6864 "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 @@ -6870,7 +6871,7 @@ int main() { tgoto() ; 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:6875: \"$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 @@ -6900,7 +6901,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:6904: checking for initscr in -l$cf_curs_lib" >&5 +echo "configure:6905: 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 @@ -6908,7 +6909,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_curs_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 6912 "configure" +#line 6913 "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 @@ -6919,7 +6920,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6924: \"$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 @@ -6945,16 +6946,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:6949: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:6950: checking if we can link with $cf_curs_lib library" >&5 cat > conftest.$ac_ext <<EOF -#line 6951 "configure" +#line 6952 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -6968,16 +6969,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:6972: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo "configure:6973: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 cat > conftest.$ac_ext <<EOF -#line 6974 "configure" +#line 6975 "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:6981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=no else @@ -6987,14 +6988,14 @@ else LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 6991 "configure" +#line 6992 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7016,14 +7017,14 @@ fi echo $ac_n "checking for curses performance tradeoff""... $ac_c" 1>&6 -echo "configure:7020: checking for curses performance tradeoff" >&5 +echo "configure:7021: 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 7027 "configure" +#line 7028 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7037,11 +7038,11 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 7045 "configure" +#line 7046 "configure" #include "confdefs.h" #define CURS_PERFORMANCE @@ -7056,7 +7057,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_curs_performance=yes else @@ -7081,13 +7082,13 @@ EOF ncurses) echo $ac_n "checking for ncurses header file""... $ac_c" 1>&6 -echo "configure:7085: checking for ncurses header file" >&5 +echo "configure:7086: 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 7091 "configure" +#line 7092 "configure" #include "confdefs.h" #include <curses.h> int main() { @@ -7104,7 +7105,7 @@ make an error ; return 0; } EOF -if { (eval echo configure:7108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=predefined else @@ -7191,7 +7192,7 @@ done ;; esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:7195: checking for ncurses version" >&5 +echo "configure:7196: 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 @@ -7216,7 +7217,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:7220: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:7221: \"$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" @@ -7225,7 +7226,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 7229 "configure" +#line 7230 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7248,7 +7249,7 @@ int main() exit(0); } EOF -if { (eval echo configure:7252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7253: \"$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` @@ -7273,7 +7274,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:7277: checking for Gpm_Open in -lgpm" >&5 +echo "configure:7278: 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 @@ -7281,7 +7282,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 7285 "configure" +#line 7286 "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 +7293,7 @@ int main() { Gpm_Open() ; 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:7297: \"$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 @@ -7308,7 +7309,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:7312: checking for initscr in -lgpm" >&5 +echo "configure:7313: 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 @@ -7316,7 +7317,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 7320 "configure" +#line 7321 "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 @@ -7327,7 +7328,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7332: \"$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 @@ -7358,7 +7359,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:7362: checking for tgoto in -lmytinfo" >&5 +echo "configure:7363: 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 @@ -7366,7 +7367,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 7370 "configure" +#line 7371 "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 @@ -7377,7 +7378,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:7381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7382: \"$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 @@ -7405,12 +7406,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:7409: checking for initscr" >&5 +echo "configure:7410: 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 7414 "configure" +#line 7415 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr(); below. */ @@ -7433,7 +7434,7 @@ initscr(); ; return 0; } EOF -if { (eval echo configure:7437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7438: \"$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 @@ -7453,17 +7454,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:7457: checking for initscr in -lncurses" >&5 +echo "configure:7458: checking for initscr in -lncurses" >&5 LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 7460 "configure" +#line 7461 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; 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:7468: \"$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 @@ -7491,17 +7492,17 @@ test "$prefix" != /opt && cf_search="$cf_search /opt/lib /opt/lib/ncur for cf_libdir in $cf_search do echo $ac_n "checking for -lncurses in $cf_libdir""... $ac_c" 1>&6 -echo "configure:7495: checking for -lncurses in $cf_libdir" >&5 +echo "configure:7496: checking for -lncurses in $cf_libdir" >&5 LIBS="-L$cf_libdir -lncurses $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 7498 "configure" +#line 7499 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7506: \"$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 @@ -7533,7 +7534,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:7537: checking if we can link ncurses without $cf_ncurses_LIBS" >&5 +echo "configure:7538: 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'$//'` @@ -7542,14 +7543,14 @@ echo "configure:7537: checking if we can link ncurses without $cf_ncurses_LIBS" fi done cat > conftest.$ac_ext <<EOF -#line 7546 "configure" +#line 7547 "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:7553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7554: \"$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 @@ -7566,20 +7567,20 @@ fi slang) echo $ac_n "checking for slang header file""... $ac_c" 1>&6 -echo "configure:7570: checking for slang header file" >&5 +echo "configure:7571: 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 7576 "configure" +#line 7577 "configure" #include "confdefs.h" #include <slang.h> int main() { printf("%s\n", SLANG_VERSION) ; return 0; } EOF -if { (eval echo configure:7583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_slang_header=predefined else @@ -7662,24 +7663,24 @@ else cf_cv_termlib=none cat > conftest.$ac_ext <<EOF -#line 7666 "configure" +#line 7667 "configure" #include "confdefs.h" int main() { char *x=(char*)tgoto("",0,0) ; return 0; } EOF -if { (eval echo configure:7673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 7676 "configure" +#line 7677 "configure" #include "confdefs.h" int main() { int x=tigetstr("") ; return 0; } EOF -if { (eval echo configure:7683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_termlib=terminfo else @@ -7708,16 +7709,16 @@ if test "$cf_cv_termlib" = none; then for cf_func in tigetstr tgetstr do echo $ac_n "checking for $cf_func in -l$cf_lib""... $ac_c" 1>&6 -echo "configure:7712: checking for $cf_func in -l$cf_lib" >&5 +echo "configure:7713: checking for $cf_func in -l$cf_lib" >&5 cat > conftest.$ac_ext <<EOF -#line 7714 "configure" +#line 7715 "configure" #include "confdefs.h" int main() { int x=$cf_func("") ; return 0; } EOF -if { (eval echo configure:7721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7744,7 +7745,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:7748: checking for initscr in -lcurses" >&5 +echo "configure:7749: 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 @@ -7752,7 +7753,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 7756 "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 @@ -7763,7 +7764,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7767: \"$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 @@ -7784,7 +7785,7 @@ else fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:7788: checking for tgoto in -ltermcap" >&5 +echo "configure:7789: 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 @@ -7792,7 +7793,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 7796 "configure" +#line 7797 "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 @@ -7803,7 +7804,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:7807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7808: \"$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 @@ -7835,12 +7836,12 @@ fi cf_slang_LIBS2="$LIBS" echo $ac_n "checking for acos""... $ac_c" 1>&6 -echo "configure:7839: checking for acos" >&5 +echo "configure:7840: 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 7844 "configure" +#line 7845 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char acos(); below. */ @@ -7863,7 +7864,7 @@ acos(); ; return 0; } EOF -if { (eval echo configure:7867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7868: \"$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 @@ -7882,7 +7883,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for acos in -lm""... $ac_c" 1>&6 -echo "configure:7886: checking for acos in -lm" >&5 +echo "configure:7887: 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 @@ -7890,7 +7891,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 7894 "configure" +#line 7895 "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 @@ -7901,7 +7902,7 @@ int main() { acos() ; return 0; } EOF -if { (eval echo configure:7905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7906: \"$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 @@ -7941,12 +7942,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:7945: checking for SLtt_get_screen_size" >&5 +echo "configure:7946: 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 7950 "configure" +#line 7951 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char SLtt_get_screen_size(); below. */ @@ -7969,7 +7970,7 @@ SLtt_get_screen_size(); ; return 0; } EOF -if { (eval echo configure:7973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7974: \"$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 @@ -7989,17 +7990,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6 -echo "configure:7993: checking for SLtt_get_screen_size in -lslang" >&5 +echo "configure:7994: checking for SLtt_get_screen_size in -lslang" >&5 LIBS="-lslang $LIBS" cat > conftest.$ac_ext <<EOF -#line 7996 "configure" +#line 7997 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:8003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8004: \"$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 @@ -8027,17 +8028,17 @@ test "$prefix" != /opt && cf_search="$cf_search /opt/lib /opt/lib/slan for cf_libdir in $cf_search do echo $ac_n "checking for -lslang in $cf_libdir""... $ac_c" 1>&6 -echo "configure:8031: checking for -lslang in $cf_libdir" >&5 +echo "configure:8032: checking for -lslang in $cf_libdir" >&5 LIBS="-L$cf_libdir -lslang $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 8034 "configure" +#line 8035 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:8041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8042: \"$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 @@ -8068,7 +8069,7 @@ esac cf_slang_LIBS3="$LIBS" echo $ac_n "checking if we can link slang without termcap""... $ac_c" 1>&6 -echo "configure:8072: checking if we can link slang without termcap" >&5 +echo "configure:8073: 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 @@ -8076,14 +8077,14 @@ else fi LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s@$cf_exclude@@" -e 's@^.@@'` cat > conftest.$ac_ext <<EOF -#line 8080 "configure" +#line 8081 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:8087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -8103,7 +8104,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:8107: checking for location of config-file" >&5 +echo "configure:8108: 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" @@ -8115,7 +8116,7 @@ CHARSET_DEFS= echo $ac_n "checking if you want only a few charsets""... $ac_c" 1>&6 -echo "configure:8119: checking if you want only a few charsets" >&5 +echo "configure:8120: checking if you want only a few charsets" >&5 # Check whether --with-charsets or --without-charsets was given. if test "${with_charsets+set}" = set; then @@ -8160,12 +8161,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:8164: checking for ANSI C header files" >&5 +echo "configure:8165: 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 8169 "configure" +#line 8170 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -8173,7 +8174,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8178: \"$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* @@ -8190,7 +8191,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 8194 "configure" +#line 8195 "configure" #include "confdefs.h" #include <string.h> EOF @@ -8208,7 +8209,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 8212 "configure" +#line 8213 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -8229,7 +8230,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 8233 "configure" +#line 8234 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -8240,7 +8241,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:8244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8264,12 +8265,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:8268: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:8269: 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 8273 "configure" +#line 8274 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -8278,7 +8279,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:8282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -8303,12 +8304,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:8307: checking for $ac_hdr that defines DIR" >&5 +echo "configure:8308: 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 8312 "configure" +#line 8313 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -8316,7 +8317,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:8320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -8341,7 +8342,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:8345: checking for opendir in -ldir" >&5 +echo "configure:8346: 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 @@ -8349,7 +8350,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 8353 "configure" +#line 8354 "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 @@ -8360,7 +8361,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:8364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8365: \"$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 @@ -8382,7 +8383,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:8386: checking for opendir in -lx" >&5 +echo "configure:8387: 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 @@ -8390,7 +8391,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 8394 "configure" +#line 8395 "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 @@ -8401,7 +8402,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:8405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8406: \"$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 @@ -8441,17 +8442,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:8445: checking for $ac_hdr" >&5 +echo "configure:8446: 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 8450 "configure" +#line 8451 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8456: \"$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* @@ -8479,13 +8480,13 @@ done echo $ac_n "checking termio.h and termios.h""... $ac_c" 1>&6 -echo "configure:8483: checking termio.h and termios.h" >&5 +echo "configure:8484: 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 8489 "configure" +#line 8490 "configure" #include "confdefs.h" #if HAVE_TERMIO_H @@ -8498,7 +8499,7 @@ int main() { putchar (0x0a) ; return 0; } EOF -if { (eval echo configure:8502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_termio_and_termios=yes else @@ -8518,13 +8519,13 @@ EOF echo $ac_n "checking for sigaction and structs""... $ac_c" 1>&6 -echo "configure:8522: checking for sigaction and structs" >&5 +echo "configure:8523: 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 8528 "configure" +#line 8529 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8539,7 +8540,7 @@ struct sigaction act; ; return 0; } EOF -if { (eval echo configure:8543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_func_sigaction=yes else @@ -8563,17 +8564,17 @@ 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:8567: checking for $ac_hdr" >&5 +echo "configure:8568: 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 8572 "configure" +#line 8573 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8578: \"$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* @@ -8610,17 +8611,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:8614: checking for $ac_hdr" >&5 +echo "configure:8615: 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 8619 "configure" +#line 8620 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8625: \"$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* @@ -8650,17 +8651,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:8654: checking for $ac_hdr" >&5 +echo "configure:8655: 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 8659 "configure" +#line 8660 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8665: \"$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* @@ -8701,13 +8702,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:8705: checking for union wait" >&5 +echo "configure:8706: 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 8711 "configure" +#line 8712 "configure" #include "confdefs.h" $cf_wait_headers int main() { @@ -8718,7 +8719,7 @@ int x; ; return 0; } EOF -if { (eval echo configure:8722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8723: \"$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 @@ -8729,7 +8730,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 8733 "configure" +#line 8734 "configure" #include "confdefs.h" $cf_wait_headers int main() { @@ -8744,7 +8745,7 @@ union wait x; ; return 0; } EOF -if { (eval echo configure:8748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8749: \"$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 @@ -8771,20 +8772,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:8775: checking if union wait can be used as wait-arg" >&5 +echo "configure:8776: 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 8781 "configure" +#line 8782 "configure" #include "confdefs.h" $cf_wait_headers int main() { union wait x; wait(&x) ; return 0; } EOF -if { (eval echo configure:8788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_arg_union_wait=yes else @@ -8804,20 +8805,20 @@ EOF echo $ac_n "checking if union wait can be used as waitpid-arg""... $ac_c" 1>&6 -echo "configure:8808: checking if union wait can be used as waitpid-arg" >&5 +echo "configure:8809: 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 8814 "configure" +#line 8815 "configure" #include "confdefs.h" $cf_wait_headers int main() { union wait x; waitpid(0, &x, 0) ; return 0; } EOF -if { (eval echo configure:8821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_arg_union_waitpid=yes else @@ -8843,17 +8844,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:8847: checking for $ac_hdr" >&5 +echo "configure:8848: 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 8852 "configure" +#line 8853 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8858: \"$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* @@ -8880,13 +8881,13 @@ fi done echo $ac_n "checking for standard varargs""... $ac_c" 1>&6 -echo "configure:8884: checking for standard varargs" >&5 +echo "configure:8885: 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 8890 "configure" +#line 8891 "configure" #include "confdefs.h" #if HAVE_STDARG_H @@ -8901,7 +8902,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:8905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_varargs=yes else @@ -8921,12 +8922,12 @@ EOF echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:8925: checking for uid_t in sys/types.h" >&5 +echo "configure:8926: 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 8930 "configure" +#line 8931 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -8955,7 +8956,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:8959: checking type of array argument to getgroups" >&5 +echo "configure:8960: 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 @@ -8963,7 +8964,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <<EOF -#line 8967 "configure" +#line 8968 "configure" #include "confdefs.h" /* Thanks to Mike Rendell for this test. */ @@ -8988,7 +8989,7 @@ main() } EOF -if { (eval echo configure:8992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8993: \"$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 @@ -9002,7 +9003,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext <<EOF -#line 9006 "configure" +#line 9007 "configure" #include "confdefs.h" #include <unistd.h> EOF @@ -9026,12 +9027,12 @@ EOF echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:9030: checking for pid_t" >&5 +echo "configure:9031: 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 9035 "configure" +#line 9036 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -9059,12 +9060,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:9063: checking for uid_t in sys/types.h" >&5 +echo "configure:9064: 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 9068 "configure" +#line 9069 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -9093,12 +9094,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:9097: checking for mode_t" >&5 +echo "configure:9098: 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 9102 "configure" +#line 9103 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -9129,17 +9130,17 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:9133: checking for vfork.h" >&5 +echo "configure:9134: 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 9138 "configure" +#line 9139 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9144: \"$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* @@ -9164,18 +9165,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:9168: checking for working vfork" >&5 +echo "configure:9169: 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:9174: checking for vfork" >&5 +echo "configure:9175: 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 9179 "configure" +#line 9180 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vfork(); below. */ @@ -9198,7 +9199,7 @@ vfork(); ; return 0; } EOF -if { (eval echo configure:9202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9203: \"$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 @@ -9220,7 +9221,7 @@ fi ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext <<EOF -#line 9224 "configure" +#line 9225 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -9315,7 +9316,7 @@ main() { } } EOF -if { (eval echo configure:9319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9320: \"$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 @@ -9339,13 +9340,13 @@ fi echo $ac_n "checking if we should use fcntl or ioctl""... $ac_c" 1>&6 -echo "configure:9343: checking if we should use fcntl or ioctl" >&5 +echo "configure:9344: 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 9349 "configure" +#line 9350 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9357,7 +9358,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_fionbio=ioctl else @@ -9366,7 +9367,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9370 "configure" +#line 9371 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9383,7 +9384,7 @@ int main() { ; 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:9388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_fionbio=fcntl else @@ -9406,20 +9407,20 @@ EOF echo $ac_n "checking for broken/missing definition of remove""... $ac_c" 1>&6 -echo "configure:9410: checking for broken/missing definition of remove" >&5 +echo "configure:9411: 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 9416 "configure" +#line 9417 "configure" #include "confdefs.h" #include <stdio.h> int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:9423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_baddef_remove=no else @@ -9427,7 +9428,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9431 "configure" +#line 9432 "configure" #include "confdefs.h" #include <stdio.h> int __unlink(name) { return unlink(name); } @@ -9435,7 +9436,7 @@ int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:9439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_baddef_remove=yes else @@ -9459,13 +9460,13 @@ EOF echo $ac_n "checking for lstat""... $ac_c" 1>&6 -echo "configure:9463: checking for lstat" >&5 +echo "configure:9464: 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 9469 "configure" +#line 9470 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9474,7 +9475,7 @@ int main() { lstat(".", (struct stat *)0) ; return 0; } EOF -if { (eval echo configure:9478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_lstat=yes else @@ -9513,12 +9514,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9517: checking for $ac_func" >&5 +echo "configure:9518: 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 9522 "configure" +#line 9523 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9541,7 +9542,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:9545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9546: \"$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 @@ -9571,12 +9572,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9575: checking for $ac_func" >&5 +echo "configure:9576: 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 9580 "configure" +#line 9581 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9599,7 +9600,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:9603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9604: \"$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 @@ -9630,12 +9631,12 @@ for ac_func in strstr do echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6 -echo "configure:9634: checking for $ac_func declaration" >&5 +echo "configure:9635: 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 9639 "configure" +#line 9640 "configure" #include "confdefs.h" #include <string.h> int main() { @@ -9644,11 +9645,11 @@ extern int ${ac_func}(); #endif ; return 0; } EOF -if { (eval echo configure:9648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9652 "configure" +#line 9653 "configure" #include "confdefs.h" #include <string.h> int main() { @@ -9657,7 +9658,7 @@ int (*p)() = ${ac_func}; #endif ; return 0; } EOF -if { (eval echo configure:9661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_decl_$ac_func=yes" @@ -9699,12 +9700,12 @@ for ac_func in getgrgid getgrnam do echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6 -echo "configure:9703: checking for $ac_func declaration" >&5 +echo "configure:9704: 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 9708 "configure" +#line 9709 "configure" #include "confdefs.h" #include <stdio.h> @@ -9715,11 +9716,11 @@ extern int ${ac_func}(); #endif ; return 0; } EOF -if { (eval echo configure:9719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9723 "configure" +#line 9724 "configure" #include "confdefs.h" #include <stdio.h> @@ -9730,7 +9731,7 @@ int (*p)() = ${ac_func}; #endif ; return 0; } EOF -if { (eval echo configure:9734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_decl_$ac_func=yes" @@ -9772,13 +9773,13 @@ done echo $ac_n "checking if TRUE/FALSE are defined""... $ac_c" 1>&6 -echo "configure:9776: checking if TRUE/FALSE are defined" >&5 +echo "configure:9777: 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 9782 "configure" +#line 9783 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -9787,7 +9788,7 @@ int main() { int x = TRUE, y = FALSE ; return 0; } EOF -if { (eval echo configure:9791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_bool_defs=yes else @@ -9814,13 +9815,13 @@ fi echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6 -echo "configure:9818: checking if external errno is declared" >&5 +echo "configure:9819: 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 9824 "configure" +#line 9825 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -9833,7 +9834,7 @@ int main() { long x = (long) errno ; return 0; } EOF -if { (eval echo configure:9837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_dcl_'errno'=yes' else @@ -9864,13 +9865,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:9868: checking if external errno exists" >&5 +echo "configure:9869: 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 9874 "configure" +#line 9875 "configure" #include "confdefs.h" #undef errno @@ -9880,7 +9881,7 @@ int main() { errno = 2 ; return 0; } EOF -if { (eval echo configure:9884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9885: \"$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 @@ -9912,20 +9913,20 @@ fi echo $ac_n "checking for setlocale()""... $ac_c" 1>&6 -echo "configure:9916: checking for setlocale()" >&5 +echo "configure:9917: 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 9922 "configure" +#line 9923 "configure" #include "confdefs.h" #include <locale.h> int main() { setlocale(LC_ALL, "") ; return 0; } EOF -if { (eval echo configure:9929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_locale=yes else @@ -9946,13 +9947,13 @@ EOF echo $ac_n "checking if NGROUPS is defined""... $ac_c" 1>&6 -echo "configure:9950: checking if NGROUPS is defined" >&5 +echo "configure:9951: 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 9956 "configure" +#line 9957 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -9966,7 +9967,7 @@ int main() { int x = NGROUPS ; return 0; } EOF -if { (eval echo configure:9970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=yes else @@ -9974,7 +9975,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9978 "configure" +#line 9979 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -9988,7 +9989,7 @@ int main() { int x = NGROUPS_MAX ; return 0; } EOF -if { (eval echo configure:9992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=NGROUPS_MAX else @@ -10022,13 +10023,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:10026: checking if external $cf_name is declared" >&5 +echo "configure:10027: 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 10032 "configure" +#line 10033 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -10041,7 +10042,7 @@ int main() { long x = (long) $cf_name ; return 0; } EOF -if { (eval echo configure:10045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_dcl_'$cf_name'=yes' else @@ -10072,13 +10073,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:10076: checking if external $cf_name exists" >&5 +echo "configure:10077: 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 10082 "configure" +#line 10083 "configure" #include "confdefs.h" #undef $cf_name @@ -10088,7 +10089,7 @@ int main() { $cf_name = 2 ; return 0; } EOF -if { (eval echo configure:10092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10093: \"$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 @@ -10121,13 +10122,13 @@ done echo $ac_n "checking if struct utmp is declared""... $ac_c" 1>&6 -echo "configure:10125: checking if struct utmp is declared" >&5 +echo "configure:10126: 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 10131 "configure" +#line 10132 "configure" #include "confdefs.h" #include <sys/types.h> @@ -10136,7 +10137,7 @@ int main() { struct utmp x; char *y = &x.ut_host[0] ; return 0; } EOF -if { (eval echo configure:10140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=yes else @@ -10144,14 +10145,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 10148 "configure" +#line 10149 "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:10155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=utmpx else @@ -10179,13 +10180,13 @@ EOF echo $ac_n "checking if external h_errno exists""... $ac_c" 1>&6 -echo "configure:10183: checking if external h_errno exists" >&5 +echo "configure:10184: 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 10189 "configure" +#line 10190 "configure" #include "confdefs.h" #undef h_errno @@ -10195,7 +10196,7 @@ int main() { h_errno = 2 ; return 0; } EOF -if { (eval echo configure:10199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10200: \"$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 @@ -10226,13 +10227,13 @@ fi echo $ac_n "checking if character set is EBCDIC""... $ac_c" 1>&6 -echo "configure:10230: checking if character set is EBCDIC" >&5 +echo "configure:10231: 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 10236 "configure" +#line 10237 "configure" #include "confdefs.h" int main() { @@ -10245,7 +10246,7 @@ make an error "Character set is not EBCDIC" #endif ; return 0; } EOF -if { (eval echo configure:10249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # TryCompile action if true cf_cv_ebcdic=yes @@ -10279,7 +10280,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:10283: checking if curses supports alternate-character set" >&5 +echo "configure:10284: 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 @@ -10287,7 +10288,7 @@ else for mapname in acs_map _acs_map do cat > conftest.$ac_ext <<EOF -#line 10291 "configure" +#line 10292 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10296,7 +10297,7 @@ int main() { chtype x = $mapname['l']; $mapname['m'] = 0 ; return 0; } EOF -if { (eval echo configure:10300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10301: \"$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 @@ -10319,13 +10320,13 @@ EOF echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6 -echo "configure:10323: checking if curses supports fancy attributes" >&5 +echo "configure:10324: 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 10329 "configure" +#line 10330 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10338,7 +10339,7 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE); ; return 0; } EOF -if { (eval echo configure:10342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_fancy_curses=yes else @@ -10358,7 +10359,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:10362: checking for ncurses version" >&5 +echo "configure:10363: 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 @@ -10383,7 +10384,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:10387: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:10388: \"$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" @@ -10392,7 +10393,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 10396 "configure" +#line 10397 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10415,7 +10416,7 @@ int main() exit(0); } EOF -if { (eval echo configure:10419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10420: \"$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` @@ -10435,13 +10436,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:10439: checking for obsolete/broken version of ncurses" >&5 +echo "configure:10440: 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 10445 "configure" +#line 10446 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10455,7 +10456,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -10480,13 +10481,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:10484: checking if curses supports color attributes" >&5 +echo "configure:10485: 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 10490 "configure" +#line 10491 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10501,7 +10502,7 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:10505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_color_curses=yes else @@ -10528,7 +10529,7 @@ fi echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:10532: checking declaration of size-change" >&5 +echo "configure:10533: 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 @@ -10542,7 +10543,7 @@ do CFLAGS="$cf_save_CFLAGS" test -n "$cf_opts" && CFLAGS="$CFLAGS -D$cf_opts" cat > conftest.$ac_ext <<EOF -#line 10546 "configure" +#line 10547 "configure" #include "confdefs.h" #include <sys/types.h> #if HAVE_TERMIOS_H @@ -10581,7 +10582,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -10613,20 +10614,20 @@ EOF echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6 -echo "configure:10617: checking if ttytype is declared in curses library" >&5 +echo "configure:10618: 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 10623 "configure" +#line 10624 "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:10630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_ttytype=yes else @@ -10647,13 +10648,13 @@ EOF echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:10651: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:10652: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10657 "configure" +#line 10658 "configure" #include "confdefs.h" #include <stdlib.h> @@ -10663,7 +10664,7 @@ int main() { long x = winnstr(stdscr, "", 0) ; return 0; } EOF -if { (eval echo configure:10667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=no else @@ -10671,7 +10672,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 10675 "configure" +#line 10676 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -10682,7 +10683,7 @@ int main() { long x = winnstr(stdscr, "", 0) ; return 0; } EOF -if { (eval echo configure:10686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=yes else @@ -10715,9 +10716,9 @@ do cf_tr_func=`echo $cf_func | tr '[a-z]' '[A-Z]'` echo $ac_n "checking for ${cf_func}""... $ac_c" 1>&6 -echo "configure:10719: checking for ${cf_func}" >&5 +echo "configure:10720: checking for ${cf_func}" >&5 -echo "(line 10721) testing ${cf_func} ..." 1>&5 +echo "(line 10722) testing ${cf_func} ..." 1>&5 if eval "test \"`echo '$''{'cf_cv_func_$cf_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10726,7 +10727,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat > conftest.$ac_ext <<EOF -#line 10730 "configure" +#line 10731 "configure" #include "confdefs.h" #include <curses.h> @@ -10741,7 +10742,7 @@ long foo = (long)(&${cf_func}); ; return 0; } EOF -if { (eval echo configure:10745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -10773,7 +10774,7 @@ fi echo $ac_n "checking if configuration info should be browsable""... $ac_c" 1>&6 -echo "configure:10777: checking if configuration info should be browsable" >&5 +echo "configure:10778: 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 @@ -10797,7 +10798,7 @@ EOF echo $ac_n "checking if new-style forms-based options screen should be used""... $ac_c" 1>&6 -echo "configure:10801: checking if new-style forms-based options screen should be used" >&5 +echo "configure:10802: 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 @@ -10821,7 +10822,7 @@ EOF echo $ac_n "checking if old-style options menu should be used""... $ac_c" 1>&6 -echo "configure:10825: checking if old-style options menu should be used" >&5 +echo "configure:10826: 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 @@ -10845,7 +10846,7 @@ EOF echo $ac_n "checking if experimental address-list page should be used""... $ac_c" 1>&6 -echo "configure:10849: checking if experimental address-list page should be used" >&5 +echo "configure:10850: 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 @@ -10869,7 +10870,7 @@ EOF echo $ac_n "checking if experimental charset-selection logic should be used""... $ac_c" 1>&6 -echo "configure:10873: checking if experimental charset-selection logic should be used" >&5 +echo "configure:10874: checking if experimental charset-selection logic should be used" >&5 # Check whether --enable-charset-choice or --disable-charset-choice was given. if test "${enable_charset_choice+set}" = set; then @@ -10893,7 +10894,7 @@ EOF echo $ac_n "checking if experimental CJK logic should be used""... $ac_c" 1>&6 -echo "configure:10897: checking if experimental CJK logic should be used" >&5 +echo "configure:10898: 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 @@ -10917,7 +10918,7 @@ EOF echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6 -echo "configure:10921: checking if color-style code should be used" >&5 +echo "configure:10922: 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 @@ -10965,7 +10966,7 @@ EOF echo "$ac_t""yes" 1>&6 echo $ac_n "checking for location of style-sheet file""... $ac_c" 1>&6 -echo "configure:10969: checking for location of style-sheet file" >&5 +echo "configure:10970: 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" @@ -10983,7 +10984,7 @@ test ".$cf_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:10987: checking if you want to use default-colors" >&5 +echo "configure:10988: 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 @@ -11008,7 +11009,7 @@ EOF fi echo $ac_n "checking if experimental file-upload logic should be used""... $ac_c" 1>&6 -echo "configure:11012: checking if experimental file-upload logic should be used" >&5 +echo "configure:11013: 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 @@ -11031,8 +11032,37 @@ test $use_file_upload != no && cat >> confdefs.h <<\EOF EOF +echo $ac_n "checking if experimental htmlized lynx.cfg should be built""... $ac_c" 1>&6 +echo "configure:11037: checking if experimental htmlized lynx.cfg should be built" >&5 + +# Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given. +if test "${enable_htmlized_cfg+set}" = set; then + enableval="$enable_htmlized_cfg" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + use_exp_htmlized_cfg=$enableval + else + use_exp_htmlized_cfg=no + fi +else + enableval=no + use_exp_htmlized_cfg=no + +fi + +echo "$ac_t""$use_exp_htmlized_cfg" 1>&6 + +LYNXCFG_MAKE='' +LYNXCFG_URL='' +if test $use_exp_htmlized_cfg = no ; then + LYNXCFG_MAKE='#' + LYNXCFG_URL='http://www.hippo.ru/%7Ehvv/' +fi + + + echo $ac_n "checking if experimental element-justification logic should be used""... $ac_c" 1>&6 -echo "configure:11036: checking if experimental element-justification logic should be used" >&5 +echo "configure:11066: 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 @@ -11056,7 +11086,7 @@ EOF echo $ac_n "checking if experimental keyboard-layout logic should be used""... $ac_c" 1>&6 -echo "configure:11060: checking if experimental keyboard-layout logic should be used" >&5 +echo "configure:11090: 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 @@ -11080,7 +11110,7 @@ EOF echo $ac_n "checking if experimental JavaScript support should be used""... $ac_c" 1>&6 -echo "configure:11084: checking if experimental JavaScript support should be used" >&5 +echo "configure:11114: 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 @@ -11104,7 +11134,7 @@ EOF echo $ac_n "checking if html source should be colorized""... $ac_c" 1>&6 -echo "configure:11108: checking if html source should be colorized" >&5 +echo "configure:11138: checking if html source should be colorized" >&5 # Check whether --enable-prettysrc or --disable-prettysrc was given. if test "${enable_prettysrc+set}" = set; then @@ -11128,7 +11158,7 @@ EOF echo $ac_n "checking if read-progress message should show ETA""... $ac_c" 1>&6 -echo "configure:11132: checking if read-progress message should show ETA" >&5 +echo "configure:11162: 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 @@ -11152,7 +11182,7 @@ EOF echo $ac_n "checking if scrollbar code should be used""... $ac_c" 1>&6 -echo "configure:11156: checking if scrollbar code should be used" >&5 +echo "configure:11186: checking if scrollbar code should be used" >&5 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -11183,7 +11213,7 @@ EOF fi echo $ac_n "checking if source caching should be used""... $ac_c" 1>&6 -echo "configure:11187: checking if source caching should be used" >&5 +echo "configure:11217: 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 @@ -11210,7 +11240,7 @@ EOF echo $ac_n "checking if alternative line-edit bindings should be used""... $ac_c" 1>&6 -echo "configure:11214: checking if alternative line-edit bindings should be used" >&5 +echo "configure:11244: 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 @@ -11234,7 +11264,7 @@ EOF echo $ac_n "checking if you want to use extended HTML DTD logic""... $ac_c" 1>&6 -echo "configure:11238: checking if you want to use extended HTML DTD logic" >&5 +echo "configure:11268: 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 @@ -11258,7 +11288,7 @@ EOF echo $ac_n "checking if partial-display should be used""... $ac_c" 1>&6 -echo "configure:11262: checking if partial-display should be used" >&5 +echo "configure:11292: checking if partial-display should be used" >&5 # Check whether --enable-partial or --disable-partial was given. if test "${enable_partial+set}" = set; then @@ -11282,7 +11312,7 @@ EOF echo $ac_n "checking if you want to use external commands""... $ac_c" 1>&6 -echo "configure:11286: checking if you want to use external commands" >&5 +echo "configure:11316: 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 @@ -11306,7 +11336,7 @@ EOF echo $ac_n "checking if you want to use setfont support""... $ac_c" 1>&6 -echo "configure:11310: checking if you want to use setfont support" >&5 +echo "configure:11340: 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 @@ -11330,7 +11360,7 @@ EOF echo $ac_n "checking if you want cgi-link support""... $ac_c" 1>&6 -echo "configure:11334: checking if you want cgi-link support" >&5 +echo "configure:11364: 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 @@ -11349,7 +11379,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you want change-exec support""... $ac_c" 1>&6 -echo "configure:11353: checking if you want change-exec support" >&5 +echo "configure:11383: 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 @@ -11373,7 +11403,7 @@ EOF echo $ac_n "checking if you want exec-links support""... $ac_c" 1>&6 -echo "configure:11377: checking if you want exec-links support" >&5 +echo "configure:11407: 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 @@ -11397,7 +11427,7 @@ EOF echo $ac_n "checking if you want exec-scripts support""... $ac_c" 1>&6 -echo "configure:11401: checking if you want exec-scripts support" >&5 +echo "configure:11431: 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 @@ -11421,7 +11451,7 @@ EOF echo $ac_n "checking if you want internal-links feature""... $ac_c" 1>&6 -echo "configure:11425: checking if you want internal-links feature" >&5 +echo "configure:11455: 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 @@ -11445,7 +11475,7 @@ EOF echo $ac_n "checking if you want to fork NSL requests""... $ac_c" 1>&6 -echo "configure:11449: checking if you want to fork NSL requests" >&5 +echo "configure:11479: 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 @@ -11469,7 +11499,7 @@ EOF echo $ac_n "checking if you want to log URL requests via syslog""... $ac_c" 1>&6 -echo "configure:11473: checking if you want to log URL requests via syslog" >&5 +echo "configure:11503: 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 @@ -11493,7 +11523,7 @@ EOF echo $ac_n "checking if persistent-cookie logic should be used""... $ac_c" 1>&6 -echo "configure:11497: checking if persistent-cookie logic should be used" >&5 +echo "configure:11527: 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 @@ -11517,7 +11547,7 @@ EOF echo $ac_n "checking if you want to underline links""... $ac_c" 1>&6 -echo "configure:11521: checking if you want to underline links" >&5 +echo "configure:11551: checking if you want to underline links" >&5 # Check whether --enable-underlines or --disable-underlines was given. if test "${enable_underlines+set}" = set; then @@ -11541,7 +11571,7 @@ EOF echo $ac_n "checking if help files should be gzip'ed""... $ac_c" 1>&6 -echo "configure:11545: checking if help files should be gzip'ed" >&5 +echo "configure:11575: 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 @@ -11570,7 +11600,7 @@ fi echo $ac_n "checking if you want to use zlib for decompression of some gzip files""... $ac_c" 1>&6 -echo "configure:11574: checking if you want to use zlib for decompression of some gzip files" >&5 +echo "configure:11604: 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 @@ -11587,12 +11617,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:11591: checking for gzopen" >&5 +echo "configure:11621: 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 11596 "configure" +#line 11626 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gzopen(); below. */ @@ -11615,7 +11645,7 @@ gzopen(); ; return 0; } EOF -if { (eval echo configure:11619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11649: \"$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 @@ -11635,17 +11665,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6 -echo "configure:11639: checking for gzopen in -lz" >&5 +echo "configure:11669: checking for gzopen in -lz" >&5 LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 11642 "configure" +#line 11672 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:11649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11679: \"$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 @@ -11673,17 +11703,17 @@ 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:11677: checking for -lz in $cf_libdir" >&5 +echo "configure:11707: checking for -lz in $cf_libdir" >&5 LIBS="-L$cf_libdir -lz $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 11680 "configure" +#line 11710 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:11687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11717: \"$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 @@ -11719,7 +11749,7 @@ EOF fi echo $ac_n "checking if you want to exclude FINGER code""... $ac_c" 1>&6 -echo "configure:11723: checking if you want to exclude FINGER code" >&5 +echo "configure:11753: 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 @@ -11743,7 +11773,7 @@ EOF echo $ac_n "checking if you want to exclude GOPHER code""... $ac_c" 1>&6 -echo "configure:11747: checking if you want to exclude GOPHER code" >&5 +echo "configure:11777: 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 @@ -11767,7 +11797,7 @@ EOF echo $ac_n "checking if you want to exclude NEWS code""... $ac_c" 1>&6 -echo "configure:11771: checking if you want to exclude NEWS code" >&5 +echo "configure:11801: 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 @@ -11791,7 +11821,7 @@ EOF echo $ac_n "checking if you want to exclude FTP code""... $ac_c" 1>&6 -echo "configure:11795: checking if you want to exclude FTP code" >&5 +echo "configure:11825: 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 @@ -11820,7 +11850,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:11824: checking if directory-editor code should be used" >&5 +echo "configure:11854: 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 @@ -11846,7 +11876,7 @@ EOF echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6 -echo "configure:11850: checking if you wish to allow extracting from archives via DirEd" >&5 +echo "configure:11880: checking if you wish to allow extracting from archives via DirEd" >&5 # Check whether --enable-dired-dearchive or --disable-dired-dearchive was given. if test "${enable_dired_dearchive+set}" = set; then @@ -11865,7 +11895,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if DirEd mode should override keys""... $ac_c" 1>&6 -echo "configure:11869: checking if DirEd mode should override keys" >&5 +echo "configure:11899: checking if DirEd mode should override keys" >&5 # Check whether --enable-dired-override or --disable-dired-override was given. if test "${enable_dired_override+set}" = set; then @@ -11891,7 +11921,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:11895: checking if you wish to allow permissions commands via DirEd" >&5 +echo "configure:11925: 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 @@ -11917,7 +11947,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:11921: checking if you wish to allow executable-permission commands via DirEd" >&5 +echo "configure:11951: 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 @@ -11936,7 +11966,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:11940: checking if you wish to allow "tar" commands from DirEd" >&5 +echo "configure:11970: 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 @@ -11962,7 +11992,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:11966: checking if you wish to allow "uudecode" commands from DirEd" >&5 +echo "configure:11996: 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 @@ -11988,7 +12018,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:11992: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5 +echo "configure:12022: 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 @@ -12014,7 +12044,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:12018: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5 +echo "configure:12048: 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 @@ -12041,7 +12071,7 @@ fi fi echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6 -echo "configure:12045: checking if you want long-directory listings" >&5 +echo "configure:12075: 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 @@ -12067,7 +12097,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6 -echo "configure:12071: checking if parent-directory references are permitted" >&5 +echo "configure:12101: 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 @@ -12087,7 +12117,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:12091: checking if we can include termio.h with curses" >&5 +echo "configure:12121: 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 @@ -12096,7 +12126,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 12100 "configure" +#line 12130 "configure" #include "confdefs.h" #include <LYCurses.h> @@ -12105,7 +12135,7 @@ int main() { putchar(0x0a) ; return 0; } EOF -if { (eval echo configure:12109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_termio_and_curses=yes else @@ -12352,6 +12382,8 @@ s%@PROG_EXT@%$PROG_EXT%g s%@CHARSET_DEFS@%$CHARSET_DEFS%g s%@LIBOBJS@%$LIBOBJS%g s%@INSTALL_LSS@%$INSTALL_LSS%g +s%@LYNXCFG_MAKE@%$LYNXCFG_MAKE%g +s%@LYNXCFG_URL@%$LYNXCFG_URL%g s%@COMPRESS_PROG@%$COMPRESS_PROG%g s%@COMPRESS_EXT@%$COMPRESS_EXT%g s%@CONFIG_SHELL@%$CONFIG_SHELL%g diff --git a/configure.in b/configure.in index 3cf2efac..87968a06 100644 --- a/configure.in +++ b/configure.in @@ -696,6 +696,22 @@ 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 htmlized lynx.cfg should be built) +CF_ARG_ENABLE(htmlized-cfg, +[ --enable-htmlized-cfg build experimental htmlized lynx.cfg], + [use_exp_htmlized_cfg=$enableval], + [use_exp_htmlized_cfg=no]) +AC_MSG_RESULT($use_exp_htmlized_cfg) + +LYNXCFG_MAKE='' +LYNXCFG_URL='' +if test $use_exp_htmlized_cfg = no ; then + LYNXCFG_MAKE='#' + LYNXCFG_URL='http://www.hippo.ru/%7Ehvv/' +fi +AC_SUBST(LYNXCFG_MAKE) +AC_SUBST(LYNXCFG_URL) + AC_MSG_CHECKING(if experimental element-justification logic should be used) CF_ARG_ENABLE(justify-elts, [ --enable-justify-elts use experimental element-justification logic], diff --git a/lynx.cfg b/lynx.cfg index 7cee0b77..092bc60b 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -612,7 +612,7 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html # Showing the cursor is handy if you are a sighted user with a poor # terminal that can't do bold and reverse video at the same time or # at all. It also can be useful to blind users, as an alternative -# or supplement to setting LINKS_AND_FORM_FIELDS_ARE_NUMBERED or +# or supplement to setting LINKS_AND_FIELDS_ARE_NUMBERED or # LINKS_ARE_NUMBERED. # The default defined here or in userdefs.h can be changed via the # 'o'ptions menu and saved in the RC file, and always can be toggled @@ -1268,7 +1268,7 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html # numbers work like arrows or numbered links. # Set to TRUE, indicates numbers act as arrows, # and set to FALSE indicates numbers refer to numbered links on the page. -# LINKS_AND_FORM_FIELDS_ARE_NUMBERED cannot be set by this option because +# LINKS_AND_FIELDS_ARE_NUMBERED cannot be set by this option because # it allows only two values (true and false). # #DEFAULT_KEYPAD_MODE_IS_NUMBERS_AS_ARROWS:TRUE diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html index 15dad208..0088da1e 100644 --- a/lynx_help/Lynx_users_guide.html +++ b/lynx_help/Lynx_users_guide.html @@ -2845,7 +2845,7 @@ file. Earlier CHANGES file can be found in the docs/ subdirectory of this distribution. <p>Information on obtaining the most current version of Lynx is available -at <a href="http://www.slcc.edu/lynx/current/index.html">the current distribution page</a>. +at <a href="http://lynx.isc.org/current/index.html">the current distribution page</a>. <p>[<A HREF="#TOC">ToC</A>] </body> diff --git a/lynx_help/help_files.txt b/lynx_help/help_files.txt index 2352649c..56618d57 100644 --- a/lynx_help/help_files.txt +++ b/lynx_help/help_files.txt @@ -39,10 +39,10 @@ LYNX_DEV=lynx-dev.html # Each link has to contain 'http:' or 'ftp:' otherwise install-help will fail. # LYNX_DEV_ARCHIVE=http://www.flora.org/lynx-dev/html/ -LYNX_DIST=http://www.slcc.edu/lynx/current/index.html +LYNX_DIST=http://lynx.isc.org/current/index.html LYNX_FAQ=http://www.slcc.edu/lynx/faq.html LYNX_FAQ_AL=http://www.access.digex.net/~asgilman/lynx/FAQ/ -LYNX_FAQ_O_MATIC=http://www.slcc.edu/cgi-bin/lynx/fom +LYNX_FAQ_O_MATIC=http://lynx.isc.org/cgi-bin/fom LYNX_HOME=http://lynx.browser.org/ LYNX_SPEECH=http://leb.net/blinux/blynx/ LYNX_SUBIR=http://www.crl.com/~subir/lynx.html diff --git a/lynx_help/lynx-dev.html b/lynx_help/lynx-dev.html index 07abb81b..b5501bc0 100644 --- a/lynx_help/lynx-dev.html +++ b/lynx_help/lynx-dev.html @@ -41,7 +41,7 @@ which are experimental -- though usually stable enough to use -- and appear every few weeks, depending on current activity. You can find the latest <em>development</em> version of Lynx by visiting -<a href="http://sol.slcc.edu/lynx/current">the development site</a>. +<a href="http://lynx.isc.org/current">the development site</a>. <h1><em>Subscribing to Lynx-Dev</em></h1> <p> diff --git a/lynx_help/lynx_help_main.html b/lynx_help/lynx_help_main.html index bb1117a7..76c4264e 100644 --- a/lynx_help/lynx_help_main.html +++ b/lynx_help/lynx_help_main.html @@ -29,7 +29,7 @@ <li><a href="http://www.hippo.ru/%7Ehvv/lynxcfg_toc.html">lynx.cfg options</a> -- a reference for advanced configurations <li><a href="http://www.chass.utoronto.ca/%7Epurslow/lhfb.html">Lynx Help for Beginners</a> -- quick help on many common problems -<li><a href="http://www.slcc.edu/cgi-bin/lynx/fom">The Lynx FAQ-O-Matic</a> -- many common queries, some more advanced; users may add answers. +<li><a href="http://lynx.isc.org/cgi-bin/fom">The Lynx FAQ-O-Matic</a> -- many common queries, some more advanced; users may add answers. <li><a href="http://www.crl.com/%7Esubir/lynx.html">Lynx Links</a> -- source & binaries, FAQs, developers & archives,<br> SSL & security, and more diff --git a/makefile.in b/makefile.in index d67e509c..4206f960 100644 --- a/makefile.in +++ b/makefile.in @@ -231,6 +231,7 @@ clean: @INTLDIR_MAKE@ cd intl && $(MAKE) $@ @MSG_DIR_MAKE@ cd po && $(MAKE) $@ rm -f *.b src/lynx$x *.leaks cfg_defs.h LYHelp.h lint.* + rm -f help_files.sed rm -f core *.core depend: cfg_defs.h LYHelp.h @@ -333,25 +334,34 @@ install-doc : $(DOCDIR) $(HELPDIR) FIX_SED = tr '=' '%' #FIX_SED = cat -install-help : $(HELPDIR) - (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's@/lynx_help$$@@'` && test $$WD != $$HEAD && rm -rf *) - @echo Constructing sed-script +help_files.sed : makefile $(srcdir)/lynx_help/help_files.txt + @echo Constructing sed-script $@ + @-rm -f $@ help_files.tmp + @cat $(srcdir)/lynx_help/help_files.txt > help_files.tmp +@LYNXCFG_MAKE@ @echo 's!http://www.hippo.ru/%7Ehvv/lynxcfg_toc.html#alphatoc!alphatoc.html\$(COMPRESS_EXT)!' >> help_files.tmp +@LYNXCFG_MAKE@ @echo 's!http://www.hippo.ru/%7Ehvv/lynxcfg_toc.html!cattoc.html\$(COMPRESS_EXT)!' >> help_files.tmp @ECHO_CC@sed -e '/^#/d' -e '/^$$/d' \ -e 's%\(.*\)=\(.*\@.*\)$$%s=@\1@=\2=g%' \ -e 's%\(.*\)=\(http:.*\)$$%s=@\1@=\2=g%' \ -e 's%\(.*\)=\(ftp:.*\)$$%s=@\1@=\2=g%' \ -e 's%\(.*\)=\(.*\.html\)$$%s=@\1@=\2$(COMPRESS_EXT)=g%' \ - $(srcdir)/lynx_help/help_files.txt | $(FIX_SED) > \ - $(HELPDIR)/help_files.sed - @echo Appending interim-fix for existing html files + help_files.tmp | $(FIX_SED) > $@ + @echo Appending interim-fix for existing html files to $@ @ECHO_CC@sed -e '/^#/d' -e '/[:@]/d' -e '/^$$/d' \ -e 's%\(.*\)=\(.*\.html\)$$%s=\2=\2$(COMPRESS_EXT)=g%' \ -e 's%\.html=%\\.html=%' \ - $(srcdir)/lynx_help/help_files.txt | $(FIX_SED) >> \ - $(HELPDIR)/help_files.sed - @ECHO_CC@if test -n "$(COMPRESS_EXT)"; then echo 's%\$(COMPRESS_EXT)\$(COMPRESS_EXT)%$(COMPRESS_EXT)%g' >> \ - $(HELPDIR)/help_files.sed; fi + help_files.tmp | $(FIX_SED) >> $@ + @ECHO_CC@if test -n "$(COMPRESS_EXT)"; then echo 's%\$(COMPRESS_EXT)\$(COMPRESS_EXT)%$(COMPRESS_EXT)%g' >> $@; fi + @-rm -f help_files.tmp + +install-help : help_files.sed $(HELPDIR) + (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's@/lynx_help$$@@'` && test $$WD != $$HEAD && rm -rf *) +@LYNXCFG_MAKE@ @echo 'Making htmlized lynx.cfg' +@LYNXCFG_MAKE@ @-rm -f alphatoc.html body.html cattoc.html +@LYNXCFG_MAKE@ perl $(srcdir)/scripts/cfg2html.pl $(srcdir)/lynx.cfg +@LYNXCFG_MAKE@ mv alphatoc.html body.html cattoc.html $(HELPDIR) @echo Translating/copying html files + @cat help_files.sed > $(HELPDIR)/help_files.sed @ECHO_CC@$(SHELL) -c 'cd $(srcdir)/lynx_help && ( \ dirs=keystrokes; \ (cd $(HELPDIR) && mkdir $$dirs 2>/dev/null ) ; \ @@ -363,7 +373,7 @@ install-help : $(HELPDIR) (cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \ fi ; \ )' - -rm -f $(HELPDIR)/help_files.sed + @-rm -f $(HELPDIR)/help_files.sed @echo Updating $(libdir)/lynx.cfg $(SHELL) -c 'if test -f $(LIBDIR)/lynx.cfg ; then \ mv $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.tmp ; \ @@ -381,18 +391,9 @@ install-help : $(HELPDIR) chmod 644 $(LIBDIR)/lynx.cfg -rm -f $(LIBDIR)/lynx.tmp -LYHelp.h : LYHelp.hin - @echo Constructing sed-script - @ECHO_CC@sed -e '/^#/d' -e '/^$$/d' \ - -e 's%\(.*\)=\(.*\@.*\)$$%s=@\1@=\2=g%' \ - -e 's%\(.*\)=\(http:.*\)$$%s=@\1@=\2=g%' \ - -e 's%\(.*\)=\(ftp:.*\)$$%s=@\1@=\2=g%' \ - -e 's%\(.*\)=\(.*\.html\)$$%s=@\1@=\2$(COMPRESS_EXT)=g%' \ - $(srcdir)/lynx_help/help_files.txt | $(FIX_SED) > \ - help_files.sed +LYHelp.h : help_files.sed LYHelp.hin @echo Creating $@ @sed -f help_files.sed $(srcdir)/LYHelp.hin > $@ - -@rm -f help_files.sed @echo '**********************************************' @echo @$(SHELL) -c 'if test "$(COMPRESS_PROG)" = "" ; then \ diff --git a/po/lynx.pot b/po/lynx.pot index 8ba89d8d..ae95afd4 100644 --- a/po/lynx.pot +++ b/po/lynx.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-02-24 22:36-0500\n" +"POT-Creation-Date: 2000-03-11 20:26-0500\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" @@ -2249,14 +2249,14 @@ msgid "" msgstr "" #. #define ENTER_PERIOD_WHEN_DONE_A -#: LYMessages.c:712 src/LYNews.c:397 +#: LYMessages.c:712 src/LYNews.c:399 msgid "" "\n" " When you are done, press enter and put a single period (.)" msgstr "" #. #define ENTER_PERIOD_WHEN_DONE_B -#: LYMessages.c:714 src/LYNews.c:398 +#: LYMessages.c:714 src/LYNews.c:400 msgid "" "\n" " on a line and press enter again." @@ -2849,7 +2849,7 @@ msgstr "" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1070 src/LYMainLoop.c:7565 +#: WWW/Library/Implementation/HTAccess.c:1070 src/LYMainLoop.c:7547 msgid "Can't Access" msgstr "" @@ -2857,20 +2857,20 @@ msgstr "" msgid "Unable to access document." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:767 +#: WWW/Library/Implementation/HTFTP.c:766 #, c-format msgid "Enter password for user %s@%s:" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:795 +#: WWW/Library/Implementation/HTFTP.c:794 msgid "Unable to connect to FTP host." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:1053 +#: WWW/Library/Implementation/HTFTP.c:1052 msgid "close master socket" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:1093 +#: WWW/Library/Implementation/HTFTP.c:1092 msgid "socket for master socket" msgstr "" @@ -2879,25 +2879,25 @@ msgstr "" #. ** knowing if it is symbolic? I think so since #. ** it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1542 -#: WWW/Library/Implementation/HTFTP.c:2173 +#: WWW/Library/Implementation/HTFTP.c:1540 +#: WWW/Library/Implementation/HTFTP.c:2160 msgid "Symbolic Link" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:2534 +#: WWW/Library/Implementation/HTFTP.c:2521 msgid "Receiving FTP directory." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:2677 +#: WWW/Library/Implementation/HTFTP.c:2664 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:2939 +#: WWW/Library/Implementation/HTFTP.c:2926 msgid "connect for data" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:3537 +#: WWW/Library/Implementation/HTFTP.c:3520 msgid "Receiving FTP file." msgstr "" @@ -2930,44 +2930,44 @@ msgstr "" msgid "No response from finger server." msgstr "" -#: WWW/Library/Implementation/HTGopher.c:1729 +#: WWW/Library/Implementation/HTGopher.c:1727 msgid "Unable to access document!" msgstr "" -#: WWW/Library/Implementation/HTNews.c:364 +#: WWW/Library/Implementation/HTNews.c:361 #, c-format msgid "Username for news host '%s':" msgstr "" -#: WWW/Library/Implementation/HTNews.c:418 +#: WWW/Library/Implementation/HTNews.c:415 msgid "Change username?" msgstr "" -#: WWW/Library/Implementation/HTNews.c:422 +#: WWW/Library/Implementation/HTNews.c:419 msgid "Username:" msgstr "" -#: WWW/Library/Implementation/HTNews.c:449 +#: WWW/Library/Implementation/HTNews.c:443 #, c-format msgid "Password for news host '%s':" msgstr "" -#: WWW/Library/Implementation/HTNews.c:533 +#: WWW/Library/Implementation/HTNews.c:527 msgid "Change password?" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1702 +#: WWW/Library/Implementation/HTNews.c:1697 #, c-format msgid "No matches for: %s" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1754 +#: WWW/Library/Implementation/HTNews.c:1750 msgid "" "\n" "No articles in this group.\n" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1767 +#: WWW/Library/Implementation/HTNews.c:1763 msgid "" "\n" "No articles in this range.\n" @@ -2976,16 +2976,16 @@ msgstr "" #. #. ** Set window title. #. -#: WWW/Library/Implementation/HTNews.c:1780 +#: WWW/Library/Implementation/HTNews.c:1776 #, c-format msgid "%s, Articles %d-%d" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1802 +#: WWW/Library/Implementation/HTNews.c:1798 msgid "Earlier articles" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1815 +#: WWW/Library/Implementation/HTNews.c:1811 #, c-format msgid "" "\n" @@ -2993,41 +2993,41 @@ msgid "" "\n" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1875 +#: WWW/Library/Implementation/HTNews.c:1871 msgid "All available articles in " msgstr "" -#: WWW/Library/Implementation/HTNews.c:2091 +#: WWW/Library/Implementation/HTNews.c:2087 msgid "Later articles" msgstr "" -#: WWW/Library/Implementation/HTNews.c:2115 +#: WWW/Library/Implementation/HTNews.c:2111 msgid "Post to " msgstr "" -#: WWW/Library/Implementation/HTNews.c:2295 +#: WWW/Library/Implementation/HTNews.c:2290 msgid "This client does not contain support for SNEWS URLs." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2502 +#: WWW/Library/Implementation/HTNews.c:2497 msgid "No target for raw text!" msgstr "" -#: WWW/Library/Implementation/HTNews.c:2532 +#: WWW/Library/Implementation/HTNews.c:2527 msgid "Connecting to NewsHost ..." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2566 +#: WWW/Library/Implementation/HTNews.c:2561 #, c-format msgid "Could not access %s." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2618 +#: WWW/Library/Implementation/HTNews.c:2613 #, c-format msgid "Can't read news info. News host %.20s responded: %.200s" msgstr "" -#: WWW/Library/Implementation/HTNews.c:2622 +#: WWW/Library/Implementation/HTNews.c:2617 #, c-format msgid "Can't read news info, empty response from host %s" msgstr "" @@ -3035,34 +3035,34 @@ msgstr "" #. #. ** List available newsgroups. - FM #. -#: WWW/Library/Implementation/HTNews.c:2826 +#: WWW/Library/Implementation/HTNews.c:2821 msgid "Reading list of available newsgroups." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2848 +#: WWW/Library/Implementation/HTNews.c:2843 msgid "Reading list of articles in newsgroup." msgstr "" #. #. ** Get an article from a news group. - FM #. -#: WWW/Library/Implementation/HTNews.c:2854 +#: WWW/Library/Implementation/HTNews.c:2849 msgid "Reading news article." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2884 +#: WWW/Library/Implementation/HTNews.c:2879 msgid "Sorry, could not load requested news." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1230 +#: WWW/Library/Implementation/HTTCP.c:1215 msgid "Address has invalid port" msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1331 +#: WWW/Library/Implementation/HTTCP.c:1316 msgid "Address length looks invalid" msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1489 +#: WWW/Library/Implementation/HTTCP.c:1474 #, c-format msgid "Looking up %s." msgstr "" @@ -3071,39 +3071,39 @@ msgstr "" #. * immediately; but not HTAlert, because typically #. * there will be other alerts from the callers. - kw #. -#: WWW/Library/Implementation/HTTCP.c:1499 +#: WWW/Library/Implementation/HTTCP.c:1484 #: WWW/Library/Implementation/HTTelnet.c:103 #, c-format msgid "Invalid hostname %s" msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1502 +#: WWW/Library/Implementation/HTTCP.c:1487 #, c-format msgid "Unable to locate remote host %s." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1512 +#: WWW/Library/Implementation/HTTCP.c:1497 #, c-format msgid "Making %s connection to %s." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1522 +#: WWW/Library/Implementation/HTTCP.c:1507 msgid "socket failed." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1541 +#: WWW/Library/Implementation/HTTCP.c:1526 msgid "Could not make connection non-blocking." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1602 +#: WWW/Library/Implementation/HTTCP.c:1583 msgid "Connection failed (too many retries)." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1775 +#: WWW/Library/Implementation/HTTCP.c:1746 msgid "Could not restore socket to blocking." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1837 +#: WWW/Library/Implementation/HTTCP.c:1808 msgid "Socket read failed for 180,000 tries." msgstr "" @@ -3115,19 +3115,19 @@ msgstr "" msgid "Unable to connect to remote host." msgstr "" -#: WWW/Library/Implementation/HTTP.c:802 +#: WWW/Library/Implementation/HTTP.c:785 msgid "Sending HTTP request." msgstr "" -#: WWW/Library/Implementation/HTTP.c:835 +#: WWW/Library/Implementation/HTTP.c:819 msgid "Unexpected network write error; connection aborted." msgstr "" -#: WWW/Library/Implementation/HTTP.c:841 +#: WWW/Library/Implementation/HTTP.c:825 msgid "HTTP request sent; waiting for response." msgstr "" -#: WWW/Library/Implementation/HTTP.c:905 +#: WWW/Library/Implementation/HTTP.c:889 msgid "Unexpected network read error; connection aborted." msgstr "" @@ -3141,7 +3141,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:1101 +#: WWW/Library/Implementation/HTTP.c:1085 msgid "Got unexpected Informational Status." msgstr "" @@ -3152,7 +3152,7 @@ msgstr "" #. * user to do that, and restore the current #. * document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1136 +#: WWW/Library/Implementation/HTTP.c:1120 msgid "Request fulfilled. Reset Content." msgstr "" @@ -3163,27 +3163,27 @@ msgstr "" #. * with it by showing the full header to the user #. * as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1226 +#: WWW/Library/Implementation/HTTP.c:1210 msgid "Got unexpected 304 Not Modified status." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1293 +#: WWW/Library/Implementation/HTTP.c:1277 msgid "Redirection of POST content requires user approval." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1308 +#: WWW/Library/Implementation/HTTP.c:1292 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1353 +#: WWW/Library/Implementation/HTTP.c:1337 msgid "Retrying with access authorization information." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1358 +#: WWW/Library/Implementation/HTTP.c:1342 msgid "Show the 401 message body?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1403 +#: WWW/Library/Implementation/HTTP.c:1387 msgid "Show the 407 message body?" msgstr "" @@ -3192,7 +3192,7 @@ msgstr "" #. ** Take a chance and hope there is #. ** something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1508 +#: WWW/Library/Implementation/HTTP.c:1492 msgid "Unknown status reply from server!" msgstr "" @@ -3201,172 +3201,172 @@ msgstr "" msgid "remote %s session:" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:165 +#: WWW/Library/Implementation/HTWAIS.c:166 msgid "Could not connect to WAIS server." msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:174 +#: WWW/Library/Implementation/HTWAIS.c:175 msgid "Could not open WAIS connection for reading." msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:198 +#: WWW/Library/Implementation/HTWAIS.c:199 msgid "Diagnostic code is " msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:470 +#: WWW/Library/Implementation/HTWAIS.c:471 msgid "Index " msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:474 +#: WWW/Library/Implementation/HTWAIS.c:475 #, c-format msgid " contains the following %d item%s relevant to \"" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:482 +#: WWW/Library/Implementation/HTWAIS.c:483 msgid "The first figure after each entry is its relative score, " msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:483 +#: WWW/Library/Implementation/HTWAIS.c:484 msgid "the second is the number of lines in the item." msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:524 +#: WWW/Library/Implementation/HTWAIS.c:525 msgid " (bad file name)" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:546 +#: WWW/Library/Implementation/HTWAIS.c:550 msgid "(bad doc id)" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:562 +#: WWW/Library/Implementation/HTWAIS.c:566 msgid "(Short Header record, can't display)" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:569 +#: WWW/Library/Implementation/HTWAIS.c:573 msgid "" "\n" "Long Header record, can't display\n" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:576 +#: WWW/Library/Implementation/HTWAIS.c:580 msgid "" "\n" "Text record\n" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:585 +#: WWW/Library/Implementation/HTWAIS.c:589 msgid "" "\n" "Headline record, can't display\n" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:593 +#: WWW/Library/Implementation/HTWAIS.c:597 msgid "" "\n" "Code record, can't display\n" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:697 +#: WWW/Library/Implementation/HTWAIS.c:701 msgid "Syntax error in WAIS URL" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:769 +#: WWW/Library/Implementation/HTWAIS.c:773 msgid " (WAIS Index)" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:776 +#: WWW/Library/Implementation/HTWAIS.c:780 msgid "WAIS Index: " msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:782 +#: WWW/Library/Implementation/HTWAIS.c:786 msgid "This is a link for searching the " msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:786 +#: WWW/Library/Implementation/HTWAIS.c:790 msgid " WAIS Index.\n" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:812 +#: WWW/Library/Implementation/HTWAIS.c:817 msgid "" "\n" "Enter the 's'earch command and then specify search words.\n" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:834 +#: WWW/Library/Implementation/HTWAIS.c:839 msgid " (in " msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:843 +#: WWW/Library/Implementation/HTWAIS.c:848 msgid "WAIS Search of \"" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:847 +#: WWW/Library/Implementation/HTWAIS.c:852 msgid "\" in: " msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:862 +#: WWW/Library/Implementation/HTWAIS.c:867 msgid "HTWAIS: Request too large." msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:871 +#: WWW/Library/Implementation/HTWAIS.c:876 msgid "Searching WAIS database..." msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:881 +#: WWW/Library/Implementation/HTWAIS.c:886 msgid "Search interrupted." msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:931 +#: WWW/Library/Implementation/HTWAIS.c:936 msgid "Can't convert format of WAIS document" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:975 +#: WWW/Library/Implementation/HTWAIS.c:980 msgid "HTWAIS: Request too long." msgstr "" #. #. ** Actually do the transaction given by request_message. #. -#: WWW/Library/Implementation/HTWAIS.c:989 +#: WWW/Library/Implementation/HTWAIS.c:994 msgid "Fetching WAIS document..." msgstr "" #. display_search_response(target, retrieval_response, #. wais_database, keywords); -#: WWW/Library/Implementation/HTWAIS.c:1028 +#: WWW/Library/Implementation/HTWAIS.c:1033 msgid "No text was returned!\n" msgstr "" -#: WWW/Library/Implementation/HTWSRC.c:285 +#: WWW/Library/Implementation/HTWSRC.c:289 msgid " NOT GIVEN in source file; " msgstr "" -#: WWW/Library/Implementation/HTWSRC.c:309 +#: WWW/Library/Implementation/HTWSRC.c:313 msgid " WAIS source file" msgstr "" -#: WWW/Library/Implementation/HTWSRC.c:316 +#: WWW/Library/Implementation/HTWSRC.c:320 msgid " description" msgstr "" -#: WWW/Library/Implementation/HTWSRC.c:326 +#: WWW/Library/Implementation/HTWSRC.c:330 msgid "Access links" msgstr "" -#: WWW/Library/Implementation/HTWSRC.c:343 +#: WWW/Library/Implementation/HTWSRC.c:347 msgid "Direct access" msgstr "" #. * Proxy will be used if defined, so let user know that - FM * -#: WWW/Library/Implementation/HTWSRC.c:346 +#: WWW/Library/Implementation/HTWSRC.c:350 msgid " (or via proxy server, if defined)" msgstr "" -#: WWW/Library/Implementation/HTWSRC.c:360 +#: WWW/Library/Implementation/HTWSRC.c:365 msgid "Maintainer" msgstr "" -#: WWW/Library/Implementation/HTWSRC.c:368 +#: WWW/Library/Implementation/HTWSRC.c:373 msgid "Host" msgstr "" @@ -3477,7 +3477,7 @@ msgstr "" msgid "Very long lines have been truncated!" msgstr "" -#: src/HTAlert.c:187 src/HTAlert.c:389 src/LYShowInfo.c:290 +#: src/HTAlert.c:187 src/HTAlert.c:389 src/LYShowInfo.c:287 msgid "bytes" msgstr "" @@ -3748,7 +3748,7 @@ msgstr "" msgid "Local additions:" msgstr "" -#: src/LYDownload.c:566 src/LYUpload.c:229 +#: src/LYDownload.c:566 src/LYUpload.c:230 msgid "No Name Given" msgstr "" @@ -3998,7 +3998,7 @@ msgstr "" msgid "Specify permissions below:" msgstr "" -#: src/LYLocal.c:1155 src/LYShowInfo.c:169 +#: src/LYLocal.c:1155 src/LYShowInfo.c:165 msgid "Owner:" msgstr "" @@ -4113,47 +4113,47 @@ msgstr "" msgid "Probable failure to %s due to system error!" msgstr "" -#: src/LYMail.c:879 +#: src/LYMail.c:859 #, c-format msgid "The link %s :?: %s \n" msgstr "" -#: src/LYMail.c:881 +#: src/LYMail.c:861 #, c-format msgid "called \"%s\"\n" msgstr "" -#: src/LYMail.c:882 +#: src/LYMail.c:862 #, c-format msgid "in the file \"%s\" called \"%s\"\n" msgstr "" -#: src/LYMail.c:883 +#: src/LYMail.c:863 msgid "was requested but was not available." msgstr "" -#: src/LYMail.c:884 +#: src/LYMail.c:864 msgid "Thought you might want to know." msgstr "" -#: src/LYMail.c:886 +#: src/LYMail.c:866 msgid "This message was automatically generated by" msgstr "" -#: src/LYMail.c:887 +#: src/LYMail.c:867 #, c-format msgid "Lynx ver. %s" msgstr "" -#: src/LYMail.c:1504 +#: src/LYMail.c:1469 msgid "Personal_name: " msgstr "" -#: src/LYMail.c:1506 +#: src/LYMail.c:1471 msgid "X_Personal_name: " msgstr "" -#: src/LYMail.c:1509 +#: src/LYMail.c:1474 msgid "Personal Name: " msgstr "" @@ -4165,7 +4165,7 @@ msgstr "" msgid "You MUST define a valid TMP or TEMP area!\n" msgstr "" -#: src/LYMain.c:1399 +#: src/LYMain.c:1395 #, c-format msgid "" "\n" @@ -4173,21 +4173,21 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1415 +#: src/LYMain.c:1411 msgid "" "\n" "Lynx character sets not declared.\n" "\n" msgstr "" -#: src/LYMain.c:1439 +#: src/LYMain.c:1435 msgid "" "\n" "Lynx edit map not declared.\n" "\n" msgstr "" -#: src/LYMain.c:1482 +#: src/LYMain.c:1478 #, c-format msgid "" "\n" @@ -4195,56 +4195,56 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1711 +#: src/LYMain.c:1707 msgid "Warning:" msgstr "" -#: src/LYMain.c:2264 +#: src/LYMain.c:2260 msgid "persistent cookies state will be changed in next session only." msgstr "" -#: src/LYMain.c:2543 +#: src/LYMain.c:2539 #, c-format msgid "Lynx: ignoring unrecognized charset=%s\n" msgstr "" -#: src/LYMain.c:3029 +#: src/LYMain.c:3025 #, c-format msgid "" "\n" "%s Version %s (%.*s)\n" msgstr "" -#: src/LYMain.c:3041 +#: src/LYMain.c:3037 #, c-format msgid "Built on %s %s %s\n" msgstr "" -#: src/LYMain.c:3045 +#: src/LYMain.c:3041 msgid "" "Copyrights held by the University of Kansas, CERN, and other contributors.\n" msgstr "" -#: src/LYMain.c:3047 +#: src/LYMain.c:3043 msgid "Distributed under the GNU General Public License.\n" msgstr "" -#: src/LYMain.c:3049 +#: src/LYMain.c:3045 msgid "" "See http://lynx.browser.org/ and the online help for more information.\n" "\n" msgstr "" -#: src/LYMain.c:3726 +#: src/LYMain.c:3722 #, c-format msgid "USAGE: %s [options] [file]\n" msgstr "" -#: src/LYMain.c:3727 +#: src/LYMain.c:3723 msgid "Options are:\n" msgstr "" -#: src/LYMain.c:3964 +#: src/LYMain.c:3960 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "" @@ -4268,57 +4268,57 @@ msgstr "" #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3068 +#: src/LYMainLoop.c:3056 msgid "Help Screen" msgstr "" -#: src/LYMainLoop.c:3209 +#: src/LYMainLoop.c:3197 msgid "System Index" msgstr "" -#: src/LYMainLoop.c:3595 src/LYMainLoop.c:5152 +#: src/LYMainLoop.c:3583 src/LYMainLoop.c:5136 msgid "Entry into main screen" msgstr "" -#: src/LYMainLoop.c:4170 +#: src/LYMainLoop.c:4158 msgid "charset for this document specified explicitly, sorry..." msgstr "" -#: src/LYMainLoop.c:6106 +#: src/LYMainLoop.c:6088 msgid "Reparsing document under current settings..." msgstr "" -#: src/LYMainLoop.c:6394 src/LYMainLoop.c:6398 +#: src/LYMainLoop.c:6376 src/LYMainLoop.c:6380 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "" -#: src/LYMainLoop.c:7442 src/LYMainLoop.c:7617 +#: src/LYMainLoop.c:7424 src/LYMainLoop.c:7605 msgid "-index-" msgstr "" -#: src/LYMainLoop.c:7484 +#: src/LYMainLoop.c:7466 msgid "Inactive text input, activate to edit (e.g., press ENTER)" msgstr "" -#: src/LYMainLoop.c:7560 +#: src/LYMainLoop.c:7542 msgid "lynx: Can't access startfile" msgstr "" -#: src/LYMainLoop.c:7573 +#: src/LYMainLoop.c:7555 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "" -#: src/LYMainLoop.c:7574 +#: src/LYMainLoop.c:7556 msgid " Exiting..." msgstr "" -#: src/LYMainLoop.c:7615 +#: src/LYMainLoop.c:7599 msgid "-more-" msgstr "" #. Enable scrolling. -#: src/LYNews.c:205 +#: src/LYNews.c:206 msgid "You will be posting to:" msgstr "" @@ -4326,7 +4326,7 @@ msgstr "" #. * Get the mail address for the From header, #. * offering personal_mail_address as default. #. -#: src/LYNews.c:214 +#: src/LYNews.c:215 msgid "" "\n" "\n" @@ -4338,14 +4338,14 @@ msgstr "" #. * document's title as the default if this is a #. * followup rather than a new post. - FM #. -#: src/LYNews.c:233 +#: src/LYNews.c:234 msgid "" "\n" "\n" " Please provide or edit the Subject: header\n" msgstr "" -#: src/LYNews.c:324 +#: src/LYNews.c:325 msgid "" "\n" "\n" @@ -4355,14 +4355,14 @@ msgstr "" #. #. * Use the built in line editior. #. -#: src/LYNews.c:396 +#: src/LYNews.c:398 msgid "" "\n" "\n" " Please enter your message below." msgstr "" -#: src/LYNews.c:442 +#: src/LYNews.c:444 msgid "Message has no original text!" msgstr "" @@ -4374,93 +4374,93 @@ msgstr "" msgid "B)ookmark file: " msgstr "" -#: src/LYOptions.c:2384 +#: src/LYOptions.c:2390 msgid "Left mouse button or return to select, arrow keys to scroll." msgstr "" -#: src/LYOptions.c:3604 src/LYOptions.c:3628 +#: src/LYOptions.c:3593 src/LYOptions.c:3617 #, c-format msgid "Use %s to invoke the Options menu!" msgstr "" -#: src/LYOptions.c:4235 +#: src/LYOptions.c:4224 msgid "Personal Preferences" msgstr "" #. Cookies: SELECT #. @@@ This is inconsistent - LYAcceptAllCookies gets saved to RC file #. but LYSetCookies doesn't! -#: src/LYOptions.c:4240 +#: src/LYOptions.c:4229 msgid "Cookies" msgstr "" #. Editor: INPUT -#: src/LYOptions.c:4254 +#: src/LYOptions.c:4243 msgid "Editor" msgstr "" #. Emacs keys: ON/OFF -#: src/LYOptions.c:4259 +#: src/LYOptions.c:4248 msgid "Emacs keys" msgstr "" #. Keypad Mode: SELECT -#: src/LYOptions.c:4265 +#: src/LYOptions.c:4254 msgid "Keypad mode" msgstr "" #. Mail Address: INPUT -#: src/LYOptions.c:4295 +#: src/LYOptions.c:4284 msgid "Personal mail address" msgstr "" #. Search Type: SELECT -#: src/LYOptions.c:4300 +#: src/LYOptions.c:4289 msgid "Searching type" msgstr "" -#: src/LYOptions.c:4308 +#: src/LYOptions.c:4297 msgid "Show color" msgstr "" #. Show cursor: ON/OFF -#: src/LYOptions.c:4332 +#: src/LYOptions.c:4321 msgid "Show cursor" msgstr "" #. User Mode: SELECT -#: src/LYOptions.c:4338 +#: src/LYOptions.c:4327 msgid "User mode" msgstr "" #. VI Keys: ON/OFF -#: src/LYOptions.c:4344 +#: src/LYOptions.c:4333 msgid "VI keys" msgstr "" #. Visited Pages: SELECT -#: src/LYOptions.c:4350 +#: src/LYOptions.c:4339 msgid "Visited Pages" msgstr "" #. Display Character Set: SELECT -#: src/LYOptions.c:4356 +#: src/LYOptions.c:4345 msgid "Display character set" msgstr "" #. X Display: INPUT -#: src/LYOptions.c:4372 +#: src/LYOptions.c:4361 msgid "X Display" msgstr "" #. #. * Document Layout #. -#: src/LYOptions.c:4378 +#: src/LYOptions.c:4367 msgid "Document Layout" msgstr "" -#: src/LYOptions.c:4395 +#: src/LYOptions.c:4384 msgid "Assumed document character set" msgstr "" @@ -4469,93 +4469,93 @@ 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:4415 +#: src/LYOptions.c:4404 msgid "CJK mode" msgstr "" -#: src/LYOptions.c:4417 +#: src/LYOptions.c:4406 msgid "Raw 8-bit" msgstr "" #. HTML error recovery: SELECT -#: src/LYOptions.c:4426 +#: src/LYOptions.c:4415 msgid "HTML error recovery" msgstr "" #. Select Popups: ON/OFF -#: src/LYOptions.c:4433 +#: src/LYOptions.c:4422 msgid "Popups for select fields" msgstr "" #. Show Images: SELECT -#: src/LYOptions.c:4439 +#: src/LYOptions.c:4428 msgid "Show images" msgstr "" #. Verbose Images: ON/OFF -#: src/LYOptions.c:4453 +#: src/LYOptions.c:4442 msgid "Verbose images" msgstr "" #. #. * Bookmark Options #. -#: src/LYOptions.c:4461 +#: src/LYOptions.c:4450 msgid "Bookmark Options" msgstr "" -#: src/LYOptions.c:4465 +#: src/LYOptions.c:4454 msgid "Multi-bookmarks" msgstr "" -#: src/LYOptions.c:4482 +#: src/LYOptions.c:4471 msgid "Review/edit Bookmarks files" msgstr "" -#: src/LYOptions.c:4484 +#: src/LYOptions.c:4473 msgid "Goto multi-bookmark menu" msgstr "" -#: src/LYOptions.c:4487 +#: src/LYOptions.c:4476 msgid "Bookmarks file" msgstr "" #. FTP sort: SELECT -#: src/LYOptions.c:4498 +#: src/LYOptions.c:4487 msgid "FTP sort criteria" msgstr "" #. Local Directory Sort: SELECT -#: src/LYOptions.c:4505 +#: src/LYOptions.c:4494 msgid "Local directory sort criteria" msgstr "" -#: src/LYOptions.c:4513 +#: src/LYOptions.c:4502 msgid "Show dot files" msgstr "" -#: src/LYOptions.c:4521 +#: src/LYOptions.c:4510 msgid "Execution links" msgstr "" #. #. * Headers transferred to remote server #. -#: src/LYOptions.c:4542 +#: src/LYOptions.c:4531 msgid "Headers transferred to remote server" msgstr "" #. Preferred Document Character Set: INPUT -#: src/LYOptions.c:4545 +#: src/LYOptions.c:4534 msgid "Preferred document character set" msgstr "" #. Preferred Document Language: INPUT -#: src/LYOptions.c:4550 +#: src/LYOptions.c:4539 msgid "Preferred document language" msgstr "" -#: src/LYOptions.c:4556 +#: src/LYOptions.c:4545 msgid "User-Agent header" msgstr "" @@ -4637,257 +4637,257 @@ msgstr "" msgid "Offending line:" msgstr "" -#: src/LYReadCFG.c:691 +#: src/LYReadCFG.c:711 #, c-format msgid "key remapping of %s to %s for %s failed\n" msgstr "" -#: src/LYReadCFG.c:698 +#: src/LYReadCFG.c:718 #, c-format msgid "key remapping of %s to %s failed\n" msgstr "" -#: src/LYReadCFG.c:719 +#: src/LYReadCFG.c:739 #, c-format msgid "invalid line-editor selection %s for key %s, selecting all\n" msgstr "" -#: src/LYReadCFG.c:746 src/LYReadCFG.c:759 +#: src/LYReadCFG.c:766 src/LYReadCFG.c:779 #, c-format msgid "" "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n" msgstr "" -#: src/LYReadCFG.c:764 +#: src/LYReadCFG.c:784 #, c-format msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n" msgstr "" -#: src/LYReadCFG.c:869 +#: src/LYReadCFG.c:889 #, c-format msgid "Lynx: cannot start, CERN rules file %s is not available\n" msgstr "" -#: src/LYReadCFG.c:871 +#: src/LYReadCFG.c:891 msgid "(no name)" msgstr "" -#: src/LYReadCFG.c:1651 +#: src/LYReadCFG.c:1660 #, c-format msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n" msgstr "" -#: src/LYReadCFG.c:1653 +#: src/LYReadCFG.c:1662 #, c-format msgid "Last attempted include was '%s',\n" msgstr "" -#: src/LYReadCFG.c:1654 +#: src/LYReadCFG.c:1663 #, c-format msgid "included from '%s'.\n" msgstr "" -#: src/LYReadCFG.c:2156 src/LYReadCFG.c:2169 src/LYReadCFG.c:2205 +#: src/LYReadCFG.c:2165 src/LYReadCFG.c:2178 src/LYReadCFG.c:2214 msgid "The following is read from your lynx.cfg file." msgstr "" -#: src/LYReadCFG.c:2157 src/LYReadCFG.c:2170 +#: src/LYReadCFG.c:2166 src/LYReadCFG.c:2179 msgid "Please read the distribution" msgstr "" -#: src/LYReadCFG.c:2163 src/LYReadCFG.c:2173 +#: src/LYReadCFG.c:2172 src/LYReadCFG.c:2182 msgid "for more comments." msgstr "" -#: src/LYReadCFG.c:2187 +#: src/LYReadCFG.c:2196 msgid "RELOAD THE CHANGES" msgstr "" -#: src/LYReadCFG.c:2196 +#: src/LYReadCFG.c:2205 msgid "Your primary configuration" msgstr "" -#: src/LYShowInfo.c:99 +#: src/LYShowInfo.c:98 msgid "Directory that you are currently viewing" msgstr "" -#: src/LYShowInfo.c:105 +#: src/LYShowInfo.c:101 msgid "Name:" msgstr "" -#: src/LYShowInfo.c:106 +#: src/LYShowInfo.c:104 msgid "URL:" msgstr "" -#: src/LYShowInfo.c:119 +#: src/LYShowInfo.c:115 msgid "Directory that you have currently selected" msgstr "" -#: src/LYShowInfo.c:122 +#: src/LYShowInfo.c:118 msgid "File that you have currently selected" msgstr "" -#: src/LYShowInfo.c:126 +#: src/LYShowInfo.c:122 msgid "Symbolic link that you have currently selected" msgstr "" -#: src/LYShowInfo.c:130 +#: src/LYShowInfo.c:126 msgid "Item that you have currently selected" msgstr "" -#: src/LYShowInfo.c:132 +#: src/LYShowInfo.c:128 msgid "Full name:" msgstr "" -#: src/LYShowInfo.c:141 +#: src/LYShowInfo.c:137 msgid "Unable to follow link" msgstr "" -#: src/LYShowInfo.c:143 +#: src/LYShowInfo.c:139 msgid "Points to file:" msgstr "" -#: src/LYShowInfo.c:148 +#: src/LYShowInfo.c:144 msgid "Name of owner:" msgstr "" -#: src/LYShowInfo.c:151 +#: src/LYShowInfo.c:147 msgid "Group name:" msgstr "" -#: src/LYShowInfo.c:154 +#: src/LYShowInfo.c:150 msgid "File size:" msgstr "" -#: src/LYShowInfo.c:160 +#: src/LYShowInfo.c:156 msgid "Creation date:" msgstr "" -#: src/LYShowInfo.c:163 +#: src/LYShowInfo.c:159 msgid "Last modified:" msgstr "" -#: src/LYShowInfo.c:166 +#: src/LYShowInfo.c:162 msgid "Last accessed:" msgstr "" -#: src/LYShowInfo.c:168 +#: src/LYShowInfo.c:164 msgid "Access Permissions" msgstr "" -#: src/LYShowInfo.c:233 +#: src/LYShowInfo.c:230 msgid "File that you are currently viewing" msgstr "" -#: src/LYShowInfo.c:238 src/LYShowInfo.c:347 +#: src/LYShowInfo.c:235 src/LYShowInfo.c:344 msgid "Linkname:" msgstr "" -#: src/LYShowInfo.c:251 src/LYShowInfo.c:263 +#: src/LYShowInfo.c:248 src/LYShowInfo.c:260 msgid "Charset:" msgstr "" -#: src/LYShowInfo.c:269 +#: src/LYShowInfo.c:266 msgid "Server:" msgstr "" -#: src/LYShowInfo.c:272 +#: src/LYShowInfo.c:269 msgid "Date:" msgstr "" -#: src/LYShowInfo.c:275 +#: src/LYShowInfo.c:272 msgid "Last Mod:" msgstr "" -#: src/LYShowInfo.c:281 +#: src/LYShowInfo.c:278 msgid " Expires:" msgstr "" -#: src/LYShowInfo.c:285 +#: src/LYShowInfo.c:282 msgid "Cache-Control:" msgstr "" -#: src/LYShowInfo.c:289 +#: src/LYShowInfo.c:286 msgid "Content-Length:" msgstr "" -#: src/LYShowInfo.c:294 +#: src/LYShowInfo.c:291 msgid "Language:" msgstr "" -#: src/LYShowInfo.c:301 +#: src/LYShowInfo.c:298 msgid "Post Data:" msgstr "" -#: src/LYShowInfo.c:303 +#: src/LYShowInfo.c:300 msgid "Post Content Type:" msgstr "" -#: src/LYShowInfo.c:312 +#: src/LYShowInfo.c:309 msgid "Owner(s):" msgstr "" -#: src/LYShowInfo.c:315 +#: src/LYShowInfo.c:312 msgid "size:" msgstr "" -#: src/LYShowInfo.c:315 +#: src/LYShowInfo.c:312 msgid "lines" msgstr "" -#: src/LYShowInfo.c:318 +#: src/LYShowInfo.c:315 msgid "mode:" msgstr "" -#: src/LYShowInfo.c:320 +#: src/LYShowInfo.c:317 msgid "forms mode" msgstr "" -#: src/LYShowInfo.c:322 +#: src/LYShowInfo.c:319 msgid "source" msgstr "" -#: src/LYShowInfo.c:322 +#: src/LYShowInfo.c:319 msgid "normal" msgstr "" -#: src/LYShowInfo.c:323 +#: src/LYShowInfo.c:320 msgid ", safe" msgstr "" -#: src/LYShowInfo.c:324 +#: src/LYShowInfo.c:321 msgid ", via internal link" msgstr "" -#: src/LYShowInfo.c:330 +#: src/LYShowInfo.c:327 msgid ", no-cache" msgstr "" -#: src/LYShowInfo.c:332 +#: src/LYShowInfo.c:329 msgid ", ISMAP script" msgstr "" -#: src/LYShowInfo.c:334 +#: src/LYShowInfo.c:331 msgid ", bookmark file" msgstr "" -#: src/LYShowInfo.c:343 +#: src/LYShowInfo.c:340 msgid "Link that you currently have selected" msgstr "" -#: src/LYShowInfo.c:356 +#: src/LYShowInfo.c:353 msgid "Method:" msgstr "" -#: src/LYShowInfo.c:361 +#: src/LYShowInfo.c:358 msgid "Enctype:" msgstr "" -#: src/LYShowInfo.c:373 +#: src/LYShowInfo.c:370 msgid "(Form field)" msgstr "" -#: src/LYShowInfo.c:388 +#: src/LYShowInfo.c:385 msgid "No Links on the current page" msgstr "" @@ -4922,15 +4922,15 @@ msgstr "" msgid "Illegal redirection using \"~\" found! Request ignored." msgstr "" -#: src/LYUpload.c:168 +#: src/LYUpload.c:169 msgid "Unable to upload file." msgstr "" -#: src/LYUpload.c:219 +#: src/LYUpload.c:220 msgid "Upload To:" msgstr "" -#: src/LYUpload.c:220 +#: src/LYUpload.c:221 msgid "Upload options:" msgstr "" @@ -4938,22 +4938,22 @@ msgstr "" msgid "Unexpected access protocol for this URL scheme." msgstr "" -#: src/LYUtils.c:4150 +#: src/LYUtils.c:4146 msgid "No restrictions set.\n" msgstr "" -#: src/LYUtils.c:4153 +#: src/LYUtils.c:4149 msgid "Restrictions set:\n" msgstr "" -#: src/LYUtils.c:5514 +#: src/LYUtils.c:5510 msgid "Ignoring invalid HOME" msgstr "" #. #. * Header. #. -#: src/LYrcFile.c:578 +#: src/LYrcFile.c:608 msgid "" "Lynx User Defaults File\n" "\n" @@ -4970,7 +4970,7 @@ msgstr "" #. #. * File editor #. -#: src/LYrcFile.c:595 +#: src/LYrcFile.c:625 msgid "" "file_editor specifies the editor to be invoked when editing local files\n" "or sending mail. If no editor is specified, then file editing is disabled\n" @@ -4981,7 +4981,7 @@ msgstr "" #. #. * Default bookmark file. #. -#: src/LYrcFile.c:606 +#: src/LYrcFile.c:636 msgid "" "bookmark_file specifies the name and location of the default bookmark\n" "file into which the user can paste links for easy access at a later\n" @@ -4991,7 +4991,7 @@ msgstr "" #. #. * Multiple (sub)bookmark support settings. #. -#: src/LYrcFile.c:616 +#: src/LYrcFile.c:646 msgid "" "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n" "been defined (see below), then all bookmark operations will first\n" @@ -5007,7 +5007,7 @@ msgstr "" #. #. * Multiple (sub)bookmark definitions and descriptions. #. -#: src/LYrcFile.c:635 +#: src/LYrcFile.c:665 msgid "" "The following allow you to define sub-bookmark files and descriptions.\n" "The format is multi_bookmark<capital_letter>=<filename>,<description>\n" @@ -5018,7 +5018,7 @@ msgstr "" #. #. * FTP/file sorting method. #. -#: src/LYrcFile.c:655 +#: src/LYrcFile.c:685 msgid "" "The file_sorting_method specifies which value to sort on when viewing\n" "file lists such as FTP directories. The options are:\n" @@ -5031,7 +5031,7 @@ msgstr "" #. #. * Personal mail address. #. -#: src/LYrcFile.c:674 +#: src/LYrcFile.c:699 msgid "" "personal_mail_address specifies your personal mail address. The\n" "address will be sent during HTTP file transfers for authorization and\n" @@ -5045,7 +5045,7 @@ msgstr "" #. #. * Searching type. #. -#: src/LYrcFile.c:689 +#: src/LYrcFile.c:714 msgid "" "If case_sensitive_searching is \"on\" then when the user invokes a search\n" "using the 's' or '/' keys, the search performed will be case sensitive\n" @@ -5055,7 +5055,7 @@ msgstr "" #. #. * Character set. #. -#: src/LYrcFile.c:700 +#: src/LYrcFile.c:724 msgid "" "The character_set definition controls the representation of 8 bit\n" "characters for your terminal. If 8 bit characters do not show up\n" @@ -5067,7 +5067,7 @@ msgstr "" #. #. * Preferred language. #. -#: src/LYrcFile.c:715 +#: src/LYrcFile.c:739 msgid "" "preferred_language specifies the language in MIME notation (e.g., en,\n" "fr, may be a comma-separated list in decreasing preference)\n" @@ -5079,7 +5079,7 @@ msgstr "" #. #. * Preferred charset. #. -#: src/LYrcFile.c:727 +#: src/LYrcFile.c:751 msgid "" "preferred_charset specifies the character set in MIME notation (e.g.,\n" "ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n" @@ -5095,7 +5095,7 @@ msgid "" "is also allowed.\n" msgstr "" -#: src/LYrcFile.c:748 +#: src/LYrcFile.c:772 msgid "" "show_color specifies how to set the color mode at startup. A value of\n" "\"never\" will force color mode off (treat the terminal as monochrome)\n" @@ -5117,7 +5117,7 @@ msgstr "" #. #. * VI keys. #. -#: src/LYrcFile.c:774 +#: src/LYrcFile.c:798 msgid "" "If vi_keys is set to \"on\", then the normal VI movement keys:\n" " j = down k = up\n" @@ -5130,7 +5130,7 @@ msgstr "" #. #. * EMACS keys. #. -#: src/LYrcFile.c:787 +#: src/LYrcFile.c:811 msgid "" "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n" " ^N = down ^P = up\n" @@ -5141,7 +5141,7 @@ msgstr "" #. #. * Show dot files. #. -#: src/LYrcFile.c:798 +#: src/LYrcFile.c:822 msgid "" "show_dotfiles specifies that the directory listing should include\n" "\"hidden\" (dot) files/directories. If set \"on\", this will be\n" @@ -5153,7 +5153,7 @@ msgstr "" #. #. * Select popups. #. -#: src/LYrcFile.c:810 +#: src/LYrcFile.c:834 msgid "" "select_popups specifies whether the OPTIONs in a SELECT block which\n" "lacks a MULTIPLE attribute are presented as a vertical list of radio\n" @@ -5167,7 +5167,7 @@ msgstr "" #. #. * Show cursor. #. -#: src/LYrcFile.c:824 +#: src/LYrcFile.c:848 msgid "" "show_cursor specifies whether to 'hide' the cursor to the right (and\n" "bottom, if possible) of the screen, or to place it to the left of the\n" @@ -5183,7 +5183,7 @@ msgstr "" #. #. * Keypad mode. #. -#: src/LYrcFile.c:840 +#: src/LYrcFile.c:864 msgid "" "If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n" "your keypad when the numlock is on will act as arrow keys:\n" @@ -5194,13 +5194,13 @@ msgid "" "regardless of whether numlock is on.\n" msgstr "" -#: src/LYrcFile.c:849 +#: src/LYrcFile.c:873 msgid "" "If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n" "appear next to each link and numbers are used to select links.\n" msgstr "" -#: src/LYrcFile.c:853 +#: src/LYrcFile.c:877 msgid "" "If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n" "numbers will appear next to each link and visible form input field.\n" @@ -5211,7 +5211,7 @@ msgid "" "lists and output from the list command also enumerate form inputs.\n" msgstr "" -#: src/LYrcFile.c:862 +#: src/LYrcFile.c:886 msgid "" "NOTE: Some fixed format documents may look disfigured when\n" "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n" @@ -5221,7 +5221,7 @@ msgstr "" #. #. * Partial display threshold #. -#: src/LYrcFile.c:877 +#: src/LYrcFile.c:898 msgid "" "partial_thres specifies the number of lines Lynx should download and render\n" "before we redraw the screen in Partial Display logic\n" @@ -5233,7 +5233,7 @@ msgstr "" #. #. * Line edit mode. #. -#: src/LYrcFile.c:891 +#: src/LYrcFile.c:912 msgid "" "lineedit_mode specifies the key binding used for inputting strings in\n" "prompts and forms. If lineedit_mode is set to \"Default Binding\" then\n" @@ -5251,7 +5251,7 @@ msgstr "" #. #. * Directory list style. #. -#: src/LYrcFile.c:920 +#: src/LYrcFile.c:941 msgid "" "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n" "(if implemented). The default is \"MIXED_STYLE\", which sorts both\n" @@ -5262,7 +5262,7 @@ msgstr "" #. #. * User mode. #. -#: src/LYrcFile.c:936 +#: src/LYrcFile.c:954 msgid "" "user_mode specifies the users level of knowledge with Lynx. The\n" "default is \"NOVICE\" which displays two extra lines of help at the\n" @@ -5275,7 +5275,7 @@ msgstr "" #. #. * Cookie options #. -#: src/LYrcFile.c:952 +#: src/LYrcFile.c:968 msgid "" "accept_all_cookies allows the user to tell Lynx to automatically\n" "accept all cookies if desired. The default is \"FALSE\" which will\n" @@ -5283,7 +5283,7 @@ msgid "" "all cookies.\n" msgstr "" -#: src/LYrcFile.c:961 +#: src/LYrcFile.c:976 msgid "" "cookie_accept_domains and cookie_reject_domains are comma-delimited\n" "lists of domains from which Lynx should automatically accept or reject\n" @@ -5292,7 +5292,7 @@ msgid "" "settings made here.\n" msgstr "" -#: src/LYrcFile.c:976 +#: src/LYrcFile.c:991 msgid "" "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n" "cookie_query_invalid_domains are comma-delimited lists of which domains\n" @@ -5306,7 +5306,7 @@ msgstr "" #. #. * Cookie read file. #. -#: src/LYrcFile.c:1000 +#: src/LYrcFile.c:1015 msgid "" "cookie_file specifies the file from which to read persistent cookies.\n" "The default is ~/.lynx_cookies.\n" @@ -5315,7 +5315,7 @@ msgstr "" #. #. * Local execution mode - all links. #. -#: src/LYrcFile.c:1014 +#: src/LYrcFile.c:1029 msgid "" "If run_all_execution_links is set \"on\" then all local execution links\n" "will be executed when they are selected.\n" @@ -5331,7 +5331,7 @@ msgstr "" #. #. * Local execution mode - only links in local files. #. -#: src/LYrcFile.c:1031 +#: src/LYrcFile.c:1045 msgid "" "If run_execution_links_on_local_files is set \"on\" then all local\n" "execution links that are found in LOCAL files will be executed when they\n" @@ -5347,9 +5347,15 @@ msgid "" " you are viewing trusted source information.\n" msgstr "" -#: src/LYrcFile.c:1049 +#: src/LYrcFile.c:1063 msgid "" "If verbose_images is \"on\", lynx will print the name of the image\n" "source file in place of [INLINE], [LINK] or [IMAGE]\n" "See also VERBOSE_IMAGES in lynx.cfg\n" msgstr "" + +#: src/LYrcFile.c:1070 +msgid "" +"The visited_links setting controls how Lynx organizes the information\n" +"in the Visited Links Page.\n" +msgstr "" diff --git a/src/GridText.c b/src/GridText.c index a8687293..b88bf97d 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -4379,7 +4379,7 @@ check_WrapSource: #ifndef CONV_JISX0201KANA_JISX0208KANA else if ((HTCJK == JAPANESE) && IS_SJIS_X0201KANA((unsigned char)(ch)) && (kanji_code == EUC)) { - line->data[line->size++] = 0x8e; + line->data[line->size++] = (unsigned char) 0x8e; line->data[line->size++] = ch; } #endif @@ -6957,7 +6957,7 @@ PUBLIC void HText_pageDisplay ARGS2( #ifdef DISP_PARTIAL if (display_partial && debug_display_partial) - sleep(MessageSecs); + LYSleepMsg(); #endif is_www_index = HTAnchor_isIndex(HTMainAnchor); @@ -10358,7 +10358,7 @@ PUBLIC int HText_SubmitForm ARGS4( _user_message( CANNOT_TRANSCODE_FORM, target_csname ? target_csname : "UNKNOWN"); - sleep(AlertSecs); + LYSleepAlert(); } } } @@ -10490,7 +10490,7 @@ PUBLIC int HText_SubmitForm ARGS4( _user_message( CANNOT_TRANSCODE_FORM, target_csname ? target_csname : "UNKNOWN"); - sleep(AlertSecs); + LYSleepAlert(); } out_cs = form_ptr->value_cs; } else { @@ -10592,7 +10592,7 @@ PUBLIC int HText_SubmitForm ARGS4( _user_message( CANNOT_TRANSCODE_FORM, target_csname ? target_csname : "UNKNOWN"); - sleep(AlertSecs); + LYSleepAlert(); } } if (Boundary) { diff --git a/src/HTAlert.c b/src/HTAlert.c index 6596f411..a2415b1c 100644 --- a/src/HTAlert.c +++ b/src/HTAlert.c @@ -35,7 +35,7 @@ PUBLIC void HTAlert ARGS1( _user_message(ALERT_FORMAT, Msg); LYstore_message2(ALERT_FORMAT, Msg); - sleep(AlertSecs); + LYSleepAlert(); } PUBLIC void HTAlwaysAlert ARGS2( @@ -51,14 +51,14 @@ PUBLIC void HTAlwaysAlert ARGS2( extra_prefix, Msg); fflush(stdout); LYstore_message2(ALERT_FORMAT, Msg); - sleep(AlertSecs); + LYSleepAlert(); } else { fprintf(((TRACE) ? stdout : stderr), ALERT_FORMAT, (Msg == 0) ? "" : Msg); fflush(stdout); LYstore_message2(ALERT_FORMAT, Msg); - sleep(AlertSecs); + LYSleepAlert(); fprintf(((TRACE) ? stdout : stderr), "\n"); } CTRACE((tfp, "\nAlert!: %s\n\n", Msg)); @@ -90,7 +90,7 @@ PUBLIC void HTUserMsg ARGS1( if (Msg && *Msg) { CTRACE((tfp, "User message: %s\n", Msg)); LYstore_message(Msg); - sleep(MessageSecs); + LYSleepMsg(); } } @@ -104,7 +104,7 @@ PUBLIC void HTUserMsg2 ARGS2( CTRACE((tfp, Msg2, Arg)); CTRACE((tfp, "\n")); LYstore_message2(Msg2, Arg); - sleep(MessageSecs); + LYSleepMsg(); } } @@ -219,7 +219,7 @@ PUBLIC void HTReadProgress ARGS2( static long bytes_last; double transfer_rate; - char line[80]; + char line[MAX_LINE]; struct timeb tb; char *units = "bytes"; @@ -1100,6 +1100,29 @@ PUBLIC int HTConfirmPostRedirect ARGS2( return (result); } +#define okToSleep() (!crawl && !traversal && LYCursesON) + +/* + * Sleep for the given message class's time. + */ +PUBLIC void LYSleepAlert NOARGS +{ + if (okToSleep()) + sleep(AlertSecs); +} + +PUBLIC void LYSleepInfo NOARGS +{ + if (okToSleep()) + sleep(InfoSecs); +} + +PUBLIC void LYSleepMsg NOARGS +{ + if (okToSleep()) + sleep(MessageSecs); +} + /* * LYstrerror emulates the ANSI strerror() function. */ diff --git a/src/HTAlert.h b/src/HTAlert.h index 04f07bdd..563405de 100644 --- a/src/HTAlert.h +++ b/src/HTAlert.h @@ -151,6 +151,10 @@ extern int HTConfirmPostRedirect PARAMS(( int server_status)); +extern void LYSleepAlert NOPARAMS; +extern void LYSleepInfo NOPARAMS; +extern void LYSleepMsg NOPARAMS; + #ifdef HAVE_STRERROR #define LYStrerror strerror #else diff --git a/src/HTInit.c b/src/HTInit.c index 743c8ace..b3890286 100644 --- a/src/HTInit.c +++ b/src/HTInit.c @@ -1159,11 +1159,9 @@ PRIVATE int HTLoadExtensionsConfigFile ARGS1( while(line[0]) { HTGetWord(word, line, ' ', '\t'); if (word[0] && (word[0] != ' ')) { - char *ext = (char *)malloc(sizeof(char) * (strlen(word)+1+1)); - if (!ext) - outofmem(__FILE__, "HTLoadExtensionsConfigFile"); + char *ext = NULL; - sprintf(ext, ".%s", word); + HTSprintf0(&ext, ".%s", word); LYLowerCase(ext); CTRACE((tfp, "SETTING SUFFIX '%s' to '%s'.\n", ext, ct)); diff --git a/src/LYBookmark.c b/src/LYBookmark.c index f3caae8a..848d4cc8 100644 --- a/src/LYBookmark.c +++ b/src/LYBookmark.c @@ -146,7 +146,7 @@ PRIVATE char * convert_mosaic_bookmark_file ARGS1( LYRemoveTemp(newfile); if ((nfp = LYOpenTemp(newfile, HTML_SUFFIX, "w")) == NULL) { LYMBM_statusline(NO_TEMP_FOR_HOTLIST); - sleep(AlertSecs); + LYSleepAlert(); return (""); } @@ -298,7 +298,7 @@ PUBLIC void save_bookmark_link ARGS2( LYgetstr(string_buffer, VISIBLE, sizeof(string_buffer), NORECALL); if (*string_buffer == '\0') { LYMBM_statusline(CANCELLED); - sleep(MessageSecs); + LYSleepMsg(); FREE(bookmark_URL); return; } @@ -354,7 +354,7 @@ PUBLIC void save_bookmark_link ARGS2( BookmarkPage, filename_buffer)); if ((fp = fopen(filename_buffer, (first_time ? "w" : "a+"))) == NULL) { LYMBM_statusline(BOOKMARK_OPEN_FAILED); - sleep(AlertSecs); + LYSleepAlert(); FREE(Title); FREE(bookmark_URL); return; @@ -452,7 +452,7 @@ Note: if you edit this file manually\n\ FREE(Address); FREE(bookmark_URL); LYMBM_statusline(OPERATION_DONE); - sleep(MessageSecs); + LYSleepMsg(); } /* @@ -611,7 +611,7 @@ PUBLIC void remove_bookmark_link ARGS2( LYRemoveTemp(newfile); return; } - sleep(AlertSecs); /* give a chance to see error from cp - kw */ + LYSleepAlert(); /* give a chance to see error from cp - kw */ HTUserMsg(BOOKTEMP_COPY_FAIL); keep_tempfile = TRUE; } diff --git a/src/LYCookie.c b/src/LYCookie.c index cdae410a..c0f6845a 100644 --- a/src/LYCookie.c +++ b/src/LYCookie.c @@ -2315,7 +2315,7 @@ PRIVATE int LYHandleCookies ARGS4 ( */ if (HTList_isEmpty(domain_list)) { HTProgress(COOKIE_JAR_IS_EMPTY); - sleep(MessageSecs); + LYSleepMsg(); HTNoDataOK = 1; return(HT_NO_DATA); } @@ -2402,7 +2402,7 @@ PRIVATE int LYHandleCookies ARGS4 ( } else { HTProgress(COOKIE_EATEN); } - sleep(MessageSecs); + LYSleepMsg(); HTNoDataOK = 1; break; } @@ -2460,7 +2460,7 @@ PRIVATE int LYHandleCookies ARGS4 ( HTList_removeObject(domain_list, de); FREE(de); HTProgress(DOMAIN_EATEN); - sleep(MessageSecs); + LYSleepMsg(); break; } Delete_all_cookies_in_domain: @@ -2481,7 +2481,7 @@ Delete_all_cookies_in_domain: cl = next; } HTProgress(DOMAIN_COOKIES_EATEN); - sleep(MessageSecs); + LYSleepMsg(); /* * If a default accept/reject * choice is set, we're done. - FM @@ -2500,7 +2500,7 @@ Delete_all_cookies_in_domain: HTList_removeObject(domain_list, de); FREE(de); HTProgress(DOMAIN_EATEN); - sleep(MessageSecs); + LYSleepMsg(); } break; @@ -2543,7 +2543,7 @@ Delete_all_cookies_in_domain: * atexit may be called multiple times. - kw */ HTProgress(ALL_COOKIES_EATEN); - sleep(MessageSecs); + LYSleepMsg(); } FREE(domain); FREE(lynxID); diff --git a/src/LYCurses.c b/src/LYCurses.c index 0897642d..dce797f9 100644 --- a/src/LYCurses.c +++ b/src/LYCurses.c @@ -1201,7 +1201,7 @@ PUBLIC BOOLEAN setup ARGS1( (void) putenv(term_putenv); printf("\n%s %s\n", gettext("TERMINAL TYPE IS SET TO"), getenv("TERM")); - sleep(MESSAGESECS); + LYSleepMsg(); } start_curses(); diff --git a/src/LYExtern.c b/src/LYExtern.c index e3d84275..cc7a41ea 100644 --- a/src/LYExtern.c +++ b/src/LYExtern.c @@ -254,11 +254,11 @@ void run_external ARGS1(char *, c) char e_buff[PATH_MAX], *p; p = c + 17; + *e_buff = 0; if (strchr(p, ':') == NULL) { - sprintf(e_buff, "%s/%s", windows_drive, p); - } else { - strcpy(e_buff, p); + sprintf(e_buff, "%.3s/", windows_drive); } + strncat(e_buff, p, sizeof(e_buff) - strlen(e_buff) - 1); p = strrchr(e_buff, '.'); if (p) { p = strchr(p, '#'); diff --git a/src/LYGetFile.c b/src/LYGetFile.c index 4525dcbf..bb70c2e6 100644 --- a/src/LYGetFile.c +++ b/src/LYGetFile.c @@ -903,7 +903,7 @@ Try_Redirected_URL: if (LYCursesON) { _user_message(WWW_ILLEGAL_URL_MESSAGE, use_this_url_instead); - sleep(AlertSecs); + LYSleepAlert(); } else { fprintf(stderr, WWW_ILLEGAL_URL_MESSAGE, @@ -931,7 +931,7 @@ Try_Redirected_URL: CTRACE_SLEEP(MessageSecs); _user_message(WWW_USING_MESSAGE, use_this_url_instead); - sleep(InfoSecs); + LYSleepInfo(); CTRACE((tfp, "\n")); StrAllocCopy(doc->address, use_this_url_instead); diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h index 14cdc76d..c394e812 100644 --- a/src/LYGlobalDefs.h +++ b/src/LYGlobalDefs.h @@ -464,7 +464,7 @@ extern BOOLEAN FileInitAlreadyDone; /* LYMain.c */ extern BOOLEAN focus_window; extern BOOLEAN system_is_NT; -extern char windows_drive[]; +extern char windows_drive[4]; extern int lynx_timeout; #endif /* _WINDOWS */ diff --git a/src/LYHistory.c b/src/LYHistory.c index ba3c1a26..c8b70d00 100644 --- a/src/LYHistory.c +++ b/src/LYHistory.c @@ -29,7 +29,7 @@ #include <HTCJK.h> PUBLIC HTList * Visited_Links = NULL; /* List of safe popped docs. */ -PUBLIC int Visited_Links_As = VISITED_LINKS_AS_TREE; +PUBLIC int Visited_Links_As = VISITED_LINKS_AS_LATEST | VISITED_LINKS_REVERSE; PRIVATE VisitedLink *PrevVisitedLink = NULL; /* NULL on auxillary */ PRIVATE VisitedLink *PrevActiveVisitedLink = NULL; /* Last non-auxillary */ PRIVATE VisitedLink Latest_first; diff --git a/src/LYJump.c b/src/LYJump.c index 0267cc6f..3da3b870 100644 --- a/src/LYJump.c +++ b/src/LYJump.c @@ -354,7 +354,7 @@ check_recall: jtp->nel, sizeof(JumpDatum), LYCompare); if (!found) { user_message("Unknown target '%s'", buf); - sleep(AlertSecs); + LYSleepAlert(); } StrAllocCopy(jtp->shortcut, bp); diff --git a/src/LYKeymap.c b/src/LYKeymap.c index dbde16f1..75914bd5 100644 --- a/src/LYKeymap.c +++ b/src/LYKeymap.c @@ -845,7 +845,7 @@ PRIVATE char *pretty ARGS1 (int, c) sprintf(buf, "^%c", c|0100); else if (c >= 0400 && (c - 0400) < (int) TABLESIZE(funckey) && funckey[c-0400]) - sprintf(buf, "%s", funckey[c-0400]); + sprintf(buf, "%.*s", (int)(sizeof(buf) - 1), funckey[c-0400]); else if (c >= 0400) sprintf(buf, "key-%#x", c); else @@ -879,7 +879,7 @@ PRIVATE char *pretty_html ARGS1 (int, c) sprintf(buf, "^%c", c|0100); else if (c >= 0400 && (c - 0400) < (int) TABLESIZE(funckey) && funckey[c-0400]) - sprintf(buf, "%s", funckey[c-0400]); + sprintf(buf, "%.*s", (int)(sizeof(buf) - 1), funckey[c-0400]); else if (c >= 0400) sprintf(buf, "%#x", c); else diff --git a/src/LYLocal.c b/src/LYLocal.c index bc6d8557..60244df9 100644 --- a/src/LYLocal.c +++ b/src/LYLocal.c @@ -2410,7 +2410,7 @@ PRIVATE int LYExecv ARGS3( * Screen may have message from the failed execv'd command. * Give user time to look at it before screen refresh. */ - sleep(AlertSecs); + LYSleepAlert(); } start_curses(); if (tmpbuf != 0) { diff --git a/src/LYMail.c b/src/LYMail.c index 3544ba46..00cf7eff 100644 --- a/src/LYMail.c +++ b/src/LYMail.c @@ -1,13 +1,3 @@ -/* - * This file checked for sprintf() buffer overruns on 1998/05/06 by Bela - * Lubkin <filbo@armory.com>. Please don't introduce any new ones... - * - * See comments marked "- BL" for two still-possible overruns in the VMS - * code. - * - * Not yet checked for any other sort of buffer overrun. - */ - #include <HTUtils.h> #include <HTParse.h> #include <LYGlobalDefs.h> @@ -69,7 +59,7 @@ PRIVATE char *blat_cmd( char *mail_addr) { FILE *fp; - static char b_cmd[512]; + static char *b_cmd; #ifdef __CYGWIN__ char dosname[LY_MAXPATH]; #endif @@ -98,9 +88,9 @@ PRIVATE char *blat_cmd( #ifdef __CYGWIN__ cygwin_conv_to_full_win32_path(bl_cmd_file, dosname); - sprintf(b_cmd, "%s \"@%s\"", mail_cmd, dosname); + HTSprintf0(&b_cmd, "%s \"@%s\"", mail_cmd, dosname); #else - sprintf(b_cmd, "%s @%s", mail_cmd, bl_cmd_file); + HTSprintf0(&b_cmd, "%s @%s", mail_cmd, bl_cmd_file); #endif return b_cmd; @@ -139,6 +129,7 @@ PUBLIC void mailform ARGS4( CONST char *, mailto_content, CONST char *, mailto_type) { + static char *cmd; FILE *fd; char *address = NULL; char *ccaddr = NULL; @@ -147,7 +138,7 @@ PUBLIC void mailform ARGS4( char self[80]; char subject[80]; char *searchpart = NULL; - char cmd[512]; + char buf[512]; char *cp0 = NULL, *cp1 = NULL; int ch, len, i; #ifdef VMS @@ -413,7 +404,7 @@ PUBLIC void mailform ARGS4( } #if CAN_PIPE_TO_MAILER - sprintf(cmd, "%s %s", system_mail, system_mail_flags); + HTSprintf0(&cmd, "%s %s", system_mail, system_mail_flags); if ((fd = popen(cmd, "w")) == NULL) { HTAlert(FORM_MAILTO_FAILED); FREE(address); @@ -502,9 +493,9 @@ PUBLIC void mailform ARGS4( i = 0; len = strlen(mailto_content); while (len > 78) { - strncpy(cmd, &mailto_content[i], 78); - cmd[78] = '\0'; - fprintf(fd, "%s\n", cmd); + strncpy(buf, &mailto_content[i], 78); + buf[78] = '\0'; + fprintf(fd, "%s\n", buf); i += 78; len = strlen(&mailto_content[i]); } @@ -514,9 +505,9 @@ PUBLIC void mailform ARGS4( i = 0; len = strlen(mailto_content); while (len > 78) { - strncpy(cmd, &mailto_content[i], 78); - cmd[78] = '\0'; - fprintf(fd, "%s\n", cmd); + strncpy(buf, &mailto_content[i], 78); + buf[78] = '\0'; + fprintf(fd, "%s\n", buf); i += 78; len = strlen(&mailto_content[i]); } @@ -525,7 +516,7 @@ PUBLIC void mailform ARGS4( #if CAN_PIPE_TO_MAILER pclose(fd); - sleep(MessageSecs); + LYSleepMsg(); #endif /* UNIX */ #if defined(VMS) || defined(DOSPATH) || defined(SH_EX) LYCloseTempFP(fd); @@ -546,7 +537,7 @@ PUBLIC void mailform ARGS4( /* * Now set up the command. - FM */ - sprintf(cmd, + HTSprintf0(&cmd, "%s %s %s,%s ", system_mail, system_mail_flags, @@ -558,10 +549,8 @@ PUBLIC void mailform ARGS4( * command, and ignore any keywords to minimize risk * of them making the line too long or having problem * characters. - FM - * - * Possibly still a problem if user supplies long subject. - BL */ - sprintf(cmd, + HTSprintf0(&cmd, "%s %s%s/subject=\"%s\" %s ", system_mail, system_mail_flags, @@ -587,16 +576,12 @@ PUBLIC void mailform ARGS4( * 4 letters is arbitrarily the smallest possible mail * address, at least for lynx. That way extra spaces * won't confuse the mailer and give a blank address. - * - * ignore addresses so long that they would overflow the - * temporary buffer (i.e., about 500 chars). - BL */ - if (strlen(address_ptr1) > 3 && - strlen(address_ptr1) + strlen(mail_adrs) < sizeof(cmd)) { + if (strlen(address_ptr1) > 3) { if (!first) { StrAllocCat(command, ","); } - sprintf(cmd, mail_adrs, address_ptr1); + HTSprintf0(&cmd, mail_adrs, address_ptr1); StrAllocCat(command, cmd); first = FALSE; } @@ -620,18 +605,13 @@ PUBLIC void mailform ARGS4( * 4 letters is arbitrarily the smallest possible mail * address, at least for lynx. That way extra spaces * won't confuse the mailer and give a blank address. - * - * ignore addresses so long that they would overflow the - * temporary buffer (i.e., about 500 chars). - BL */ - if (strlen(address_ptr1) > 3 && - strlen(address_ptr1) + strlen(mail_adrs) < sizeof(cmd)) { + if (strlen(address_ptr1) > 3) { StrAllocCat(command, ","); - sprintf(cmd, mail_adrs, address_ptr1); + HTSprintf(&command, mail_adrs, address_ptr1); if (isPMDF) { - strcat(cmd, "/CC"); + StrAllocCat(command, "/CC"); } - StrAllocCat(command, cmd); } address_ptr1 = address_ptr2; } while (address_ptr1 != NULL); @@ -641,7 +621,7 @@ PUBLIC void mailform ARGS4( printf("%s\n\n$ %s\n\n%s", SENDING_FORM_CONTENT, command, PLEASE_WAIT); LYSystem(command); /* Mail (VMS) */ FREE(command); - sleep(AlertSecs); + LYSleepAlert(); start_curses(); LYRemoveTemp(my_tmpfile); LYRemoveTemp(hdrfile); @@ -673,7 +653,7 @@ PUBLIC void mailform ARGS4( printf("%s\n\n$ %s\n\n%s", SENDING_FORM_CONTENT, command, PLEASE_WAIT); LYSystem(command); /* Mail sending form content (DOS/Windows) */ FREE(command); - sleep(MessageSecs); + LYSleepMsg(); start_curses(); LYRemoveTemp(my_tmpfile); @@ -938,9 +918,6 @@ PUBLIC void mailmsg ARGS4( * 4 letters is arbitrarily the smallest possible mail * address, at least for lynx. That way extra spaces * won't confuse the mailer and give a blank address. - * - * ignore addresses so long that they would overflow the - * temporary buffer (i.e., about 500 chars). - BL */ if (!first) { StrAllocCat(command, ","); @@ -961,7 +938,7 @@ PUBLIC void mailmsg ARGS4( #else /* DOSPATH */ #if USE_BLAT_MAILER if (mail_is_blat) - strcpy(cmd, + StrAllocCopy(cmd, blat_cmd( system_mail, my_tmpfile, @@ -973,13 +950,11 @@ PUBLIC void mailmsg ARGS4( ); else #endif - sprintf(cmd, "%s -t \"%s\" -F %s", system_mail, address, my_tmpfile); + HTSprintf0(&cmd, "%s -t \"%s\" -F %s", system_mail, address, my_tmpfile); LYSystem(cmd); /* Mail (DOS/Windows) */ + FREE(cmd); -#if 0 /* Not SH_EX */ - FREE(command); -#endif LYRemoveTemp(my_tmpfile); #if USE_BLAT_MAILER if (mail_is_blat) @@ -1028,10 +1003,10 @@ PUBLIC void reply_by_mail ARGS4( char *temp = NULL; int i, len; int c = 0; /* user input */ - char my_tmpfile[LY_MAXPATH], cmd[512]; + char my_tmpfile[LY_MAXPATH]; + char *command = NULL; #if !CAN_PIPE_TO_MAILER char tmpfile2[LY_MAXPATH]; - char *command = NULL; #endif #ifndef NO_ANONYMOUS_EMAIL static char *personal_name = NULL; @@ -1249,30 +1224,22 @@ PUBLIC void reply_by_mail ARGS4( i = 0; len = strlen(cp0); while (len > 78) { - strncpy(cmd, (char *)&cp0[i], 78); - cmd[78] = '\0'; - strcat(cmd, "\n"); - StrAllocCat(body, cmd); + HTSprintf(&body, "%.78s\n", &cp0[i]); i += 78; - len = strlen((char *)&cp0[i]); + len = strlen(&cp0[i]); } - sprintf(cmd, "%s\n", (char *)&cp0[i]); - StrAllocCat(body, cmd); + HTSprintf(&body, "%s\n", &cp0[i]); cp0 = (cp + 1); } i = 0; len = strlen(cp0); while (len > 78) { - strncpy(cmd, (char *)&cp0[i], 78); - cmd[78] = '\0'; - strcat(cmd, "\n"); - StrAllocCat(body, cmd); + HTSprintf(&body, "%.78s\n", &cp0[i]); i += 78; - len = strlen((char *)&cp0[i]); + len = strlen(&cp0[i]); } if (len) { - sprintf(cmd, "%s\n", (char *)&cp0[i]); - StrAllocCat(body, cmd); + HTSprintf(&body, "%s\n", &cp0[i]); } FREE(temp); } @@ -1403,9 +1370,8 @@ PUBLIC void reply_by_mail ARGS4( if (!LYHaveCJKCharacterSet && strncasecomp(LYCharSet_UC[current_char_set].MIMEname, "x-", 2) != 0) { - sprintf(buf,"Content-Type: text/plain; charset=%s\n", + HTSprintf(&header, "Content-Type: text/plain; charset=%s\n", LYCharSet_UC[current_char_set].MIMEname); - StrAllocCat(header, buf); } StrAllocCat(header, "Content-Transfer-Encoding: 8bit\n"); } @@ -1421,8 +1387,7 @@ PUBLIC void reply_by_mail ARGS4( StrAllocCat(header, address); } StrAllocCat(header, "\n"); - sprintf(buf, "X-Mailer: Lynx, Version %s\n", LYNX_VERSION); - StrAllocCat(header, buf); + HTSprintf(&header, "X-Mailer: Lynx, Version %s\n", LYNX_VERSION); if (refid && *refid) { StrAllocCat(header, "In-Reply-To: <"); @@ -1548,8 +1513,10 @@ PUBLIC void reply_by_mail ARGS4( addstr("From: "); #endif /* VMS */ /* Add the personal mail address if there is one. */ - sprintf(user_input, "%s", (personal_mail_address ? - personal_mail_address : "")); + sprintf(user_input, "%.*s", (int)(sizeof(user_input) - 1), + (personal_mail_address + ? personal_mail_address + : "")); if (LYgetstr(user_input, VISIBLE, sizeof(user_input), NORECALL) < 0 || term_letter) { addstr("\n"); @@ -1626,8 +1593,10 @@ PUBLIC void reply_by_mail ARGS4( /* * Add the mail address if there is one. */ - sprintf(user_input, "%s", (personal_mail_address ? - personal_mail_address : "")); + sprintf(user_input, "%.*s", (int) (sizeof(user_input) - 1), + (personal_mail_address + ? personal_mail_address + : "")); if (LYgetstr(user_input, VISIBLE, sizeof(user_input), NORECALL) < 0 || term_letter) { addstr("\n"); @@ -1684,8 +1653,7 @@ PUBLIC void reply_by_mail ARGS4( /* * Terminate the header. */ - sprintf(buf, "\n"); - StrAllocCat(header, buf); + StrAllocCat(header, "\n"); CTRACE((tfp,"**header==\n%s",header)); #endif /* !VMS */ @@ -1732,15 +1700,17 @@ PUBLIC void reply_by_mail ARGS4( if (strstr(editor, "pico")) { editor_arg = " -t"; /* No prompt for filename to use */ } - sprintf(user_input, "%s%s %s", editor, editor_arg, my_tmpfile); + command = 0; + HTSprintf0(&command, "%s%s %s", editor, editor_arg, my_tmpfile); _statusline(SPAWNING_EDITOR_FOR_MAIL); stop_curses(); - if (LYSystem(user_input)) { /* Spawn Editor */ + if (LYSystem(command)) { /* Spawn Editor */ start_curses(); HTAlert(ERROR_SPAWNING_EDITOR); } else { start_curses(); } + FREE(command); } else if (body) { /* @@ -1760,7 +1730,7 @@ PUBLIC void reply_by_mail ARGS4( addstr("\n"); if (term_letter || c == 7 || c == 3) { addstr(CANCELLED); - sleep(InfoSecs); + LYSleepInfo(); LYCloseTempFP(fd); /* Close the tmpfile. */ scrollok(stdscr, FALSE); /* Stop scrolling. */ goto cleanup; @@ -1879,8 +1849,7 @@ PUBLIC void reply_by_mail ARGS4( /* * Now set up the command. - FM */ - sprintf(cmd, - "%s %s %s,%s ", + HTSprintf0(&command, "%s %s %s,%s ", system_mail, system_mail_flags, hdrfile, @@ -1891,18 +1860,14 @@ PUBLIC void reply_by_mail ARGS4( * command, and ignore any keywords to minimize risk * of them making the line too long or having problem * characters. - FM - * - * Possibly still a problem if user supplies long subject. - BL */ - sprintf(cmd, - "%s %s%s/subject=\"%s\" %s ", + HTSprintf0(&command, "%s %s%s/subject=\"%s\" %s ", system_mail, system_mail_flags, (strncasecomp(system_mail, "MAIL", 4) ? "" : "/noself"), subject, my_tmpfile); } - StrAllocCopy(command, cmd); /* * Now add all the people in the address field. - FM @@ -1920,17 +1885,12 @@ PUBLIC void reply_by_mail ARGS4( * 4 letters is arbitrarily the smallest possible mail * address, at least for lynx. That way extra spaces * won't confuse the mailer and give a blank address. - * - * ignore addresses so long that they would overflow the - * temporary buffer (i.e., about 500 chars). - BL */ - if (strlen(address_ptr1) > 3 && - strlen(address_ptr1) + strlen(mail_adrs) < sizeof(cmd)) { + if (strlen(address_ptr1) > 3) { if (!first) { StrAllocCat(command, ","); } - sprintf(cmd, mail_adrs, address_ptr1); - StrAllocCat(command, cmd); + HTSprintf(command, mail_adrs, address_ptr1); first = FALSE; } address_ptr1 = address_ptr2; @@ -1953,18 +1913,13 @@ PUBLIC void reply_by_mail ARGS4( * 4 letters is arbitrarily the smallest possible mail * address, at least for lynx. That way extra spaces * won't confuse the mailer and give a blank address. - * - * ignore addresses so long that they would overflow the - * temporary buffer (i.e., about 500 chars). - BL */ - if (strlen(address_ptr1) > 3 && - strlen(address_ptr1) + strlen(mail_adrs) < sizeof(cmd)) { + if (strlen(address_ptr1) > 3) { StrAllocCat(command, ","); - sprintf(cmd, mail_adrs, address_ptr1); + HTSprintf(&command, mail_adrs, address_ptr1); if (isPMDF) { - strcat(cmd, "/CC"); + StrAllocCat(command, "/CC"); } - StrAllocCat(command, cmd); } address_ptr1 = address_ptr2; } while (address_ptr1 != NULL); @@ -1974,7 +1929,7 @@ PUBLIC void reply_by_mail ARGS4( printf("%s\n\n$ %s\n\n%s", SENDING_COMMENT, command, PLEASE_WAIT); LYSystem(command); /* SENDING COMMENT (VMS) */ FREE(command); - sleep(AlertSecs); + LYSleepAlert(); start_curses(); #else /* Unix/DOS/Windows */ /* @@ -1983,12 +1938,13 @@ PUBLIC void reply_by_mail ARGS4( _statusline(SENDING_YOUR_MSG); #if CAN_PIPE_TO_MAILER signal(SIGINT, SIG_IGN); - sprintf(cmd, "%s %s", system_mail, system_mail_flags); - CTRACE((tfp, "%s\n", cmd)); - fp = popen(cmd, "w"); + HTSprintf0(&command, "%s %s", system_mail, system_mail_flags); + CTRACE((tfp, "%s\n", command)); + fp = popen(command, "w"); if (fp == NULL) { HTInfoMsg(COMMENT_REQUEST_CANCELLED); } + FREE(command); #else if ((fp = LYOpenTemp(tmpfile2, ".txt", "w")) == NULL) { HTAlert(MAILTO_URL_TEMPOPEN_FAILED); @@ -2042,7 +1998,7 @@ PUBLIC void reply_by_mail ARGS4( printf("%s\n\n$ %s\n\n%s", SENDING_COMMENT, command, PLEASE_WAIT); LYSystem(command); /* SENDING COMMENT (DOS/Windows/Unix) */ FREE(command); - sleep(MessageSecs); + LYSleepMsg(); start_curses(); LYRemoveTemp(tmpfile2); /* Delete the tmpfile. */ #if USE_BLAT_MAILER diff --git a/src/LYMain.c b/src/LYMain.c index 1313b2dd..dcaa028f 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -1343,16 +1343,12 @@ PUBLIC int main ARGS2( #ifdef JUMPFILE StrAllocCopy(jumpfile, JUMPFILE); { - temp = (char *)malloc(strlen(jumpfile) + 10); - if (!temp) { - outofmem(__FILE__, "main"); - } else { - sprintf(temp, "JUMPFILE:%s", jumpfile); - if (!LYJumpInit(temp)) { - CTRACE((tfp, "Failed to register %s\n", temp)); - } - FREE(temp); + temp = NULL; + HTSprintf0(&temp, "JUMPFILE:%s", jumpfile); + if (!LYJumpInit(temp)) { + CTRACE((tfp, "Failed to register %s\n", temp)); } + FREE(temp); } #endif /* JUMPFILE */ @@ -3743,10 +3739,10 @@ in double-quotes (\"-\") on VMS)", NULL); switch (p->type & ARG_TYPE_MASK) { case TOGGLE_ARG: case SET_ARG: - sprintf(temp, "%s", *(q->set_value) ? "on" : "off"); + strcpy(temp, *(q->set_value) ? "on" : "off"); break; case UNSET_ARG: - sprintf(temp, "%s", *(q->set_value) ? "off" : "on"); + strcpy(temp, *(q->set_value) ? "off" : "on"); break; case INT_ARG: sprintf(temp, "%d", *(q->int_value)); @@ -3995,7 +3991,7 @@ PRIVATE void FatalProblem ARGS1( * Deal with curses, if on, and clean up. - FM */ if (LYOutOfMemory && LYCursesON) { - sleep(AlertSecs); + LYSleepAlert(); } cleanup_sig(0); #ifndef __linux__ diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c index b3f0f624..dd02bd80 100644 --- a/src/LYMainLoop.c +++ b/src/LYMainLoop.c @@ -1842,7 +1842,7 @@ PRIVATE void handle_LYK_DIRED_MENU ARGS3( int, real_c GCC_UNUSED) { #ifdef VMS - char *cp, *temp; + char *cp, *temp = 0; /* * Check if the CSwing Directory/File Manager is available. @@ -1888,10 +1888,7 @@ PRIVATE void handle_LYK_DIRED_MENU ARGS3( if (HTStat(cp, &stat_info) == -1) { CTRACE((tfp, "mainloop: Can't stat %s\n", cp)); FREE(cp); - temp = (char *)calloc(1, (strlen(LYCSwingPath) + 4)); - if (temp == NULL) - outofmem(__FILE__, "mainloop"); - sprintf(temp, "%s []", LYCSwingPath); + HTSprintf0(&temp, "%s []", LYCSwingPath); *refresh_screen = TRUE; /* redisplay */ } else { char *VMSdir = NULL; @@ -1919,13 +1916,7 @@ PRIVATE void handle_LYK_DIRED_MENU ARGS3( cp == NULL; } } - temp = (char *)calloc(1, - (strlen(LYCSwingPath) + - strlen(VMSdir) + - 2)); - if (temp == NULL) - outofmem(__FILE__, "mainloop"); - sprintf(temp, "%s %s", LYCSwingPath, VMSdir); + HTSprintf0(&temp, "%s %s", LYCSwingPath, VMSdir); FREE(VMSdir); /* * Uncache the current document in case we @@ -1950,10 +1941,7 @@ PRIVATE void handle_LYK_DIRED_MENU ARGS3( * an argument and don't uncache the current * document. - FM */ - temp = (char *)calloc(1, (strlen(LYCSwingPath) + 4)); - if (temp == NULL) - outofmem(__FILE__, "mainloop"); - sprintf(temp, "%s []", LYCSwingPath); + HTSprintf0(&temp, "%s []", LYCSwingPath); *refresh_screen = TRUE; /* redisplay */ } stop_curses(); @@ -4511,7 +4499,7 @@ PRIVATE void handle_LYK_TOOLBAR ARGS4( int, real_c) { char *cp; - char *toolbar; + char *toolbar = NULL; if (!HText_hasToolbar(HTMainText)) { if (*old_c != real_c) { @@ -4522,12 +4510,8 @@ PRIVATE void handle_LYK_TOOLBAR ARGS4( *old_c = real_c; if ((cp = strchr(curdoc.address, '#')) != NULL) *cp = '\0'; - toolbar = (char *)malloc(strlen(curdoc.address) + - strlen(LYToolbarName) + 2); - if (!toolbar) - outofmem(__FILE__, "mainloop"); - sprintf(toolbar, "%s#%s", curdoc.address, LYToolbarName); + HTSprintf0(&toolbar, "%s#%s", curdoc.address, LYToolbarName); if (cp) *cp = '#'; StrAllocCopy(newdoc.address, toolbar); @@ -4760,7 +4744,7 @@ PRIVATE void handle_LYK_VIEW_BOOKMARK ARGS3( if (*old_c != real_c) { *old_c = real_c; LYMBM_statusline(BOOKMARKS_NOT_OPEN); - sleep(AlertSecs); + LYSleepAlert(); if (LYMultiBookmarks == TRUE) { *refresh_screen = TRUE; } @@ -5705,17 +5689,15 @@ try_again: * if so, reload if with the relevant * bookmark elements set. - FM */ - if ((cp = (char *)calloc(1, - (strlen((char *)&temp[len]) + 2))) == NULL) - outofmem(__FILE__, "mainloop"); + cp = NULL; if (temp[len] == '/') { - if (strchr((char *)&temp[(len + 1)], '/')) { - sprintf(cp, ".%s", (char *)&temp[len]); + if (strchr(&temp[(len + 1)], '/')) { + HTSprintf0(&cp, ".%s", &temp[len]); } else { - strcpy(cp, (char *)&temp[(len + 1)]); + StrAllocCopy(cp, &temp[(len + 1)]); } } else { - strcpy(cp, (char *)&temp[len]); + StrAllocCopy(cp, &temp[len]); } #ifdef VMS #define CompareBookmark(a,b) strcasecomp(a, b) @@ -5855,7 +5837,7 @@ try_again: if (TRACE) { if (!LYTraceLogFP || trace_mode_flag) { - sleep(AlertSecs); /* allow me to look at the results */ + LYSleepAlert(); /* allow me to look at the results */ } } @@ -6088,7 +6070,7 @@ try_again: if (TRACE) { refresh_screen = TRUE; if (!LYTraceLogFP || trace_mode_flag) { - sleep(AlertSecs); + LYSleepAlert(); } } } @@ -7607,18 +7589,25 @@ PRIVATE void status_link ARGS3( #define MAX_STATUS (LYcols - 2) #define MIN_STATUS 0 char format[MAX_LINE]; - int prefix; + int prefix = 0; int length; *format = 0; - if (show_more) - sprintf(format, "%s ", gettext("-more-")); - if (show_indx) - sprintf(format + strlen(format), "%s ", gettext("-index-")); + if (show_more) { + sprintf(format, "%.*s ", + (int)(sizeof(format) - 1), + gettext("-more-")); + prefix = strlen(format); + } + if (show_indx) { + sprintf(format + prefix, "%.*s ", + (int)(sizeof(format) - prefix - 1), + gettext("-index-")); + } prefix = strlen(format); length = strlen(curlink_name); - if (prefix > MAX_STATUS) { + if (prefix > MAX_STATUS || prefix >= MAX_LINE - 1) { _user_message("%s", format); /* no room for url */ } else { sprintf(format + prefix, "%%.%ds", MAX_STATUS - prefix); diff --git a/src/LYNews.c b/src/LYNews.c index 910f8a9b..a58a5146 100644 --- a/src/LYNews.c +++ b/src/LYNews.c @@ -103,6 +103,7 @@ PUBLIC char *LYNewsPost ARGS2( BOOLEAN, followup) { char user_input[1024]; + char *command = NULL; char CJKinput[1024]; char *cp = NULL; CONST char *kp = NULL; @@ -377,15 +378,16 @@ PUBLIC char *LYNewsPost ARGS2( if (strstr(editor, "pico")) { editor_arg = " -t"; /* No prompt for filename to use */ } - sprintf(user_input,"%s%s %s", editor, editor_arg, my_tempfile); + HTSprintf0(&command, "%s%s %s", editor, editor_arg, my_tempfile); _statusline(SPAWNING_EDITOR_FOR_NEWS); stop_curses(); - if (LYSystem(user_input)) { + if (LYSystem(command)) { start_curses(); HTAlert(ERROR_SPAWNING_EDITOR); } else { start_curses(); } + FREE(command); nonempty = message_has_content(my_tempfile, &nonspaces); diff --git a/src/LYOptions.c b/src/LYOptions.c index c97dac50..9126fa56 100644 --- a/src/LYOptions.c +++ b/src/LYOptions.c @@ -2111,7 +2111,7 @@ draw_bookmark_list: } else if (!LYPathOffHomeOK(MBM_tmp_line, sizeof(MBM_tmp_line))) { LYMBM_statusline(USE_PATH_OFF_HOME); - sleep(AlertSecs); + LYSleepAlert(); } else { StrAllocCopy(MBM_A_subbookmark[a], MBM_tmp_line); if (a == 0) { @@ -2181,6 +2181,12 @@ PRIVATE int get_popup_choice_number ARGS1( return(atoi(temp)); } +#define FormatChoiceNum(dst, choice, value) \ + sprintf(dst, "%s%d: %.500s", \ + ((num_choices > 8 && choice < 9) ? \ + " " : ""), \ + (choice + 1), value) + /* * This function offers the choices for values of an * option via a popup window which functions like @@ -2412,10 +2418,7 @@ redraw: */ for (i = 0; i <= num_choices; i++) { if (i >= window_offset && i - window_offset < length) { - sprintf(Cnum, "%s%d: ", - ((num_choices > 8 && i < 9) ? - " " : ""), - (i + 1)); + FormatChoiceNum(Cnum, i, ""); #ifdef USE_SLANG SLsmg_gotorc(top + ((i + 1) - window_offset), (lx - 1 + 2)); addstr(Cnum); @@ -2448,10 +2451,7 @@ redraw: * Unreverse cur choice. */ if (Cptr != NULL) { - sprintf(Cnum, "%s%d: ", - ((num_choices > 8 && i < 9) ? - " " : ""), - (i + 1)); + FormatChoiceNum(Cnum, i, ""); #ifdef USE_SLANG SLsmg_gotorc((top + ((i + 1) - window_offset)), (lx - 1 + 2)); addstr(Cnum); @@ -2464,10 +2464,7 @@ redraw: } Cptr = choices; i = cur_choice; - sprintf(Cnum, "%s%d: ", - ((num_choices > 8 && i < 9) ? - " " : ""), - (i + 1)); + FormatChoiceNum(Cnum, i, ""); #ifdef USE_SLANG SLsmg_gotorc((top + ((i + 1) - window_offset)), (lx - 1 + 2)); addstr(Cnum); @@ -3048,11 +3045,7 @@ check_recall: * Start search at the next choice. - FM */ for (j = 1; Cptr[i+j] != NULL; j++) { - sprintf(buffer, "%s%d: %s", - ((num_choices > 8 && (j + i) < 9) ? - " " : ""), - (i + j + 1), - Cptr[i+j]); + FormatChoiceNum(buffer, (i + j), Cptr[i+j]); if (case_sensitive) { if (strstr(buffer, prev_target_buffer) != NULL) break; @@ -3090,11 +3083,7 @@ check_recall: * Search from the beginning to the current choice. - FM */ for (j = 0; j < cur_choice; j++) { - sprintf(buffer, "%s%d: %s", - ((num_choices > 8 && j < 9) ? - " " : ""), - (j + 1), - Cptr[j]); + FormatChoiceNum(buffer, (j + 1), Cptr[j]); if (case_sensitive) { if (strstr(buffer, prev_target_buffer) != NULL) break; diff --git a/src/LYPrint.c b/src/LYPrint.c index 640386cd..4ae19b31 100644 --- a/src/LYPrint.c +++ b/src/LYPrint.c @@ -655,7 +655,7 @@ PRIVATE void send_file_to_mail ARGS3( SetOutputMode( O_TEXT ); printf(MAILING_FILE); LYSystem(buffer); - sleep(AlertSecs); + LYSleepAlert(); start_curses(); SetOutputMode( O_BINARY ); @@ -781,7 +781,7 @@ PRIVATE void send_file_to_mail ARGS3( SetOutputMode(O_TEXT); printf("%s\n\n$ %s\n\n%s", gettext("Sending"), buffer, PLEASE_WAIT); LYSystem(buffer); - sleep(MessageSecs); + LYSleepMsg(); start_curses(); SetOutputMode( O_BINARY ); @@ -964,7 +964,7 @@ check_again: fflush(stdout); #endif SetOutputMode( O_BINARY ); - sleep(MessageSecs); + LYSleepMsg(); start_curses(); done: /* send_file_to_printer() */ diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c index bfaa0de1..c1360af2 100644 --- a/src/LYReadCFG.c +++ b/src/LYReadCFG.c @@ -520,6 +520,25 @@ typedef struct } Config_Type; +typedef struct +{ + CONST char *name; + int value; +} +Config_Enum; + +static int config_enum ARGS2( + Config_Enum *, table, + CONST char *, name) +{ + while (table->name != 0) { + if (!strcasecomp(table->name, name)) + break; + table++; + } + return table->value; +} + static int assume_charset_fun ARGS1( char *, value) { @@ -631,14 +650,15 @@ static int numbers_as_arrows_fun ARGS1( static int default_user_mode_fun ARGS1( char *, value) { - if (!strncasecomp(value, "NOVICE", 6)) - user_mode = NOVICE_MODE; - else if (!strncasecomp(value, "INTER", 5)) - user_mode = INTERMEDIATE_MODE; - else if (!strncasecomp(value, "ADVANCE", 7)) - user_mode = ADVANCED_MODE; + static Config_Enum table[] = { + { "NOVICE", NOVICE_MODE }, + { "INTER", INTERMEDIATE_MODE }, + { "ADVANCE", ADVANCED_MODE }, + { NULL, NOVICE_MODE } + }; + user_mode = config_enum(table, value); - return 0; + return 0; } #ifdef DIRED_SUPPORT @@ -897,12 +917,13 @@ static int referer_with_query_fun ARGS1( static int source_cache_fun ARGS1( char *, value) { - if (!strncasecomp(value, "FILE", 4)) - LYCacheSource = SOURCE_CACHE_FILE; - else if (!strncasecomp(value, "MEM", 3)) - LYCacheSource = SOURCE_CACHE_MEMORY; - else if (!strncasecomp(value, "NONE", 4)) - LYCacheSource = SOURCE_CACHE_NONE; + static Config_Enum table[] = { + { "FILE", SOURCE_CACHE_FILE }, + { "MEM", SOURCE_CACHE_MEMORY }, + { "NONE", SOURCE_CACHE_NONE }, + { NULL, SOURCE_CACHE_NONE }, + }; + LYCacheSource = config_enum(table, value); return 0; } @@ -978,7 +999,7 @@ static int suffix_fun ARGS1( sq, value)); q = -1.0; } else { - q = df; + q = (float) df; } } HTSetSuffix5(value, mime_type, encoding, description, q); @@ -1211,16 +1232,10 @@ static int parse_html_src_spec ARGS3( return 0; } -typedef struct string_int_pair_ -{ - char* str; - int val; -} string_int_pair; - PRIVATE int psrcspec_fun ARGS1(char*,s) { char* e; - static string_int_pair lexemnames[] = + static Config_Enum lexemnames[] = { { "comm", HTL_comm }, { "tag", HTL_tag }, @@ -1236,8 +1251,7 @@ PRIVATE int psrcspec_fun ARGS1(char*,s) { "sgmlspecial", HTL_sgmlspecial }, { NULL, -1 } }; - string_int_pair* cur = lexemnames; - BOOL found = FALSE; + int found; e = strchr(s,':'); if (!e) { @@ -1245,16 +1259,11 @@ PRIVATE int psrcspec_fun ARGS1(char*,s) return 0; } *e = '\0'; - while (cur->str) { - if ((found = !strcasecomp(s, cur->str)) != 0) - break; - ++cur; - } - if (!found) { + if ((found = config_enum(lexemnames, s)) < 0) { CTRACE((tfp,"bad format of PRETTYSRC_SPEC setting value, ignored %s:%s\n",s,e+1)); return 0; } - parse_html_src_spec(cur->val, e+1, s); + parse_html_src_spec(found, e+1, s); return 0; } @@ -1525,9 +1534,9 @@ static Config_Type Config_Table [] = PARSE_SET("use_mouse", CONF_BOOL, &LYUseMouse), #endif PARSE_SET("use_select_popups", CONF_BOOL, &LYSelectPopups), + PARSE_FUN("viewer", CONF_FUN, viewer_fun), PARSE_SET("verbose_images", CONF_BOOL, &verbose_img), PARSE_SET("vi_keys_always_on", CONF_BOOL, &vi_keys), - PARSE_FUN("viewer", CONF_FUN, viewer_fun), PARSE_ENV("wais_proxy", CONF_ENV, 0 ), PARSE_STR("xloadimage_command", CONF_STR, &XLoadImageCommand), diff --git a/src/LYShowInfo.c b/src/LYShowInfo.c index 0be89fcd..f00e1557 100644 --- a/src/LYShowInfo.c +++ b/src/LYShowInfo.c @@ -44,7 +44,6 @@ PUBLIC int showinfo ARGS4( #endif #ifdef DIRED_SUPPORT - char temp[LY_MAXPATH]; struct stat dir_info; #endif /* DIRED_SUPPORT */ @@ -93,21 +92,18 @@ PUBLIC int showinfo ARGS4( #ifdef DIRED_SUPPORT if (lynx_edit_mode && nlinks > 0) { - char *s; + char *temp; fprintf(fp0, "<pre>\n"); fprintf(fp0, "\n%s\n\n", gettext("Directory that you are currently viewing")); - s = HTfullURL_toFile(doc->address); - strcpy(temp, s); - FREE(s); - + temp = HTfullURL_toFile(doc->address); fprintf(fp0, " <em>%4s</em> %s\n", gettext("Name:"), temp); + FREE(temp); + fprintf(fp0, " <em>%4s</em> %s\n", gettext("URL:"), doc->address); - s = HTfullURL_toFile(links[doc->link].lname); - strcpy(temp, s); - FREE(s); + temp = HTfullURL_toFile(links[doc->link].lname); if (lstat(temp, &dir_info) == -1) { CTRACE((tfp, "lstat(%s) failed, errno=%d\n", temp, errno)); @@ -138,7 +134,7 @@ PUBLIC int showinfo ARGS4( if ((buf_size = readlink(temp, buf, sizeof(buf)-1)) != -1) { buf[buf_size] = '\0'; } else { - strcpy(buf, gettext("Unable to follow link")); + sprintf(buf, "%.1024s", gettext("Unable to follow link")); } fprintf(fp0, " <em>%s</em> %s\n", gettext("Points to file:"), buf); } @@ -225,6 +221,7 @@ PUBLIC int showinfo ARGS4( } fprintf(fp0, "%s\n", (char *)&modes[2]); /* Skip leading ', ' */ } + FREE(temp); fprintf(fp0,"</pre>\n"); } else { #endif /* DIRED_SUPPORT */ diff --git a/src/LYStrings.c b/src/LYStrings.c index 0e4244f5..f02cff44 100644 --- a/src/LYStrings.c +++ b/src/LYStrings.c @@ -2085,9 +2085,9 @@ re_read: if (MOUSE_Y_POS > (LYlines - V_CMD_AREA)) { /* Screen BOTTOM */ if (MOUSE_X_POS < left) { - c = LTARROW; p = "<-"; + c = LTARROW; p = "<-"; } else if (MOUSE_X_POS < HIST_CMD_2) { - c = RTARROW; p = "->"; + c = RTARROW; p = "->"; } else if (MOUSE_X_POS > right) { c = 'z'; p = "Cancel"; } else { @@ -2096,9 +2096,9 @@ re_read: } else if (MOUSE_Y_POS < V_CMD_AREA) { /* Screen TOP */ if (MOUSE_X_POS < left) { - c = LTARROW; p = "<-"; + c = LTARROW; p = "<-"; } else if (MOUSE_X_POS < HIST_CMD_2) { - c = RTARROW; p = "->"; + c = RTARROW; p = "->"; } else if (MOUSE_X_POS > right) { c = 'z'; p = "Cancel"; } else { diff --git a/src/LYUpload.c b/src/LYUpload.c index 672a7b06..104d2087 100644 --- a/src/LYUpload.c +++ b/src/LYUpload.c @@ -46,7 +46,7 @@ PUBLIC int LYUpload ARGS1( int count; char *the_upload = 0; char tmpbuf[LY_MAXPATH]; - char buffer[LY_MAXPATH]; + char *filename = NULL; lynx_html_item_type *upload_command = 0; FILE *fp; char *the_command = 0; @@ -107,16 +107,16 @@ retry: HTAlert(gettext("Illegal redirection using \"~\" found! Request ignored.")); goto cancelled; } - sprintf(buffer, "%s/%s", directory, tmpbuf); + HTSprintf0(&filename, "%s/%s", directory, tmpbuf); #if HAVE_POPEN - if (LYIsPipeCommand(buffer)) { + if (LYIsPipeCommand(filename)) { HTAlert(CANNOT_WRITE_TO_FILE); _statusline(NEW_FILENAME_PROMPT); goto retry; } #endif - switch (LYValidateOutput(buffer)) { + switch (LYValidateOutput(filename)) { case 'Y': break; case 'N': @@ -128,18 +128,18 @@ retry: /* * See if we can write to it. */ - CTRACE((tfp, "LYUpload: filename is %s", buffer)); + CTRACE((tfp, "LYUpload: filename is %s", filename)); - if ((fp = fopen(buffer, "w")) != NULL) { + if ((fp = fopen(filename, "w")) != NULL) { fclose(fp); - remove(buffer); + remove(filename); } else { HTAlert(CANNOT_WRITE_TO_FILE); _statusline(NEW_FILENAME_PROMPT); goto retry; } - HTAddParam(&the_upload, upload_command->command, 1, buffer); + HTAddParam(&the_upload, upload_command->command, 1, filename); HTEndParam(&the_upload, upload_command->command, 1); } else { /* No substitution, no changes */ StrAllocCopy(the_upload, upload_command->command); @@ -158,9 +158,10 @@ retry: FREE(the_command); FREE(the_upload); #ifdef UNIX - chmod(buffer, HIDE_CHMOD); + if (filename != 0) + chmod(filename, HIDE_CHMOD); #endif /* UNIX */ - /* don't remove(file); */ + FREE(filename); return 1; diff --git a/src/LYUtils.c b/src/LYUtils.c index 31572b19..43e4292b 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -167,6 +167,15 @@ PRIVATE LY_TEMP *FindTempfileByFP ARGS1(FILE *, fp) } /* + * Get an environment variable, rejecting empty strings + */ +PRIVATE char *getenv_text ARGS1(char *, name) +{ + char *result = getenv(name); + return (result != 0 && *result != 0) ? result : 0; +} + +/* * Highlight (or unhighlight) a given link. */ PUBLIC void highlight ARGS3( @@ -2476,6 +2485,9 @@ PUBLIC int HTCheckForInterrupt NOARGS PUBLIC BOOLEAN LYisAbsPath ARGS1( char *, path) { +#ifdef VMS + return TRUE; +#else BOOLEAN result; #ifdef DOSPATH result = (BOOL) (LYIsPathSep(path[0]) @@ -2486,6 +2498,7 @@ PUBLIC BOOLEAN LYisAbsPath ARGS1( result = (LYIsPathSep(path[0])); #endif /* DOSPATH */ return result; +#endif } /* @@ -3128,7 +3141,7 @@ PUBLIC BOOLEAN LYCanDoHEAD ARGS1( if (acc_method && *acc_method) { char *proxy; StrAllocCat(acc_method, "_proxy"); - proxy = (char *)getenv(acc_method); + proxy = getenv(acc_method); if (proxy && (!strncmp(proxy, "http:", 5) || !strncmp(proxy, "lynxcgi:", 8)) && !override_proxy(temp0)) { @@ -3465,7 +3478,7 @@ PUBLIC void HTAddSugFilename ARGS1( PUBLIC void change_sug_filename ARGS1( char *, fname) { - char *temp, *cp, *cp1, *end; + char *temp = 0, *cp, *cp1, *end; #ifdef VMS char *dot; int j, k; @@ -3484,30 +3497,26 @@ PUBLIC void change_sug_filename ARGS1( /* * Rename any temporary files. */ - temp = (char *)calloc(1, (strlen(lynx_temp_space) + 60)); - if (temp == NULL) - outofmem(__FILE__, "change_sug_filename"); cp = wwwName(lynx_temp_space); #ifdef FNAMES_8_3 if (LYIsHtmlSep(*cp)) { - sprintf(temp, "file://localhost%s%04x", cp, GETPID()); + HTSprintf0(&temp, "file://localhost%s%04x", cp, GETPID()); } else { - sprintf(temp, "file://localhost/%s%04x", cp, GETPID()); + HTSprintf0(&temp, "file://localhost/%s%04x", cp, GETPID()); } #else if (LYIsHtmlSep(*cp)) { - sprintf(temp, "file://localhost%s%d", cp, (int)getpid()); + HTSprintf0(&temp, "file://localhost%s%d", cp, (int)getpid()); } else { - sprintf(temp, "file://localhost/%s%d", cp, (int)getpid()); + HTSprintf0(&temp, "file://localhost/%s%d", cp, (int)getpid()); } #endif if (!strncmp(fname, temp, strlen(temp))) { cp = strrchr(fname, '.'); if (strlen(cp) > (strlen(temp) - 4)) cp = NULL; - strcpy(temp, (cp ? cp : "")); - strcpy(fname, "temp"); - strcat(fname, temp); + StrAllocCopy(temp, (cp ? cp : "")); + sprintf(fname, "temp%.*s", LY_MAXPATH - 10, temp); } FREE(temp); @@ -4726,7 +4735,7 @@ have_VMS_URL: sprintf(buff, "'%s' not exist, Goto LynxHome '%s'.", q, p); _statusline(buff); - sleep(AlertSecs); + LYSleepAlert(); FREE(temp); StrAllocCat(*AllocatedString, p); goto Retry; @@ -5462,36 +5471,21 @@ PUBLIC CONST char * Home_Dir NOARGS char *cp = NULL; if (homedir == NULL) { - if ((cp = getenv("HOME")) == NULL || *cp == '\0' -#ifdef UNIX - || !(LYIsPathSep(*cp) -# ifdef __EMX__ - || (*cp && cp[1] == ':' && LYIsPathSep(cp[2])) -# endif - ) -#endif /* UNIX */ - ) { + if ((cp = getenv_text("HOME")) == NULL + || !LYisAbsPath(cp)) { #if defined (DOSPATH) || defined (__EMX__) /* BAD! WSB */ - if ((cp = getenv("TEMP")) == NULL || *cp == '\0') { - if ((cp = getenv("TMP")) == NULL || *cp == '\0') { - StrAllocCopy(HomeDir, "C:\\"); - } else { - StrAllocCopy(HomeDir, cp); - } - } else { - StrAllocCopy(HomeDir, cp); + if ((cp = getenv_text("TEMP")) == NULL + && (cp = getenv_text("TMP")) == NULL) { + cp = "C:\\"; } + StrAllocCopy(HomeDir, cp); #else #ifdef VMS - if ((cp = getenv("SYS$LOGIN")) == NULL || *cp == '\0') { - if ((cp = getenv("SYS$SCRATCH")) == NULL || *cp == '\0') { - StrAllocCopy(HomeDir, "sys$scratch:"); - } else { - StrAllocCopy(HomeDir, cp); - } - } else { - StrAllocCopy(HomeDir, cp); + if ((cp = getenv_text("SYS$LOGIN")) == NULL + && (cp = getenv_text("SYS$SCRATCH")) == NULL) { + cp = "sys$scratch:"; } + StrAllocCopy(HomeDir, cp); #else #if HAVE_UTMP /* @@ -5516,6 +5510,14 @@ PUBLIC CONST char * Home_Dir NOARGS #endif /* VMS */ #endif /* DOSPATH */ } else { +#if defined(_WINDOWS) || defined(DOSPATH) + char *hp = getenv_text("HOMEDRIVE"); + if (hp != 0 + && (LYIsPathSep(*cp) || !LYisAbsPath(cp))) { + StrAllocCopy(HomeDir, hp); + StrAllocCat(HomeDir, cp); + } else +#endif StrAllocCopy(HomeDir, cp); } homedir = (CONST char *)HomeDir; @@ -5817,11 +5819,8 @@ PUBLIC void LYAddPathToHome ARGS3( * SHELL syntax and append subdirectory path, * then convert that to VMS syntax. - FM */ - char *temp = (char *)calloc(1, - (strlen(home) + strlen(file) + 10)); - if (temp == NULL) - outofmem(__FILE__, "LYAddPathToHome"); - sprintf(temp, "%s%s", HTVMS_wwwName(home), (file + 1)); + char *temp = NULL; + HTSprintf0(&temp, "%s%s", HTVMS_wwwName(home), (file + 1)); sprintf(fbuffer, "%.*s", (fbuffer_size - 1), HTVMS_name("", temp)); FREE(temp); @@ -7031,12 +7030,17 @@ PUBLIC BOOLEAN LYValidateFilename ARGS2( #endif /* __EMX__*/ cp = NULL; + *result = 0; if (cp) { LYTrimPathSep(cp); - sprintf(result, "%s/%s", cp, HTSYS_name(given)); - } else { - strcpy(result, HTSYS_name(given)); + if (strlen(cp) >= LY_MAXPATH - 2) + return FALSE; + sprintf(result, "%s/", cp); } + cp = HTSYS_name(given); + if (strlen(result) + strlen(cp) >= LY_MAXPATH - 1) + return FALSE; + strcat(result, cp); #endif /* VMS */ return TRUE; } @@ -7426,7 +7430,7 @@ PUBLIC int LYSystem ARGS1( if (strchr(p, '\\') == NULL) { /* for Windows Application */ cygwin_conv_to_full_win32_path(p, win32_name); - sprintf(new_command, "%s \"%s\"", new_cmd, win32_name); + sprintf(new_command, "%.*s \"%.*s\"", LY_MAXPATH, new_cmd, LY_MAXPATH, win32_name); } else { /* for DOS like editor */ q = win32_name; @@ -7439,7 +7443,7 @@ PUBLIC int LYSystem ARGS1( q++, p++; } *q = '\0'; - sprintf(new_command, "%s %s", new_cmd, win32_name); + sprintf(new_command, "%.*s %.*s", LY_MAXPATH, new_cmd, LY_MAXPATH, win32_name); } command = new_command; } @@ -7502,7 +7506,7 @@ PUBLIC int Cygwin_Shell NOARGS /* Init a startup structure */ GetStartupInfo(&startUpInfo); - shell = getenv("COMSPEC"); + shell = getenv_text("COMSPEC"); /* Create the child process, specifying inherited handles. Pass the value of the @@ -7531,10 +7535,10 @@ PUBLIC char *LYSysShell NOARGS char *shell = 0; #ifdef DOSPATH #ifdef WIN_EX - shell = getenv("SHELL"); + shell = getenv_text("SHELL"); if (shell) { if (access(shell, 0) != 0) - shell = getenv("COMSPEC"); + shell = getenv_text("COMSPEC"); } if (shell == NULL) { if (system_is_NT) @@ -7543,9 +7547,9 @@ PUBLIC char *LYSysShell NOARGS shell = "command.com"; } #else - shell = getenv("SHELL"); + shell = getenv_text("SHELL"); if (shell == NULL) { - shell = getenv("COMSPEC"); + shell = getenv_text("COMSPEC"); } if (shell == NULL) { shell = "command.com"; @@ -7553,10 +7557,10 @@ PUBLIC char *LYSysShell NOARGS #endif /* WIN_EX */ #else #ifdef __EMX__ - if (getenv("SHELL") != NULL) { - shell = getenv("SHELL"); + if (getenv_text("SHELL") != NULL) { + shell = getenv_text("SHELL"); } else { - shell = (getenv("COMSPEC") == NULL) ? "cmd.exe" : getenv("COMSPEC"); + shell = (getenv_text("COMSPEC") == NULL) ? "cmd.exe" : getenv_text("COMSPEC"); } #else #ifdef VMS @@ -7581,7 +7585,7 @@ PUBLIC char *LYSysShell NOARGS PUBLIC char *LYgetXDisplay NOARGS { char *cp; - if ((cp = getenv(DISPLAY)) == NULL || *cp == '\0') + if ((cp = getenv_text(DISPLAY)) == NULL) cp = 0; return cp; } @@ -7599,11 +7603,8 @@ PUBLIC void LYsetXDisplay ARGS1( Define_VMSLogical(DISPLAY, new_display); #else static char *display_putenv_command; - display_putenv_command = malloc(strlen(new_display) + 12); - if (!display_putenv_command) - outofmem(__FILE__, "LYsetXDisplay"); - sprintf(display_putenv_command, "DISPLAY=%s", new_display); + HTSprintf0(&display_putenv_command, "DISPLAY=%s", new_display); putenv(display_putenv_command); #endif /* VMS */ if ((new_display = LYgetXDisplay()) != 0) { diff --git a/src/LYexit.c b/src/LYexit.c index 9d4fd0f2..02ad6fa6 100644 --- a/src/LYexit.c +++ b/src/LYexit.c @@ -3,6 +3,7 @@ */ #include <HTUtils.h> #include <LYexit.h> +#include <HTAlert.h> #ifndef VMS #include <LYGlobalDefs.h> #include <LYUtils.h> @@ -124,7 +125,7 @@ PUBLIC void LYexit ARGS1( * Deal with curses, if on, and clean up. - FM */ if (LYCursesON) { - sleep(AlertSecs); + LYSleepAlert(); } cleanup_sig(0); #ifndef __linux__ diff --git a/src/LYrcFile.c b/src/LYrcFile.c index d03f49d0..de97c538 100644 --- a/src/LYrcFile.c +++ b/src/LYrcFile.c @@ -17,10 +17,60 @@ #define FNAME_LYNXRC ".lynxrc" #endif /* FNAMES_8_3 */ +typedef struct +{ + CONST char *name; + int value; +} +Config_Enum; + #define FIND_KEYWORD(cp, keyword) \ ((cp = LYstrstr(line_buffer, keyword)) != NULL && \ (cp - line_buffer) < number_sign) +#define putBool(value) ((value) ? "on" : "off") + +#ifdef DIRED_SUPPORT +static Config_Enum dir_list_style_tbl[] = { + { "FILES_FIRST", FILES_FIRST }, + { "DIRECTORIES_FIRST", 0 }, + { "MIXED_STYLE", MIXED_STYLE }, + { NULL, -1 }, +}; +#endif + +static Config_Enum file_sort_tbl[] = { + { "BY_FILENAME", FILE_BY_NAME }, + { "BY_TYPE", FILE_BY_TYPE }, + { "BY_SIZE", FILE_BY_SIZE }, + { "BY_DATE", FILE_BY_DATE }, + { NULL, -1 }, +}; + +static Config_Enum keypad_mode_tbl[] = { + { "LINKS_AND_FIELDS_ARE_NUMBERED", LINKS_AND_FIELDS_ARE_NUMBERED }, + { "LINKS_AND_FORM_FIELDS_ARE_NUMBERED", LINKS_AND_FIELDS_ARE_NUMBERED }, + { "LINKS_ARE_NUMBERED", LINKS_ARE_NUMBERED }, + { "NUMBERS_AS_ARROWS", NUMBERS_AS_ARROWS }, + { NULL, -1 } +}; + +static Config_Enum user_mode_tbl[] = { + { "ADVANCED", ADVANCED_MODE }, + { "INTERMEDIATE", INTERMEDIATE_MODE }, + { "NOVICE", NOVICE_MODE }, + { NULL, -1 } +}; + +static Config_Enum visited_links_tbl[] = { + { "FIRST_REVERSED", VISITED_LINKS_AS_FIRST_V | VISITED_LINKS_REVERSE }, + { "FIRST", VISITED_LINKS_AS_FIRST_V }, + { "TREE", VISITED_LINKS_AS_TREE }, + { "LAST_REVERSED", VISITED_LINKS_AS_LATEST | VISITED_LINKS_REVERSE }, + { "LAST", VISITED_LINKS_AS_LATEST }, + { NULL, -1 } +}; + PRIVATE char *SkipEquals ARGS1(char *, src) { char *tmp; @@ -29,6 +79,41 @@ PRIVATE char *SkipEquals ARGS1(char *, src) return LYSkipBlanks(src); } +PRIVATE BOOL getBool ARGS1(char *, src) +{ + src = SkipEquals(src); + return (!strncasecomp(src, "on", 2) || !strncasecomp(src, "true", 4)); +} + +PRIVATE CONST char *putEnum ARGS2( + Config_Enum *, table, + int, value) +{ + while (table->name != 0) { + if (table->value == value) { + return table->name; + } + table++; + } + return "?"; +} + +PRIVATE BOOL getEnum ARGS3( + Config_Enum *, table, + char *, src, + int *, value) +{ + src = SkipEquals(src); + while (table->name != 0) { + if (!strncasecomp(table->name, src, strlen(table->name))) { + *value = table->value; + return TRUE; + } + table++; + } + return FALSE; +} + /* Read and process user options. * If the passed-in fp is NULL, open the regular user defaults file * for reading, otherwise use fp which has to be a file open for @@ -195,15 +280,7 @@ PUBLIC void read_rc ARGS1(FILE *, fp) */ } else if (FIND_KEYWORD(cp, "file_sorting_method")) { - cp = SkipEquals(cp); - if (!strncasecomp(cp, "BY_FILENAME", 11)) - HTfileSortMethod = FILE_BY_NAME; - else if (!strncasecomp(cp, "BY_TYPE", 7)) - HTfileSortMethod = FILE_BY_TYPE; - else if (!strncasecomp(cp, "BY_SIZE", 7)) - HTfileSortMethod = FILE_BY_SIZE; - else if (!strncasecomp(cp, "BY_DATE", 7)) - HTfileSortMethod = FILE_BY_DATE; + getEnum(file_sort_tbl, cp, &HTfileSortMethod); /* * Personal mail address. @@ -218,11 +295,7 @@ PUBLIC void read_rc ARGS1(FILE *, fp) */ } else if (FIND_KEYWORD(cp, "case_sensitive_searching")) { - cp = SkipEquals(cp); - if (!strncasecomp(cp, "on", 2)) - case_sensitive = TRUE; - else - case_sensitive = FALSE; + case_sensitive = getBool(cp); /* * Character set. @@ -260,33 +333,21 @@ PUBLIC void read_rc ARGS1(FILE *, fp) */ } else if (FIND_KEYWORD(cp, "vi_keys")) { - cp = SkipEquals(cp); - if (!strncasecomp(cp, "on", 2)) - vi_keys = TRUE; - else - vi_keys = FALSE; + vi_keys = getBool(cp); /* * EMACS keys. */ } else if (FIND_KEYWORD(cp, "emacs_keys")) { - cp = SkipEquals(cp); - if (!strncasecomp(cp, "on", 2)) - emacs_keys = TRUE; - else - emacs_keys=FALSE; + emacs_keys = getBool(cp); /* * Show dot files. */ } else if (FIND_KEYWORD(cp, "show_dotfiles")) { - cp = SkipEquals(cp); - if (!strncasecomp(cp, "on", 2)) - show_dotfiles = TRUE; - else - show_dotfiles = FALSE; + show_dotfiles = getBool(cp); /* * Show color. @@ -335,13 +396,8 @@ PUBLIC void read_rc ARGS1(FILE *, fp) */ } else if (FIND_KEYWORD(cp, "keypad_mode")) { - cp = SkipEquals(cp); - if (LYstrstr(cp, "LINKS_ARE_NUMBERED")) - keypad_mode = LINKS_ARE_NUMBERED; - else if (LYstrstr(cp, "LINKS_AND_FORM_FIELDS_ARE_NUMBERED")) - keypad_mode = LINKS_AND_FIELDS_ARE_NUMBERED; - else - keypad_mode = NUMBERS_AS_ARROWS; + if (!getEnum(keypad_mode_tbl, cp, &keypad_mode)) + keypad_mode = DEFAULT_KEYPAD_MODE; /* * Keyboard layout. @@ -381,27 +437,15 @@ PUBLIC void read_rc ARGS1(FILE *, fp) */ } else if (FIND_KEYWORD(cp, "dir_list_style")) { - cp = SkipEquals(cp); - if (LYstrstr(cp, "FILES_FIRST") != NULL) { - dir_list_style = FILES_FIRST; - } else if (LYstrstr(cp,"DIRECTORIES_FIRST") != NULL) { - dir_list_style = 0; - } else { + if (!getEnum(dir_list_style_tbl, cp, &dir_list_style)) dir_list_style = MIXED_STYLE; - } #endif /* DIRED_SUPPORT */ /* * Accept cookies from all domains? */ } else if (FIND_KEYWORD(cp, "accept_all_cookies")) { - cp = SkipEquals(cp); - if (LYstrstr(cp,"TRUE") != NULL) { - LYAcceptAllCookies = TRUE; - } else { - LYAcceptAllCookies = FALSE; - } - + LYAcceptAllCookies = getBool(cp); /* * Accept all cookies from certain domains? @@ -464,14 +508,8 @@ PUBLIC void read_rc ARGS1(FILE *, fp) */ } else if (FIND_KEYWORD(cp, "user_mode")) { - cp = SkipEquals(cp); - if (LYstrstr(cp, "ADVANCED") != NULL) { - user_mode = ADVANCED_MODE; - } else if (LYstrstr(cp,"INTERMEDIATE") != NULL) { - user_mode = INTERMEDIATE_MODE; - } else { + if (!getEnum(user_mode_tbl, cp, &user_mode)) user_mode = NOVICE_MODE; - } #ifdef NOTUSED #ifdef DISP_PARTIAL @@ -492,29 +530,21 @@ PUBLIC void read_rc ARGS1(FILE *, fp) */ } else if (FIND_KEYWORD(cp, "run_all_execution_links")) { - cp = SkipEquals(cp); - if (!strncasecomp(cp, "on", 2)) - local_exec = TRUE; - else - local_exec = FALSE; + local_exec = getBool(cp); /* * Local execution mode - only links in local files. */ } else if (FIND_KEYWORD(cp, "run_execution_links_on_local_files")) { - cp = SkipEquals(cp); - if (!strncasecomp(cp, "on", 2)) - local_exec_on_local_files = TRUE; - else - local_exec_on_local_files=FALSE; + local_exec_on_local_files = getBool(cp); #endif /* ENABLE_OPTS_CHANGE_EXEC */ } else if (FIND_KEYWORD(cp, "verbose_images")) { - cp = SkipEquals(cp); - if (!strncasecomp(cp, "on", 2)) - verbose_img = 1; - else if (!strncasecomp(cp, "off", 3)) - verbose_img = 0; + verbose_img = getBool(cp); + + } else if (FIND_KEYWORD(cp, "visited_links")) { + if (!getEnum(visited_links_tbl, cp, &Visited_Links_As)) + Visited_Links_As = DEFAULT_VISITED_LINKS; } /* end of if */ @@ -661,12 +691,7 @@ file lists such as FTP directories. The options are:\n\ BY_DATE -- sorts on the date of the file\n\ ")); fprintf(fp, "file_sorting_method=%s\n\n", - (HTfileSortMethod == FILE_BY_NAME ? "BY_FILENAME" - : - (HTfileSortMethod == FILE_BY_SIZE ? "BY_SIZE" - : - (HTfileSortMethod == FILE_BY_TYPE ? "BY_TYPE" - : "BY_DATE")))); + putEnum(file_sort_tbl, HTfileSortMethod)); /* * Personal mail address. @@ -691,8 +716,7 @@ If case_sensitive_searching is \"on\" then when the user invokes a search\n\ using the 's' or '/' keys, the search performed will be case sensitive\n\ instead of case INsensitive. The default is usually \"off\".\n\ ")); - fprintf(fp, "case_sensitive_searching=%s\n\n", - (case_sensitive ? "on" : "off")); + fprintf(fp, "case_sensitive_searching=%s\n\n", putBool(case_sensitive)); /* * Character set. @@ -779,7 +803,7 @@ will be enabled. These keys are only lower case.\n\ Capital 'H', 'J' and 'K will still activate help, jump shortcuts,\n\ and the keymap display, respectively.\n\ ")); - fprintf(fp, "vi_keys=%s\n\n", (vi_keys ? "on" : "off")); + fprintf(fp, "vi_keys=%s\n\n", putBool(vi_keys)); /* * EMACS keys. @@ -790,7 +814,7 @@ If emacs_keys is to \"on\" then the normal EMACS movement keys:\n\ ^B = left ^F = right\n\ will be enabled.\n\ ")); - fprintf(fp, "emacs_keys=%s\n\n", (emacs_keys ? "on" : "off")); + fprintf(fp, "emacs_keys=%s\n\n", putBool(emacs_keys)); /* * Show dot files. @@ -802,7 +826,7 @@ honored only if enabled via userdefs.h and/or lynx.cfg, and not\n\ restricted via a command line switch. If display of hidden files\n\ is disabled, creation of such files via Lynx also is disabled.\n\ ")); - fprintf(fp, "show_dotfiles=%s\n\n", (show_dotfiles ? "on" : "off")); + fprintf(fp, "show_dotfiles=%s\n\n", putBool(show_dotfiles)); /* * Select popups. @@ -816,7 +840,7 @@ of checkboxes for the OPTIONs. A value of \"on\" will set popup menus\n\ as the default while a value of \"off\" will set use of radio boxes.\n\ The default can be overridden via the -popup command line toggle.\n\ ")); - fprintf(fp, "select_popups=%s\n\n", (LYSelectPopups ? "on" : "off")); + fprintf(fp, "select_popups=%s\n\n", putBool(LYSelectPopups)); /* * Show cursor. @@ -832,7 +856,7 @@ or color. A value of \"on\" will set positioning to the left as the\n\ default while a value of \"off\" will set 'hiding' of the cursor.\n\ The default can be overridden via the -show_cursor command line toggle.\n\ ")); - fprintf(fp, "show_cursor=%s\n\n", (LYShowCursor ? "on" : "off")); + fprintf(fp, "show_cursor=%s\n\n", putBool(LYShowCursor)); /* * Keypad mode. @@ -864,10 +888,7 @@ NOTE: Some fixed format documents may look disfigured when\n\ \"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n\ enabled.\n\ ")); - fprintf(fp, "keypad_mode=%s\n\n", - ((keypad_mode == NUMBERS_AS_ARROWS) ? "NUMBERS_AS_ARROWS" : - ((keypad_mode == LINKS_ARE_NUMBERED) ? "LINKS_ARE_NUMBERED" : - "LINKS_AND_FORM_FIELDS_ARE_NUMBERED"))); + fprintf(fp, "keypad_mode=%s\n\n", putEnum(keypad_mode_tbl, keypad_mode)); #ifdef NOTUSED #ifdef DISP_PARTIAL @@ -924,10 +945,7 @@ files and directories together. \"FILES_FIRST\" lists files first and\n\ \"DIRECTORIES_FIRST\" lists directories first.\n\ ")); fprintf(fp, "dir_list_style=%s\n\n", - (dir_list_style==FILES_FIRST ? "FILES_FIRST" - : - (dir_list_style==MIXED_STYLE ? "MIXED_STYLE" - : "DIRECTORIES_FIRST"))); + putEnum(dir_list_style_tbl, dir_list_style)); #endif /* DIRED_SUPPORT */ /* @@ -942,9 +960,7 @@ Use \"ADVANCED\" to see the URL of the currently selected link at the\n\ bottom of the screen.\n\ ")); fprintf(fp, "user_mode=%s\n\n", - (user_mode == NOVICE_MODE ? "NOVICE" : - (user_mode == ADVANCED_MODE ? - "ADVANCED" : "INTERMEDIATE"))); + putEnum(user_mode_tbl, user_mode)); /* * Cookie options @@ -955,8 +971,7 @@ accept all cookies if desired. The default is \"FALSE\" which will\n\ prompt for each cookie. Set accept_all_cookies to \"TRUE\" to accept\n\ all cookies.\n\ ")); - fprintf(fp, "accept_all_cookies=%s\n\n", - (LYAcceptAllCookies == FALSE ? "FALSE" : "TRUE")); + fprintf(fp, "accept_all_cookies=%s\n\n", putBool(LYAcceptAllCookies)); write_list(fp, gettext("\ cookie_accept_domains and cookie_reject_domains are comma-delimited\n\ @@ -1022,8 +1037,7 @@ WARNING - This is potentially VERY dangerous. Since you may view\n\ or compromise security. This should only be set to \"on\" if\n\ you are viewing trusted source information.\n\ ")); - fprintf(fp, "run_all_execution_links=%s\n\n", - (local_exec ? "on" : "off")); + fprintf(fp, "run_all_execution_links=%s\n\n", putBool(local_exec)); /* * Local execution mode - only links in local files. @@ -1043,7 +1057,7 @@ WARNING - This is potentially dangerous. Since you may view\n\ you are viewing trusted source information.\n\ ")); fprintf(fp, "run_execution_links_on_local_files=%s\n\n", - (local_exec_on_local_files ? "on" : "off")); + putBool(local_exec_on_local_files)); #endif /* defined(EXEC_LINKS) || defined(EXEC_SCRIPTS) */ write_list(fp, gettext("\ @@ -1051,8 +1065,14 @@ If verbose_images is \"on\", lynx will print the name of the image\n\ source file in place of [INLINE], [LINK] or [IMAGE]\n\ See also VERBOSE_IMAGES in lynx.cfg\n\ ")); - fprintf(fp, "verbose_images=%s\n\n", - verbose_img ? "on" : "off"); + fprintf(fp, "verbose_images=%s\n\n", putBool(verbose_img)); + + write_list(fp, gettext("\ +The visited_links setting controls how Lynx organizes the information\n\ +in the Visited Links Page.\n\ +")); + fprintf(fp, "visited_links=%s\n\n", + putEnum(visited_links_tbl, Visited_Links_As)); /* * Close the RC file. diff --git a/src/chrtrans/makefile.dos b/src/chrtrans/makefile.dos index 369246ac..3ba32967 100644 --- a/src/chrtrans/makefile.dos +++ b/src/chrtrans/makefile.dos @@ -12,7 +12,7 @@ CFLAGS = $(MCFLAGS) CC = gcc -MCFLAGS = -O3 -DDOSPATH -DNO_TTYTYP \ +MCFLAGS = -O1 -DDOSPATH -DNO_TTYTYP \ -I. \ -I../../WWW/Library/Implementation \ -I../../djgpp/watt32/inc \ diff --git a/userdefs.h b/userdefs.h index 9c0e297b..264894ee 100644 --- a/userdefs.h +++ b/userdefs.h @@ -348,7 +348,7 @@ * upgrade, because anonymous mail makes it far too easy for a user to * spoof someone else's email address.) */ -#define NO_ANONYMOUS_EMAIL TRUE +/*#define NO_ANONYMOUS_EMAIL TRUE */ /******************************** * LIST_FORMAT defines the display for local files when LONG_LIST @@ -1299,6 +1299,20 @@ /**************************************************************** + * DEFAULT_VISITED_LINKS may be set to one or more of + * VISITED_LINKS_AS_FIRST_V + * VISITED_LINKS_AS_TREE + * VISITED_LINKS_AS_LATEST + * VISITED_LINKS_REVERSE + * to change the organization of the Visited Links page. + * + * (Not all combinations are meaningful; see src/LYrcFile.c for a list + * in the visited_links_tbl table). + */ +#define DEFAULT_VISITED_LINKS (VISITED_LINKS_AS_LATEST | VISITED_LINKS_REVERSE) + + +/**************************************************************** * Section 3. Things that you should not change until you * have a good knowledge of the program */ @@ -1308,12 +1322,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.21" +#define LYNX_VERSION "2.8.3dev.22" #define LYNX_WWW_HOME "http://lynx.browser.org/" -#define LYNX_WWW_DIST "http://www.slcc.edu/lynx/current/" +#define LYNX_WWW_DIST "http://lynx.isc.org/current/" #define LYNX_RELEASE FALSE /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ -#define LYNX_DATE "Fri, 25 Feb 2000 04:38:35 -0800" +#define LYNX_DATE "Sun, 12 Mar 2000 16:38:38 -0800" #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" |