diff options
167 files changed, 10201 insertions, 9407 deletions
diff --git a/CHANGES b/CHANGES index 34eb8dd1..35ca1eed 100644 --- a/CHANGES +++ b/CHANGES @@ -1,56 +1,77 @@ Changes since Lynx 2.8 release =============================================================================== -2004-12-31 (2.8.6dev.9) -+ remove fixed limit on history[] array (report by Richard Eyre) -TD -+ improve logic for highlighting links which extend to multiple lines by +2005-01-02 (2.8.6dev.10) +* correct final sed command in help_files.sed which was not a basic regular + expression, left some links ending with .gz.gz -TD +* update config.guess, config.sub +* modify configure script to check for Intel compiler 8.0 -TD +* modify ifdef's for USE_DEFAULT_COLORS, disabling it if the + use_default_colors() function is not found -TD +* modify to allow compiling with C++ compiler, e.g., rename conflicting + keywords such as new, class, template (suggested by Nelson Beebe) -TD +* remove leading/trailing blanks from suggested title string for ADD_BOOKMARK + (request by Walter Ian Kaye) -TD +* add tags rules to makefile.in's -TD +* repair fix for Debian #171312 by ensuring that it is only invoked if a URL + fragment was found in the getfile() call (report by PG) -TD +* correct leak-checking for result of LYAddHilite(), which was not freeing + the associated strings -TD +* correct leak-checking for result of LYcommandList(), which was not freeing + the associated strings -TD +* correct pointer initialization in LYCheckForProxyURL() broken by fix for + Debian #240237 (reported by GV, Stef Caunter) -TD + +2004-12-30 (2.8.6dev.9) +* remove fixed limit on history[] array (report by Richard Eyre) -TD +* improve logic for highlighting links which extend to multiple lines by ensuring that if they cover a blank line that the following lines of the link will be highlighted rather than the blank line (report Hataguchi Takeshi). -+ replace most instances of exit() by exit_immediately(), except those needed +* replace most instances of exit() by exit_immediately(), except those needed for the leak-checking code, to add an ifdef'd call to _nc_freeall() which simplifies testing with valgrind -TD -+ fix definition of put_clip(), to compile in Windows environment (Hataguchi +* fix definition of put_clip(), to compile in Windows environment (Hataguchi Takeshi). -+ update da.po, et.po, hu.po, nl.po, sv.po, tr.po from +* update da.po, et.po, hu.po, nl.po, sv.po, tr.po from http://www.iro.umontreal.ca/translation/maint/lynx/ -+ fix for mouse versus network I/O -GV +* fix for mouse versus network I/O -GV Building the djgpp version with S-Lang and mouse-support causes network I/O to stop when Lynx is idle waiting for key/mouse events. This patch adds a djgpp_idle_loop() function that does what getxkey() used to do; calls tcp_tick() to finish off closed sockets and reply to pings etc. Tested with PD-curses 2.6 too, but I couldn't get mouse to work under DOS. Not sure that's possible at all. -+ add "Anonymous FTP Password" to Options menu, to allow user to override use +* add "Anonymous FTP Password" to Options menu, to allow user to override use of personal email address as the anonymous ftp password (Debian #137480) -TD -+ modify LYCheckForProxyURL() to check if a colon follows a slash, which would +* modify LYCheckForProxyURL() to check if a colon follows a slash, which would make the colon not part of a URL (report/patch by Matt Kraal, Debian #240237). -+ add test/special_urls.html -TD -+ minor fixes/update test/iso8859-1.html from +* add test/special_urls.html -TD +* minor fixes/update test/iso8859-1.html from http://www.ramsch.org/martin/uni/fmi-hp/iso8859-1.html -+ add check for broken WU_FTPD 2.6.2-12, e.g., at ftp://ftp.pppl.gov/, and +* add check for broken WU_FTPD 2.6.2-12, e.g., at ftp://ftp.pppl.gov/, and disable EPSV. This is ifdef'd with BROKEN_WU_FTPD and checks version (Debian #66560, as well as April 2003 reports by HN, PW) -TD -+ modify getfile(), etc., to ensure that following a link consisting of a +* modify getfile(), etc., to ensure that following a link consisting of a fragment will move the cursor to the link containing the target rather than simply ensuring that it is visible (Debian #171312) -TD -+ modify ShowInfo() to list the rendered size in bytes if the Content-Length +* modify ShowInfo() to list the rendered size in bytes if the Content-Length is not available (Debian #61085) -TD -+ modify print_wwwfile_to_fd() and void print_crawl_to_fd() to ensure that no +* modify print_wwwfile_to_fd() and void print_crawl_to_fd() to ensure that no trailing blanks are written (Debian #204515) -TD -+ modify behavior when user attempts to toggle a radiobutton off, to make the +* modify behavior when user attempts to toggle a radiobutton off, to make the message that one radio button must be selected only in novice mode (Debian #121520) -TD -+ make the maximum number of cookies configurable in lynx.cfg, added +* make the maximum number of cookies configurable in lynx.cfg, added MAX_COOKIES_DOMAIN, MAX_COOKIES_GLOBAL and MAX_COOKIES_BUFFER (Debian #152810) -TD -+ reduce embedded blanks in button labels to single blanks -TD -+ reduce embedded blanks in title strings to single blanks (Debian #284679) -TD -+ add command-line option (-syslog-urls) and lynx.cfg settings (SYSLOG_TEXT, +* reduce embedded blanks in button labels to single blanks -TD +* reduce embedded blanks in title strings to single blanks (Debian #284679) -TD +* add command-line option (-syslog-urls) and lynx.cfg settings (SYSLOG_TEXT, SYSLOG_REQUESTED_URLS) to allow syslog'ing of URLs to be optional. This cannot be set from the options menu (Debian #282739) -TD -+ modify HTParse() to restore a slash which may be removed during +* modify HTParse() to restore a slash which may be removed during simplification of URLs such as "file://localhost/tmp/..". The LYFillLocalFileURL() function would then append the current directory to the URL rather than the expected "/". This case which happens in DIRED, was diff --git a/WWW/Library/Implementation/HTAABrow.c b/WWW/Library/Implementation/HTAABrow.c index 1f39a2ac..73853301 100644 --- a/WWW/Library/Implementation/HTAABrow.c +++ b/WWW/Library/Implementation/HTAABrow.c @@ -88,7 +88,7 @@ typedef struct { */ typedef struct { HTAAServer *server; /* Which server serves this tree */ - char *template; /* Template for this tree */ + char *ctemplate; /* Template for this tree */ HTList *valid_schemes; /* Valid authentic.schemes */ HTAssocList **scheme_specifics; /* Scheme specific params */ BOOL retry; /* Failed last time -- reprompt (or whatever) */ @@ -340,15 +340,15 @@ static HTAASetup *HTAASetup_lookup(const char *hostname, hostname, portnumber, docname)); while (NULL != (setup = (HTAASetup *) HTList_nextObject(cur))) { - if (HTAA_templateMatch(setup->template, docname)) { + if (HTAA_templateMatch(setup->ctemplate, docname)) { CTRACE((tfp, "%s `%s' %s `%s'\n", "HTAASetup_lookup:", docname, - "matched template", setup->template)); + "matched template", setup->ctemplate)); return setup; } else { CTRACE((tfp, "%s `%s' %s `%s'\n", "HTAASetup_lookup:", docname, - "did NOT match template", setup->template)); + "did NOT match template", setup->ctemplate)); } } /* while setups remain */ } @@ -366,7 +366,7 @@ static HTAASetup *HTAASetup_lookup(const char *hostname, * ON ENTRY: * server is a pointer to a HTAAServer structure * to which this setup belongs. - * template documents matching this template + * ctemplate documents matching this template * are protected according to this setup. * valid_schemes a list containing all valid authentication * schemes for this setup. @@ -380,13 +380,13 @@ static HTAASetup *HTAASetup_lookup(const char *hostname, * returns a new HTAASetup node, and also adds it as * part of the HTAAServer given as parameter. */ -static HTAASetup *HTAASetup_new(HTAAServer *server, char *template, +static HTAASetup *HTAASetup_new(HTAAServer *server, char *ctemplate, HTList *valid_schemes, HTAssocList **scheme_specifics) { HTAASetup *setup; - if (!server || isEmpty(template)) + if (!server || isEmpty(ctemplate)) return NULL; if ((setup = typecalloc(HTAASetup)) == 0) @@ -394,9 +394,9 @@ static HTAASetup *HTAASetup_new(HTAAServer *server, char *template, setup->retry = NO; setup->server = server; - setup->template = NULL; - if (template) - StrAllocCopy(setup->template, template); + setup->ctemplate = NULL; + if (ctemplate) + StrAllocCopy(setup->ctemplate, ctemplate); setup->valid_schemes = valid_schemes; setup->scheme_specifics = scheme_specifics; @@ -418,7 +418,7 @@ static void HTAASetup_delete(HTAASetup * killme) int scheme; if (killme) { - FREE(killme->template); + FREE(killme->ctemplate); if (killme->valid_schemes) { HTList_delete(killme->valid_schemes); killme->valid_schemes = NULL; @@ -598,8 +598,8 @@ static char *compose_auth_string(HTAAScheme scheme, HTAASetup * setup, BOOL IsPr * absolute URL instead of a path. If we do get a host from this, it * will include the port. - FM */ - if ((!IsProxy) && using_proxy && setup->template) { - proxiedHost = HTParse(setup->template, "", PARSE_HOST); + if ((!IsProxy) && using_proxy && setup->ctemplate) { + proxiedHost = HTParse(setup->ctemplate, "", PARSE_HOST); if (proxiedHost && *proxiedHost != '\0') { theHost = proxiedHost; } @@ -733,12 +733,12 @@ static char *compose_auth_string(HTAAScheme scheme, HTAASetup * setup, BOOL IsPr */ static HTAAScheme HTAA_selectScheme(HTAASetup * setup) { - HTAAScheme scheme; + int scheme; if (setup && setup->valid_schemes) { for (scheme = HTAA_BASIC; scheme < HTAA_MAX_SCHEMES; scheme++) if (-1 < HTList_indexOf(setup->valid_schemes, (void *) scheme)) - return scheme; + return (HTAAScheme) scheme; } return HTAA_BASIC; } @@ -1039,7 +1039,7 @@ BOOL HTAA_shouldRetryWithAuth(char *start_of_headers, int num_schemes = 0; HTList *valid_schemes = HTList_new(); HTAssocList **scheme_specifics = NULL; - char *template = NULL; + char *ctemplate = NULL; char *temp = NULL; /* @@ -1074,10 +1074,10 @@ BOOL HTAA_shouldRetryWithAuth(char *start_of_headers, 0 == strcasecomp(fieldname, "WWW-Authenticate:"))) { if (!(arg1 && *arg1 && args && *args)) { HTSprintf0(&temp, gettext("Invalid header '%s%s%s%s%s'"), line, - ((arg1 && *arg1) ? " " : ""), - ((arg1 && *arg1) ? arg1 : ""), - ((args && *args) ? " " : ""), - ((args && *args) ? args : "")); + (!isEmpty(arg1) ? " " : ""), + (!isEmpty(arg1) ? arg1 : ""), + (!isEmpty(args) ? " " : ""), + (!isEmpty(args) ? args : "")); HTAlert(temp); FREE(temp); } else if (HTAA_UNKNOWN != (scheme = HTAAScheme_enum(arg1))) { @@ -1107,7 +1107,7 @@ BOOL HTAA_shouldRetryWithAuth(char *start_of_headers, else if (!IsProxy && 0 == strcasecomp(fieldname, "WWW-Protection-Template:")) { CTRACE((tfp, "Protection template set to `%s'\n", arg1)); - StrAllocCopy(template, arg1); + StrAllocCopy(ctemplate, arg1); } } else { @@ -1167,13 +1167,13 @@ BOOL HTAA_shouldRetryWithAuth(char *start_of_headers, proxy_portnumber, IsProxy); } - if (!template) /* Proxy matches everything -AJL */ - StrAllocCopy(template, "*"); + if (!ctemplate) /* Proxy matches everything -AJL */ + StrAllocCopy(ctemplate, "*"); proxy_setup = HTAASetup_new(server, - template, + ctemplate, valid_schemes, scheme_specifics); - FREE(template); + FREE(ctemplate); HTAlert(gettext("Proxy authorization required -- retrying")); return YES; @@ -1225,13 +1225,13 @@ BOOL HTAA_shouldRetryWithAuth(char *start_of_headers, current_portnumber, IsProxy); } - if (!template) - template = HTAA_makeProtectionTemplate(current_docname); + if (!ctemplate) + ctemplate = HTAA_makeProtectionTemplate(current_docname); current_setup = HTAASetup_new(server, - template, + ctemplate, valid_schemes, scheme_specifics); - FREE(template); + FREE(ctemplate); HTAlert(gettext("Access without authorization denied -- retrying")); return YES; diff --git a/WWW/Library/Implementation/HTAABrow.h b/WWW/Library/Implementation/HTAABrow.h index f7570ae3..774a1f73 100644 --- a/WWW/Library/Implementation/HTAABrow.h +++ b/WWW/Library/Implementation/HTAABrow.h @@ -33,6 +33,9 @@ #include <HTAAUtil.h> /* Common parts of AA */ +#ifdef __cplusplus +extern "C" { +#endif /* Routines for Browser Side Recording of AA Info @@ -49,30 +52,27 @@ Routines for Browser Side Recording of AA Info HTAA_shouldRetryWithAuth() determines whether to retry the request with AA or with a new AA (in case username or password was misspelled). - */ - -/* PUBLIC HTAA_composeAuth() - * - * COMPOSE THE ENTIRE AUTHORIZATION HEADER LINE IF WE - * ALREADY KNOW, THAT THE HOST MIGHT REQUIRE AUTHORIZATION - * - * ON ENTRY: - * hostname is the hostname of the server. - * portnumber is the portnumber in which the server runs. - * docname is the pathname of the document (as in URL) - * - * ON EXIT: - * returns NULL, if no authorization seems to be needed, or - * if it is the entire Authorization: line, e.g. - * - * "Authorization: basic username:password" - * - * As usual, this string is automatically freed. - */ -extern char *HTAA_composeAuth(const char *hostname, - const int portnumber, - const char *docname, - BOOL IsProxy); + *//* PUBLIC HTAA_composeAuth() + * + * COMPOSE THE ENTIRE AUTHORIZATION HEADER LINE IF WE + * ALREADY KNOW, THAT THE HOST MIGHT REQUIRE AUTHORIZATION + * + * ON ENTRY: + * hostname is the hostname of the server. + * portnumber is the portnumber in which the server runs. + * docname is the pathname of the document (as in URL) + * + * ON EXIT: + * returns NULL, if no authorization seems to be needed, or + * if it is the entire Authorization: line, e.g. + * + * "Authorization: basic username:password" + * + * As usual, this string is automatically freed. + */ extern char *HTAA_composeAuth(const char *hostname, + const int portnumber, + const char *docname, + BOOL IsProxy); /* BROWSER PUBLIC HTAA_shouldRetryWithAuth() * @@ -101,16 +101,16 @@ extern char *HTAA_composeAuth(const char *hostname, * field (in function HTAA_composeAuth()). * NO, otherwise. */ -extern BOOL HTAA_shouldRetryWithAuth(char *start_of_headers, - int length, - int soc, - BOOL IsProxy); + extern BOOL HTAA_shouldRetryWithAuth(char *start_of_headers, + int length, + int soc, + BOOL IsProxy); /* * Function to allow clearing of all Authorization info * via a browser command. - FM */ -extern void HTClearHTTPAuthInfo(void); + extern void HTClearHTTPAuthInfo(void); /* @@ -123,8 +123,11 @@ Enabling Gateway httpds to Forward Authorization */ -extern void HTAAForwardAuth_set(const char *scheme_name, - const char *scheme_specifics); -extern void HTAAForwardAuth_reset(void); + extern void HTAAForwardAuth_set(const char *scheme_name, + const char *scheme_specifics); + extern void HTAAForwardAuth_reset(void); -#endif /* NOT HTAABROW_H */ +#ifdef __cplusplus +} +#endif +#endif /* NOT HTAABROW_H */ diff --git a/WWW/Library/Implementation/HTAAProt.c b/WWW/Library/Implementation/HTAAProt.c index f4bc2e87..9e8a06d5 100644 --- a/WWW/Library/Implementation/HTAAProt.c +++ b/WWW/Library/Implementation/HTAAProt.c @@ -382,7 +382,7 @@ static HTAAProt *HTAAProt_new(const char *cur_docname, if ((prot = typecalloc(HTAAProt)) == 0) outofmem(__FILE__, "HTAAProt_new"); - prot->template = NULL; + prot->ctemplate = NULL; prot->filename = NULL; prot->uid_name = NULL; prot->gid_name = NULL; diff --git a/WWW/Library/Implementation/HTAAProt.h b/WWW/Library/Implementation/HTAAProt.h index 4bdd1964..8595ca66 100644 --- a/WWW/Library/Implementation/HTAAProt.h +++ b/WWW/Library/Implementation/HTAAProt.h @@ -8,22 +8,23 @@ #include <HTGroup.h> #include <HTAssoc.h> +#ifdef __cplusplus +extern "C" { +#endif /* Server's Representation of Document (Tree) Protections - */ - -typedef struct { - char *template; /* Template for this protection */ - char *filename; /* Current document file */ - char *uid_name; /* Effective uid (name of it) */ - char *gid_name; /* Effective gid (name of it) */ - GroupDef *mask_group; /* Allowed users and IP addresses */ - HTList *valid_schemes; /* Valid authentication schemes */ - HTAssocList *values; /* Association list for scheme specific */ - /* parameters. */ -} HTAAProt; + */ typedef struct { + char *ctemplate; /* Template for this protection */ + char *filename; /* Current document file */ + char *uid_name; /* Effective uid (name of it) */ + char *gid_name; /* Effective gid (name of it) */ + GroupDef *mask_group; /* Allowed users and IP addresses */ + HTList *valid_schemes; /* Valid authentication schemes */ + HTAssocList *values; /* Association list for scheme specific */ + /* parameters. */ + } HTAAProt; /* @@ -60,9 +61,9 @@ Callbacks for rule system * returns nothing. * Sets the module-wide variable default_prot. */ -extern void HTAA_setDefaultProtection(const char *cur_docname, - const char *prot_filename, - const char *eff_ids); + extern void HTAA_setDefaultProtection(const char *cur_docname, + const char *prot_filename, + const char *eff_ids); /* PUBLIC HTAA_setCurrentProtection() * SET THE CURRENT PROTECTION MODE @@ -83,9 +84,9 @@ extern void HTAA_setDefaultProtection(const char *cur_docname, * returns nothing. * Sets the module-wide variable current_prot. */ -extern void HTAA_setCurrentProtection(const char *cur_docname, - const char *prot_filename, - const char *eff_ids); + extern void HTAA_setCurrentProtection(const char *cur_docname, + const char *prot_filename, + const char *eff_ids); /* SERVER INTERNAL HTAA_clearProtections() * CLEAR DOCUMENT PROTECTION MODE @@ -98,7 +99,7 @@ extern void HTAA_setCurrentProtection(const char *cur_docname, * returns nothing. * Frees the memory used by protection information. */ -extern void HTAA_clearProtections(void); + extern void HTAA_clearProtections(void); /* @@ -127,7 +128,7 @@ Getting Protection Settings * protection setup of the HTTranslate()'d file. * This must not be free()'d. */ -extern HTAAProt *HTAA_getCurrentProtection(void); + extern HTAAProt *HTAA_getCurrentProtection(void); /* PUBLIC HTAA_getDefaultProtection() * GET DEFAULT PROTECTION SETUP STRUCTURE @@ -147,7 +148,7 @@ extern HTAAProt *HTAA_getCurrentProtection(void); * protection settings). * This must not be free()'d. */ -extern HTAAProt *HTAA_getDefaultProtection(void); + extern HTAAProt *HTAA_getDefaultProtection(void); /* @@ -165,7 +166,7 @@ Get User and Group IDs to Which Set to * returns the uid number to give to setuid() system call. * Default is 65534 (nobody). */ -extern int HTAA_getUid(void); + extern int HTAA_getUid(void); /* PUBLIC HTAA_getGid() * GET THE GROUP ID TO CHANGE THE PROCESS GID TO @@ -176,8 +177,8 @@ extern int HTAA_getUid(void); * returns the uid number to give to setgid() system call. * Default is 65534 (nogroup). */ -extern int HTAA_getGid(void); -#endif /* not VMS */ + extern int HTAA_getGid(void); +#endif /* not VMS */ /* For VMS: @@ -194,7 +195,7 @@ extern int HTAA_getGid(void); * returns the user name * Default is "" (nobody). */ -extern const char *HTAA_getUidName(void); + extern const char *HTAA_getUidName(void); /* PUBLIC HTAA_getFileName * GET THE FILENAME (VMS ONLY) @@ -204,8 +205,8 @@ extern const char *HTAA_getUidName(void); * ON EXIT: * returns the filename */ -extern const char *HTAA_getFileName(void); -#endif /* VMS */ + extern const char *HTAA_getFileName(void); +#endif /* VMS */ /* PUBLIC HTAA_UidToName * GET THE USER NAME @@ -215,7 +216,7 @@ extern const char *HTAA_getFileName(void); * ON EXIT: * returns the user name */ -extern const char *HTAA_UidToName(int uid); + extern const char *HTAA_UidToName(int uid); /* PUBLIC HTAA_NameToUid * GET THE USER ID @@ -225,7 +226,7 @@ extern const char *HTAA_UidToName(int uid); * ON EXIT: * returns the user id */ -extern int HTAA_NameToUid(const char *name); + extern int HTAA_NameToUid(const char *name); /* PUBLIC HTAA_GidToName * GET THE GROUP NAME @@ -235,7 +236,7 @@ extern int HTAA_NameToUid(const char *name); * ON EXIT: * returns the group name */ -extern const char *HTAA_GidToName(int gid); + extern const char *HTAA_GidToName(int gid); /* PUBLIC HTAA_NameToGid * GET THE GROUP ID @@ -245,6 +246,9 @@ extern const char *HTAA_GidToName(int gid); * ON EXIT: * returns the group id */ -extern int HTAA_NameToGid(const char *name); + extern int HTAA_NameToGid(const char *name); -#endif /* not HTAAPROT_H */ +#ifdef __cplusplus +} +#endif +#endif /* not HTAAPROT_H */ diff --git a/WWW/Library/Implementation/HTAAUtil.c b/WWW/Library/Implementation/HTAAUtil.c index a5651d16..6270338a 100644 --- a/WWW/Library/Implementation/HTAAUtil.c +++ b/WWW/Library/Implementation/HTAAUtil.c @@ -205,7 +205,7 @@ BOOL HTAAMethod_inList(HTAAMethod method, HTList *list) * sometimes so hard...) * * ON ENTRY: - * template is a template string to match the file name + * ctemplate is a template string to match the file name * against, may contain a single wildcard * character * which matches zero or more * arbitrary characters. @@ -216,10 +216,10 @@ BOOL HTAAMethod_inList(HTAAMethod method, HTList *list) * returns YES, if filename matches the template. * NO, otherwise. */ -BOOL HTAA_templateMatch(const char *template, +BOOL HTAA_templateMatch(const char *ctemplate, const char *filename) { - const char *p = template; + const char *p = ctemplate; const char *q = filename; int m; @@ -266,10 +266,10 @@ BOOL HTAA_templateMatch(const char *template, * returns YES, if filename matches the template. * NO, otherwise. */ -BOOL HTAA_templateCaseMatch(const char *template, +BOOL HTAA_templateCaseMatch(const char *ctemplate, const char *filename) { - const char *p = template; + const char *p = ctemplate; const char *q = filename; int m; @@ -315,25 +315,25 @@ BOOL HTAA_templateCaseMatch(const char *template, */ char *HTAA_makeProtectionTemplate(const char *docname) { - char *template = NULL; + char *ctemplate = NULL; char *slash = NULL; if (docname) { - StrAllocCopy(template, docname); - slash = strrchr(template, '/'); + StrAllocCopy(ctemplate, docname); + slash = strrchr(ctemplate, '/'); if (slash) slash++; else - slash = template; + slash = ctemplate; *slash = '\0'; - StrAllocCat(template, "*"); + StrAllocCat(ctemplate, "*"); } else - StrAllocCopy(template, "*"); + StrAllocCopy(ctemplate, "*"); CTRACE((tfp, "make_template: made template `%s' for file `%s'\n", - template, docname)); + ctemplate, docname)); - return template; + return ctemplate; } /* diff --git a/WWW/Library/Implementation/HTAAUtil.h b/WWW/Library/Implementation/HTAAUtil.h index 488b9859..e5044498 100644 --- a/WWW/Library/Implementation/HTAAUtil.h +++ b/WWW/Library/Implementation/HTAAUtil.h @@ -32,38 +32,37 @@ #include <HTList.h> +#ifdef __cplusplus +extern "C" { +#endif /* * Numeric constants */ #define MAX_USERNAME_LEN 16 /* @@ Longest allowed username */ #define MAX_PASSWORD_LEN 3*13 /* @@ Longest allowed password */ - /* (encrypted, so really only 3*8) */ + /* (encrypted, so really only 3*8) */ #define MAX_METHODNAME_LEN 12 /* @@ Longest allowed method name */ #define MAX_FIELDNAME_LEN 16 /* @@ Longest field name in */ - /* protection setup file */ + /* protection setup file */ #define MAX_PATHNAME_LEN 80 /* @@ Longest passwd/group file */ - /* pathname to allow */ +/* pathname to allow *//* -/* - -Datatype definitions + Datatype definitions - HTAASCHEME + HTAASCHEME The enumeration HTAAScheme represents the possible authentication schemes used by the WWW Access Authorization. - */ - -typedef enum { - HTAA_UNKNOWN, - HTAA_NONE, - HTAA_BASIC, - HTAA_PUBKEY, - HTAA_KERBEROS_V4, - HTAA_KERBEROS_V5, - HTAA_MAX_SCHEMES /* THIS MUST ALWAYS BE LAST! Number of schemes */ -} HTAAScheme; + */ typedef enum { + HTAA_UNKNOWN, + HTAA_NONE, + HTAA_BASIC, + HTAA_PUBKEY, + HTAA_KERBEROS_V4, + HTAA_KERBEROS_V5, + HTAA_MAX_SCHEMES /* THIS MUST ALWAYS BE LAST! Number of schemes */ + } HTAAScheme; /* @@ -71,11 +70,11 @@ typedef enum { */ -typedef enum { - METHOD_UNKNOWN, - METHOD_GET, - METHOD_PUT -} HTAAMethod; + typedef enum { + METHOD_UNKNOWN, + METHOD_GET, + METHOD_PUT + } HTAAMethod; /* @@ -91,7 +90,7 @@ Authentication Schemes * ON EXIT: * returns the enumerated constant for that scheme. */ -extern HTAAScheme HTAAScheme_enum(const char *name); + extern HTAAScheme HTAAScheme_enum(const char *name); /* PUBLIC HTAAScheme_name() * GET THE NAME OF A GIVEN SCHEME @@ -103,7 +102,7 @@ extern HTAAScheme HTAAScheme_enum(const char *name); * returns the name of the scheme, i.e. * "none", "basic", "pubkey", ... */ -extern const char *HTAAScheme_name(HTAAScheme scheme); + extern const char *HTAAScheme_name(HTAAScheme scheme); /* @@ -120,7 +119,7 @@ Methods * returns HTAAMethod enumerated value corresponding * to the given name. */ -extern HTAAMethod HTAAMethod_enum(const char *name); + extern HTAAMethod HTAAMethod_enum(const char *name); /* PUBLIC HTAAMethod_name() * GET THE NAME OF A GIVEN METHOD @@ -132,7 +131,7 @@ extern HTAAMethod HTAAMethod_enum(const char *name); * returns the name of the scheme, i.e. * "GET", "PUT", ... */ -extern const char *HTAAMethod_name(HTAAMethod method); + extern const char *HTAAMethod_name(HTAAMethod method); /* PUBLIC HTAAMethod_inList() * IS A METHOD IN A LIST OF METHOD NAMES @@ -144,7 +143,7 @@ extern const char *HTAAMethod_name(HTAAMethod method); * returns YES, if method was found. * NO, if not found. */ -extern BOOL HTAAMethod_inList(HTAAMethod method, HTList *list); + extern BOOL HTAAMethod_inList(HTAAMethod method, HTList *list); /* @@ -163,7 +162,7 @@ Match Template Against Filename * sometimes so hard...) * * ON ENTRY: - * template is a template string to match the file name + * ctemplate is a template string to match the file name * against, may contain a single wildcard * character * which matches zero or more * arbitrary characters. @@ -174,8 +173,8 @@ Match Template Against Filename * returns YES, if filename matches the template. * NO, otherwise. */ -extern BOOL HTAA_templateMatch(const char *template, - const char *filename); + extern BOOL HTAA_templateMatch(const char *ctemplate, + const char *filename); /* PUBLIC HTAA_templateCaseMatch() * STRING COMPARISON FUNCTION FOR FILE NAMES @@ -188,7 +187,7 @@ extern BOOL HTAA_templateMatch(const char *template, * change the HTAA_templateMatch routine for VMS. * * ON ENTRY: - * template is a template string to match the file name + * ctemplate is a template string to match the file name * against, may contain a single wildcard * character * which matches zero or more * arbitrary characters. @@ -199,8 +198,8 @@ extern BOOL HTAA_templateMatch(const char *template, * returns YES, if filename matches the template. * NO, otherwise. */ -extern BOOL HTAA_templateCaseMatch(const char *template, - const char *filename); + extern BOOL HTAA_templateCaseMatch(const char *ctemplate, + const char *filename); /* PUBLIC HTAA_makeProtectionTemplate() * CREATE A PROTECTION TEMPLATE FOR THE FILES @@ -221,7 +220,7 @@ extern BOOL HTAA_templateCaseMatch(const char *template, * being a comment marker here, * there really isn't any space. */ -extern char *HTAA_makeProtectionTemplate(const char *docname); + extern char *HTAA_makeProtectionTemplate(const char *docname); /* @@ -255,7 +254,7 @@ MIME Argument List Parser * the number of order number of that item. E.g. * "1" for the first, etc. */ -extern HTList *HTAA_parseArgList(char *str); + extern HTList *HTAA_parseArgList(char *str); /* @@ -282,9 +281,9 @@ Header Line Reader * will use this buffer first and then * proceed to read from socket. */ -extern void HTAA_setupReader(char *start_of_headers, - int length, - int soc); + extern void HTAA_setupReader(char *start_of_headers, + int length, + int soc); /* PUBLIC HTAA_getUnfoldedLine() * READ AN UNFOLDED HEADER LINE FROM SOCKET @@ -307,6 +306,9 @@ extern void HTAA_setupReader(char *start_of_headers, * Field-Name: Blaa-Blaa This-Is-A-Continuation-Line Here-Is_Another * */ -extern char *HTAA_getUnfoldedLine(void); + extern char *HTAA_getUnfoldedLine(void); -#endif /* NOT HTAAUTIL_H */ +#ifdef __cplusplus +} +#endif +#endif /* NOT HTAAUTIL_H */ diff --git a/WWW/Library/Implementation/HTAccess.h b/WWW/Library/Implementation/HTAccess.h index b3cff533..81e8f3c7 100644 --- a/WWW/Library/Implementation/HTAccess.h +++ b/WWW/Library/Implementation/HTAccess.h @@ -11,15 +11,18 @@ #ifndef HTACCESS_H #define HTACCESS_H -extern char *use_this_url_instead; - -extern int redirection_attempts; - /* Definition uses: */ #include <HTAnchor.h> #include <HTFormat.h> +#ifdef __cplusplus +extern "C" { +#endif + extern char *use_this_url_instead; + + extern int redirection_attempts; + /* Return codes from load routines: * * These codes may be returned by the protocol modules, @@ -71,14 +74,14 @@ Flags which may be set to control this module */ #ifdef NOT -extern int HTDiag; /* Flag: load source as plain text */ -#endif /* NOT */ -extern char *HTClientHost; /* Name or number of telnetting host */ -extern FILE *HTlogfile; /* File to output one-liners to */ -extern BOOL HTSecure; /* Disable security holes? */ -extern BOOL HTPermitRedir; /* Special flag for getfile() */ -extern HTStream *HTOutputStream; /* For non-interactive, set this */ -extern HTFormat HTOutputFormat; /* To convert on load, set this */ + extern int HTDiag; /* Flag: load source as plain text */ +#endif /* NOT */ + extern char *HTClientHost; /* Name or number of telnetting host */ + extern FILE *HTlogfile; /* File to output one-liners to */ + extern BOOL HTSecure; /* Disable security holes? */ + extern BOOL HTPermitRedir; /* Special flag for getfile() */ + extern HTStream *HTOutputStream; /* For non-interactive, set this */ + extern HTFormat HTOutputFormat; /* To convert on load, set this */ /* Check for proxy override. override_proxy() * @@ -95,7 +98,7 @@ extern HTFormat HTOutputFormat; /* To convert on load, set this */ * Use "*" to override all proxy service: * no_proxy="*" */ -extern BOOL override_proxy(const char *addr); + extern BOOL override_proxy(const char *addr); /* @@ -110,8 +113,8 @@ Load a document from relative name NO Failure */ -extern BOOL HTLoadRelative(const char *relative_name, - HTParentAnchor *here); + extern BOOL HTLoadRelative(const char *relative_name, + HTParentAnchor *here); /* @@ -126,7 +129,7 @@ Load a document from absolute name NO Failure */ -extern BOOL HTLoadAbsolute(const DocAddress *addr); + extern BOOL HTLoadAbsolute(const DocAddress *addr); /* @@ -143,8 +146,8 @@ Load a document from absolute name to a stream Note: This is equivalent to HTLoadDocument */ -extern BOOL HTLoadToStream(const char *addr, BOOL filter_it, - HTStream *sink); + extern BOOL HTLoadToStream(const char *addr, BOOL filter_it, + HTStream *sink); /* @@ -158,7 +161,7 @@ Load if necessary, and select an anchor returns NO Failure */ -extern BOOL HTLoadAnchor(HTAnchor * destination); + extern BOOL HTLoadAnchor(HTAnchor * destination); /* @@ -171,7 +174,7 @@ Make a stream for Saving object back returns 0 if error else a stream to save the object to. */ -extern HTStream *HTSaveStream(HTParentAnchor *anchor); + extern HTStream *HTSaveStream(HTParentAnchor *anchor); /* @@ -185,7 +188,7 @@ Search here The anchor of the object being searched */ -extern BOOL HTSearch(const char *keywords, HTParentAnchor *here); + extern BOOL HTSearch(const char *keywords, HTParentAnchor *here); /* @@ -199,8 +202,8 @@ Search Given Indexname *indexname is name of object search is to be done on. */ -extern BOOL HTSearchAbsolute(const char *keywords, - char *indexname); + extern BOOL HTSearchAbsolute(const char *keywords, + char *indexname); /* @@ -208,19 +211,19 @@ Register an access method */ -typedef struct _HTProtocol { - const char *name; + typedef struct _HTProtocol { + const char *name; - int (*load) (const char *full_address, - HTParentAnchor *anchor, - HTFormat format_out, - HTStream *sink); + int (*load) (const char *full_address, + HTParentAnchor *anchor, + HTFormat format_out, + HTStream *sink); - HTStream *(*saveStream) (HTParentAnchor *anchor); + HTStream *(*saveStream) (HTParentAnchor *anchor); -} HTProtocol; + } HTProtocol; -extern BOOL HTRegisterProtocol(HTProtocol * protocol); + extern BOOL HTRegisterProtocol(HTProtocol * protocol); /* @@ -234,25 +237,28 @@ Generate the anchor for the home page This is a default algorithm -- browser don't HAVE to use this. */ -extern HTParentAnchor *HTHomeAnchor(void); + extern HTParentAnchor *HTHomeAnchor(void); /* Return Host Name */ -extern const char *HTHostName(void); + extern const char *HTHostName(void); /* For registering protocols supported by Lynx */ -extern void LYRegisterLynxProtocols(void); + extern void LYRegisterLynxProtocols(void); -extern void LYUCPushAssumed(HTParentAnchor *anchor); -extern int LYUCPopAssumed(void); + extern void LYUCPushAssumed(HTParentAnchor *anchor); + extern int LYUCPopAssumed(void); -extern BOOL using_proxy; /* Are we using an NNTP proxy? */ + extern BOOL using_proxy; /* Are we using an NNTP proxy? */ -#endif /* HTACCESS_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTACCESS_H */ diff --git a/WWW/Library/Implementation/HTAnchor.h b/WWW/Library/Implementation/HTAnchor.h index b7d4f760..2cbe0d4a 100644 --- a/WWW/Library/Implementation/HTAnchor.h +++ b/WWW/Library/Implementation/HTAnchor.h @@ -20,38 +20,39 @@ #include <HTAtom.h> #include <UCDefs.h> -/* Main definition of anchor - * ========================= - */ - typedef struct _HyperDoc HyperDoc; /* Ready for forward references */ typedef struct _HTAnchor HTAnchor; typedef struct _HTParentAnchor HTParentAnchor; typedef struct _HTParentAnchor0 HTParentAnchor0; -/* After definition of HTFormat: */ #include <HTFormat.h> -struct _HTAnchor { /* Generic anchor */ - HTParentAnchor0 *parent; /* Parent of this anchor (self for adults) */ -}; +#ifdef __cplusplus +extern "C" { +#endif +/* Main definition of anchor + * ========================= + */ struct _HTAnchor { + /* Generic anchor */ + HTParentAnchor0 *parent; /* Parent of this anchor (self for adults) */ + }; -struct _HTParentAnchor0 { /* One for adult_table, + struct _HTParentAnchor0 { /* One for adult_table, * generally not used outside HTAnchor.c */ - /* Common part from the generic anchor structure */ - HTParentAnchor0 *parent; /* (self) */ + /* Common part from the generic anchor structure */ + HTParentAnchor0 *parent; /* (self) */ - /* ParentAnchor0-specific information */ - char *address; /* Absolute address of this node */ - HTParentAnchor *info; /* additional info, allocated on demand */ + /* ParentAnchor0-specific information */ + char *address; /* Absolute address of this node */ + HTParentAnchor *info; /* additional info, allocated on demand */ - HTBTree *children; /* Subanchors <a name="tag">, sorted by tag */ - HTList sources; /* List of anchors pointing to this, if any */ + HTBTree *children; /* Subanchors <a name="tag">, sorted by tag */ + HTList sources; /* List of anchors pointing to this, if any */ - HTList _add_adult; /* - just a memory for list entry:) */ - short adult_hash; /* adult list number */ - BOOL underway; /* Document about to be attached to it */ -}; + HTList _add_adult; /* - just a memory for list entry:) */ + short adult_hash; /* adult list number */ + BOOL underway; /* Document about to be attached to it */ + }; /* * Separated from the above to save memory: allocated on demand, @@ -60,100 +61,100 @@ struct _HTParentAnchor0 { /* One for adult_table, * [being precise, we currently allocate it before HTLoadDocument(), * in HTAnchor_findAddress() and HTAnchor_parent()]. */ -struct _HTParentAnchor { - /* Common part from the generic anchor structure */ - HTParentAnchor0 *parent; /* Parent of this anchor */ - - /* ParentAnchor-specific information */ - HTList children_notag; /* Subanchors <a href=...>, tag is NULL */ - HyperDoc *document; /* The document within which this is an anchor */ - - char *address; /* parent->address, a pointer */ - bstring *post_data; /* Posting data */ - char *post_content_type; /* Type of post data */ - char *bookmark; /* Bookmark filename */ - HTFormat format; /* Pointer to node format descriptor */ - char *charset; /* Pointer to character set (kludge, for now */ - BOOL isIndex; /* Acceptance of a keyword search */ - char *isIndexAction; /* URL of isIndex server */ - char *isIndexPrompt; /* Prompt for isIndex query */ - char *title; /* Title of document */ - char *owner; /* Owner of document */ - char *RevTitle; /* TITLE in REV="made" or REV="owner" LINK */ - char *citehost; /* Citehost from REL="citehost" LINK */ + struct _HTParentAnchor { + /* Common part from the generic anchor structure */ + HTParentAnchor0 *parent; /* Parent of this anchor */ + + /* ParentAnchor-specific information */ + HTList children_notag; /* Subanchors <a href=...>, tag is NULL */ + HyperDoc *document; /* The document within which this is an anchor */ + + char *address; /* parent->address, a pointer */ + bstring *post_data; /* Posting data */ + char *post_content_type; /* Type of post data */ + char *bookmark; /* Bookmark filename */ + HTFormat format; /* Pointer to node format descriptor */ + char *charset; /* Pointer to character set (kludge, for now */ + BOOL isIndex; /* Acceptance of a keyword search */ + char *isIndexAction; /* URL of isIndex server */ + char *isIndexPrompt; /* Prompt for isIndex query */ + char *title; /* Title of document */ + char *owner; /* Owner of document */ + char *RevTitle; /* TITLE in REV="made" or REV="owner" LINK */ + char *citehost; /* Citehost from REL="citehost" LINK */ #ifdef USE_COLOR_STYLE - char *style; + char *style; #endif - HTList *methods; /* Methods available as HTAtoms */ - void *protocol; /* Protocol object */ - char *physical; /* Physical address */ - BOOL isISMAPScript; /* Script for clickable image map */ - BOOL isHEAD; /* Document is headers from a HEAD request */ - BOOL safe; /* Safe */ + HTList *methods; /* Methods available as HTAtoms */ + void *protocol; /* Protocol object */ + char *physical; /* Physical address */ + BOOL isISMAPScript; /* Script for clickable image map */ + BOOL isHEAD; /* Document is headers from a HEAD request */ + BOOL safe; /* Safe */ #ifdef USE_SOURCE_CACHE - char *source_cache_file; - HTChunk *source_cache_chunk; + char *source_cache_file; + HTChunk *source_cache_chunk; #endif - char *FileCache; /* Path to a disk-cached copy (see src/HTFWriter.c) */ - char *SugFname; /* Suggested filename */ - char *cache_control; /* Cache-Control */ - BOOL no_cache; /* Cache-Control, Pragma or META "no-cache"? */ - BOOL inBASE; /* duplicated from HTStructured (HTML.c/h) */ + char *FileCache; /* Path to a disk-cached copy (see src/HTFWriter.c) */ + char *SugFname; /* Suggested filename */ + char *cache_control; /* Cache-Control */ + BOOL no_cache; /* Cache-Control, Pragma or META "no-cache"? */ + BOOL inBASE; /* duplicated from HTStructured (HTML.c/h) */ #ifdef EXP_HTTP_HEADERS - HTChunk http_headers; + HTChunk http_headers; #endif - char *content_type_params; /* Content-Type (with parameters if any) */ - char *content_type; /* Content-Type */ - char *content_language; /* Content-Language */ - char *content_encoding; /* Compression algorithm */ - char *content_base; /* Content-Base */ - char *content_disposition; /* Content-Disposition */ - char *content_location; /* Content-Location */ - char *content_md5; /* Content-MD5 */ - char *message_id; /* Message-ID */ - char *subject; /* Subject */ - int content_length; /* Content-Length */ - char *date; /* Date */ - char *expires; /* Expires */ - char *last_modified; /* Last-Modified */ - char *ETag; /* ETag (HTTP1.1 cache validator) */ - char *server; /* Server */ - UCAnchorInfo *UCStages; /* chartrans stages */ - HTList *imaps; /* client side image maps */ -}; - -typedef HTAtom HTLinkType; - -typedef struct { - /* Common part from the generic anchor structure */ - HTParentAnchor0 *parent; /* Parent of this anchor */ - - /* ChildAnchor-specific information */ - char *tag; /* #fragment, relative to the parent */ - - HTAnchor *dest; /* The anchor to which this leads */ - HTLinkType *type; /* Semantics of this link */ - - HTList _add_children_notag; /* - just a memory for list entry:) */ - HTList _add_sources; /* - just a memory for list entry:) */ -} HTChildAnchor; + char *content_type_params; /* Content-Type (with parameters if any) */ + char *content_type; /* Content-Type */ + char *content_language; /* Content-Language */ + char *content_encoding; /* Compression algorithm */ + char *content_base; /* Content-Base */ + char *content_disposition; /* Content-Disposition */ + char *content_location; /* Content-Location */ + char *content_md5; /* Content-MD5 */ + char *message_id; /* Message-ID */ + char *subject; /* Subject */ + int content_length; /* Content-Length */ + char *date; /* Date */ + char *expires; /* Expires */ + char *last_modified; /* Last-Modified */ + char *ETag; /* ETag (HTTP1.1 cache validator) */ + char *server; /* Server */ + UCAnchorInfo *UCStages; /* chartrans stages */ + HTList *imaps; /* client side image maps */ + }; + + typedef HTAtom HTLinkType; + + typedef struct { + /* Common part from the generic anchor structure */ + HTParentAnchor0 *parent; /* Parent of this anchor */ + + /* ChildAnchor-specific information */ + char *tag; /* #fragment, relative to the parent */ + + HTAnchor *dest; /* The anchor to which this leads */ + HTLinkType *type; /* Semantics of this link */ + + HTList _add_children_notag; /* - just a memory for list entry:) */ + HTList _add_sources; /* - just a memory for list entry:) */ + } HTChildAnchor; /* * DocAddress structure is used for loading an absolute anchor with all * needed information including posting data and post content type. */ -typedef struct _DocAddress { - char *address; - bstring *post_data; - char *post_content_type; - char *bookmark; - BOOL isHEAD; - BOOL safe; -} DocAddress; + typedef struct _DocAddress { + char *address; + bstring *post_data; + char *post_content_type; + char *bookmark; + BOOL isHEAD; + BOOL safe; + } DocAddress; /* "internal" means "within the same document, with certainty". */ -extern HTLinkType *HTInternalLink; + extern HTLinkType *HTInternalLink; /* Create or find a child anchor with a possible link * -------------------------------------------------- @@ -162,10 +163,10 @@ extern HTLinkType *HTInternalLink; * a name, and possibly a link to a _relatively_ named anchor. * (Code originally in ParseHTML.h) */ -extern HTChildAnchor *HTAnchor_findChildAndLink(HTParentAnchor *parent, /* May not be 0 */ - const char *tag, /* May be "" or 0 */ - const char *href, /* May be "" or 0 */ - HTLinkType *ltype); /* May be 0 */ + extern HTChildAnchor *HTAnchor_findChildAndLink(HTParentAnchor *parent, /* May not be 0 */ + const char *tag, /* May be "" or 0 */ + const char *href, /* May be "" or 0 */ + HTLinkType *ltype); /* May be 0 */ /* Create new or find old parent anchor * ------------------------------------ @@ -175,7 +176,7 @@ extern HTChildAnchor *HTAnchor_findChildAndLink(HTParentAnchor *parent, /* May * Note: You are not guaranteed a new anchor -- you might get an old one, * like with fonts. */ -extern HTParentAnchor *HTAnchor_findAddress(const DocAddress *address); + extern HTParentAnchor *HTAnchor_findAddress(const DocAddress *address); /* Create new or find old named anchor - simple form * ------------------------------------------------- @@ -183,7 +184,7 @@ extern HTParentAnchor *HTAnchor_findAddress(const DocAddress *address); * Like the previous one, but simpler to use for simple cases. * No post data etc. can be supplied. - kw */ -extern HTParentAnchor *HTAnchor_findSimpleAddress(const char *url); + extern HTParentAnchor *HTAnchor_findSimpleAddress(const char *url); /* Delete an anchor and possibly related things (auto garbage collection) * -------------------------------------------- @@ -194,211 +195,214 @@ extern HTParentAnchor *HTAnchor_findSimpleAddress(const char *url); * We also try to delete the targets whose documents are not loaded. * If this anchor's sources list is empty, we delete it and its children. */ -extern BOOL HTAnchor_delete(HTParentAnchor0 *me); + extern BOOL HTAnchor_delete(HTParentAnchor0 *me); /* * Unnamed children (children_notag) have no sense without HText - * delete them and their links if we are about to free HText. * Document currently exists. Called within HText_free(). */ -extern void HTAnchor_delete_links(HTParentAnchor *me); + extern void HTAnchor_delete_links(HTParentAnchor *me); #ifdef USE_SOURCE_CACHE -extern void HTAnchor_clearSourceCache(HTParentAnchor *me); + extern void HTAnchor_clearSourceCache(HTParentAnchor *me); #endif /* Data access functions * --------------------- */ -extern HTParentAnchor *HTAnchor_parent(HTAnchor * me); + extern HTParentAnchor *HTAnchor_parent(HTAnchor * me); -extern void HTAnchor_setDocument(HTParentAnchor *me, - HyperDoc *doc); + extern void HTAnchor_setDocument(HTParentAnchor *me, + HyperDoc *doc); -extern HyperDoc *HTAnchor_document(HTParentAnchor *me); + extern HyperDoc *HTAnchor_document(HTParentAnchor *me); /* Returns the full URI of the anchor, child or parent * as a malloc'd string to be freed by the caller. */ -extern char *HTAnchor_address(HTAnchor * me); + extern char *HTAnchor_address(HTAnchor * me); -extern void HTAnchor_setFormat(HTParentAnchor *me, - HTFormat form); + extern void HTAnchor_setFormat(HTParentAnchor *me, + HTFormat form); -extern HTFormat HTAnchor_format(HTParentAnchor *me); + extern HTFormat HTAnchor_format(HTParentAnchor *me); -extern void HTAnchor_setIndex(HTParentAnchor *me, - const char *address); + extern void HTAnchor_setIndex(HTParentAnchor *me, + const char *address); -extern void HTAnchor_setPrompt(HTParentAnchor *me, - const char *prompt); + extern void HTAnchor_setPrompt(HTParentAnchor *me, + const char *prompt); -extern BOOL HTAnchor_isIndex(HTParentAnchor *me); + extern BOOL HTAnchor_isIndex(HTParentAnchor *me); -extern BOOL HTAnchor_isISMAPScript(HTAnchor * me); + extern BOOL HTAnchor_isISMAPScript(HTAnchor * me); #if defined(USE_COLOR_STYLE) -extern const char *HTAnchor_style(HTParentAnchor *me); + extern const char *HTAnchor_style(HTParentAnchor *me); -extern void HTAnchor_setStyle(HTParentAnchor *me, - const char *style); + extern void HTAnchor_setStyle(HTParentAnchor *me, + const char *style); #endif /* Title handling. */ -extern const char *HTAnchor_title(HTParentAnchor *me); + extern const char *HTAnchor_title(HTParentAnchor *me); -extern void HTAnchor_setTitle(HTParentAnchor *me, - const char *title); + extern void HTAnchor_setTitle(HTParentAnchor *me, + const char *title); -extern void HTAnchor_appendTitle(HTParentAnchor *me, - const char *title); + extern void HTAnchor_appendTitle(HTParentAnchor *me, + const char *title); /* Bookmark handling. */ -extern const char *HTAnchor_bookmark(HTParentAnchor *me); + extern const char *HTAnchor_bookmark(HTParentAnchor *me); -extern void HTAnchor_setBookmark(HTParentAnchor *me, - const char *bookmark); + extern void HTAnchor_setBookmark(HTParentAnchor *me, + const char *bookmark); /* Owner handling. */ -extern const char *HTAnchor_owner(HTParentAnchor *me); + extern const char *HTAnchor_owner(HTParentAnchor *me); -extern void HTAnchor_setOwner(HTParentAnchor *me, - const char *owner); + extern void HTAnchor_setOwner(HTParentAnchor *me, + const char *owner); /* TITLE handling in LINKs with REV="made" or REV="owner". - FM */ -extern const char *HTAnchor_RevTitle(HTParentAnchor *me); + extern const char *HTAnchor_RevTitle(HTParentAnchor *me); -extern void HTAnchor_setRevTitle(HTParentAnchor *me, - const char *title); + extern void HTAnchor_setRevTitle(HTParentAnchor *me, + const char *title); /* Citehost for bibp links from LINKs with REL="citehost". - RDC */ -extern const char *HTAnchor_citehost(HTParentAnchor *me); + extern const char *HTAnchor_citehost(HTParentAnchor *me); -extern void HTAnchor_setCitehost(HTParentAnchor *me, - const char *citehost); + extern void HTAnchor_setCitehost(HTParentAnchor *me, + const char *citehost); /* Suggested filename handling. - FM * (will be loaded if we had a Content-Disposition * header or META element with filename=name.suffix) */ -extern const char *HTAnchor_SugFname(HTParentAnchor *me); + extern const char *HTAnchor_SugFname(HTParentAnchor *me); /* HTTP Headers. */ -extern const char *HTAnchor_http_headers(HTParentAnchor *me); + extern const char *HTAnchor_http_headers(HTParentAnchor *me); /* Content-Type handling (parameter list). */ -extern const char *HTAnchor_content_type_params(HTParentAnchor *me); + extern const char *HTAnchor_content_type_params(HTParentAnchor *me); /* Content-Type handling. - FM */ -extern const char *HTAnchor_content_type(HTParentAnchor *me); + extern const char *HTAnchor_content_type(HTParentAnchor *me); /* Content-Encoding handling. - FM * (will be loaded if we had a Content-Encoding * header.) */ -extern const char *HTAnchor_content_encoding(HTParentAnchor *me); + extern const char *HTAnchor_content_encoding(HTParentAnchor *me); /* Last-Modified header handling. - FM */ -extern const char *HTAnchor_last_modified(HTParentAnchor *me); + extern const char *HTAnchor_last_modified(HTParentAnchor *me); /* Date header handling. - FM */ -extern const char *HTAnchor_date(HTParentAnchor *me); + extern const char *HTAnchor_date(HTParentAnchor *me); /* Server header handling. - FM */ -extern const char *HTAnchor_server(HTParentAnchor *me); + extern const char *HTAnchor_server(HTParentAnchor *me); /* Safe header handling. - FM */ -extern BOOL HTAnchor_safe(HTParentAnchor *me); + extern BOOL HTAnchor_safe(HTParentAnchor *me); /* Content-Base header handling. - FM */ -extern const char *HTAnchor_content_base(HTParentAnchor *me); + extern const char *HTAnchor_content_base(HTParentAnchor *me); /* Content-Location header handling. - FM */ -extern const char *HTAnchor_content_location(HTParentAnchor *me); + extern const char *HTAnchor_content_location(HTParentAnchor *me); /* Message-ID, used for mail replies - kw */ -extern const char *HTAnchor_messageID(HTParentAnchor *me); + extern const char *HTAnchor_messageID(HTParentAnchor *me); -extern BOOL HTAnchor_setMessageID(HTParentAnchor *me, - const char *messageid); + extern BOOL HTAnchor_setMessageID(HTParentAnchor *me, + const char *messageid); /* Subject, used for mail replies - kw */ -extern const char *HTAnchor_subject(HTParentAnchor *me); + extern const char *HTAnchor_subject(HTParentAnchor *me); -extern BOOL HTAnchor_setSubject(HTParentAnchor *me, - const char *subject); + extern BOOL HTAnchor_setSubject(HTParentAnchor *me, + const char *subject); /* Manipulation of links * --------------------- */ -extern HTAnchor *HTAnchor_followLink(HTChildAnchor *me); + extern HTAnchor *HTAnchor_followLink(HTChildAnchor *me); -extern HTAnchor *HTAnchor_followTypedLink(HTChildAnchor *me, - HTLinkType *type); + extern HTAnchor *HTAnchor_followTypedLink(HTChildAnchor *me, + HTLinkType *type); /* Read and write methods * ---------------------- */ -extern HTList *HTAnchor_methods(HTParentAnchor *me); + extern HTList *HTAnchor_methods(HTParentAnchor *me); /* Protocol * -------- */ -extern void *HTAnchor_protocol(HTParentAnchor *me); + extern void *HTAnchor_protocol(HTParentAnchor *me); -extern void HTAnchor_setProtocol(HTParentAnchor *me, - void *protocol); + extern void HTAnchor_setProtocol(HTParentAnchor *me, + void *protocol); /* Physical address * ---------------- */ -extern char *HTAnchor_physical(HTParentAnchor *me); + extern char *HTAnchor_physical(HTParentAnchor *me); -extern void HTAnchor_setPhysical(HTParentAnchor *me, - char *protocol); + extern void HTAnchor_setPhysical(HTParentAnchor *me, + char *protocol); -extern LYUCcharset *HTAnchor_getUCInfoStage(HTParentAnchor *me, - int which_stage); + extern LYUCcharset *HTAnchor_getUCInfoStage(HTParentAnchor *me, + int which_stage); -extern int HTAnchor_getUCLYhndl(HTParentAnchor *me, - int which_stage); + extern int HTAnchor_getUCLYhndl(HTParentAnchor *me, + int which_stage); -extern LYUCcharset *HTAnchor_setUCInfoStage(HTParentAnchor *me, - int LYhndl, - int which_stage, - int set_by); + extern LYUCcharset *HTAnchor_setUCInfoStage(HTParentAnchor *me, + int LYhndl, + int which_stage, + int set_by); -extern LYUCcharset *HTAnchor_setUCInfoStage(HTParentAnchor *me, - int LYhndl, - int which_stage, - int set_by); + extern LYUCcharset *HTAnchor_setUCInfoStage(HTParentAnchor *me, + int LYhndl, + int which_stage, + int set_by); -extern LYUCcharset *HTAnchor_resetUCInfoStage(HTParentAnchor *me, - int LYhndl, - int which_stage, - int set_by); + extern LYUCcharset *HTAnchor_resetUCInfoStage(HTParentAnchor *me, + int LYhndl, + int which_stage, + int set_by); -extern LYUCcharset *HTAnchor_copyUCInfoStage(HTParentAnchor *me, - int to_stage, - int from_stage, - int set_by); + extern LYUCcharset *HTAnchor_copyUCInfoStage(HTParentAnchor *me, + int to_stage, + int from_stage, + int set_by); -extern void ImageMapList_free(HTList *list); + extern void ImageMapList_free(HTList *list); -#endif /* HTANCHOR_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTANCHOR_H */ diff --git a/WWW/Library/Implementation/HTAssoc.h b/WWW/Library/Implementation/HTAssoc.h index c1117ffa..327809c2 100644 --- a/WWW/Library/Implementation/HTAssoc.h +++ b/WWW/Library/Implementation/HTAssoc.h @@ -9,21 +9,27 @@ #include <HTList.h> -typedef HTList HTAssocList; - -typedef struct { - char *name; - char *value; -} HTAssoc; - -extern HTAssocList *HTAssocList_new(void); -extern void HTAssocList_delete(HTAssocList *alist); - -extern void HTAssocList_add(HTAssocList *alist, - const char *name, - const char *value); - -extern char *HTAssocList_lookup(HTAssocList *alist, - const char *name); - -#endif /* not HTASSOC_H */ +#ifdef __cplusplus +extern "C" { +#endif + typedef HTList HTAssocList; + + typedef struct { + char *name; + char *value; + } HTAssoc; + + extern HTAssocList *HTAssocList_new(void); + extern void HTAssocList_delete(HTAssocList *alist); + + extern void HTAssocList_add(HTAssocList *alist, + const char *name, + const char *value); + + extern char *HTAssocList_lookup(HTAssocList *alist, + const char *name); + +#ifdef __cplusplus +} +#endif +#endif /* not HTASSOC_H */ diff --git a/WWW/Library/Implementation/HTAtom.h b/WWW/Library/Implementation/HTAtom.h index e0843c28..4125d31b 100644 --- a/WWW/Library/Implementation/HTAtom.h +++ b/WWW/Library/Implementation/HTAtom.h @@ -23,16 +23,32 @@ #include <HTList.h> -typedef struct _HTAtom HTAtom; +#ifdef __cplusplus +extern "C" { +#endif + typedef struct _HTAtom HTAtom; -struct _HTAtom { - HTAtom *next; - char *name; -}; /* struct _HTAtom */ + struct _HTAtom { + HTAtom *next; + char *name; + }; /* struct _HTAtom */ -extern HTAtom *HTAtom_for(const char *string); -extern HTList *HTAtom_templateMatches(const char *templ); + extern HTAtom *HTAtom_for(const char *string); + extern HTList *HTAtom_templateMatches(const char *templ); #define HTAtom_name(a) ((a)->name) -#endif /* HTATOM_H */ +/* + +The HTFormat type + + We use the HTAtom object for holding representations. This allows faster manipulation + (comparison and copying) that if we stayed with strings. + + */ + typedef HTAtom *HTFormat; + +#ifdef __cplusplus +} +#endif +#endif /* HTATOM_H */ diff --git a/WWW/Library/Implementation/HTBTree.h b/WWW/Library/Implementation/HTBTree.h index dc1cbc3e..a4f78f94 100644 --- a/WWW/Library/Implementation/HTBTree.h +++ b/WWW/Library/Implementation/HTBTree.h @@ -16,47 +16,49 @@ #include <HTUtils.h> #endif +#ifdef __cplusplus +extern "C" { +#endif /* Data structures - */ -typedef struct _HTBTree_element { - void *object; /* User object */ - struct _HTBTree_element *up; - struct _HTBTree_element *left; - int left_depth; - struct _HTBTree_element *right; - int right_depth; -} HTBTElement; - -typedef int (*HTComparer) (void *a, void *b); - -typedef struct _HTBTree_top { - HTComparer compare; - struct _HTBTree_element *top; -} HTBTree; + */ typedef struct _HTBTree_element { + void *object; /* User object */ + struct _HTBTree_element *up; + struct _HTBTree_element *left; + int left_depth; + struct _HTBTree_element *right; + int right_depth; + } HTBTElement; + + typedef int (*HTComparer) (void *a, void *b); + + typedef struct _HTBTree_top { + HTComparer compare; + struct _HTBTree_element *top; + } HTBTree; /* Create a binary tree given its discrimination routine */ -extern HTBTree *HTBTree_new(HTComparer comp); + extern HTBTree *HTBTree_new(HTComparer comp); /* Free storage of the tree but not of the objects */ -extern void HTBTree_free(HTBTree *tree); + extern void HTBTree_free(HTBTree *tree); /* Free storage of the tree and of the objects */ -extern void HTBTreeAndObject_free(HTBTree *tree); + extern void HTBTreeAndObject_free(HTBTree *tree); /* @@ -64,7 +66,7 @@ Add an object to a binary tree */ -extern void HTBTree_add(HTBTree *tree, void *object); + extern void HTBTree_add(HTBTree *tree, void *object); /* @@ -73,7 +75,7 @@ Search an object in a binary tree returns Pointer to equivalent object in a tree or NULL if none. */ -extern void *HTBTree_search(HTBTree *tree, void *object); + extern void *HTBTree_search(HTBTree *tree, void *object); /* @@ -94,6 +96,9 @@ Find next element in depth-first order returns Pointer to element or NULL if none left. */ -extern HTBTElement *HTBTree_next(HTBTree *tree, HTBTElement *ele); + extern HTBTElement *HTBTree_next(HTBTree *tree, HTBTElement *ele); -#endif /* HTBTREE_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTBTREE_H */ diff --git a/WWW/Library/Implementation/HTCJK.h b/WWW/Library/Implementation/HTCJK.h index 28b98e76..6bdc41c4 100644 --- a/WWW/Library/Implementation/HTCJK.h +++ b/WWW/Library/Implementation/HTCJK.h @@ -15,100 +15,99 @@ #include <HTUtils.h> #endif +#ifdef __cplusplus +extern "C" { +#endif /* * STATUS CHANGE CODES */ #ifdef ESC #undef ESC -#endif /* ESC */ +#endif /* ESC */ #define ESC CH_ESC /* S/390 -- gil -- 0098 */ #define TO_2BCODE '$' #define TO_1BCODE '(' - #define TO_KANA '\016' #define TO_KANAOUT '\017' - #define TO_KANJI "\033$B" #define TO_HANJI "\033$A" #define TO_HANGUL "\033$(C" #define TO_ASCII "\033(B" - #define IS_SJIS_LO(lo) ((0x40<=lo)&&(lo!=0x7F)&&(lo<=0xFC)) #define IS_SJIS_HI1(hi) ((0x81<=hi)&&(hi<=0x9F)) /* 1st lev. */ #define IS_SJIS_HI2(hi) ((0xE0<=hi)&&(hi<=0xEF)) /* 2nd lev. */ #define IS_SJIS(hi,lo,in_sjis) (!IS_SJIS_LO(lo)?0:IS_SJIS_HI1(hi)?(in_sjis=1):in_sjis&&IS_SJIS_HI2(hi)) #define IS_SJIS_2BYTE(hi,lo) (IS_SJIS_LO(lo)&&(IS_SJIS_HI1(hi)||IS_SJIS_HI2(hi))) #define IS_SJIS_X0201KANA(lo) ((0xA1<=lo)&&(lo<=0xDF)) - #define IS_EUC_LOX(lo) ((0xA1<=lo)&&(lo<=0xFE)) /* extended */ #define IS_EUC_HI(hi) ((0xA1<=hi)&&(hi<=0xFE)) #define IS_EUC_X0201KANA(hi,lo) ((hi==0x8E)&&(0xA1<=lo)&&(lo<=0xDF)) #define IS_EUC(hi,lo) ((IS_EUC_HI(hi) && IS_EUC_LOX(lo))||IS_EUC_X0201KANA(hi,lo)) - #define IS_JAPANESE_2BYTE(hi,lo) (IS_SJIS_2BYTE(hi,lo) || IS_EUC(hi,lo)) - #define IS_BIG5_LOS(lo) ((0x40<=lo)&&(lo<=0x7E)) /* standard */ #define IS_BIG5_LOX(lo) ((0xA1<=lo)&&(lo<=0xFE)) /* extended */ #define IS_BIG5_HI(hi) ((0xA1<=hi)&&(hi<=0xFE)) #define IS_BIG5(hi,lo) (IS_BIG5_HI(hi) && (IS_BIG5_LOS(lo) || IS_BIG5_LOX(lo))) + typedef enum { + NOKANJI = 0, EUC, SJIS, JIS + } HTkcode; + typedef enum { + NOCJK = 0, JAPANESE, CHINESE, KOREAN, TAIPEI + } HTCJKlang; -typedef enum { - NOKANJI, EUC, SJIS, JIS -} HTkcode; -typedef enum { - NOCJK, JAPANESE, CHINESE, KOREAN, TAIPEI -} HTCJKlang; - -extern HTCJKlang HTCJK; + extern HTCJKlang HTCJK; /* * Function prototypes. */ -extern void JISx0201TO0208_EUC(register unsigned char IHI, - register unsigned char ILO, - register unsigned char *OHI, - register unsigned char *OLO); + extern void JISx0201TO0208_EUC(register unsigned char IHI, + register unsigned char ILO, + register unsigned char *OHI, + register unsigned char *OLO); -extern unsigned char *SJIS_TO_JIS1(register unsigned char HI, - register unsigned char LO, - register unsigned char *JCODE); + extern unsigned char *SJIS_TO_JIS1(register unsigned char HI, + register unsigned char LO, + register unsigned char *JCODE); -extern unsigned char *JIS_TO_SJIS1(register unsigned char HI, - register unsigned char LO, - register unsigned char *SJCODE); + extern unsigned char *JIS_TO_SJIS1(register unsigned char HI, + register unsigned char LO, + register unsigned char *SJCODE); -extern unsigned char *EUC_TO_SJIS1(unsigned char HI, - unsigned char LO, - register unsigned char *SJCODE); + extern unsigned char *EUC_TO_SJIS1(unsigned char HI, + unsigned char LO, + register unsigned char *SJCODE); -extern void JISx0201TO0208_SJIS(register unsigned char I, - register unsigned char *OHI, - register unsigned char *OLO); + extern void JISx0201TO0208_SJIS(register unsigned char I, + register unsigned char *OHI, + register unsigned char *OLO); -extern unsigned char *SJIS_TO_EUC1(unsigned char HI, - unsigned char LO, - unsigned char *EUCp); + extern unsigned char *SJIS_TO_EUC1(unsigned char HI, + unsigned char LO, + unsigned char *EUCp); -extern unsigned char *SJIS_TO_EUC(unsigned char *src, - unsigned char *dst); + extern unsigned char *SJIS_TO_EUC(unsigned char *src, + unsigned char *dst); -extern unsigned char *EUC_TO_SJIS(unsigned char *src, - unsigned char *dst); + extern unsigned char *EUC_TO_SJIS(unsigned char *src, + unsigned char *dst); -extern unsigned char *EUC_TO_JIS(unsigned char *src, - unsigned char *dst, - const char *toK, - const char *toA); + extern unsigned char *EUC_TO_JIS(unsigned char *src, + unsigned char *dst, + const char *toK, + const char *toA); -extern unsigned char *TO_EUC(const unsigned char *jis, - unsigned char *euc); + extern unsigned char *TO_EUC(const unsigned char *jis, + unsigned char *euc); -extern void TO_SJIS(const unsigned char *any, - unsigned char *sjis); + extern void TO_SJIS(const unsigned char *any, + unsigned char *sjis); -extern void TO_JIS(const unsigned char *any, - unsigned char *jis); + extern void TO_JIS(const unsigned char *any, + unsigned char *jis); -extern char *str_kcode(HTkcode code); + extern char *str_kcode(HTkcode code); -#endif /* HTCJK_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTCJK_H */ diff --git a/WWW/Library/Implementation/HTChunk.h b/WWW/Library/Implementation/HTChunk.h index ba28c422..8a5ade18 100644 --- a/WWW/Library/Implementation/HTChunk.h +++ b/WWW/Library/Implementation/HTChunk.h @@ -16,18 +16,21 @@ #include <UCMap.h> -typedef struct { - int size; /* In bytes */ - int growby; /* Allocation unit in bytes */ - int allocated; /* Current size of *data */ - char *data; /* Pointer to malloc'd area or 0 */ - int failok; /* allowed to fail without exiting program? */ -} HTChunk; +#ifdef __cplusplus +extern "C" { +#endif + typedef struct { + int size; /* In bytes */ + int growby; /* Allocation unit in bytes */ + int allocated; /* Current size of *data */ + char *data; /* Pointer to malloc'd area or 0 */ + int failok; /* allowed to fail without exiting program? */ + } HTChunk; /* * Initialize a chunk's allocation data and allocation-increment. */ -extern void HTChunkInit(HTChunk *ch, int grow); + extern void HTChunkInit(HTChunk *ch, int grow); /* * @@ -45,7 +48,7 @@ extern void HTChunkInit(HTChunk *ch, int grow); * */ -extern HTChunk *HTChunkCreate(int growby); + extern HTChunk *HTChunkCreate(int growby); /* * Create a chunk for which an allocation error is not a fatal application @@ -54,13 +57,13 @@ extern HTChunk *HTChunkCreate(int growby); * are ok each time after data have been appended. * The create call may also fail and will reurn NULL in that case. - kw */ -extern HTChunk *HTChunkCreateMayFail(int growby, int failok); + extern HTChunk *HTChunkCreateMayFail(int growby, int failok); /* * Like HTChunkCreate but with initial allocation - kw * */ -extern HTChunk *HTChunkCreate2(int growby, size_t needed); + extern HTChunk *HTChunkCreate2(int growby, size_t needed); /* * @@ -76,7 +79,7 @@ extern HTChunk *HTChunkCreate2(int growby, size_t needed); * */ -extern void HTChunkFree(HTChunk *ch); + extern void HTChunkFree(HTChunk *ch); /* * @@ -92,7 +95,7 @@ extern void HTChunkFree(HTChunk *ch); * */ -extern void HTChunkClear(HTChunk *ch); + extern void HTChunkClear(HTChunk *ch); /* * @@ -110,7 +113,7 @@ extern void HTChunkClear(HTChunk *ch); * */ -extern BOOL HTChunkRealloc(HTChunk *ch, int growby); + extern BOOL HTChunkRealloc(HTChunk *ch, int growby); /* * @@ -128,7 +131,7 @@ extern BOOL HTChunkRealloc(HTChunk *ch, int growby); * */ -extern void HTChunkEnsure(HTChunk *ch, int s); + extern void HTChunkEnsure(HTChunk *ch, int s); /* * @@ -145,11 +148,11 @@ extern void HTChunkEnsure(HTChunk *ch, int s); * *ch Is one character bigger * */ -extern void HTChunkPutc(HTChunk *ch, char c); + extern void HTChunkPutc(HTChunk *ch, char c); -extern void HTChunkPutb(HTChunk *ch, const char *b, int l); + extern void HTChunkPutb(HTChunk *ch, const char *b, int l); -extern void HTChunkPutUtf8Char(HTChunk *ch, UCode_t code); + extern void HTChunkPutUtf8Char(HTChunk *ch, UCode_t code); /* * Append a string to a chunk @@ -166,7 +169,7 @@ extern void HTChunkPutUtf8Char(HTChunk *ch, UCode_t code); * */ -extern void HTChunkPuts(HTChunk *ch, const char *str); + extern void HTChunkPuts(HTChunk *ch, const char *str); /* * @@ -186,6 +189,9 @@ extern void HTChunkPuts(HTChunk *ch, const char *str); * */ -extern void HTChunkTerminate(HTChunk *ch); + extern void HTChunkTerminate(HTChunk *ch); -#endif /* HTCHUNK_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTCHUNK_H */ diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c index 1cb75232..a6242d42 100644 --- a/WWW/Library/Implementation/HTFTP.c +++ b/WWW/Library/Implementation/HTFTP.c @@ -102,6 +102,49 @@ typedef struct _connection { */ #include <HTML.h> +/* + * socklen_t is the standard, but there are many pre-standard variants. + * This ifdef works around a few of those cases. + * + * Information was obtained from header files on these platforms: + * AIX 4.3.2, 5.1 + * HPUX 10.20, 11.00, 11.11 + * IRIX64 6.5 + * Tru64 4.0G, 4.0D, 5.1 + */ +#if defined(SYS_IRIX64) + /* IRIX64 6.5 socket.h may use socklen_t if SGI_SOURCE is not defined */ +# if _NO_XOPEN4 && _NO_XOPEN5 +# define LY_SOCKLEN socklen_t +# elif _ABIAPI +# define LY_SOCKLEN int +# elif _XOPEN5 +# if (_MIPS_SIM != _ABIO32) +# define LY_SOCKLEN socklen_t +# else +# define LY_SOCKLEN int +# endif +# else +# define LY_SOCKLEN size_t +# endif +#elif defined(SYS_HPUX) +# if defined(_XOPEN_SOURCE_EXTENDED) && defined(SO_PROTOTYPE) +# define LY_SOCKLEN socklen_t +# else /* HPUX 10.20, etc. */ +# define LY_SOCKLEN int +# endif +#elif defined(SYS_TRU64) +# if defined(_POSIX_PII_SOCKET) +# define LY_SOCKLEN socklen_t +# elif defined(_XOPEN_SOURCE_EXTENDED) +# define LY_SOCKLEN size_t +# else +# define LY_SOCKLEN int +# endif +#else +# define LY_SOCKLEN socklen_t +#endif + #define PUTC(c) (*targetClass.put_character) (target, c) #define PUTS(s) (*targetClass.put_string) (target, s) #define START(e) (*targetClass.start_element) (target, e, 0, 0, -1, 0) @@ -1096,7 +1139,7 @@ static int get_listen_socket(void) struct sockaddr_storage soc_address; /* Binary network address */ struct sockaddr_in *soc_in = (struct sockaddr_in *) &soc_address; int af; - int slen; + LY_SOCKLEN slen; #else struct sockaddr_in soc_address; /* Binary network address */ @@ -1203,18 +1246,18 @@ static int get_listen_socket(void) #else { int status; - int address_length = sizeof(soc_address); + LY_SOCKLEN address_length = sizeof(soc_address); #ifdef SOCKS if (socks_flag) status = Rgetsockname(control->socket, (struct sockaddr *) &soc_address, - (void *) &address_length); + &address_length); else #endif /* SOCKS */ status = getsockname(control->socket, (struct sockaddr *) &soc_address, - (void *) &address_length); + &address_length); if (status < 0) return HTInetStatus("getsockname"); #ifdef INET6 @@ -1257,12 +1300,12 @@ static int get_listen_socket(void) if (socks_flag) status = Rgetsockname(new_socket, (struct sockaddr *) &soc_address, - (void *) &address_length); + &address_length); else #endif /* SOCKS */ status = getsockname(new_socket, (struct sockaddr *) &soc_address, - (void *) &address_length); + &address_length); if (status < 0) return HTInetStatus("getsockname"); } @@ -2935,7 +2978,7 @@ static int setup_connection(const char *name, HTParentAnchor *anchor) { int retry; /* How many times tried? */ - int status; + int status = HT_NO_CONNECTION; CTRACE((tfp, "setup_connection(%s)\n", name)); @@ -3038,7 +3081,7 @@ static int setup_connection(const char *name, } else if (strcmp(p, "EPSV") == 0) { char c0, c1, c2, c3; struct sockaddr_storage ss; - int sslen; + LY_SOCKLEN sslen; /* * EPSV bla (|||port|) @@ -3672,18 +3715,18 @@ int HTFTPLoad(const char *name, #else struct sockaddr_in soc_address; #endif /* INET6 */ - int soc_addrlen = sizeof(soc_address); + LY_SOCKLEN soc_addrlen = sizeof(soc_address); #ifdef SOCKS if (socks_flag) status = Raccept(master_socket, (struct sockaddr *) &soc_address, - (void *) &soc_addrlen); + &soc_addrlen); else #endif /* SOCKS */ status = accept(master_socket, (struct sockaddr *) &soc_address, - (void *) &soc_addrlen); + &soc_addrlen); if (status < 0) { init_help_message_cache(); /* to free memory */ return HTInetStatus("accept"); diff --git a/WWW/Library/Implementation/HTFTP.h b/WWW/Library/Implementation/HTFTP.h index 75e60aaf..a903bbb8 100644 --- a/WWW/Library/Implementation/HTFTP.h +++ b/WWW/Library/Implementation/HTFTP.h @@ -14,12 +14,14 @@ #include <HTStream.h> #include <HTParse.h> +#ifdef __cplusplus +extern "C" { +#endif #define FILE_BY_NAME 0 #define FILE_BY_TYPE 1 #define FILE_BY_SIZE 2 #define FILE_BY_DATE 3 - -extern int HTfileSortMethod; /* specifies the method of sorting */ + extern int HTfileSortMethod; /* specifies the method of sorting */ /* PUBLIC HTVMS_name() * CONVERTS WWW name into a VMS name @@ -32,8 +34,8 @@ extern int HTfileSortMethod; /* specifies the method of sorting */ * * Bug: Returns pointer to static -- non-reentrant */ -extern char *HTVMS_name(const char *nn, - const char *fn); + extern char *HTVMS_name(const char *nn, + const char *fn); /* @@ -44,22 +46,25 @@ Retrieve File from Server returns Socket number for file if good.<0 if bad. */ -extern int HTFTPLoad(const char *name, - HTParentAnchor *anchor, - HTFormat format_out, - HTStream *sink); + extern int HTFTPLoad(const char *name, + HTParentAnchor *anchor, + HTFormat format_out, + HTStream *sink); /* * This function frees any user entered password, so that * it must be entered again for a future request. - FM */ -extern void HTClearFTPPassword(void); + extern void HTClearFTPPassword(void); /* Return Host Name */ -extern const char *HTHostName(void); + extern const char *HTHostName(void); +#ifdef __cplusplus +} +#endif #endif diff --git a/WWW/Library/Implementation/HTFWriter.h b/WWW/Library/Implementation/HTFWriter.h index 615e6341..015ea15f 100644 --- a/WWW/Library/Implementation/HTFWriter.h +++ b/WWW/Library/Implementation/HTFWriter.h @@ -11,14 +11,20 @@ #include <HTStream.h> #include <HTFormat.h> -extern HTStream *HTFWriter_new(FILE *fp); +#ifdef __cplusplus +extern "C" { +#endif + extern HTStream *HTFWriter_new(FILE *fp); -extern HTStream *HTSaveAndExecute(HTPresentation *pres, - HTParentAnchor *anchor, /* Not used */ - HTStream *sink); + extern HTStream *HTSaveAndExecute(HTPresentation *pres, + HTParentAnchor *anchor, /* Not used */ + HTStream *sink); -extern HTStream *HTSaveLocally(HTPresentation *pres, - HTParentAnchor *anchor, /* Not used */ - HTStream *sink); + extern HTStream *HTSaveLocally(HTPresentation *pres, + HTParentAnchor *anchor, /* Not used */ + HTStream *sink); -#endif /* HTFWRITE_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTFWRITE_H */ diff --git a/WWW/Library/Implementation/HTFile.h b/WWW/Library/Implementation/HTFile.h index c9aacc2d..4541fb49 100644 --- a/WWW/Library/Implementation/HTFile.h +++ b/WWW/Library/Implementation/HTFile.h @@ -12,18 +12,22 @@ #include <HTFormat.h> #include <HTAccess.h> + #ifndef HTML_H #include <HTML.h> /* SCW */ #endif /* HTML_H */ +#ifdef __cplusplus +extern "C" { +#endif /* * Controlling globals * * These flags control how directories and files are represented as * hypertext, and are typically set by the application from command * line options, etc. - */ -extern int HTDirAccess; /* Directory access level */ + */ extern int HTDirAccess; + /* Directory access level */ #define HT_DIR_FORBID 0 /* Altogether forbidden */ #define HT_DIR_SELECTIVE 1 /* If HT_DIR_ENABLE_FILE exists */ @@ -31,9 +35,9 @@ extern int HTDirAccess; /* Directory access level */ #define HT_DIR_ENABLE_FILE ".www_browsable" /* If exists, can browse */ -extern int HTDirReadme; /* Include readme files in listing? */ + extern int HTDirReadme; /* Include readme files in listing? */ - /* Values: */ + /* Values: */ #define HT_DIR_README_NONE 0 /* No */ #define HT_DIR_README_TOP 1 /* Yes, first */ #define HT_DIR_README_BOTTOM 2 /* Yes, at the end */ @@ -43,8 +47,8 @@ extern int HTDirReadme; /* Include readme files in listing? */ /* * Convert filenames between local and WWW formats */ -extern char *HTURLPath_toFile(const char *name, BOOL expand_all, BOOL is_remote); -extern char *HTnameOfFile_WWW(const char *name, BOOL WWW_prefix, BOOL expand_all); + extern char *HTURLPath_toFile(const char *name, BOOL expand_all, BOOL is_remote); + extern char *HTnameOfFile_WWW(const char *name, BOOL WWW_prefix, BOOL expand_all); #define HTLocalName(name) HTnameOfFile_WWW(name,TRUE,TRUE) #define HTfullURL_toFile(name) HTnameOfFile_WWW(name,FALSE,TRUE) @@ -53,12 +57,12 @@ extern char *HTnameOfFile_WWW(const char *name, BOOL WWW_prefix, BOOL expand_all /* * Make a WWW name from a full local path name */ -extern char *WWW_nameOfFile(const char *name); + extern char *WWW_nameOfFile(const char *name); /* * Generate the name of a cache file */ -extern char *HTCacheFileName(const char *name); + extern char *HTCacheFileName(const char *name); /* * Output directory titles @@ -69,22 +73,22 @@ extern char *HTCacheFileName(const char *name); * changed to return TRUE if parent directory link was generated, * FALSE otherwise - KW */ -extern BOOL HTDirTitles(HTStructured * target, HTParentAnchor *anchor, - BOOL tildeIsTop); + extern BOOL HTDirTitles(HTStructured * target, HTParentAnchor *anchor, + BOOL tildeIsTop); /* * Check existence. */ -extern int HTStat(const char *filename, - struct stat *data); + extern int HTStat(const char *filename, + struct stat *data); /* Load a document. * ---------------- */ -extern int HTLoadFile(const char *addr, - HTParentAnchor *anchor, - HTFormat format_out, - HTStream *sink); + extern int HTLoadFile(const char *addr, + HTParentAnchor *anchor, + HTFormat format_out, + HTStream *sink); /* * Output a directory entry @@ -92,8 +96,8 @@ extern int HTLoadFile(const char *addr, * This is used by HTFTP.c for example -- it is a common routine for * generating a linked directory entry. */ -extern void HTDirEntry(HTStructured * target, /* in which to put the linked text */ const char *tail, /* last part of directory name */ - const char *entry); /* name of this entry */ + extern void HTDirEntry(HTStructured * target, /* in which to put the linked text */ const char *tail, /* last part of directory name */ + const char *entry); /* name of this entry */ /* * HTSetSuffix: Define the representation for a file suffix @@ -125,11 +129,11 @@ extern void HTDirEntry(HTStructured * target, /* in which to put the linked text * ("application/x-compressed-tar"), but in that case don't use enconding * to also indicate it but use "binary" etc. */ -extern void HTSetSuffix5(const char *suffix, - const char *representation, - const char *encoding, - const char *desc, - double quality); + extern void HTSetSuffix5(const char *suffix, + const char *representation, + const char *encoding, + const char *desc, + double quality); #define HTSetSuffix(suff,rep,enc,q) HTSetSuffix5(suff, rep, enc, NULL, q) @@ -142,9 +146,9 @@ extern void HTSetSuffix5(const char *suffix, * * *pEncoding The encoding (binary, 7bit, etc). See HTSetSuffix. */ -extern HTFormat HTFileFormat(const char *filename, - HTAtom **pEncoding, - const char **pDesc); + extern HTFormat HTFileFormat(const char *filename, + HTAtom **pEncoding, + const char **pDesc); /* * HTCharsetFormat: Revise the file format in relation to the Lynx charset. @@ -154,9 +158,9 @@ extern HTFormat HTFileFormat(const char *filename, * indicated, sets Lynx up for proper handling in relation * to the currently selected character set. - FM */ -extern HTFormat HTCharsetFormat(HTFormat format, - HTParentAnchor *anchor, - int default_LYhndl); + extern HTFormat HTCharsetFormat(HTFormat format, + HTParentAnchor *anchor, + int default_LYhndl); /* Get various pieces of meta info from file name. * ----------------------------------------------- @@ -178,46 +182,46 @@ extern HTFormat HTCharsetFormat(HTFormat format, * through HTuncache_current_document or at the next document load. * - kw */ -extern void LYGetFileInfo(const char *filename, - HTParentAnchor **pfile_anchor, - HTFormat *pformat, - HTAtom **pencoding, - const char **pdesc, - const char **pcharset, - int *pfile_cs); + extern void LYGetFileInfo(const char *filename, + HTParentAnchor **pfile_anchor, + HTFormat *pformat, + HTAtom **pencoding, + const char **pdesc, + const char **pcharset, + int *pfile_cs); /* * Determine file value from file name. */ -extern float HTFileValue(const char *filename); + extern float HTFileValue(const char *filename); /* * Known compression types. */ -typedef enum { - cftNone - ,cftCompress - ,cftGzip - ,cftBzip2 - ,cftDeflate -} CompressFileType; + typedef enum { + cftNone + ,cftCompress + ,cftGzip + ,cftBzip2 + ,cftDeflate + } CompressFileType; /* * Determine compression type from file name, by looking at its suffix. */ -extern CompressFileType HTCompressFileType(const char *filename, - const char *dots, - int *rootlen); + extern CompressFileType HTCompressFileType(const char *filename, + const char *dots, + int *rootlen); /* * Determine compression type from the content-type. */ -extern CompressFileType HTContentToCompressType(const char *encoding); + extern CompressFileType HTContentToCompressType(const char *encoding); /* * Determine compression type from the content-encoding. */ -extern CompressFileType HTEncodingToCompressType(const char *encoding); + extern CompressFileType HTEncodingToCompressType(const char *encoding); /* * Determine write access to a file. @@ -241,25 +245,25 @@ extern CompressFileType HTEncodingToCompressType(const char *encoding); #ifdef VMS #define NO_GROUPS -#endif /* VMS */ +#endif /* VMS */ #ifdef NO_UNIX_IO #define NO_GROUPS -#endif /* NO_UNIX_IO */ +#endif /* NO_UNIX_IO */ #ifdef PCNFS #define NO_GROUPS -#endif /* PCNFS */ +#endif /* PCNFS */ #ifdef NOUSERS #define NO_GROUPS -#endif /* PCNFS */ +#endif /* PCNFS */ -#endif /* HAVE_CONFIG_H */ +#endif /* HAVE_CONFIG_H */ -extern BOOL HTEditable(const char *filename); + extern BOOL HTEditable(const char *filename); /* Make a save stream. * ------------------- */ -extern HTStream *HTFileSaveStream(HTParentAnchor *anchor); + extern HTStream *HTFileSaveStream(HTParentAnchor *anchor); /* * Determine a suitable suffix, given the representation. @@ -274,66 +278,69 @@ extern HTStream *HTFileSaveStream(HTParentAnchor *anchor); * returns a pointer to a suitable suffix string if one has * been found, else NULL. */ -extern const char *HTFileSuffix(HTAtom *rep, - const char *enc); + extern const char *HTFileSuffix(HTAtom *rep, + const char *enc); /* * Enumerate external programs that lynx may assume exists. Unlike those * given in download scripts, etc., lynx would really like to know their * absolute paths, for better security. */ -typedef enum { - ppUnknown = 0 - ,ppBZIP2 - ,ppCHMOD - ,ppCOMPRESS - ,ppCOPY - ,ppCSWING - ,ppGZIP - ,ppINFLATE - ,ppINSTALL - ,ppMKDIR - ,ppMV - ,ppRLOGIN - ,ppRM - ,ppRMDIR - ,ppTAR - ,ppTELNET - ,ppTN3270 - ,ppTOUCH - ,ppUNCOMPRESS - ,ppUNZIP - ,ppUUDECODE - ,ppZCAT - ,ppZIP - ,pp_Last -} ProgramPaths; + typedef enum { + ppUnknown = 0 + ,ppBZIP2 + ,ppCHMOD + ,ppCOMPRESS + ,ppCOPY + ,ppCSWING + ,ppGZIP + ,ppINFLATE + ,ppINSTALL + ,ppMKDIR + ,ppMV + ,ppRLOGIN + ,ppRM + ,ppRMDIR + ,ppTAR + ,ppTELNET + ,ppTN3270 + ,ppTOUCH + ,ppUNCOMPRESS + ,ppUNZIP + ,ppUUDECODE + ,ppZCAT + ,ppZIP + ,pp_Last + } ProgramPaths; /* * Given a program number, return its path */ -extern const char *HTGetProgramPath(ProgramPaths code); + extern const char *HTGetProgramPath(ProgramPaths code); /* * Store a program's path */ -extern void HTSetProgramPath(ProgramPaths code, - const char *path); + extern void HTSetProgramPath(ProgramPaths code, + const char *path); /* * Reset the list of known program paths to the ones that are compiled-in */ -extern void HTInitProgramPaths(void); + extern void HTInitProgramPaths(void); /* * The Protocols */ #ifdef GLOBALREF_IS_MACRO -extern GLOBALREF (HTProtocol, HTFTP); -extern GLOBALREF (HTProtocol, HTFile); + extern GLOBALREF (HTProtocol, HTFTP); + extern GLOBALREF (HTProtocol, HTFile); #else -GLOBALREF HTProtocol HTFTP, HTFile; -#endif /* GLOBALREF_IS_MACRO */ + GLOBALREF HTProtocol HTFTP, HTFile; +#endif /* GLOBALREF_IS_MACRO */ -#endif /* HTFILE_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTFILE_H */ diff --git a/WWW/Library/Implementation/HTFinger.h b/WWW/Library/Implementation/HTFinger.h index bda272ad..071d43bc 100644 --- a/WWW/Library/Implementation/HTFinger.h +++ b/WWW/Library/Implementation/HTFinger.h @@ -9,16 +9,22 @@ #include <HTAccess.h> #include <HTAnchor.h> +#ifdef __cplusplus +extern "C" { +#endif #ifdef GLOBALREF_IS_MACRO -extern GLOBALREF (HTProtocol, HTFinger); + extern GLOBALREF (HTProtocol, HTFinger); #else -GLOBALREF HTProtocol HTFinger; -#endif /* GLOBALREF_IS_MACRO */ + GLOBALREF HTProtocol HTFinger; +#endif /* GLOBALREF_IS_MACRO */ -extern int HTLoadFinger(const char *arg, - HTParentAnchor *anAnchor, - HTFormat format_out, - HTStream *stream); + extern int HTLoadFinger(const char *arg, + HTParentAnchor *anAnchor, + HTFormat format_out, + HTStream *stream); -#endif /* HTFINGER_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTFINGER_H */ diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c index 43c7892a..85bca424 100644 --- a/WWW/Library/Implementation/HTFormat.c +++ b/WWW/Library/Implementation/HTFormat.c @@ -552,7 +552,7 @@ void HTFilterPresentations(void) s = HTAtom_name(p->rep); p->get_accept = FALSE; - if (LYAcceptMedia & p->accept_opt + if ((LYAcceptMedia & p->accept_opt) != 0 && p->rep_out == WWW_PRESENT && p->rep != WWW_SOURCE && strcasecomp(s, "www/mime") diff --git a/WWW/Library/Implementation/HTFormat.h b/WWW/Library/Implementation/HTFormat.h index ad3df250..903462bb 100644 --- a/WWW/Library/Implementation/HTFormat.h +++ b/WWW/Library/Implementation/HTFormat.h @@ -17,17 +17,23 @@ Preamble #include <HTStream.h> #include <HTAtom.h> #include <HTList.h> +#include <HTAnchor.h> -/* - -The HTFormat type +#ifdef USE_SOURCE_CACHE +#include <HTChunk.h> +#endif - We use the HTAtom object for holding representations. This allows faster manipulation - (comparison and copying) that if we stayed with strings. +#ifdef USE_BZLIB +#include <bzlib.h> +#endif - */ -typedef HTAtom *HTFormat; +#ifdef USE_ZLIB +#include <zlib.h> +#endif +#ifdef __cplusplus +extern "C" { +#endif /* These macros (which used to be constants) define some basic internally @@ -38,10 +44,8 @@ typedef HTAtom *HTFormat; useful for diagnostics, and for users who want to see the original, whatever it is. - */ - /* Internal ones */ -/* #define WWW_SOURCE HTAtom_for("www/source") *//* Whatever it was originally */ -extern HTAtom *WWW_SOURCE; /* calculated once, heavy used */ + *//* Internal ones *//* #define WWW_SOURCE HTAtom_for("www/source") *//* Whatever it was originally */ extern HTAtom *WWW_SOURCE; + /* calculated once, heavy used */ /* @@ -107,36 +111,24 @@ extern HTAtom *WWW_SOURCE; /* calculated once, heavy used */ #define WWW_HTML HTAtom_for("text/html") #define WWW_BINARY HTAtom_for("application/octet-stream") -/* - - We must include the following file after defining HTFormat, to which it - makes reference. - -The HTEncoding type - - */ -typedef HTAtom *HTEncoding; + typedef HTAtom *HTEncoding; /* - - The following are values for the MIME types: - + * The following are values for the MIME types: */ #define WWW_ENC_7BIT HTAtom_for("7bit") #define WWW_ENC_8BIT HTAtom_for("8bit") #define WWW_ENC_BINARY HTAtom_for("binary") /* - - We also add - + * We also add */ #define WWW_ENC_COMPRESS HTAtom_for("compress") /* - Does a string designate a real encoding, or is it just - a "dummy" as for example 7bit, 8bit, and binary? - */ + * Does a string designate a real encoding, or is it just + * a "dummy" as for example 7bit, 8bit, and binary? + */ #define IsUnityEncStr(senc) \ ((senc)==NULL || *(senc)=='\0' || !strcmp(senc,"identity") ||\ !strcmp(senc,"8bit") || !strcmp(senc,"binary") || !strcmp(senc,"7bit")) @@ -145,8 +137,6 @@ typedef HTAtom *HTEncoding; ((enc)==NULL || (enc)==HTAtom_for("identity") ||\ (enc)==WWW_ENC_8BIT || (enc)==WWW_ENC_BINARY || (enc)==WWW_ENC_7BIT) -#include <HTAnchor.h> - /* The HTPresentation and HTConverter types @@ -158,25 +148,25 @@ The HTPresentation and HTConverter types one. See the initialisation module for a list of conversion routines. */ -typedef struct _HTPresentation HTPresentation; + typedef struct _HTPresentation HTPresentation; -typedef HTStream *HTConverter (HTPresentation *pres, - HTParentAnchor *anchor, - HTStream *sink); + typedef HTStream *HTConverter (HTPresentation *pres, + HTParentAnchor *anchor, + HTStream *sink); -struct _HTPresentation { - HTAtom *rep; /* representation name atomized */ - HTAtom *rep_out; /* resulting representation */ - HTConverter *converter; /* routine to gen the stream stack */ - char *command; /* MIME-format command string */ - char *testcommand; /* MIME-format test string */ - float quality; /* Between 0 (bad) and 1 (good) */ - float secs; - float secs_per_byte; - long int maxbytes; - BOOL get_accept; /* list in "Accept:" for GET */ - int accept_opt; /* matches against LYAcceptMedia */ -}; + struct _HTPresentation { + HTAtom *rep; /* representation name atomized */ + HTAtom *rep_out; /* resulting representation */ + HTConverter *converter; /* routine to gen the stream stack */ + char *command; /* MIME-format command string */ + char *testcommand; /* MIME-format test string */ + float quality; /* Between 0 (bad) and 1 (good) */ + float secs; + float secs_per_byte; + long int maxbytes; + BOOL get_accept; /* list in "Accept:" for GET */ + int accept_opt; /* matches against LYAcceptMedia */ + }; /* @@ -184,48 +174,48 @@ struct _HTPresentation { modules which want to know the set of formats supported. for example. */ -extern HTList *HTPresentations; + extern HTList *HTPresentations; /* The default presentation is used when no other is appropriate */ -extern HTPresentation *default_presentation; + extern HTPresentation *default_presentation; /* * Options used for "Accept:" string */ -typedef enum { - /* make the components powers of two so we can add them */ - mediaINT = 1 /* internal types predefined in HTInit.c */ - ,mediaEXT = 2 /* external types predefined in HTInit.c */ - ,mediaCFG = 4 /* types, e.g., viewers, from lynx.cfg */ - ,mediaUSR = 8 /* user's mime-types, etc. */ - ,mediaSYS = 16 /* system's mime-types, etc. */ - /* these are useful flavors for the options menu */ - ,mediaOpt1 = mediaINT - ,mediaOpt2 = mediaINT + mediaCFG - ,mediaOpt3 = mediaINT + mediaCFG + mediaUSR - ,mediaOpt4 = mediaINT + mediaCFG + mediaUSR + mediaSYS - /* this is the flavor from pre-2.8.6 */ - ,mediaALL = mediaINT + mediaEXT + mediaCFG + mediaUSR + mediaSYS -} AcceptMedia; + typedef enum { + /* make the components powers of two so we can add them */ + mediaINT = 1 /* internal types predefined in HTInit.c */ + ,mediaEXT = 2 /* external types predefined in HTInit.c */ + ,mediaCFG = 4 /* types, e.g., viewers, from lynx.cfg */ + ,mediaUSR = 8 /* user's mime-types, etc. */ + ,mediaSYS = 16 /* system's mime-types, etc. */ + /* these are useful flavors for the options menu */ + ,mediaOpt1 = mediaINT + ,mediaOpt2 = mediaINT + mediaCFG + ,mediaOpt3 = mediaINT + mediaCFG + mediaUSR + ,mediaOpt4 = mediaINT + mediaCFG + mediaUSR + mediaSYS + /* this is the flavor from pre-2.8.6 */ + ,mediaALL = mediaINT + mediaEXT + mediaCFG + mediaUSR + mediaSYS + } AcceptMedia; /* * Options used for "Accept-Encoding:" string */ -typedef enum { - encodingNONE = 0 - ,encodingGZIP = 1 - ,encodingDEFLATE = 2 - ,encodingCOMPRESS = 4 - ,encodingBZIP2 = 8 - ,encodingALL = (encodingGZIP - + encodingDEFLATE - + encodingCOMPRESS - + encodingBZIP2) -} AcceptEncoding; + typedef enum { + encodingNONE = 0 + ,encodingGZIP = 1 + ,encodingDEFLATE = 2 + ,encodingCOMPRESS = 4 + ,encodingBZIP2 = 8 + ,encodingALL = (encodingGZIP + + encodingDEFLATE + + encodingCOMPRESS + + encodingBZIP2) + } AcceptEncoding; /* @@ -249,15 +239,15 @@ HTSetPresentation: Register a system command to present a format media Used in filtering presentation types for "Accept:" */ -extern void HTSetPresentation(const char *representation, - const char *command, - const char *testcommand, - double quality, - double secs, - double secs_per_byte, - long int maxbytes, - AcceptMedia media -); + extern void HTSetPresentation(const char *representation, + const char *command, + const char *testcommand, + double quality, + double secs, + double secs_per_byte, + long int maxbytes, + AcceptMedia media + ); /* @@ -273,15 +263,15 @@ HTSetConversion: Register a converstion routine */ -extern void HTSetConversion(const char *rep_in, - const char *rep_out, - HTConverter *converter, - float quality, - float secs, - float secs_per_byte, - long int maxbytes, - AcceptMedia media -); + extern void HTSetConversion(const char *rep_in, + const char *rep_out, + HTConverter *converter, + float quality, + float secs, + float secs_per_byte, + long int maxbytes, + AcceptMedia media + ); /* @@ -295,10 +285,10 @@ HTStreamStack: Create a stack of streams load information into the anchor object which represents them. */ -extern HTStream *HTStreamStack(HTFormat format_in, - HTFormat format_out, - HTStream *stream_out, - HTParentAnchor *anchor); + extern HTStream *HTStreamStack(HTFormat format_in, + HTFormat format_out, + HTStream *stream_out, + HTParentAnchor *anchor); /* HTReorderPresentation: put presentation near head of list @@ -307,14 +297,14 @@ HTReorderPresentation: put presentation near head of list start of the HTPresentations list. - kw */ -extern void HTReorderPresentation(HTFormat format_in, - HTFormat format_out); + extern void HTReorderPresentation(HTFormat format_in, + HTFormat format_out); /* * Setup 'get_accept' flag to denote presentations that are not redundant, * and will be listed in "Accept:" header. */ -extern void HTFilterPresentations(void); + extern void HTFilterPresentations(void); /* @@ -334,10 +324,10 @@ HTStackValue: Find the cost of a filter stack length The number of bytes expected in the input format */ -extern float HTStackValue(HTFormat format_in, - HTFormat rep_out, - float initial_value, - long int length); + extern float HTStackValue(HTFormat format_in, + HTFormat rep_out, + float initial_value, + long int length); #define NO_VALUE_FOUND -1e20 /* returned if none found */ @@ -348,9 +338,9 @@ extern float HTStackValue(HTFormat format_in, * This is a traverse call for HText_pageDispaly() - it works!. * */ -extern void HTDisplayPartial(void); + extern void HTDisplayPartial(void); -extern void HTFinishDisplayPartial(void); + extern void HTFinishDisplayPartial(void); /* @@ -360,10 +350,10 @@ HTCopy: Copy a socket to a stream one which has been generated by HTStreamStack. */ -extern int HTCopy(HTParentAnchor *anchor, - int file_number, - void *handle, - HTStream *sink); + extern int HTCopy(HTParentAnchor *anchor, + int file_number, + void *handle, + HTStream *sink); /* @@ -374,11 +364,10 @@ HTFileCopy: Copy a file to a stream HTParseFile */ -extern int HTFileCopy(FILE *fp, - HTStream *sink); + extern int HTFileCopy(FILE *fp, + HTStream *sink); #ifdef USE_SOURCE_CACHE -#include <HTChunk.h> /* HTMemCopy: Copy a memory chunk to a stream @@ -388,8 +377,8 @@ HTMemCopy: Copy a memory chunk to a stream HTParseMem */ -extern int HTMemCopy(HTChunk *chunk, - HTStream *sink); + extern int HTMemCopy(HTChunk *chunk, + HTStream *sink); #endif /* @@ -400,9 +389,9 @@ HTCopyNoCR: Copy a socket to a stream, stripping CR characters. */ -extern void HTCopyNoCR(HTParentAnchor *anchor, - int file_number, - HTStream *sink); + extern void HTCopyNoCR(HTParentAnchor *anchor, + int file_number, + HTStream *sink); /* @@ -414,15 +403,15 @@ Clear input buffer and set file number small implementations. */ -extern void HTInitInput(int file_number); + extern void HTInitInput(int file_number); /* Get next character from buffer */ -extern int interrupted_in_htgetcharacter; -extern int HTGetCharacter(void); + extern int interrupted_in_htgetcharacter; + extern int HTGetCharacter(void); /* @@ -433,11 +422,11 @@ HTParseSocket: Parse a socket given its format <0 if not. */ -extern int HTParseSocket(HTFormat format_in, - HTFormat format_out, - HTParentAnchor *anchor, - int file_number, - HTStream *sink); + extern int HTParseSocket(HTFormat format_in, + HTFormat format_out, + HTParentAnchor *anchor, + int file_number, + HTStream *sink); /* @@ -448,11 +437,11 @@ HTParseFile: Parse a File through a file pointer return HT_PARTIAL_CONTENT, HT_NO_DATA, or other <0 for failure. */ -extern int HTParseFile(HTFormat format_in, - HTFormat format_out, - HTParentAnchor *anchor, - FILE *fp, - HTStream *sink); + extern int HTParseFile(HTFormat format_in, + HTFormat format_out, + HTParentAnchor *anchor, + FILE *fp, + HTStream *sink); #ifdef USE_SOURCE_CACHE /* @@ -464,15 +453,14 @@ HTParseMem: Parse a document in memory return <0 for failure. */ -extern int HTParseMem(HTFormat format_in, - HTFormat format_out, - HTParentAnchor *anchor, - HTChunk *chunk, - HTStream *sink); + extern int HTParseMem(HTFormat format_in, + HTFormat format_out, + HTParentAnchor *anchor, + HTChunk *chunk, + HTStream *sink); #endif #ifdef USE_ZLIB -#include <zlib.h> /* HTParseGzFile: Parse a gzip'ed File through a file pointer @@ -480,11 +468,11 @@ HTParseGzFile: Parse a gzip'ed File through a file pointer HTStreamStack and HTGzFileCopy. Returns HT_LOADED if successful, can also return HT_PARTIAL_CONTENT, HT_NO_DATA, or other <0 for failure. */ -extern int HTParseGzFile(HTFormat format_in, - HTFormat format_out, - HTParentAnchor *anchor, - gzFile gzfp, - HTStream *sink); + extern int HTParseGzFile(HTFormat format_in, + HTFormat format_out, + HTParentAnchor *anchor, + gzFile gzfp, + HTStream *sink); /* HTParseZzFile: Parse a deflate'd File through a file pointer @@ -493,16 +481,15 @@ HTParseZzFile: Parse a deflate'd File through a file pointer HTStreamStack and HTZzFileCopy. Returns HT_LOADED if successful, can also return HT_PARTIAL_CONTENT, HT_NO_DATA, or other <0 for failure. */ -extern int HTParseZzFile(HTFormat format_in, - HTFormat format_out, - HTParentAnchor *anchor, - FILE *zzfp, - HTStream *sink); + extern int HTParseZzFile(HTFormat format_in, + HTFormat format_out, + HTParentAnchor *anchor, + FILE *zzfp, + HTStream *sink); -#endif /* USE_ZLIB */ +#endif /* USE_ZLIB */ #ifdef USE_BZLIB -#include <bzlib.h> /* HTParseBzFile: Parse a bzip2'ed File through a file pointer @@ -510,13 +497,13 @@ HTParseBzFile: Parse a bzip2'ed File through a file pointer HTStreamStack and HTGzFileCopy. Returns HT_LOADED if successful, can also return HT_PARTIAL_CONTENT, HT_NO_DATA, or other <0 for failure. */ -extern int HTParseBzFile(HTFormat format_in, - HTFormat format_out, - HTParentAnchor *anchor, - BZFILE * bzfp, - HTStream *sink); + extern int HTParseBzFile(HTFormat format_in, + HTFormat format_out, + HTParentAnchor *anchor, + BZFILE * bzfp, + HTStream *sink); -#endif /* USE_BZLIB */ +#endif /* USE_BZLIB */ /* @@ -528,7 +515,7 @@ HTNetToText: Convert Net ASCII to local representation creating it. */ -extern HTStream *HTNetToText(HTStream *sink); + extern HTStream *HTNetToText(HTStream *sink); /* @@ -542,13 +529,16 @@ HTFormatInit: Set up default presentations and conversions defaults as well. */ -extern void HTFormatInit(void); + extern void HTFormatInit(void); /* Epilogue */ -extern BOOL HTOutputSource; /* Flag: shortcut parser */ + extern BOOL HTOutputSource; /* Flag: shortcut parser */ -#endif /* HTFORMAT_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTFORMAT_H */ diff --git a/WWW/Library/Implementation/HTGopher.c b/WWW/Library/Implementation/HTGopher.c index d45c8bcf..49a8ce83 100644 --- a/WWW/Library/Implementation/HTGopher.c +++ b/WWW/Library/Implementation/HTGopher.c @@ -109,7 +109,7 @@ typedef struct _CSOfield_info { /* For form-based CSO gateway - FM */ int defreturn; int explicit_return; int reserved; - int public; + int gpublic; char name_buf[16]; /* Avoid malloc if we can */ char desc_buf[32]; /* Avoid malloc if we can */ char attr_buf[80]; /* Avoid malloc if we can */ @@ -773,7 +773,7 @@ static void interpret_cso_key(const char *key, * 'Query' fields, public and lookup attributes. */ for (; fld; fld = fld->next) - if (fld->public && (fld->lookup == 1)) + if (fld->gpublic && (fld->lookup == 1)) break; break; case 1: @@ -789,7 +789,7 @@ static void interpret_cso_key(const char *key, * 'Return' fields, public only. */ for (; fld; fld = fld->next) - if (fld->public) + if (fld->gpublic) break; break; case 3: @@ -867,7 +867,7 @@ static int parse_cso_field_info(CSOfield_info *blk) * Initialize all fields to default values. */ blk->indexed = blk->lookup = blk->reserved = blk->max_size = blk->url = 0; - blk->defreturn = blk->explicit_return = blk->public = 0; + blk->defreturn = blk->explicit_return = blk->gpublic = 0; /* * Search for keywords in info string and set values. Attributes are @@ -880,7 +880,7 @@ static int parse_cso_field_info(CSOfield_info *blk) if (strstr(info, "default ")) blk->defreturn = 1; if (strstr(info, "public ")) - blk->public = 1; + blk->gpublic = 1; if (strstr(info, "lookup ")) blk->lookup = 1; if (strstr(info, "url ")) { @@ -908,7 +908,7 @@ static int parse_cso_fields(char *buf, int i, code = 0, prev_code; size_t alen; char *indx, *name; - CSOfield_info *last, *new; + CSOfield_info *last, *newf; last = CSOfields = (CSOfield_info *) 0; prev_code = -2555; @@ -1008,43 +1008,43 @@ static int parse_cso_fields(char *buf, * Initialize new block, append to end of list to * preserve order. */ - new = typecalloc(CSOfield_info); + newf = typecalloc(CSOfield_info); - if (!new) { + if (!newf) { outofmem(__FILE__, "HTLoadCSO"); } if (last) - last->next = new; + last->next = newf; else - CSOfields = new; - last = new; + CSOfields = newf; + last = newf; - new->next = (CSOfield_info *) 0; - new->name = new->name_buf; + newf->next = (CSOfield_info *) 0; + newf->name = newf->name_buf; alen = strlen(name) + 1; - if (alen > sizeof(new->name_buf)) { - if (!(new->name = (char *) malloc(alen))) { + if (alen > sizeof(newf->name_buf)) { + if (!(newf->name = (char *) malloc(alen))) { outofmem(__FILE__, "HTLoadCSO"); } } - strcpy(new->name, name); + strcpy(newf->name, name); - new->attributes = new->attr_buf; + newf->attributes = newf->attr_buf; alen = strlen((char *) &p[i]) + 2; - if (alen > sizeof(new->attr_buf)) { - if (!(new->attributes = (char *) malloc(alen))) { + if (alen > sizeof(newf->attr_buf)) { + if (!(newf->attributes = (char *) malloc(alen))) { outofmem(__FILE__, "HTLoadCSO"); } } - strcpy(new->attributes, (char *) &p[i]); - strcpy((char *) &new->attributes[alen - 2], " "); - new->description = new->desc_buf; - new->desc_buf[0] = '\0'; - new->id = atoi(indx); + strcpy(newf->attributes, (char *) &p[i]); + strcpy((char *) &newf->attributes[alen - 2], " "); + newf->description = newf->desc_buf; + newf->desc_buf[0] = '\0'; + newf->id = atoi(indx); /* * Scan for keywords. */ - parse_cso_field_info(new); + parse_cso_field_info(newf); } prev_code = code; } else @@ -1077,7 +1077,7 @@ static int generate_cso_form(char *host, const char *key; const char *line; CSOformgen_context ctx; - static const char *template[] = + static const char *ctemplate[] = { "<HTML>\n<HEAD>\n<TITLE>CSO/PH Query Form for $(HOST)</TITLE>\n</HEAD>\n<BODY>", "<H2><I>CSO/PH Query Form</I> for <EM>$(HOST)</EM></H2>", @@ -1119,12 +1119,12 @@ static int generate_cso_form(char *host, out = 0; buf[out] = '\0'; for (i = full_flag ? /***1***/ 0 : 0; - template[i]; + ctemplate[i]; i++) { /* * Search the current string for substitution, flagged by $( */ - for (line = template[i], j = 0; line[j]; j++) { + for (line = ctemplate[i], j = 0; line[j]; j++) { if ((line[j] == '$') && (line[j + 1] == '(')) { /* * Command detected, flush output buffer and find closing ')' @@ -1143,7 +1143,7 @@ static int generate_cso_form(char *host, interpret_cso_key(key, buf, &length, &ctx, Target); i = ctx.cur_line; j = ctx.cur_off; - line = template[i]; + line = ctemplate[i]; out = length; if (ctx.seek) { @@ -1153,15 +1153,15 @@ static int generate_cso_form(char *host, */ int slen = strlen(ctx.seek); - for (; template[i]; i++) { - for (line = template[i]; line[j]; j++) { + for (; ctemplate[i]; i++) { + for (line = ctemplate[i]; line[j]; j++) { if (line[j] == '$') if (0 == strncmp(ctx.seek, &line[j], slen)) { if (j == 0) - j = strlen(template[--i]) - 1; + j = strlen(ctemplate[--i]) - 1; else --j; - line = template[i]; + line = ctemplate[i]; ctx.seek = (char *) 0; break; } diff --git a/WWW/Library/Implementation/HTGopher.h b/WWW/Library/Implementation/HTGopher.h index c0207fb4..667fc24e 100644 --- a/WWW/Library/Implementation/HTGopher.h +++ b/WWW/Library/Implementation/HTGopher.h @@ -13,11 +13,17 @@ #include <HTAccess.h> #include <HTAnchor.h> +#ifdef __cplusplus +extern "C" { +#endif #ifdef GLOBALREF_IS_MACRO -extern GLOBALREF (HTProtocol, HTGopher); + extern GLOBALREF (HTProtocol, HTGopher); #else -GLOBALREF HTProtocol HTGopher; -#endif /* GLOBALREF_IS_MACRO */ + GLOBALREF HTProtocol HTGopher; +#endif /* GLOBALREF_IS_MACRO */ -#endif /* HTGOPHER_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTGOPHER_H */ diff --git a/WWW/Library/Implementation/HTGroup.c b/WWW/Library/Implementation/HTGroup.c index c56127bb..3bbec6d1 100644 --- a/WWW/Library/Implementation/HTGroup.c +++ b/WWW/Library/Implementation/HTGroup.c @@ -506,10 +506,10 @@ static BOOL part_match(const char *tcur, * ON EXIT: * returns YES, if match; NO, if not. */ -static BOOL ip_number_match(const char *template, +static BOOL ip_number_match(const char *ctemplate, const char *the_inet_addr) { - const char *tcur = template; + const char *tcur = ctemplate; const char *icur = the_inet_addr; int cnt; diff --git a/WWW/Library/Implementation/HTGroup.h b/WWW/Library/Implementation/HTGroup.h index cf9cbb19..78745656 100644 --- a/WWW/Library/Implementation/HTGroup.h +++ b/WWW/Library/Implementation/HTGroup.h @@ -7,31 +7,34 @@ #include <HTList.h> -typedef HTList GroupDefList; -typedef HTList ItemList; +#ifdef __cplusplus +extern "C" { +#endif + typedef HTList GroupDefList; + typedef HTList ItemList; -typedef struct { - char *group_name; - ItemList *item_list; -} GroupDef; + typedef struct { + char *group_name; + ItemList *item_list; + } GroupDef; /* * Access Authorization failure reasons */ -typedef enum { - HTAA_OK, /* 200 OK */ - HTAA_OK_GATEWAY, /* 200 OK, acting as a gateway */ - HTAA_NO_AUTH, /* 401 Unauthorized, not authenticated */ - HTAA_NOT_MEMBER, /* 401 Unauthorized, not authorized */ - HTAA_IP_MASK, /* 403 Forbidden by IP mask */ - HTAA_BY_RULE, /* 403 Forbidden by rule */ - HTAA_NO_ACL, /* 403 Forbidden, ACL non-existent */ - HTAA_NO_ENTRY, /* 403 Forbidden, no ACL entry */ - HTAA_SETUP_ERROR, /* 403 Forbidden, server setup error */ - HTAA_DOTDOT, /* 403 Forbidden, URL with /../ illegal */ - HTAA_HTBIN, /* 403 Forbidden, /htbin not enabled */ - HTAA_NOT_FOUND /* 404 Not found, or read protected */ -} HTAAFailReasonType; + typedef enum { + HTAA_OK, /* 200 OK */ + HTAA_OK_GATEWAY, /* 200 OK, acting as a gateway */ + HTAA_NO_AUTH, /* 401 Unauthorized, not authenticated */ + HTAA_NOT_MEMBER, /* 401 Unauthorized, not authorized */ + HTAA_IP_MASK, /* 403 Forbidden by IP mask */ + HTAA_BY_RULE, /* 403 Forbidden by rule */ + HTAA_NO_ACL, /* 403 Forbidden, ACL non-existent */ + HTAA_NO_ENTRY, /* 403 Forbidden, no ACL entry */ + HTAA_SETUP_ERROR, /* 403 Forbidden, server setup error */ + HTAA_DOTDOT, /* 403 Forbidden, URL with /../ illegal */ + HTAA_HTBIN, /* 403 Forbidden, /htbin not enabled */ + HTAA_NOT_FOUND /* 404 Not found, or read protected */ + } HTAAFailReasonType; /* @@ -98,7 +101,7 @@ Group definition grammar */ -extern GroupDef *HTAA_parseGroupDef(FILE *fp); + extern GroupDef *HTAA_parseGroupDef(FILE *fp); /* @@ -109,8 +112,8 @@ Fill in Pointers to referenced Group Definitions in a Group Definition */ -extern void HTAA_resolveGroupReferences(GroupDef *group_def, - GroupDefList *group_def_list); + extern void HTAA_resolveGroupReferences(GroupDef *group_def, + GroupDefList *group_def_list); /* @@ -121,7 +124,7 @@ Read Group File (and do caching) */ -extern GroupDefList *HTAA_readGroupFile(const char *filename); + extern GroupDefList *HTAA_readGroupFile(const char *filename); /* @@ -132,7 +135,7 @@ Delete Group Definition */ -extern void GroupDef_delete(GroupDef *group_def); + extern void GroupDef_delete(GroupDef *group_def); /* @@ -140,7 +143,7 @@ Print Out Group Definition (for trace purposes) */ -extern void HTAA_printGroupDef(GroupDef *group_def); + extern void HTAA_printGroupDef(GroupDef *group_def); /* @@ -168,9 +171,12 @@ Does a User Belong to a Given Set of Groups * to the group. * HTAA_OK if both IP address and user are ok. */ -extern HTAAFailReasonType HTAA_userAndInetInGroup(GroupDef *group, - char *username, - char *ip_number, - char *ip_name); - -#endif /* not HTGROUP_H */ + extern HTAAFailReasonType HTAA_userAndInetInGroup(GroupDef *group, + char *username, + char *ip_number, + char *ip_name); + +#ifdef __cplusplus +} +#endif +#endif /* not HTGROUP_H */ diff --git a/WWW/Library/Implementation/HTInit.h b/WWW/Library/Implementation/HTInit.h index 81441421..4fc70003 100644 --- a/WWW/Library/Implementation/HTInit.h +++ b/WWW/Library/Implementation/HTInit.h @@ -18,11 +18,17 @@ #include <HTUtils.h> #endif -extern void HTFormatInit(void); -extern void HTPreparsedFormatInit(void); -extern void HTFileInit(void); -extern int LYTestMailcapCommand(const char *testcommand, const char *params); -extern BOOL LYMailcapUsesPctS(const char *controlstring); -extern char *LYMakeMailcapCommand(const char *command, const char *params, const char *filename); +#ifdef __cplusplus +extern "C" { +#endif + extern void HTFormatInit(void); + extern void HTPreparsedFormatInit(void); + extern void HTFileInit(void); + extern int LYTestMailcapCommand(const char *testcommand, const char *params); + extern BOOL LYMailcapUsesPctS(const char *controlstring); + extern char *LYMakeMailcapCommand(const char *command, const char *params, const char *filename); -#endif /* HTINIT_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTINIT_H */ diff --git a/WWW/Library/Implementation/HTLex.h b/WWW/Library/Implementation/HTLex.h index c647b61f..fde90348 100644 --- a/WWW/Library/Implementation/HTLex.h +++ b/WWW/Library/Implementation/HTLex.h @@ -9,21 +9,24 @@ #include <HTUtils.h> #endif -typedef enum { - LEX_NONE, /* Internally used */ - LEX_EOF, /* End of file */ - LEX_REC_SEP, /* Record separator */ - LEX_FIELD_SEP, /* Field separator */ - LEX_ITEM_SEP, /* List item separator */ - LEX_OPEN_PAREN, /* Group start tag */ - LEX_CLOSE_PAREN, /* Group end tag */ - LEX_AT_SIGN, /* Address qualifier */ - LEX_ALPH_STR, /* Alphanumeric string */ - LEX_TMPL_STR /* Template string */ -} LexItem; - -extern char HTlex_buffer[]; /* Read lexical string */ -extern int HTlex_line; /* Line number in source file */ +#ifdef __cplusplus +extern "C" { +#endif + typedef enum { + LEX_NONE, /* Internally used */ + LEX_EOF, /* End of file */ + LEX_REC_SEP, /* Record separator */ + LEX_FIELD_SEP, /* Field separator */ + LEX_ITEM_SEP, /* List item separator */ + LEX_OPEN_PAREN, /* Group start tag */ + LEX_CLOSE_PAREN, /* Group end tag */ + LEX_AT_SIGN, /* Address qualifier */ + LEX_ALPH_STR, /* Alphanumeric string */ + LEX_TMPL_STR /* Template string */ + } LexItem; + + extern char HTlex_buffer[]; /* Read lexical string */ + extern int HTlex_line; /* Line number in source file */ /* @@ -33,7 +36,7 @@ Get Next Lexical Item */ -extern LexItem lex(FILE *fp); + extern LexItem lex(FILE *fp); /* @@ -41,7 +44,7 @@ Push Back Latest Item */ -extern void unlex(LexItem lex_item); + extern void unlex(LexItem lex_item); /* @@ -49,10 +52,13 @@ Get the Name for Lexical Item */ -extern const char *lex_verbose(LexItem lex_item); + extern const char *lex_verbose(LexItem lex_item); /* */ -#endif /* not HTLEX_H */ +#ifdef __cplusplus +} +#endif +#endif /* not HTLEX_H */ diff --git a/WWW/Library/Implementation/HTList.h b/WWW/Library/Implementation/HTList.h index 8a5ed0f2..93f91473 100644 --- a/WWW/Library/Implementation/HTList.h +++ b/WWW/Library/Implementation/HTList.h @@ -11,12 +11,15 @@ #include <HTUtils.h> #endif -typedef struct _HTList HTList; +#ifdef __cplusplus +extern "C" { +#endif + typedef struct _HTList HTList; -struct _HTList { - void *object; - HTList *next; -}; + struct _HTList { + void *object; + HTList *next; + }; /* Fast macro to traverse a list. Call it first with copy of the list * header. It returns the first object and increments the passed list @@ -37,79 +40,79 @@ struct _HTList { /* Create list. */ -extern HTList *HTList_new(void); + extern HTList *HTList_new(void); /* Delete list. */ -extern void HTList_delete(HTList *me); + extern void HTList_delete(HTList *me); /* Reverse a list. */ -extern HTList *HTList_reverse(HTList *start); + extern HTList *HTList_reverse(HTList *start); /* Append two lists, making second list empty. */ -extern HTList *HTList_appendList(HTList *start, - HTList *tail); + extern HTList *HTList_appendList(HTList *start, + HTList *tail); /* Add object to START of list (so it is pointed to by the head). */ -extern void HTList_addObject(HTList *me, - void *newObject); + extern void HTList_addObject(HTList *me, + void *newObject); /* Append object to END of list (furthest from the head). */ -extern void HTList_appendObject(HTList *me, - void *newObject); + extern void HTList_appendObject(HTList *me, + void *newObject); /* Insert an object into the list at a specified position. * If position is 0, this places the object at the head of the list * and is equivalent to HTList_addObject(). */ -extern void HTList_insertObjectAt(HTList *me, - void *newObject, - int pos); + extern void HTList_insertObjectAt(HTList *me, + void *newObject, + int pos); /* Remove specified object from list. */ -extern BOOL HTList_removeObject(HTList *me, - void *oldObject); + extern BOOL HTList_removeObject(HTList *me, + void *oldObject); /* Remove object at a given position in the list, where 0 is the * object pointed to by the head (returns a pointer to the element * (->object) for the object, and NULL if the list is empty, or * if it doesn't exist - Yuk!). */ -extern void *HTList_removeObjectAt(HTList *me, - int position); + extern void *HTList_removeObjectAt(HTList *me, + int position); /* Remove object from START of list (the Last one inserted * via HTList_addObject(), and pointed to by the head). */ -extern void *HTList_removeLastObject(HTList *me); + extern void *HTList_removeLastObject(HTList *me); /* Remove object from END of list (the First one inserted * via HTList_addObject(), and furthest from the head). */ -extern void *HTList_removeFirstObject(HTList *me); + extern void *HTList_removeFirstObject(HTList *me); /* Determine total number of objects in the list, * not counting the head. */ -extern int HTList_count(HTList *me); + extern int HTList_count(HTList *me); /* Determine position of an object in the list (a value of 0 * means it is pointed to by the head; returns -1 if not found). */ -extern int HTList_indexOf(HTList *me, - void *object); + extern int HTList_indexOf(HTList *me, + void *object); /* Return pointer to the object at a specified position in the list, * where 0 is the object pointed to by the head (returns NULL if * the list is empty, or if it doesn't exist - Yuk!). */ -extern void *HTList_objectAt(HTList *me, - int position); + extern void *HTList_objectAt(HTList *me, + int position); /* Link object to START of list (so it is pointed to by the head). * @@ -117,20 +120,23 @@ extern void *HTList_objectAt(HTList *me, * it use already allocated memory which should not be free'd by any * list operations (optimization). */ -extern void HTList_linkObject(HTList *me, - void *newObject, - HTList *newNode); + extern void HTList_linkObject(HTList *me, + void *newObject, + HTList *newNode); /* Unlink object from START of list (the Last one inserted * via HTList_linkObject(), and pointed to by the head). * It does not free memory. */ -extern void *HTList_unlinkLastObject(HTList *me); + extern void *HTList_unlinkLastObject(HTList *me); /* Unlink specified object from list. * It does not free memory. */ -extern BOOL HTList_unlinkObject(HTList *me, - void *oldObject); + extern BOOL HTList_unlinkObject(HTList *me, + void *oldObject); -#endif /* HTLIST_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTLIST_H */ diff --git a/WWW/Library/Implementation/HTMIME.h b/WWW/Library/Implementation/HTMIME.h index a7650a98..e8ecb3b4 100644 --- a/WWW/Library/Implementation/HTMIME.h +++ b/WWW/Library/Implementation/HTMIME.h @@ -26,60 +26,65 @@ #include <HTStream.h> #include <HTAnchor.h> +#ifdef __cplusplus +extern "C" { +#endif /* * This function is for trimming off any paired * open- and close-double quotes from header values. * It does not parse the string for embedded quotes, * and will not modify the string unless both the * first and last characters are double-quotes. - FM - */ -extern void HTMIME_TrimDoubleQuotes(char *value); + */ extern void HTMIME_TrimDoubleQuotes(char *value); /* INPUT: LOCAL TEXT */ -extern HTStream *HTMIMEConvert(HTPresentation *pres, - HTParentAnchor *anchor, - HTStream *sink); + extern HTStream *HTMIMEConvert(HTPresentation *pres, + HTParentAnchor *anchor, + HTStream *sink); /* INPUT: NET ASCII */ -extern HTStream *HTNetMIME(HTPresentation *pres, - HTParentAnchor *anchor, - HTStream *sink); + extern HTStream *HTNetMIME(HTPresentation *pres, + HTParentAnchor *anchor, + HTStream *sink); /* INPUT: Redirection message, parse headers only for Location if present */ -extern HTStream *HTMIMERedirect(HTPresentation *pres, - HTParentAnchor *anchor, - HTStream *sink); + extern HTStream *HTMIMERedirect(HTPresentation *pres, + HTParentAnchor *anchor, + HTStream *sink); /* For handling Japanese headers. */ -extern void HTmmdec_base64(char *t, - char *s); + extern void HTmmdec_base64(char *t, + char *s); -extern void HTmmdec_quote(char *t, - char *s); + extern void HTmmdec_quote(char *t, + char *s); -extern void HTmmdecode(char *trg, - char *str); + extern void HTmmdecode(char *trg, + char *str); -extern int HTrjis(char *t, - char *s); + extern int HTrjis(char *t, + char *s); -extern int HTmaybekanji(int c1, - int c2); + extern int HTmaybekanji(int c1, + int c2); -#endif /* !HTMIME_H */ +#ifdef __cplusplus +} +#endif +#endif /* !HTMIME_H */ diff --git a/WWW/Library/Implementation/HTMLDTD.h b/WWW/Library/Implementation/HTMLDTD.h index c1245d3b..248760fc 100644 --- a/WWW/Library/Implementation/HTMLDTD.h +++ b/WWW/Library/Implementation/HTMLDTD.h @@ -15,151 +15,149 @@ #include <SGML.h> #include <HTFont.h> +#ifdef __cplusplus +extern "C" { +#endif /* * Valid name chars for tag parsing. */ #define IsNmStart(c) (isalpha(UCH(c))) #define IsNmChar(c) (isalnum(UCH(c)) || \ c == '_' || c=='-' || c == '.' || c==':') - #define ReallyEmptyTagNum(e) ((HTML_dtd.tags[e].contents == SGML_EMPTY) && \ !(HTML_dtd.tags[e].flags & Tgf_nreie)) #define ReallyEmptyTag(t) ((t->contents == SGML_EMPTY) && \ !(t->flags & Tgf_nreie)) - /* Element Numbers - */ - -/* + *//* Must Match all tables by element! These include tables in HTMLDTD.c and code in HTML.c. - */ -typedef enum { - HTML_A, - HTML_ABBREV, - HTML_ACRONYM, - HTML_ADDRESS, - HTML_APPLET, - HTML_AREA, - HTML_AU, - HTML_AUTHOR, - HTML_B, - HTML_BANNER, - HTML_BASE, - HTML_BASEFONT, - HTML_BDO, - HTML_BGSOUND, - HTML_BIG, - HTML_BLINK, - HTML_BLOCKQUOTE, - HTML_BODY, - HTML_BODYTEXT, - HTML_BQ, - HTML_BR, - HTML_BUTTON, - HTML_CAPTION, - HTML_CENTER, - HTML_CITE, - HTML_CODE, - HTML_COL, - HTML_COLGROUP, - HTML_COMMENT, - HTML_CREDIT, - HTML_DD, - HTML_DEL, - HTML_DFN, - HTML_DIR, - HTML_DIV, - HTML_DL, - HTML_DLC, - HTML_DT, - HTML_EM, - HTML_EMBED, - HTML_FIELDSET, - HTML_FIG, - HTML_FN, - HTML_FONT, - HTML_FORM, - HTML_FRAME, - HTML_FRAMESET, - HTML_H1, - HTML_H2, - HTML_H3, - HTML_H4, - HTML_H5, - HTML_H6, - HTML_HEAD, - HTML_HR, - HTML_HTML, - HTML_HY, - HTML_I, - HTML_IFRAME, - HTML_IMG, - HTML_INPUT, - HTML_INS, - HTML_ISINDEX, - HTML_KBD, - HTML_KEYGEN, - HTML_LABEL, - HTML_LEGEND, - HTML_LH, - HTML_LI, - HTML_LINK, - HTML_LISTING, - HTML_MAP, - HTML_MARQUEE, - HTML_MATH, - HTML_MENU, - HTML_META, - HTML_NEXTID, - HTML_NOFRAMES, - HTML_NOTE, - HTML_OBJECT, - HTML_OL, - HTML_OPTION, - HTML_OVERLAY, - HTML_P, - HTML_PARAM, - HTML_PLAINTEXT, - HTML_PRE, - HTML_Q, - HTML_S, - HTML_SAMP, - HTML_SCRIPT, - HTML_SELECT, - HTML_SHY, - HTML_SMALL, - HTML_SPAN, - HTML_SPOT, - HTML_STRIKE, - HTML_STRONG, - HTML_STYLE, - HTML_SUB, - HTML_SUP, - HTML_TAB, - HTML_TABLE, - HTML_TBODY, - HTML_TD, - HTML_TEXTAREA, - HTML_TEXTFLOW, - HTML_TFOOT, - HTML_TH, - HTML_THEAD, - HTML_TITLE, - HTML_TR, - HTML_TT, - HTML_U, - HTML_UL, - HTML_VAR, - HTML_WBR, - HTML_XMP, - HTML_ALT_OBJECT -} HTMLElement; + */ typedef enum { + HTML_A, + HTML_ABBREV, + HTML_ACRONYM, + HTML_ADDRESS, + HTML_APPLET, + HTML_AREA, + HTML_AU, + HTML_AUTHOR, + HTML_B, + HTML_BANNER, + HTML_BASE, + HTML_BASEFONT, + HTML_BDO, + HTML_BGSOUND, + HTML_BIG, + HTML_BLINK, + HTML_BLOCKQUOTE, + HTML_BODY, + HTML_BODYTEXT, + HTML_BQ, + HTML_BR, + HTML_BUTTON, + HTML_CAPTION, + HTML_CENTER, + HTML_CITE, + HTML_CODE, + HTML_COL, + HTML_COLGROUP, + HTML_COMMENT, + HTML_CREDIT, + HTML_DD, + HTML_DEL, + HTML_DFN, + HTML_DIR, + HTML_DIV, + HTML_DL, + HTML_DLC, + HTML_DT, + HTML_EM, + HTML_EMBED, + HTML_FIELDSET, + HTML_FIG, + HTML_FN, + HTML_FONT, + HTML_FORM, + HTML_FRAME, + HTML_FRAMESET, + HTML_H1, + HTML_H2, + HTML_H3, + HTML_H4, + HTML_H5, + HTML_H6, + HTML_HEAD, + HTML_HR, + HTML_HTML, + HTML_HY, + HTML_I, + HTML_IFRAME, + HTML_IMG, + HTML_INPUT, + HTML_INS, + HTML_ISINDEX, + HTML_KBD, + HTML_KEYGEN, + HTML_LABEL, + HTML_LEGEND, + HTML_LH, + HTML_LI, + HTML_LINK, + HTML_LISTING, + HTML_MAP, + HTML_MARQUEE, + HTML_MATH, + HTML_MENU, + HTML_META, + HTML_NEXTID, + HTML_NOFRAMES, + HTML_NOTE, + HTML_OBJECT, + HTML_OL, + HTML_OPTION, + HTML_OVERLAY, + HTML_P, + HTML_PARAM, + HTML_PLAINTEXT, + HTML_PRE, + HTML_Q, + HTML_S, + HTML_SAMP, + HTML_SCRIPT, + HTML_SELECT, + HTML_SHY, + HTML_SMALL, + HTML_SPAN, + HTML_SPOT, + HTML_STRIKE, + HTML_STRONG, + HTML_STYLE, + HTML_SUB, + HTML_SUP, + HTML_TAB, + HTML_TABLE, + HTML_TBODY, + HTML_TD, + HTML_TEXTAREA, + HTML_TEXTFLOW, + HTML_TFOOT, + HTML_TH, + HTML_THEAD, + HTML_TITLE, + HTML_TR, + HTML_TT, + HTML_U, + HTML_UL, + HTML_VAR, + HTML_WBR, + HTML_XMP, + HTML_ALT_OBJECT + } HTMLElement; /* Notes: HTML.c uses a different extension of the HTML_ELEMENTS space privately, see HTNestedList.h. */ @@ -979,12 +977,12 @@ Attribute numbers #define HTMLA_AUXCLASS 8 /* attribute, the value of which also designates a class name */ #endif -extern const SGML_dtd HTML_dtd; + extern const SGML_dtd HTML_dtd; -extern void HTSwitchDTD(int new_flag); + extern void HTSwitchDTD(int new_flag); -extern HTTag HTTag_unrecognized; -extern HTTag HTTag_mixedObject; + extern HTTag HTTag_unrecognized; + extern HTTag HTTag_mixedObject; /* @@ -1001,13 +999,13 @@ Start anchor element to be omitted. */ -extern void HTStartAnchor(HTStructured * targetstream, const char *name, - const char *href); + extern void HTStartAnchor(HTStructured * targetstream, const char *name, + const char *href); -extern void HTStartAnchor5(HTStructured * targetstream, const char *name, - const char *href, - const char *linktype, - int tag_charset); + extern void HTStartAnchor5(HTStructured * targetstream, const char *name, + const char *href, + const char *linktype, + int tag_charset); /* @@ -1024,7 +1022,10 @@ Start IsIndex element - FM to be omitted. */ -extern void HTStartIsIndex(HTStructured * targetstream, const char *prompt, - const char *href); + extern void HTStartIsIndex(HTStructured * targetstream, const char *prompt, + const char *href); -#endif /* HTMLDTD_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTMLDTD_H */ diff --git a/WWW/Library/Implementation/HTMLGen.h b/WWW/Library/Implementation/HTMLGen.h index e1144f79..9e8b84b7 100644 --- a/WWW/Library/Implementation/HTMLGen.h +++ b/WWW/Library/Implementation/HTMLGen.h @@ -11,16 +11,18 @@ #include <HTML.h> #include <HTStream.h> +#ifdef __cplusplus +extern "C" { +#endif /* Subclass: -*/ -/* extern const HTStructuredClass HTMLGeneration; */ +*//* extern const HTStructuredClass HTMLGeneration; *//* Special Creation: + */ extern HTStructured *HTMLGenerator(HTStream *output); -/* Special Creation: -*/ -extern HTStructured *HTMLGenerator(HTStream *output); + extern HTStream *HTPlainToHTML(HTPresentation *pres, + HTParentAnchor *anchor, + HTStream *sink); -extern HTStream *HTPlainToHTML(HTPresentation *pres, - HTParentAnchor *anchor, - HTStream *sink); - -#endif /* HTMLGEN_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTMLGEN_H */ diff --git a/WWW/Library/Implementation/HTNews.c b/WWW/Library/Implementation/HTNews.c index 2b0f2bec..6163fdee 100644 --- a/WWW/Library/Implementation/HTNews.c +++ b/WWW/Library/Implementation/HTNews.c @@ -358,10 +358,10 @@ static int response(char *command) * template must be already in upper case. * unknown may be in upper or lower or mixed case to match. */ -static BOOL match(const char *unknown, const char *template) +static BOOL match(const char *unknown, const char *ctemplate) { const char *u = unknown; - const char *t = template; + const char *t = ctemplate; for (; *u && *t && (TOUPPER(*u) == *t); u++, t++) ; /* Find mismatch or end */ return (BOOL) (*t == 0); /* OK if end of template */ diff --git a/WWW/Library/Implementation/HTNews.h b/WWW/Library/Implementation/HTNews.h index 4fb7ac63..ef9a6e49 100644 --- a/WWW/Library/Implementation/HTNews.h +++ b/WWW/Library/Implementation/HTNews.h @@ -13,42 +13,48 @@ #include <HTAccess.h> #include <HTAnchor.h> -extern int HTNewsChunkSize; -extern int HTNewsMaxChunk; +#ifdef __cplusplus +extern "C" { +#endif + extern int HTNewsChunkSize; + extern int HTNewsMaxChunk; #ifdef GLOBALREF_IS_MACRO -extern GLOBALREF (HTProtocol, HTNews); -extern GLOBALREF (HTProtocol, HTNNTP); -extern GLOBALREF (HTProtocol, HTNewsPost); -extern GLOBALREF (HTProtocol, HTNewsReply); -extern GLOBALREF (HTProtocol, HTSNews); -extern GLOBALREF (HTProtocol, HTSNewsPost); -extern GLOBALREF (HTProtocol, HTSNewsReply); + extern GLOBALREF (HTProtocol, HTNews); + extern GLOBALREF (HTProtocol, HTNNTP); + extern GLOBALREF (HTProtocol, HTNewsPost); + extern GLOBALREF (HTProtocol, HTNewsReply); + extern GLOBALREF (HTProtocol, HTSNews); + extern GLOBALREF (HTProtocol, HTSNewsPost); + extern GLOBALREF (HTProtocol, HTSNewsReply); #else -GLOBALREF HTProtocol HTNews; -GLOBALREF HTProtocol HTNNTP; -GLOBALREF HTProtocol HTNewsPost; -GLOBALREF HTProtocol HTNewsReply; -GLOBALREF HTProtocol HTSNews; -GLOBALREF HTProtocol HTSNewsPost; -GLOBALREF HTProtocol HTSNewsReply; -#endif /* GLOBALREF_IS_MACRO */ + GLOBALREF HTProtocol HTNews; + GLOBALREF HTProtocol HTNNTP; + GLOBALREF HTProtocol HTNewsPost; + GLOBALREF HTProtocol HTNewsReply; + GLOBALREF HTProtocol HTSNews; + GLOBALREF HTProtocol HTSNewsPost; + GLOBALREF HTProtocol HTSNewsReply; +#endif /* GLOBALREF_IS_MACRO */ -extern void HTSetNewsHost(const char *value); -extern const char *HTGetNewsHost(void); -extern char *HTNewsHost; + extern void HTSetNewsHost(const char *value); + extern const char *HTGetNewsHost(void); + extern char *HTNewsHost; -extern void HTClearNNTPAuthInfo(void); + extern void HTClearNNTPAuthInfo(void); #ifdef USE_SSL -extern SSL_CTX *ssl_ctx; + extern SSL_CTX *ssl_ctx; -extern int HTNewsProxyConnect(int sock, - const char *url, - HTParentAnchor *anAnchor, - HTFormat format_out, - HTStream *sink); + extern int HTNewsProxyConnect(int sock, + const char *url, + HTParentAnchor *anAnchor, + HTFormat format_out, + HTStream *sink); #endif -#endif /* HTNEWS_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTNEWS_H */ diff --git a/WWW/Library/Implementation/HTParse.h b/WWW/Library/Implementation/HTParse.h index 342c61a3..cb95d722 100644 --- a/WWW/Library/Implementation/HTParse.h +++ b/WWW/Library/Implementation/HTParse.h @@ -12,6 +12,9 @@ #include <HTUtils.h> #endif +#ifdef __cplusplus +extern "C" { +#endif /* * The following are flag bits which may be ORed together to form * a number to give the 'wanted' argument to HTParse. @@ -21,10 +24,8 @@ #define PARSE_PATH 4 #define PARSE_ANCHOR 2 #define PARSE_PUNCTUATION 1 - #define PARSE_ALL 31 #define PARSE_ALL_WITHOUT_ANCHOR (PARSE_ALL ^ PARSE_ANCHOR) - /* * Additional flag bits for more details on components already * covered by the above. The PARSE_PATH above doesn't really @@ -34,7 +35,6 @@ */ #define PARSE_STRICTPATH 32 #define PARSE_QUERY 64 - /* * The following are valid mask values. The terms are the BNF names * in the URL document. @@ -42,15 +42,13 @@ #define URL_XALPHAS UCH(1) #define URL_XPALPHAS UCH(2) #define URL_PATH UCH(4) - /* Strip white space off a string. HTStrip() * ------------------------------- * * On exit, * Return value points to first non-white character, or to 0 if none. * All trailing white space is OVERWRITTEN with zero. - */ -extern char *HTStrip(char *s); + */ extern char *HTStrip(char *s); /* Parse a Name relative to another name. HTParse() * -------------------------------------- @@ -66,9 +64,9 @@ extern char *HTStrip(char *s); * On exit, * returns A pointer to a malloc'd string which MUST BE FREED */ -extern char *HTParse(const char *aName, - const char *relatedName, - int wanted); + extern char *HTParse(const char *aName, + const char *relatedName, + int wanted); /* HTParseAnchor(), fast HTParse() specialization * ---------------------------------------------- @@ -76,7 +74,7 @@ extern char *HTParse(const char *aName, * On exit, * returns A pointer within input string (probably to its end '\0') */ -extern const char *HTParseAnchor(const char *aName); + extern const char *HTParseAnchor(const char *aName); /* Simplify a filename. HTSimplify() * -------------------- @@ -93,7 +91,7 @@ extern const char *HTParseAnchor(const char *aName); * * or ../../albert.html */ -extern void HTSimplify(char *filename); + extern void HTSimplify(char *filename); /* Make Relative Name. HTRelative() * ------------------- @@ -112,8 +110,8 @@ extern void HTSimplify(char *filename); * The caller is responsible for freeing the resulting name later. * */ -extern char *HTRelative(const char *aName, - const char *relatedName); + extern char *HTRelative(const char *aName, + const char *relatedName); /* Escape undesirable characters using % HTEscape() * ------------------------------------- @@ -125,8 +123,8 @@ extern char *HTRelative(const char *aName, * * Unlike HTUnEscape(), this routine returns a malloc'd string. */ -extern char *HTEscape(const char *str, - unsigned char mask); + extern char *HTEscape(const char *str, + unsigned char mask); /* Escape unsafe characters using % HTEscapeUnsafe() * -------------------------------- @@ -138,7 +136,7 @@ extern char *HTEscape(const char *str, * * Unlike HTUnEscape(), this routine returns a malloc'd string. */ -extern char *HTEscapeUnsafe(const char *str); + extern char *HTEscapeUnsafe(const char *str); /* Escape undesirable characters using % but space to +. HTEscapeSP() * ----------------------------------------------------- @@ -151,8 +149,8 @@ extern char *HTEscapeUnsafe(const char *str); * * Unlike HTUnEscape(), this routine returns a malloc'd string. */ -extern char *HTEscapeSP(const char *str, - unsigned char mask); + extern char *HTEscapeSP(const char *str, + unsigned char mask); /* Decode %xx escaped characters. HTUnEscape() * ------------------------------ @@ -162,7 +160,7 @@ extern char *HTEscapeSP(const char *str, * the acsii hex code for character 16x+y. * The string is converted in place, as it will never grow. */ -extern char *HTUnEscape(char *str); + extern char *HTUnEscape(char *str); /* Decode some %xx escaped characters. HTUnEscapeSome() * ----------------------------------- Klaus Weide @@ -174,13 +172,16 @@ extern char *HTUnEscape(char *str); * should be unescaped if escaped in the first string. * The first string is converted in place, as it will never grow. */ -extern char *HTUnEscapeSome(char *str, - const char *do_trans); + extern char *HTUnEscapeSome(char *str, + const char *do_trans); /* * Turn a string which is not a RFC 822 token into a quoted-string. - KW */ -extern void HTMake822Word(char **str, - int quoted); + extern void HTMake822Word(char **str, + int quoted); -#endif /* HTPARSE_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTPARSE_H */ diff --git a/WWW/Library/Implementation/HTPlain.h b/WWW/Library/Implementation/HTPlain.h index 92dcc061..24fd6691 100644 --- a/WWW/Library/Implementation/HTPlain.h +++ b/WWW/Library/Implementation/HTPlain.h @@ -8,8 +8,14 @@ #include <HTStream.h> #include <HTAnchor.h> -extern HTStream *HTPlainPresent(HTPresentation *pres, - HTParentAnchor *anchor, - HTStream *sink); +#ifdef __cplusplus +extern "C" { +#endif + extern HTStream *HTPlainPresent(HTPresentation *pres, + HTParentAnchor *anchor, + HTStream *sink); -#endif /* HTPLAIN_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTPLAIN_H */ diff --git a/WWW/Library/Implementation/HTRules.h b/WWW/Library/Implementation/HTRules.h index 5c14aed9..ccf838c0 100644 --- a/WWW/Library/Implementation/HTRules.h +++ b/WWW/Library/Implementation/HTRules.h @@ -22,23 +22,26 @@ #include <HTUtils.h> #endif -typedef enum { - HT_Invalid, - HT_Map, - HT_Pass, - HT_Fail, - HT_DefProt, - HT_Protect, - HT_Progress, - HT_InfoMsg, - HT_UserMsg, - HT_Alert, - HT_AlwaysAlert, - HT_Redirect, - HT_RedirectPerm, - HT_PermitRedir, - HT_UseProxy -} HTRuleOp; +#ifdef __cplusplus +extern "C" { +#endif + typedef enum { + HT_Invalid, + HT_Map, + HT_Pass, + HT_Fail, + HT_DefProt, + HT_Protect, + HT_Progress, + HT_InfoMsg, + HT_UserMsg, + HT_Alert, + HT_AlwaysAlert, + HT_Redirect, + HT_RedirectPerm, + HT_PermitRedir, + HT_UseProxy + } HTRuleOp; #ifndef NO_RULES @@ -54,8 +57,8 @@ Server Side Script Execution */ -extern char *HTBinDir; /* Physical /htbin location */ -extern char *HTSearchScript; /* Search script name */ + extern char *HTBinDir; /* Physical /htbin location */ + extern char *HTSearchScript; /* Search script name */ /* @@ -84,10 +87,10 @@ HTAddRule: Add rule to the list large. */ -extern int HTAddRule(HTRuleOp op, const char *pattern, - const char *equiv, - const char *cond_op, - const char *cond); + extern int HTAddRule(HTRuleOp op, const char *pattern, + const char *equiv, + const char *cond_op, + const char *cond); /* @@ -99,7 +102,7 @@ HTClearRules: Clear all rules */ -extern void HTClearRules(void); + extern void HTClearRules(void); /* @@ -120,7 +123,7 @@ HTTranslate: Translate by rules a copy of the original. */ -extern char *HTTranslate(const char *required); + extern char *HTTranslate(const char *required); /* @@ -134,7 +137,7 @@ HTSetConfiguration: Load one line of configuration information the rule file, for example INI files for X resources. */ -extern int HTSetConfiguration(char *config); + extern int HTSetConfiguration(char *config); /* @@ -153,11 +156,14 @@ HtLoadRules: Load the rules from a file */ -extern int HTLoadRules(const char *filename); + extern int HTLoadRules(const char *filename); /* */ -#endif /* NO_RULES */ -#endif /* HTRULE_H */ +#endif /* NO_RULES */ +#ifdef __cplusplus +} +#endif +#endif /* HTRULE_H */ diff --git a/WWW/Library/Implementation/HTStream.h b/WWW/Library/Implementation/HTStream.h index c5f6a67a..43ce9725 100644 --- a/WWW/Library/Implementation/HTStream.h +++ b/WWW/Library/Implementation/HTStream.h @@ -17,7 +17,10 @@ #include <HTUtils.h> #endif -typedef struct _HTStream HTStream; +#ifdef __cplusplus +extern "C" { +#endif + typedef struct _HTStream HTStream; /* @@ -29,26 +32,26 @@ typedef struct _HTStream HTStream; write(). */ -typedef struct _HTStreamClass { + typedef struct _HTStreamClass { - const char *name; /* Just for diagnostics */ + const char *name; /* Just for diagnostics */ - void (*_free) (HTStream *me); + void (*_free) (HTStream *me); - void (*_abort) (HTStream *me, - HTError e); + void (*_abort) (HTStream *me, + HTError e); - void (*put_character) (HTStream *me, - char ch); + void (*put_character) (HTStream *me, + char ch); - void (*put_string) (HTStream *me, - const char *str); + void (*put_string) (HTStream *me, + const char *str); - void (*put_block) (HTStream *me, - const char *str, - int len); + void (*put_block) (HTStream *me, + const char *str, + int len); -} HTStreamClass; + } HTStreamClass; /* @@ -59,6 +62,9 @@ typedef struct _HTStreamClass { example from the network. */ -extern HTStream *HTErrorStream(void); + extern HTStream *HTErrorStream(void); -#endif /* HTSTREAM_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTSTREAM_H */ diff --git a/WWW/Library/Implementation/HTString.c b/WWW/Library/Implementation/HTString.c index bc4abf68..59dea861 100644 --- a/WWW/Library/Implementation/HTString.c +++ b/WWW/Library/Implementation/HTString.c @@ -566,7 +566,7 @@ typedef enum { #define VA_INTGR(type) ival = va_arg((*ap), type) #define VA_FLOAT(type) fval = va_arg((*ap), type) -#define VA_POINT(type) pval = (void *)va_arg((*ap), type) +#define VA_POINT(type) pval = (char *)va_arg((*ap), type) #define NUM_WIDTH 10 /* allow for width substituted for "*" in "%*s" */ /* also number of chars assumed to be needed in addition diff --git a/WWW/Library/Implementation/HTString.h b/WWW/Library/Implementation/HTString.h index 63b193ae..e9d0a4df 100644 --- a/WWW/Library/Implementation/HTString.h +++ b/WWW/Library/Implementation/HTString.h @@ -11,14 +11,17 @@ #include <HTUtils.h> #endif /* HTUTILS_H */ -extern const char *HTLibraryVersion; /* String for help screen etc */ +#ifdef __cplusplus +extern "C" { +#endif + extern const char *HTLibraryVersion; /* String for help screen etc */ /* EBCDIC string comparison using ASCII collating sequence */ #ifdef NOT_ASCII -extern int AS_casecomp(const char *a, const char *b); -extern int AS_ncmp(const char *a, const char *b, unsigned int n); + extern int AS_casecomp(const char *a, const char *b); + extern int AS_ncmp(const char *a, const char *b, unsigned int n); #define AS_cmp( a, b ) ( AS_ncmp( ( a ), ( b ), -1 ) ) @@ -27,7 +30,7 @@ extern int AS_ncmp(const char *a, const char *b, unsigned int n); #define AS_ncmp( a, b, c ) ( strncmp( ( a ), ( b ), ( c ) ) ) #define AS_cmp strcmp -#endif /* NOT_ASCII */ +#endif /* NOT_ASCII */ /* @@ -36,17 +39,17 @@ Case-insensitive string comparison The usual routines (comp instead of cmp) had some problem. */ -extern int strcasecomp(const char *a, const char *b); -extern int strncasecomp(const char *a, const char *b, int n); + extern int strcasecomp(const char *a, const char *b); + extern int strncasecomp(const char *a, const char *b, int n); -extern int strcasecomp8(const char *a, const char *b); -extern int strncasecomp8(const char *a, const char *b, int n); + extern int strcasecomp8(const char *a, const char *b); + extern int strncasecomp8(const char *a, const char *b, int n); - /* - * strcasecomp8 and strncasecomp8 are variants of strcasecomp and - * strncasecomp, but use 8bit upper/lower case information from the - * current display charset - */ + /* + * strcasecomp8 and strncasecomp8 are variants of strcasecomp and + * strncasecomp, but use 8bit upper/lower case information from the + * current display charset + */ /* @@ -55,8 +58,8 @@ Malloced string manipulation */ #define StrAllocCopy(dest, src) HTSACopy (&(dest), src) #define StrAllocCat(dest, src) HTSACat (&(dest), src) -extern char *HTSACopy(char **dest, const char *src); -extern char *HTSACat(char **dest, const char *src); + extern char *HTSACopy(char **dest, const char *src); + extern char *HTSACat(char **dest, const char *src); /* optimized for heavily realloc'd strings in temp objects @@ -64,28 +67,28 @@ optimized for heavily realloc'd strings in temp objects #define StrAllocCopy_extra(dest, src) HTSACopy_extra (&(dest), src) #define FREE_extra(x) {if (x != NULL) {HTSAFree_extra(x); x = NULL;}} #define Clear_extra(x) {if (x != NULL) {*x = '\0';}} -extern char *HTSACopy_extra(char **dest, const char *src); -extern void HTSAFree_extra(char *s); + extern char *HTSACopy_extra(char **dest, const char *src); + extern void HTSAFree_extra(char *s); /* Next word or quoted string */ -extern char *HTNextField(char **pstr); + extern char *HTNextField(char **pstr); /* A more general parser - kw */ -extern char *HTNextTok(char **pstr, - const char *delims, const char *bracks, char *found); + extern char *HTNextTok(char **pstr, + const char *delims, const char *bracks, char *found); -extern char *HTSprintf(char **pstr, const char *fmt,...) GCC_PRINTFLIKE(2,3); -extern char *HTSprintf0(char **pstr, const char *fmt,...) GCC_PRINTFLIKE(2,3); + extern char *HTSprintf(char **pstr, const char *fmt,...) GCC_PRINTFLIKE(2,3); + extern char *HTSprintf0(char **pstr, const char *fmt,...) GCC_PRINTFLIKE(2,3); #if defined(LY_FIND_LEAKS) /* private otherwise */ -extern char *StrAllocVsprintf(char **pstr, - size_t len, - const char *fmt, - va_list * ap); + extern char *StrAllocVsprintf(char **pstr, + size_t len, + const char *fmt, + va_list * ap); #endif #if (defined(VMS) || defined(DOSPATH) || defined(__EMX__)) && !defined(__CYGWIN__) @@ -95,34 +98,34 @@ extern char *StrAllocVsprintf(char **pstr, #endif #if USE_QUOTED_PARAMETER -extern char *HTQuoteParameter(const char *parameter); -extern void HTAddXpand(char **result, const char *command, int number, const char *parameter); + extern char *HTQuoteParameter(const char *parameter); + extern void HTAddXpand(char **result, const char *command, int number, const char *parameter); #else #define HTQuoteParameter(parameter) parameter /* simplify ifdef'ing */ #define HTAddXpand(result,command,number,parameter) HTAddParam(result,command,number,parameter) #endif -extern int HTCountCommandArgs(const char *command); -extern void HTAddToCmd(char **result, const char *command, int number, const char *string); -extern void HTAddParam(char **result, const char *command, int number, const char *parameter); -extern void HTEndParam(char **result, const char *command, int number); + extern int HTCountCommandArgs(const char *command); + extern void HTAddToCmd(char **result, const char *command, int number, const char *string); + extern void HTAddParam(char **result, const char *command, int number, const char *parameter); + extern void HTEndParam(char **result, const char *command, int number); /* Force an option, with leading blanks, to be appended without quoting them */ #define HTOptParam(result, command, number, parameter) HTSACat(result, parameter) /* Binary copy and concat */ -typedef struct { - char *str; - int len; -} bstring; - -extern void HTSABCopy(bstring **dest, const char *src, int len); -extern void HTSABCopy0(bstring **dest, const char *src); -extern void HTSABCat(bstring **dest, const char *src, int len); -extern void HTSABCat0(bstring **dest, const char *src); -extern BOOL HTSABEql(bstring *a, bstring *b); -extern void HTSABFree(bstring **ptr); + typedef struct { + char *str; + int len; + } bstring; + + extern void HTSABCopy(bstring **dest, const char *src, int len); + extern void HTSABCopy0(bstring **dest, const char *src); + extern void HTSABCat(bstring **dest, const char *src, int len); + extern void HTSABCat0(bstring **dest, const char *src); + extern BOOL HTSABEql(bstring *a, bstring *b); + extern void HTSABFree(bstring **ptr); #define BStrLen(s) (((s) != 0) ? (s)->len : 0) #define BStrData(s) (((s) != 0) ? (s)->str : 0) @@ -137,9 +140,12 @@ extern void HTSABFree(bstring **ptr); #define BStrCat0(d,s) HTSABCat0( &(d), s) #define BStrFree(d) HTSABFree( &(d)) -extern bstring *HTBprintf(bstring **pstr, const char *fmt,...) GCC_PRINTFLIKE(2,3); + extern bstring *HTBprintf(bstring **pstr, const char *fmt,...) GCC_PRINTFLIKE(2,3); -extern void trace_bstring(bstring *data); -extern void trace_bstring2(const char *text, int size); + extern void trace_bstring(bstring *data); + extern void trace_bstring2(const char *text, int size); -#endif /* HTSTRING_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTSTRING_H */ diff --git a/WWW/Library/Implementation/HTStyle.h b/WWW/Library/Implementation/HTStyle.h index 790ad126..550a7a06 100644 --- a/WWW/Library/Implementation/HTStyle.h +++ b/WWW/Library/Implementation/HTStyle.h @@ -62,51 +62,53 @@ typedef int HTColor; /* Sorry about the US spelling! */ #endif +#ifdef __cplusplus +extern "C" { +#endif #define STYLE_NAME_LENGTH 80 /* @@@@@@@@@@@ */ - -typedef struct { - short kind; /* only NX_LEFTTAB implemented */ - HTCoord position; /* x coordinate for stop */ -} HTTabStop; + typedef struct { + short kind; /* only NX_LEFTTAB implemented */ + HTCoord position; /* x coordinate for stop */ + } HTTabStop; /* The Style Structure * ------------------- */ -typedef struct _HTStyle { + typedef struct _HTStyle { /* Style management information */ - struct _HTStyle *next; /* Link for putting into stylesheet */ - char *name; /* Style name */ - int id; /* equivalent of name, for speed */ - char *SGMLTag; /* Tag name to start */ + struct _HTStyle *next; /* Link for putting into stylesheet */ + char *name; /* Style name */ + int id; /* equivalent of name, for speed */ + char *SGMLTag; /* Tag name to start */ /* Character attributes (a la NXRun) */ - HTFont font; /* Font id */ - HTCoord fontSize; /* The size of font, not independent */ - HTColor color; /* text gray of current run */ - int superscript; /* superscript (-sub) in points */ + HTFont font; /* Font id */ + HTCoord fontSize; /* The size of font, not independent */ + HTColor color; /* text gray of current run */ + int superscript; /* superscript (-sub) in points */ - HTAnchor *anchor; /* Anchor id if any, else zero */ + HTAnchor *anchor; /* Anchor id if any, else zero */ /* Paragraph Attribtes (a la NXTextStyle) */ - HTCoord indent1st; /* how far first line in paragraph is + HTCoord indent1st; /* how far first line in paragraph is * indented */ - HTCoord leftIndent; /* how far second line is indented */ - HTCoord rightIndent; /* (Missing from NeXT version */ - short alignment; /* quad justification */ - HTCoord lineHt; /* line height */ - HTCoord descentLine; /* descender bottom from baseline */ - const HTTabStop *tabs; /* array of tab stops, 0 terminated */ - - BOOL wordWrap; /* Yes means wrap at space not char */ - BOOL freeFormat; /* Yes means \n is just white space */ - HTCoord spaceBefore; /* Omissions from NXTextStyle */ - HTCoord spaceAfter; - int paraFlags; /* Paragraph flags, bits as follows: */ + HTCoord leftIndent; /* how far second line is indented */ + HTCoord rightIndent; /* (Missing from NeXT version */ + short alignment; /* quad justification */ + HTCoord lineHt; /* line height */ + HTCoord descentLine; /* descender bottom from baseline */ + const HTTabStop *tabs; /* array of tab stops, 0 terminated */ + + BOOL wordWrap; /* Yes means wrap at space not char */ + BOOL freeFormat; /* Yes means \n is just white space */ + HTCoord spaceBefore; /* Omissions from NXTextStyle */ + HTCoord spaceAfter; + int paraFlags; /* Paragraph flags, bits as follows: */ #define PARA_KEEP 1 /* Do not break page within this paragraph */ #define PARA_WITH_NEXT 2 /* Do not break page after this paragraph */ @@ -116,101 +118,104 @@ typedef struct _HTStyle { #define HT_RIGHT 2 #define HT_CENTER 3 -} HTStyle; + } HTStyle; #define HT_ALIGN_NONE (-1) /* Style functions: */ -extern HTStyle *HTStyleNew(void); -extern HTStyle *HTStyleNewNamed(const char *name); -extern HTStyle *HTStyleFree(HTStyle *self); + extern HTStyle *HTStyleNew(void); + extern HTStyle *HTStyleNewNamed(const char *name); + extern HTStyle *HTStyleFree(HTStyle *self); #ifdef SUPRESS -extern HTStyle *HTStyleRead(HTStyle *self, HTStream *stream); -extern HTStyle *HTStyleWrite(HTStyle *self, HTStream *stream); + extern HTStyle *HTStyleRead(HTStyle *self, HTStream *stream); + extern HTStyle *HTStyleWrite(HTStyle *self, HTStream *stream); #endif /* Style Sheet * ----------- */ -typedef struct _HTStyleSheet { - char *name; - HTStyle *styles; -} HTStyleSheet; + typedef struct _HTStyleSheet { + char *name; + HTStyle *styles; + } HTStyleSheet; /* Stylesheet functions: */ -extern HTStyleSheet *HTStyleSheetNew(void); -extern HTStyleSheet *HTStyleSheetFree(HTStyleSheet *self); -extern HTStyle *HTStyleNamed(HTStyleSheet *self, const char *name); -extern HTStyle *HTStyleForParagraph(HTStyleSheet *self, HTParagraphStyle * paraStyle); -extern HTStyle *HTStyleMatching(HTStyleSheet *self, HTStyle *style); + extern HTStyleSheet *HTStyleSheetNew(void); + extern HTStyleSheet *HTStyleSheetFree(HTStyleSheet *self); + extern HTStyle *HTStyleNamed(HTStyleSheet *self, const char *name); + extern HTStyle *HTStyleForParagraph(HTStyleSheet *self, HTParagraphStyle * paraStyle); + extern HTStyle *HTStyleMatching(HTStyleSheet *self, HTStyle *style); /* extern HTStyle * HTStyleForRun (HTStyleSheet *self, NXRun * run); */ -extern HTStyleSheet *HTStyleSheetAddStyle(HTStyleSheet *self, HTStyle *style); -extern HTStyleSheet *HTStyleSheetRemoveStyle(HTStyleSheet *self, HTStyle *style); + extern HTStyleSheet *HTStyleSheetAddStyle(HTStyleSheet *self, HTStyle *style); + extern HTStyleSheet *HTStyleSheetRemoveStyle(HTStyleSheet *self, HTStyle *style); #ifdef SUPPRESS -extern HTStyleSheet *HTStyleSheetRead(HTStyleSheet *self, HTStream *stream); -extern HTStyleSheet *HTStyleSheetWrite(HTStyleSheet *self, HTStream *stream); + extern HTStyleSheet *HTStyleSheetRead(HTStyleSheet *self, HTStream *stream); + extern HTStyleSheet *HTStyleSheetWrite(HTStyleSheet *self, HTStream *stream); #endif #define CLEAR_POINTER ((void *)-1) /* Pointer value means "clear me" */ /* DefaultStyle.c */ -extern HTStyleSheet *DefaultStyle(HTStyle ***result_array); + extern HTStyleSheet *DefaultStyle(HTStyle ***result_array); /* enum, use this instead of HTStyle name comparisons */ -enum HTStyle_Enum { - ST_Normal = 0, - ST_DivCenter, - ST_DivLeft, - ST_DivRight, - ST_Banner, - ST_Blockquote, - ST_Bq, - ST_Footnote, - ST_List, - ST_List1, - ST_List2, - ST_List3, - ST_List4, - ST_List5, - ST_List6, - ST_Menu, - ST_Menu1, - ST_Menu2, - ST_Menu3, - ST_Menu4, - ST_Menu5, - ST_Menu6, - ST_Glossary, - ST_Glossary1, - ST_Glossary2, - ST_Glossary3, - ST_Glossary4, - ST_Glossary5, - ST_Glossary6, - ST_GlossaryCompact, - ST_GlossaryCompact1, - ST_GlossaryCompact2, - ST_GlossaryCompact3, - ST_GlossaryCompact4, - ST_GlossaryCompact5, - ST_GlossaryCompact6, - ST_Example, - ST_Preformatted, - ST_Listing, - ST_Address, - ST_Note, - ST_Heading1, - ST_Heading2, - ST_Heading3, - ST_Heading4, - ST_Heading5, - ST_Heading6, - ST_HeadingCenter, - ST_HeadingLeft, - ST_HeadingRight -}; - -#endif /* HTStyle_H */ + enum HTStyle_Enum { + ST_Normal = 0, + ST_DivCenter, + ST_DivLeft, + ST_DivRight, + ST_Banner, + ST_Blockquote, + ST_Bq, + ST_Footnote, + ST_List, + ST_List1, + ST_List2, + ST_List3, + ST_List4, + ST_List5, + ST_List6, + ST_Menu, + ST_Menu1, + ST_Menu2, + ST_Menu3, + ST_Menu4, + ST_Menu5, + ST_Menu6, + ST_Glossary, + ST_Glossary1, + ST_Glossary2, + ST_Glossary3, + ST_Glossary4, + ST_Glossary5, + ST_Glossary6, + ST_GlossaryCompact, + ST_GlossaryCompact1, + ST_GlossaryCompact2, + ST_GlossaryCompact3, + ST_GlossaryCompact4, + ST_GlossaryCompact5, + ST_GlossaryCompact6, + ST_Example, + ST_Preformatted, + ST_Listing, + ST_Address, + ST_Note, + ST_Heading1, + ST_Heading2, + ST_Heading3, + ST_Heading4, + ST_Heading5, + ST_Heading6, + ST_HeadingCenter, + ST_HeadingLeft, + ST_HeadingRight + }; + +#ifdef __cplusplus +} +#endif +#endif /* HTStyle_H */ diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c index fb55e185..5b938571 100644 --- a/WWW/Library/Implementation/HTTCP.c +++ b/WWW/Library/Implementation/HTTCP.c @@ -943,10 +943,10 @@ LYNX_HOSTENT *LYGetHostByName(char *str) */ #ifdef SOCKS if (socks_flag) - selret = Rselect(pfd[0] + 1, (void *) &readfds, NULL, NULL, &one_second); + selret = Rselect(pfd[0] + 1, &readfds, NULL, NULL, &one_second); else #endif /* SOCKS */ - selret = select(pfd[0] + 1, (void *) &readfds, NULL, NULL, &one_second); + selret = select(pfd[0] + 1, &readfds, NULL, NULL, &one_second); if ((selret > 0) && FD_ISSET(pfd[0], &readfds)) { /* @@ -1359,11 +1359,11 @@ static LYNX_ADDRINFO *HTGetAddrInfo(const char *str, LYNX_ADDRINFO hints, *res; int error; char *p; - char *s; + char *s = NULL; char *host, *port; char pbuf[80]; - s = strdup(str); + StrAllocCopy(s, str); if (s[0] == '[' && (p = strchr(s, ']')) != NULL) { *p++ = '\0'; @@ -1715,12 +1715,12 @@ int HTDoConnect(const char *url, #ifdef SOCKS if (socks_flag) ret = Rselect((unsigned) *s + 1, NULL, - (void *) &writefds, NULL, &select_timeout); + &writefds, NULL, &select_timeout); else #endif /* SOCKS */ ret = select((unsigned) *s + 1, NULL, - (void *) &writefds, + &writefds, NULL, &select_timeout); @@ -1992,11 +1992,11 @@ int HTDoRead(int fildes, #ifdef SOCKS if (socks_flag) ret = Rselect((unsigned) fildes + 1, - (void *) &readfds, NULL, NULL, &select_timeout); + &readfds, NULL, NULL, &select_timeout); else #endif /* SOCKS */ ret = select((unsigned) fildes + 1, - (void *) &readfds, NULL, NULL, &select_timeout); + &readfds, NULL, NULL, &select_timeout); } while ((ret == -1) && (errno == EINTR)); if (ret < 0) { diff --git a/WWW/Library/Implementation/HTTCP.h b/WWW/Library/Implementation/HTTCP.h index eae20aa5..abbc956f 100644 --- a/WWW/Library/Implementation/HTTCP.h +++ b/WWW/Library/Implementation/HTTCP.h @@ -11,6 +11,9 @@ #include <HTUtils.h> #endif +#ifdef __cplusplus +extern "C" { +#endif /* Produce a string for an internet address * --------------------------------------- * @@ -19,11 +22,11 @@ * it is to be kept. */ #ifdef INET6 -extern const char *HTInetString(SockA * mysin); + extern const char *HTInetString(SockA * mysin); #else -extern const char *HTInetString(struct sockaddr_in *mysin); -#endif /* INET6 */ + extern const char *HTInetString(struct sockaddr_in *mysin); +#endif /* INET6 */ /* Encode INET status (as in sys/errno.h) inet_status() * ------------------ @@ -35,13 +38,13 @@ extern const char *HTInetString(struct sockaddr_in *mysin); * On return: * returns a negative status in the unix way. */ -extern int HTInetStatus(const char *where); + extern int HTInetStatus(const char *where); /* Publicly accessible variables */ /* extern struct sockaddr_in HTHostAddress; */ - /* The internet address of the host */ - /* Valid after call to HTHostName() */ + /* The internet address of the host */ + /* Valid after call to HTHostName() */ /* Parse a cardinal value parse_cardinal() * ---------------------- @@ -57,15 +60,15 @@ extern int HTInetStatus(const char *where); * *pstatus points to status updated iff bad */ -extern unsigned int HTCardinal(int *pstatus, - char **pp, - unsigned int max_value); + extern unsigned int HTCardinal(int *pstatus, + char **pp, + unsigned int max_value); /* Check whether string is a valid Internet hostname * ------------------------------------------------- */ -extern BOOL valid_hostname(char *name); + extern BOOL valid_hostname(char *name); /* Resolve an internet hostname, like gethostbyname * ------------------------------------------------ @@ -81,24 +84,27 @@ extern BOOL valid_hostname(char *name); * The interface is intended to be the same as for gethostbyname(), * but additional status is returned in lynx_nsl_status. */ -extern int lynx_nsl_status; + extern int lynx_nsl_status; -extern struct hostent *LYGetHostByName(char *str); + extern struct hostent *LYGetHostByName(char *str); /* Get Name of This Machine * ------------------------ * */ -extern const char *HTHostName(void); + extern const char *HTHostName(void); -extern int HTDoConnect(const char *url, - const char *protocol, - int default_port, - int *s); + extern int HTDoConnect(const char *url, + const char *protocol, + int default_port, + int *s); -extern int HTDoRead(int fildes, - void *buf, - unsigned nbyte); + extern int HTDoRead(int fildes, + void *buf, + unsigned nbyte); -#endif /* HTTCP_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTTCP_H */ diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c index 2204e651..27c0dcc0 100644 --- a/WWW/Library/Implementation/HTTP.c +++ b/WWW/Library/Implementation/HTTP.c @@ -411,6 +411,7 @@ static int HTLoadHTTP(const char *arg, HTFormat format_out, HTStream *sink) { + static char *empty = ""; int s; /* Socket number for returned data */ const char *url = arg; /* The URL which get_physical() returned */ bstring *command = NULL; /* The whole command */ @@ -1402,7 +1403,7 @@ static int HTLoadHTTP(const char *arg, * anything else) when !eol. Otherwise, set the value of length to * what we have beyond eol (i.e., beyond the status line). - FM */ - start_of_data = eol ? eol + 1 : ""; + start_of_data = eol ? eol + 1 : empty; length = eol ? length - (start_of_data - line_buffer) : 0; /* diff --git a/WWW/Library/Implementation/HTTP.h b/WWW/Library/Implementation/HTTP.h index 43ef29e1..1d570322 100644 --- a/WWW/Library/Implementation/HTTP.h +++ b/WWW/Library/Implementation/HTTP.h @@ -7,27 +7,33 @@ #include <HTAccess.h> +#ifdef __cplusplus +extern "C" { +#endif #ifdef GLOBALREF_IS_MACRO -extern GLOBALREF (HTProtocol, HTTP); -extern GLOBALREF (HTProtocol, HTTPS); + extern GLOBALREF (HTProtocol, HTTP); + extern GLOBALREF (HTProtocol, HTTPS); #else -GLOBALREF HTProtocol HTTP; -GLOBALREF HTProtocol HTTPS; -#endif /* GLOBALREF_IS_MACRO */ + GLOBALREF HTProtocol HTTP; + GLOBALREF HTProtocol HTTPS; +#endif /* GLOBALREF_IS_MACRO */ #define URL_GET_METHOD 1 #define URL_POST_METHOD 2 #define URL_MAIL_METHOD 3 -extern int ws_read_per_sec; -extern BOOL reloading; -extern char *redirecting_url; -extern BOOL permanent_redirection; -extern BOOL redirect_post_content; + extern int ws_read_per_sec; + extern BOOL reloading; + extern char *redirecting_url; + extern BOOL permanent_redirection; + extern BOOL redirect_post_content; #ifdef USE_SSL -extern SSL *SSL_handle; + extern SSL *SSL_handle; #endif -#endif /* HTTP_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTTP_H */ diff --git a/WWW/Library/Implementation/HTTelnet.h b/WWW/Library/Implementation/HTTelnet.h index 2f84bd8d..f2208d88 100644 --- a/WWW/Library/Implementation/HTTelnet.h +++ b/WWW/Library/Implementation/HTTelnet.h @@ -8,15 +8,21 @@ #include <HTAccess.h> +#ifdef __cplusplus +extern "C" { +#endif #ifdef GLOBALREF_IS_MACRO -extern GLOBALREF (HTProtocol, HTTelnet); -extern GLOBALREF (HTProtocol, HTRlogin); -extern GLOBALREF (HTProtocol, HTTn3270); + extern GLOBALREF (HTProtocol, HTTelnet); + extern GLOBALREF (HTProtocol, HTRlogin); + extern GLOBALREF (HTProtocol, HTTn3270); #else -GLOBALREF HTProtocol HTTelnet; -GLOBALREF HTProtocol HTRlogin; -GLOBALREF HTProtocol HTTn3270; -#endif /* GLOBALREF_IS_MACRO */ + GLOBALREF HTProtocol HTTelnet; + GLOBALREF HTProtocol HTRlogin; + GLOBALREF HTProtocol HTTn3270; +#endif /* GLOBALREF_IS_MACRO */ -#endif /* HTTELNET_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTTELNET_H */ diff --git a/WWW/Library/Implementation/HTUU.h b/WWW/Library/Implementation/HTUU.h index 6a0d4a7c..1bd5e6e6 100644 --- a/WWW/Library/Implementation/HTUU.h +++ b/WWW/Library/Implementation/HTUU.h @@ -16,12 +16,18 @@ #include <HTUtils.h> #endif -extern int HTUU_encode(unsigned char *bufin, - unsigned int nbytes, - char *bufcoded); +#ifdef __cplusplus +extern "C" { +#endif + extern int HTUU_encode(unsigned char *bufin, + unsigned int nbytes, + char *bufcoded); -extern int HTUU_decode(char *bufcoded, - unsigned char *bufplain, - int outbufsize); + extern int HTUU_decode(char *bufcoded, + unsigned char *bufplain, + int outbufsize); -#endif /* HTUU_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTUU_H */ diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h index ef2ac732..0a049577 100644 --- a/WWW/Library/Implementation/HTUtils.h +++ b/WWW/Library/Implementation/HTUtils.h @@ -188,6 +188,11 @@ typedef unsigned short mode_t; #endif /* _WINDOWS */ +#if defined(USE_DEFAULT_COLORS) && !defined(HAVE_USE_DEFAULT_COLORS) + /* if we don't have use_default_colors() */ +# undef USE_DEFAULT_COLORS +#endif + #ifndef USE_COLOR_STYLE /* it's useless for such setup */ # define NO_EMPTY_HREFLESS_A @@ -294,8 +299,10 @@ Standard C library for malloc() etc #define typecalloc(cast) (cast *)calloc(1,sizeof(cast)) #define typecallocn(cast,ntypes) (cast *)calloc(ntypes,sizeof(cast)) +#define typeRealloc(cast,ptr,ntypes) (cast *)realloc(ptr, (ntypes)*sizeof(cast)) + #define typeMalloc(cast) (cast *)malloc(sizeof(cast)) -#define typeMallocn(cast,ntypes) (cast *)malloc(ntypes*sizeof(cast)) +#define typeMallocn(cast,ntypes) (cast *)malloc((ntypes)*sizeof(cast)) /* @@ -430,8 +437,6 @@ Out Of Memory checking for malloc() return: #include <LYexit.h> -extern void outofmem(const char *fname, const char *func); - /* * Upper- and Lowercase macros * @@ -452,10 +457,6 @@ extern void outofmem(const char *fname, const char *func); #define TOUPPER(c) ascii_toupper(UCH(c)) #define ISUPPER(c) ascii_isupper(UCH(c)) -extern int ascii_toupper(int); -extern int ascii_tolower(int); -extern int ascii_isupper(int); - #else #define TOLOWER(c) (isupper(UCH(c)) ? tolower(UCH(c)) : UCH(c)) @@ -516,8 +517,6 @@ extern int WWW_TraceMask; #define CTRACE_SLEEP(secs) if (TRACE && LYTraceLogFP == 0) sleep(secs) #define CTRACE_FLUSH(fp) if (TRACE) fflush(fp) -extern FILE *TraceFP(void); - #include <www_tcp.h> /* @@ -599,10 +598,6 @@ extern FILE *TraceFP(void); #undef free_func -extern SSL *HTGetSSLHandle(void); -extern void HTSSLInitPRNG(void); -extern char HTGetSSLCharacter(void *handle); - #endif /* USE_SSL */ #ifdef HAVE_LIBDMALLOC @@ -621,4 +616,26 @@ extern char HTGetSSLCharacter(void *handle); #include <userdefs.h> -#endif /* HTUTILS_H */ +#ifdef __cplusplus +extern "C" { +#endif +#ifndef TOLOWER +#ifdef EXP_ASCII_CTYPES + extern int ascii_toupper(int); + extern int ascii_tolower(int); + extern int ascii_isupper(int); +#endif +#endif + + extern FILE *TraceFP(void); + +#ifdef USE_SSL + extern SSL *HTGetSSLHandle(void); + extern void HTSSLInitPRNG(void); + extern char HTGetSSLCharacter(void *handle); +#endif /* USE_SSL */ + +#ifdef __cplusplus +} +#endif +#endif /* HTUTILS_H */ diff --git a/WWW/Library/Implementation/HTVMSUtils.h b/WWW/Library/Implementation/HTVMSUtils.h index d7e61de3..d7efe8c4 100644 --- a/WWW/Library/Implementation/HTVMSUtils.h +++ b/WWW/Library/Implementation/HTVMSUtils.h @@ -11,7 +11,10 @@ #include <HTAnchor.h> -extern BOOL HTVMSFileVersions; /* Include version numbers in listing? */ +#ifdef __cplusplus +extern "C" { +#endif + extern BOOL HTVMSFileVersions; /* Include version numbers in listing? */ /* PUBLIC HTVMS_authSysPrv() * CHECKS IF THIS PROCESS IS AUTHORIZED TO ENABLE SYSPRV @@ -21,7 +24,7 @@ extern BOOL HTVMSFileVersions; /* Include version numbers in listing? */ * ON EXIT: * returns YES if SYSPRV is authorized */ -extern BOOL HTVMS_authSysPrv(void); + extern BOOL HTVMS_authSysPrv(void); /* PUBLIC HTVMS_enableSysPrv() * ENABLES SYSPRV @@ -31,7 +34,7 @@ extern BOOL HTVMS_authSysPrv(void); * ON EXIT: * */ -extern void HTVMS_enableSysPrv(void); + extern void HTVMS_enableSysPrv(void); /* PUBLIC HTVMS_disableSysPrv() * DISABLES SYSPRV @@ -41,7 +44,7 @@ extern void HTVMS_enableSysPrv(void); * ON EXIT: * */ -extern void HTVMS_disableSysPrv(void); + extern void HTVMS_disableSysPrv(void); /* PUBLIC HTVMS_checkAccess() * CHECKS ACCESS TO FILE FOR CERTAIN USER @@ -53,9 +56,9 @@ extern void HTVMS_disableSysPrv(void); * returns YES if access is allowed * */ -extern BOOL HTVMS_checkAccess(const char *FileName, - const char *UserName, - const char *Method); + extern BOOL HTVMS_checkAccess(const char *FileName, + const char *UserName, + const char *Method); /* PUBLIC HTVMS_wwwName() * CONVERTS VMS Name into WWW Name @@ -82,14 +85,17 @@ extern BOOL HTVMS_checkAccess(const char *FileName, * * */ -const extern char *HTVMS_wwwName(const char *vmsname); + const extern char *HTVMS_wwwName(const char *vmsname); -extern int HTVMSBrowseDir(const char *address, - HTParentAnchor *anchor, - HTFormat format_out, - HTStream *sink); + extern int HTVMSBrowseDir(const char *address, + HTParentAnchor *anchor, + HTFormat format_out, + HTStream *sink); -extern int HTVMS_remove(char *filename); -extern void HTVMS_purge(char *filename); + extern int HTVMS_remove(char *filename); + extern void HTVMS_purge(char *filename); -#endif /* not HTVMSUTIL_H */ +#ifdef __cplusplus +} +#endif +#endif /* not HTVMSUTIL_H */ diff --git a/WWW/Library/Implementation/HTVMS_WaisUI.h b/WWW/Library/Implementation/HTVMS_WaisUI.h index aaa0495a..4f072a51 100644 --- a/WWW/Library/Implementation/HTVMS_WaisUI.h +++ b/WWW/Library/Implementation/HTVMS_WaisUI.h @@ -12,14 +12,17 @@ #include <HTUtils.h> #endif -void log_write(char *); +#ifdef __cplusplus +extern "C" { +#endif + void log_write(char *); /* * Routines originally from Panic.h -- FM * *----------------------------------------------------------------------*/ -void panic(char *format,...); + void panic(char *format,...); /*----------------------------------------------------------------------*/ @@ -32,35 +35,35 @@ void panic(char *format,...); #ifndef boolean #define boolean unsigned long -#endif /* boolean */ +#endif /* boolean */ #ifndef true #define true (boolean)1L -#endif /* true */ +#endif /* true */ #ifndef false #define false (boolean)0L /* used to be (!true), but broke some compilers */ -#endif /* false */ +#endif /* false */ #ifndef TRUE #define TRUE true -#endif /* TRUE */ +#endif /* TRUE */ #ifndef FALSE #define FALSE false -#endif /* FALSE */ +#endif /* FALSE */ /*----------------------------------------------------------------------*/ /* functions */ /* enhanced memory handling functions - don't call them directly, use the macros below */ -void fs_checkPtr(void *ptr); -void *fs_malloc(size_t size); -void *fs_realloc(void *ptr, size_t size); -void fs_free(void *ptr); -char *fs_strncat(char *dst, char *src, size_t maxToAdd, size_t maxTotal); + void fs_checkPtr(void *ptr); + void *fs_malloc(size_t size); + void *fs_realloc(void *ptr, size_t size); + void fs_free(void *ptr); + char *fs_strncat(char *dst, char *src, size_t maxToAdd, size_t maxTotal); /* macros for memory functions. call these in your program. */ #define s_checkPtr(ptr) fs_checkPtr(ptr) @@ -69,13 +72,13 @@ char *fs_strncat(char *dst, char *src, size_t maxToAdd, size_t maxTotal); #define s_free(ptr) { fs_free((char*)ptr); ptr = NULL; } #define s_strncat(dst,src,maxToAdd,maxTotal) fs_strncat((dst),(src),(maxToAdd),(maxTotal)) -char *s_strdup(char *s); + char *s_strdup(char *s); #define IS_DELIMITER 1 #define NOT_DELIMITER !IS_DELIMITER -char char_downcase(unsigned long ch); -char *string_downcase(char *word); + char char_downcase(unsigned long ch); + char *string_downcase(char *word); /*----------------------------------------------------------------------*/ @@ -89,7 +92,7 @@ char *string_downcase(char *word); /* bytes to leave for the header size info */ #define HEADER_LEN (size_t)2 -typedef long pdu_type; + typedef long pdu_type; #define initAPDU (pdu_type)20 #define initResponseAPDU (pdu_type)21 @@ -104,14 +107,14 @@ typedef long pdu_type; #define resourceControlAPDU (pdu_type)30 #define resourceControlResponseAPDU (pdu_type)31 -typedef struct any { /* an any is a non-ascii string of characters */ - unsigned long size; - char *bytes; -} any; + typedef struct any { /* an any is a non-ascii string of characters */ + unsigned long size; + char *bytes; + } any; -typedef any bit_map; /* a bit_map is a group of packed bits */ + typedef any bit_map; /* a bit_map is a group of packed bits */ -typedef unsigned long data_tag; + typedef unsigned long data_tag; #define DT_PDUType (data_tag)1 #define DT_ReferenceID (data_tag)2 @@ -200,11 +203,11 @@ typedef unsigned long data_tag; #define DIAGNOSTIC_CODE_SIZE (size_t)3 -typedef struct diagnosticRecord { - boolean SURROGATE; - char DIAG[DIAGNOSTIC_CODE_SIZE]; - char *ADDINFO; -} diagnosticRecord; + typedef struct diagnosticRecord { + boolean SURROGATE; + char DIAG[DIAGNOSTIC_CODE_SIZE]; + char *ADDINFO; + } diagnosticRecord; #define D_PermanentSystemError "S1" #define D_TemporarySystemError "S2" @@ -248,7 +251,7 @@ typedef struct diagnosticRecord { /* for internal error handling */ -extern char *readErrorPosition; /* pos where buf stoped making sense */ + extern char *readErrorPosition; /* pos where buf stoped making sense */ /* the following are macros so that they can return OUT of the function which calls them @@ -274,71 +277,71 @@ extern char *readErrorPosition; /* pos where buf stoped making sense */ /*----------------------------------------------------------------------*/ -diagnosticRecord *makeDiag(boolean surrogate, char *code, char *addInfo); -void freeDiag(diagnosticRecord * diag); -char *writeDiag(diagnosticRecord * diag, char *buffer, long *len); -char *readDiag(diagnosticRecord ** diag, char *buffer); + diagnosticRecord *makeDiag(boolean surrogate, char *code, char *addInfo); + void freeDiag(diagnosticRecord * diag); + char *writeDiag(diagnosticRecord * diag, char *buffer, long *len); + char *readDiag(diagnosticRecord ** diag, char *buffer); -char *writeCompressedInteger(unsigned long num, char *buf, long *len); -char *readCompressedInteger(unsigned long *num, char *buf); -char *writeCompressedIntWithPadding(unsigned long num, unsigned long size, - char *buffer, long *len); -unsigned long writtenCompressedIntSize(unsigned long num); + char *writeCompressedInteger(unsigned long num, char *buf, long *len); + char *readCompressedInteger(unsigned long *num, char *buf); + char *writeCompressedIntWithPadding(unsigned long num, unsigned long size, + char *buffer, long *len); + unsigned long writtenCompressedIntSize(unsigned long num); -char *writeTag(data_tag tag, char *buf, long *len); -char *readTag(data_tag *tag, char *buf); -data_tag peekTag(char *buf); -unsigned long writtenTagSize(data_tag tag); + char *writeTag(data_tag tag, char *buf, long *len); + char *readTag(data_tag *tag, char *buf); + data_tag peekTag(char *buf); + unsigned long writtenTagSize(data_tag tag); -any *makeAny(unsigned long size, char *data); -void freeAny(any *a); -any *duplicateAny(any *a); -char *writeAny(any *a, data_tag tag, char *buffer, long *len); -char *readAny(any **anAny, char *buffer); -unsigned long writtenAnySize(data_tag tag, any *a); + any *makeAny(unsigned long size, char *data); + void freeAny(any *a); + any *duplicateAny(any *a); + char *writeAny(any *a, data_tag tag, char *buffer, long *len); + char *readAny(any **anAny, char *buffer); + unsigned long writtenAnySize(data_tag tag, any *a); -any *stringToAny(char *s); -char *anyToString(any *a); -unsigned long writtenStringSize(data_tag tag, char *s); + any *stringToAny(char *s); + char *anyToString(any *a); + unsigned long writtenStringSize(data_tag tag, char *s); -any *longToAny(long Num); -long anyToLong(any *a); + any *longToAny(long Num); + long anyToLong(any *a); -char *writeString(char *s, data_tag tag, char *buffer, long *len); -char *readString(char **s, char *buffer); + char *writeString(char *s, data_tag tag, char *buffer, long *len); + char *readString(char **s, char *buffer); -bit_map *makeBitMap(unsigned long numBits,...); + bit_map *makeBitMap(unsigned long numBits,...); -void freeBitMap(bit_map *bm); -boolean bitAtPos(unsigned long pos, bit_map *bm); -char *writeBitMap(bit_map *bm, data_tag tag, char *buffer, long *len); -char *readBitMap(bit_map **bm, char *buffer); + void freeBitMap(bit_map *bm); + boolean bitAtPos(unsigned long pos, bit_map *bm); + char *writeBitMap(bit_map *bm, data_tag tag, char *buffer, long *len); + char *readBitMap(bit_map **bm, char *buffer); -char *writeByte(unsigned long byte, char *buf, long *len); -char *readByte(unsigned char *byte, char *buf); + char *writeByte(unsigned long byte, char *buf, long *len); + char *readByte(unsigned char *byte, char *buf); -char *writeBoolean(boolean flag, char *buf, long *len); -char *readBoolean(boolean *flag, char *buf); + char *writeBoolean(boolean flag, char *buf, long *len); + char *readBoolean(boolean *flag, char *buf); -char *writePDUType(pdu_type pduType, char *buf, long *len); -char *readPDUType(pdu_type *pduType, char *buf); -pdu_type peekPDUType(char *buf); + char *writePDUType(pdu_type pduType, char *buf, long *len); + char *readPDUType(pdu_type *pduType, char *buf); + pdu_type peekPDUType(char *buf); -char *writeBinaryInteger(long num, unsigned long size, - char *buf, long *len); -char *readBinaryInteger(long *num, unsigned long size, char *buf); -unsigned long writtenCompressedBinIntSize(long num); + char *writeBinaryInteger(long num, unsigned long size, + char *buf, long *len); + char *readBinaryInteger(long *num, unsigned long size, char *buf); + unsigned long writtenCompressedBinIntSize(long num); -char *writeNum(long num, data_tag tag, char *buffer, long *len); -char *readNum(long *num, char *buffer); -unsigned long writtenNumSize(data_tag tag, long num); + char *writeNum(long num, data_tag tag, char *buffer, long *len); + char *readNum(long *num, char *buffer); + unsigned long writtenNumSize(data_tag tag, long num); -void doList(void **list, void (*func) (void *)); + void doList(void **list, void (*func) (void *)); -char *writeProtocolVersion(char *buf, long *len); -char *defaultImplementationID(void); -char *defaultImplementationName(void); -char *defaultImplementationVersion(void); + char *writeProtocolVersion(char *buf, long *len); + char *defaultImplementationID(void); + char *defaultImplementationName(void); + char *defaultImplementationVersion(void); /*----------------------------------------------------------------------*/ @@ -362,62 +365,62 @@ char *defaultImplementationVersion(void); #define QT_BooleanQuery "1" /* standard boolean query */ /* general attribute code - use in place of any attribute */ -#define IGNORE "ig" +#define IGNORE "ig" /* use value codes */ -#define UV_ISBN "ub" -#define CORPORATE_NAME "uc" -#define ISSN "us" -#define PERSONAL_NAME "up" -#define SUBJECT "uj" -#define TITLE "ut" -#define GEOGRAPHIC_NAME "ug" -#define CODEN "ud" +#define UV_ISBN "ub" +#define CORPORATE_NAME "uc" +#define ISSN "us" +#define PERSONAL_NAME "up" +#define SUBJECT "uj" +#define TITLE "ut" +#define GEOGRAPHIC_NAME "ug" +#define CODEN "ud" #define SUBJECT_SUBDIVISION "ue" -#define SERIES_TITLE "uf" +#define SERIES_TITLE "uf" #define MICROFORM_GENERATION "uh" #define PLACE_OF_PUBLICATION "ui" -#define NUC_CODE "uk" -#define LANGUAGE "ul" +#define NUC_CODE "uk" +#define LANGUAGE "ul" #define COMBINATION_OF_USE_VALUES "um" #define SYSTEM_CONTROL_NUMBER "un" -#define DATE "uo" +#define DATE "uo" #define LC_CONTROL_NUMBER "ur" #define MUSIC_PUBLISHERS_NUMBER "uu" #define GOVERNMENT_DOCUMENTS_NUMBER "uv" #define SUBJECT_CLASSIFICATION "uw" -#define RECORD_TYPE "uy" +#define RECORD_TYPE "uy" /* relation value codes */ -#define EQUAL "re" -#define GREATER_THAN "rg" +#define EQUAL "re" +#define GREATER_THAN "rg" #define GREATER_THAN_OR_EQUAL "ro" -#define LESS_THAN "rl" +#define LESS_THAN "rl" #define LESS_THAN_OR_EQUAL "rp" -#define NOT_EQUAL "rn" +#define NOT_EQUAL "rn" /* position value codes */ -#define FIRST_IN_FIELD "pf" +#define FIRST_IN_FIELD "pf" #define FIRST_IN_SUBFIELD "ps" #define FIRST_IN_A_SUBFIELD "pa" #define FIRST_IN_NOT_A_SUBFIELD "pt" #define ANY_POSITION_IN_FIELD "py" /* structure value codes */ -#define PHRASE "sp" -#define WORD "sw" -#define KEY "sk" -#define WORD_LIST "sl" +#define PHRASE "sp" +#define WORD "sw" +#define KEY "sk" +#define WORD_LIST "sl" /* truncation value codes */ -#define NO_TRUNCATION "tn" +#define NO_TRUNCATION "tn" #define RIGHT_TRUNCATION "tr" #define PROC_NUM_INCLUDED_IN_SEARCH_ARG "ti" /* completeness value codes */ #define INCOMPLETE_SUBFIELD "ci" #define COMPLETE_SUBFIELD "cs" -#define COMPLETEFIELD "cf" +#define COMPLETEFIELD "cf" /* operator codes */ #define AND "a" @@ -427,40 +430,40 @@ char *defaultImplementationVersion(void); /* term types */ #define TT_Attribute 1 #define TT_ResultSetID 2 -#define TT_Operator 3 +#define TT_Operator 3 #define ATTRIBUTE_SIZE 3 #define OPERATOR_SIZE 2 -typedef struct query_term { - /* type */ - long TermType; - /* for term */ - char Use[ATTRIBUTE_SIZE]; - char Relation[ATTRIBUTE_SIZE]; - char Position[ATTRIBUTE_SIZE]; - char Structure[ATTRIBUTE_SIZE]; - char Truncation[ATTRIBUTE_SIZE]; - char Completeness[ATTRIBUTE_SIZE]; - any *Term; - /* for result set */ - any *ResultSetID; - /* for operator */ - char Operator[OPERATOR_SIZE]; -} query_term; + typedef struct query_term { + /* type */ + long TermType; + /* for term */ + char Use[ATTRIBUTE_SIZE]; + char Relation[ATTRIBUTE_SIZE]; + char Position[ATTRIBUTE_SIZE]; + char Structure[ATTRIBUTE_SIZE]; + char Truncation[ATTRIBUTE_SIZE]; + char Completeness[ATTRIBUTE_SIZE]; + any *Term; + /* for result set */ + any *ResultSetID; + /* for operator */ + char Operator[OPERATOR_SIZE]; + } query_term; /*----------------------------------------------------------------------*/ /* functions */ -query_term *makeAttributeTerm(char *use, char *relation, char *position, char *structure, - char *truncation, char *completeness, any *term); -query_term *makeResultSetTerm(any *resultSet); -query_term *makeOperatorTerm(char *operatorCode); -void freeTerm(void *qt); -char *writeQueryTerm(query_term *qt, char *buffer, long *len); -char *readQueryTerm(query_term **qt, char *buffer); -any *writeQuery(query_term **terms); -query_term **readQuery(any *info); + query_term *makeAttributeTerm(char *use, char *relation, char *position, char *structure, + char *truncation, char *completeness, any *term); + query_term *makeResultSetTerm(any *resultSet); + query_term *makeOperatorTerm(char *operatorCode); + void freeTerm(void *qt); + char *writeQueryTerm(query_term *qt, char *buffer, long *len); + char *readQueryTerm(query_term **qt, char *buffer); + any *writeQuery(query_term **terms); + query_term **readQuery(any *info); /*----------------------------------------------------------------------*/ @@ -469,22 +472,22 @@ query_term **readQuery(any *info); * *----------------------------------------------------------------------*/ -char *generate_retrieval_apdu(char *buff, - long *buff_len, - any *docID, - long chunk_type, - long start_line, long end_line, - char *type, - char *database_name); + char *generate_retrieval_apdu(char *buff, + long *buff_len, + any *docID, + long chunk_type, + long start_line, long end_line, + char *type, + char *database_name); -long interpret_message(char *request_message, - long request_length, - char *response_message, - long response_buffer_length, /* length of the buffer (modified) */ - long connection, - boolean verbose); + long interpret_message(char *request_message, + long request_length, + char *response_message, + long response_buffer_length, /* length of the buffer (modified) */ + long connection, + boolean verbose); -char *trim_junk(char *headline); + char *trim_junk(char *headline); /* * Routines originally from ZProt.c -- FM @@ -493,163 +496,169 @@ char *trim_junk(char *headline); /* APDU types */ -typedef struct InitAPDU { - pdu_type PDUType; - boolean willSearch, willPresent, willDelete; - boolean supportAccessControl, supportResourceControl; - long PreferredMessageSize; - long MaximumRecordSize; - char *IDAuthentication; - char *ImplementationID; - char *ImplementationName; - char *ImplementationVersion; - any *ReferenceID; - void *UserInformationField; -} InitAPDU; - -typedef struct InitResponseAPDU { - pdu_type PDUType; - boolean Result; - boolean willSearch, willPresent, willDelete; - boolean supportAccessControl, supportResourceControl; - long PreferredMessageSize; - long MaximumRecordSize; - char *IDAuthentication; - char *ImplementationID; - char *ImplementationName; - char *ImplementationVersion; - any *ReferenceID; - void *UserInformationField; -} InitResponseAPDU; - -typedef struct SearchAPDU { - pdu_type PDUType; - long SmallSetUpperBound; - long LargeSetLowerBound; - long MediumSetPresentNumber; - boolean ReplaceIndicator; - char *ResultSetName; - char **DatabaseNames; - char *QueryType; - char **ElementSetNames; - any *ReferenceID; - void *Query; -} SearchAPDU; - -typedef struct SearchResponseAPDU { - pdu_type PDUType; - long SearchStatus; - long ResultCount; - long NumberOfRecordsReturned; - long NextResultSetPosition; - long ResultSetStatus; - long PresentStatus; - any *ReferenceID; - void *DatabaseDiagnosticRecords; -} SearchResponseAPDU; - -typedef struct PresentAPDU { - pdu_type PDUType; - long NumberOfRecordsRequested; - long ResultSetStartPosition; - char *ResultSetID; - char *ElementSetNames; - any *ReferenceID; - void *PresentInfo; -} PresentAPDU; - -typedef struct PresentResponseAPDU { - pdu_type PDUType; - boolean PresentStatus; - long NumberOfRecordsReturned; - long NextResultSetPosition; - any *ReferenceID; - void *DatabaseDiagnosticRecords; -} PresentResponseAPDU; + typedef struct InitAPDU { + pdu_type PDUType; + boolean willSearch, willPresent, willDelete; + boolean supportAccessControl, supportResourceControl; + long PreferredMessageSize; + long MaximumRecordSize; + char *IDAuthentication; + char *ImplementationID; + char *ImplementationName; + char *ImplementationVersion; + any *ReferenceID; + void *UserInformationField; + } InitAPDU; + + typedef struct InitResponseAPDU { + pdu_type PDUType; + boolean Result; + boolean willSearch, willPresent, willDelete; + boolean supportAccessControl, supportResourceControl; + long PreferredMessageSize; + long MaximumRecordSize; + char *IDAuthentication; + char *ImplementationID; + char *ImplementationName; + char *ImplementationVersion; + any *ReferenceID; + void *UserInformationField; + } InitResponseAPDU; + + typedef struct SearchAPDU { + pdu_type PDUType; + long SmallSetUpperBound; + long LargeSetLowerBound; + long MediumSetPresentNumber; + boolean ReplaceIndicator; + char *ResultSetName; + char **DatabaseNames; + char *QueryType; + char **ElementSetNames; + any *ReferenceID; + void *Query; + } SearchAPDU; + + typedef struct SearchResponseAPDU { + pdu_type PDUType; + long SearchStatus; + long ResultCount; + long NumberOfRecordsReturned; + long NextResultSetPosition; + long ResultSetStatus; + long PresentStatus; + any *ReferenceID; + void *DatabaseDiagnosticRecords; + } SearchResponseAPDU; + + typedef struct PresentAPDU { + pdu_type PDUType; + long NumberOfRecordsRequested; + long ResultSetStartPosition; + char *ResultSetID; + char *ElementSetNames; + any *ReferenceID; + void *PresentInfo; + } PresentAPDU; + + typedef struct PresentResponseAPDU { + pdu_type PDUType; + boolean PresentStatus; + long NumberOfRecordsReturned; + long NextResultSetPosition; + any *ReferenceID; + void *DatabaseDiagnosticRecords; + } PresentResponseAPDU; /*----------------------------------------------------------------------*/ /* Functions */ -InitAPDU *makeInitAPDU(boolean search, boolean present, boolean deleteIt, - boolean accessControl, boolean resourceControl, long prefMsgSize, - long maxMsgSize, - char *auth, - char *id, - char *name, - char *version, - any *refID, - void *userInfo); -void freeInitAPDU(InitAPDU * init); -char *writeInitAPDU(InitAPDU * init, char *buffer, long *len); -char *readInitAPDU(InitAPDU ** init, char *buffer); - -InitResponseAPDU *makeInitResponseAPDU(boolean result, - boolean search, - boolean present, - boolean deleteIt, - boolean accessControl, - boolean resourceControl, - long prefMsgSize, - long maxMsgSize, - char *auth, - char *id, - char *name, - char *version, - any *refID, - void *userInfo); -void freeInitResponseAPDU(InitResponseAPDU *init); -char *writeInitResponseAPDU(InitResponseAPDU *init, char *buffer, long *len); -char *readInitResponseAPDU(InitResponseAPDU **init, char *buffer); -InitResponseAPDU *replyToInitAPDU(InitAPDU * init, boolean result, void *userInfo); - -SearchAPDU *makeSearchAPDU(long small, long large, long medium, - boolean replace, char *name, char **databases, - char *type, char **elements, any *refID, void *queryInfo); -void freeSearchAPDU(SearchAPDU *query); -char *writeSearchAPDU(SearchAPDU *query, char *buffer, long *len); -char *readSearchAPDU(SearchAPDU **query, char *buffer); - -SearchResponseAPDU *makeSearchResponseAPDU(long result, long count, - long recordsReturned, long nextPos, - long resultStatus, long presentStatus, - any *refID, void *records); -void freeSearchResponseAPDU(SearchResponseAPDU *queryResponse); -char *writeSearchResponseAPDU(SearchResponseAPDU *queryResponse, char *buffer, long *len); -char *readSearchResponseAPDU(SearchResponseAPDU **queryResponse, char *buffer); - -PresentAPDU *makePresentAPDU(long recsReq, long startPos, - char *resultID, any *refID, void *info); -void freePresentAPDU(PresentAPDU * present); -char *writePresentAPDU(PresentAPDU * present, char *buffer, long *len); -char *readPresentAPDU(PresentAPDU ** present, char *buffer); - -PresentResponseAPDU *makePresentResponseAPDU(boolean status, long recsRet, - long nextPos, any *refID, - void *records); -void freePresentResponseAPDU(PresentResponseAPDU * present); -char *writePresentResponseAPDU(PresentResponseAPDU * present, char *buffer, long *len); -char *readPresentResponseAPDU(PresentResponseAPDU ** present, char *buffer); + InitAPDU *makeInitAPDU(boolean search, boolean present, boolean deleteIt, + boolean accessControl, boolean resourceControl, long prefMsgSize, + long maxMsgSize, + char *auth, + char *id, + char *name, + char *version, + any *refID, + void *userInfo); + void freeInitAPDU(InitAPDU * init); + char *writeInitAPDU(InitAPDU * init, char *buffer, long *len); + char *readInitAPDU(InitAPDU ** init, char *buffer); + + InitResponseAPDU *makeInitResponseAPDU(boolean result, + boolean search, + boolean present, + boolean deleteIt, + boolean accessControl, + boolean resourceControl, + long prefMsgSize, + long maxMsgSize, + char *auth, + char *id, + char *name, + char *version, + any *refID, + void *userInfo); + void freeInitResponseAPDU(InitResponseAPDU *init); + char *writeInitResponseAPDU(InitResponseAPDU *init, char *buffer, long *len); + char *readInitResponseAPDU(InitResponseAPDU **init, char *buffer); + InitResponseAPDU *replyToInitAPDU(InitAPDU * init, boolean result, void *userInfo); + + SearchAPDU *makeSearchAPDU(long small, long large, long medium, + boolean replace, char *name, char **databases, + char *type, char **elements, any *refID, void *queryInfo); + void freeSearchAPDU(SearchAPDU *query); + char *writeSearchAPDU(SearchAPDU *query, char *buffer, long *len); + char *readSearchAPDU(SearchAPDU **query, char *buffer); + + SearchResponseAPDU *makeSearchResponseAPDU(long result, long count, + long recordsReturned, long nextPos, + long resultStatus, long presentStatus, + any *refID, void *records); + void freeSearchResponseAPDU(SearchResponseAPDU *queryResponse); + char *writeSearchResponseAPDU(SearchResponseAPDU *queryResponse, char + *buffer, long *len); + char *readSearchResponseAPDU(SearchResponseAPDU **queryResponse, char *buffer); + + PresentAPDU *makePresentAPDU(long recsReq, long startPos, + char *resultID, any *refID, void *info); + void freePresentAPDU(PresentAPDU * present); + char *writePresentAPDU(PresentAPDU * present, char *buffer, long *len); + char *readPresentAPDU(PresentAPDU ** present, char *buffer); + + PresentResponseAPDU *makePresentResponseAPDU(boolean status, long recsRet, + long nextPos, any *refID, + void *records); + void freePresentResponseAPDU(PresentResponseAPDU * present); + char *writePresentResponseAPDU(PresentResponseAPDU * present, char + *buffer, long *len); + char *readPresentResponseAPDU(PresentResponseAPDU ** present, char *buffer); /*----------------------------------------------------------------------*/ /* user extension hooks: */ -extern char *writeInitInfo(InitAPDU * init, char *buffer, long *len); -extern char *readInitInfo(void **info, char *buffer); + extern char *writeInitInfo(InitAPDU * init, char *buffer, long *len); + extern char *readInitInfo(void **info, char *buffer); -extern char *writeInitResponseInfo(InitResponseAPDU *init, char *buffer, long *len); -extern char *readInitResponseInfo(void **info, char *buffer); + extern char *writeInitResponseInfo(InitResponseAPDU *init, char *buffer, long *len); + extern char *readInitResponseInfo(void **info, char *buffer); -extern char *writeSearchInfo(SearchAPDU *query, char *buffer, long *len); -extern char *readSearchInfo(void **info, char *buffer); + extern char *writeSearchInfo(SearchAPDU *query, char *buffer, long *len); + extern char *readSearchInfo(void **info, char *buffer); -extern char *writeSearchResponseInfo(SearchResponseAPDU *query, char *buffer, long *len); -extern char *readSearchResponseInfo(void **info, char *buffer); + extern char *writeSearchResponseInfo(SearchResponseAPDU *query, char + *buffer, long *len); + extern char *readSearchResponseInfo(void **info, char *buffer); -extern char *writePresentInfo(PresentAPDU * present, char *buffer, long *len); -extern char *readPresentInfo(void **info, char *buffer); + extern char *writePresentInfo(PresentAPDU * present, char *buffer, long *len); + extern char *readPresentInfo(void **info, char *buffer); -extern char *writePresentResponseInfo(PresentResponseAPDU * present, char - *buffer, long *len); -extern char *readPresentResponseInfo(void **info, char *buffer); + extern char *writePresentResponseInfo(PresentResponseAPDU * present, char + *buffer, long *len); + extern char *readPresentResponseInfo(void **info, char *buffer); -#endif /* HTVMSWAIS_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTVMSWAIS_H */ diff --git a/WWW/Library/Implementation/HTWAIS.h b/WWW/Library/Implementation/HTWAIS.h index 5f7af9f1..4ba6f678 100644 --- a/WWW/Library/Implementation/HTWAIS.h +++ b/WWW/Library/Implementation/HTWAIS.h @@ -27,11 +27,17 @@ #include <HTAccess.h> +#ifdef __cplusplus +extern "C" { +#endif #ifdef GLOBALREF_IS_MACRO -extern GLOBALREF (HTProtocol, HTWAIS); + extern GLOBALREF (HTProtocol, HTWAIS); #else -GLOBALREF HTProtocol HTWAIS; -#endif /* GLOBALDEF_IS_MACRO */ + GLOBALREF HTProtocol HTWAIS; +#endif /* GLOBALDEF_IS_MACRO */ -#endif /* HTWAIS_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTWAIS_H */ diff --git a/WWW/Library/Implementation/HTWSRC.h b/WWW/Library/Implementation/HTWSRC.h index c8b27bcc..152d27ab 100644 --- a/WWW/Library/Implementation/HTWSRC.h +++ b/WWW/Library/Implementation/HTWSRC.h @@ -13,11 +13,14 @@ #include <HTFormat.h> -extern char from_hex(char c); +#ifdef __cplusplus +extern "C" { +#endif + extern char from_hex(char c); -extern HTStream *HTWSRCConvert(HTPresentation *pres, - HTParentAnchor *anchor, - HTStream *sink); + extern HTStream *HTWSRCConvert(HTPresentation *pres, + HTParentAnchor *anchor, + HTStream *sink); /* @@ -30,8 +33,11 @@ Escaping Strings freed by the caller. */ -extern char *HTDeSlash(const char *str); + extern char *HTDeSlash(const char *str); -extern char *HTEnSlash(const char *str); + extern char *HTEnSlash(const char *str); -#endif /* HTWSRC_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTWSRC_H */ diff --git a/WWW/Library/Implementation/HText.h b/WWW/Library/Implementation/HText.h index 4c7b1dce..f0b44e52 100644 --- a/WWW/Library/Implementation/HText.h +++ b/WWW/Library/Implementation/HText.h @@ -12,25 +12,29 @@ */ #ifndef HTEXT_H #define HTEXT_H + #include <HTAnchor.h> #include <HTStyle.h> #include <HTStream.h> #include <SGML.h> +#ifdef __cplusplus +extern "C" { +#endif #ifndef THINK_C #ifndef HyperText /* Objective C version defined HyperText */ -typedef struct _HText HText; /* Normal Library */ + typedef struct _HText HText; /* Normal Library */ #endif #else -class CHyperText; /* Mac Think-C browser hook */ -typedef CHyperText HText; + class CHyperText; /* Mac Think-C browser hook */ + typedef CHyperText HText; #endif -extern HText *HTMainText; /* Pointer to current main text */ -extern HTParentAnchor *HTMainAnchor; /* Pointer to current text's anchor */ + extern HText *HTMainText; /* Pointer to current main text */ + extern HTParentAnchor *HTMainAnchor; /* Pointer to current text's anchor */ -extern const char *HTAppName; /* Application name */ -extern const char *HTAppVersion; /* Application version */ + extern const char *HTAppName; /* Application name */ + extern const char *HTAppVersion; /* Application version */ /* @@ -44,21 +48,21 @@ Creation and deletion which is kep by the creating stream. */ -extern HText *HText_new(HTParentAnchor *anchor); + extern HText *HText_new(HTParentAnchor *anchor); -extern HText *HText_new2(HTParentAnchor *anchor, - HTStream *output_stream); + extern HText *HText_new2(HTParentAnchor *anchor, + HTStream *output_stream); -extern HText *HText_new3(HTParentAnchor *anchor, - HTStream *output_stream, - HTStructured * structure); + extern HText *HText_new3(HTParentAnchor *anchor, + HTStream *output_stream, + HTStructured * structure); /* FREE HYPERTEXT OBJECT */ -extern void HText_free(HText *me); + extern void HText_free(HText *me); /* @@ -70,9 +74,9 @@ Object Building methods which are flushed at the end. */ -extern void HText_beginAppend(HText *text); + extern void HText_beginAppend(HText *text); -extern void HText_endAppend(HText *text); + extern void HText_endAppend(HText *text); /* @@ -80,14 +84,14 @@ extern void HText_endAppend(HText *text); */ -extern void HText_setStyle(HText *text, HTStyle *style); + extern void HText_setStyle(HText *text, HTStyle *style); /* ADD ONE CHARACTER */ -extern void HText_appendCharacter(HText *text, int ch); + extern void HText_appendCharacter(HText *text, int ch); /* @@ -95,7 +99,7 @@ extern void HText_appendCharacter(HText *text, int ch); */ -extern void HText_appendText(HText *text, const char *str); + extern void HText_appendText(HText *text, const char *str); /* @@ -104,11 +108,11 @@ extern void HText_appendText(HText *text, const char *str); and similar things */ -extern void HText_appendParagraph(HText *text); + extern void HText_appendParagraph(HText *text); -extern void HText_appendLineBreak(HText *text); + extern void HText_appendLineBreak(HText *text); -extern void HText_appendHorizontalRule(HText *text); + extern void HText_appendHorizontalRule(HText *text); /* @@ -123,10 +127,10 @@ extern void HText_appendHorizontalRule(HText *text); Anchors may not be nested. */ -extern int HText_beginAnchor(HText *text, BOOL underline, - HTChildAnchor *anc); -extern void HText_endAnchor(HText *text, int number); -extern BOOL HText_isAnchorBlank(HText *text, int number); + extern int HText_beginAnchor(HText *text, BOOL underline, + HTChildAnchor *anc); + extern void HText_endAnchor(HText *text, int number); + extern BOOL HText_isAnchorBlank(HText *text, int number); /* @@ -141,17 +145,17 @@ extern BOOL HText_isAnchorBlank(HText *text, int number); simply generate some text linked to the image itself as a separate document. */ -extern void HText_appendImage(HText *text, HTChildAnchor *anc, - const char *alternative_text, - int alignment, - BOOL isMap); + extern void HText_appendImage(HText *text, HTChildAnchor *anc, + const char *alternative_text, + int alignment, + BOOL isMap); /* RETURN THE ANCHOR ASSOCIATED WITH THIS NODE */ -extern HTParentAnchor *HText_nodeAnchor(HText *me); + extern HTParentAnchor *HText_nodeAnchor(HText *me); /* @@ -165,8 +169,8 @@ Browsing functions */ -extern BOOL HText_select(HText *text); -extern BOOL HText_selectAnchor(HText *text, HTChildAnchor *anchor); + extern BOOL HText_select(HText *text); + extern BOOL HText_selectAnchor(HText *text, HTChildAnchor *anchor); /* @@ -181,35 +185,38 @@ Editing functions */ /* Apply this style to the selection */ -extern void HText_applyStyle(HText *me, HTStyle *style); + extern void HText_applyStyle(HText *me, HTStyle *style); /* Update all text with changed style. */ -extern void HText_updateStyle(HText *me, HTStyle *style); + extern void HText_updateStyle(HText *me, HTStyle *style); /* Return style of selection */ -extern HTStyle *HText_selectionStyle(HText *me, HTStyleSheet *sheet); + extern HTStyle *HText_selectionStyle(HText *me, HTStyleSheet *sheet); /* Paste in styled text */ -extern void HText_replaceSel(HText *me, const char *aString, - HTStyle *aStyle); + extern void HText_replaceSel(HText *me, const char *aString, + HTStyle *aStyle); /* Apply this style to the selection and all similarly formatted text * (style recovery only) */ -extern void HTextApplyToSimilar(HText *me, HTStyle *style); + extern void HTextApplyToSimilar(HText *me, HTStyle *style); /* Select the first unstyled run. * (style recovery only) */ -extern void HTextSelectUnstyled(HText *me, HTStyleSheet *sheet); + extern void HTextSelectUnstyled(HText *me, HTStyleSheet *sheet); /* Anchor handling: */ -extern void HText_unlinkSelection(HText *me); -extern HTAnchor *HText_referenceSelected(HText *me); -extern HTAnchor *HText_linkSelTo(HText *me, HTAnchor * anchor); + extern void HText_unlinkSelection(HText *me); + extern HTAnchor *HText_referenceSelected(HText *me); + extern HTAnchor *HText_linkSelTo(HText *me, HTAnchor * anchor); -#endif /* HTEXT_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTEXT_H */ diff --git a/WWW/Library/Implementation/LYLeaks.h b/WWW/Library/Implementation/LYLeaks.h index 81abd551..69ccd4f4 100644 --- a/WWW/Library/Implementation/LYLeaks.h +++ b/WWW/Library/Implementation/LYLeaks.h @@ -57,6 +57,9 @@ #include <HTUtils.h> #endif +#ifdef __cplusplus +extern "C" { +#endif /* * Constant defines */ @@ -65,49 +68,47 @@ #define LEAKAGE_SINK "sys$login:Lynx.leaks" #else #define LEAKAGE_SINK "Lynx.leaks" -#endif /* VMS */ - +#endif /* VMS */ /* * Data structures - */ -typedef struct SourceLocation_tag { - /* - * The file name and line number of where an event took place. - */ - const char *cp_FileName; - short ssi_LineNumber; -} SourceLocation; - -typedef struct AllocationList_tag { - /* - * A singly linked list. - */ - struct AllocationList_tag *ALp_Next; - - /* - * Count the number of mallocs. - */ - long st_Sequence; - - /* - * The memory pointer allocated. If set to NULL, then an invalid request - * was made. The invalid pointer also. - */ - void *vp_Alloced; - void *vp_BadRequest; - - /* - * The size in bytes of the allocated memory. - */ - size_t st_Bytes; - - /* - * The source location of specific event (calloc, malloc, free). realloc - * kept separate since will track last realloc on pointer. - */ - SourceLocation SL_memory; - SourceLocation SL_realloc; -} AllocationList; + */ typedef struct SourceLocation_tag { + /* + * The file name and line number of where an event took place. + */ + const char *cp_FileName; + short ssi_LineNumber; + } SourceLocation; + + typedef struct AllocationList_tag { + /* + * A singly linked list. + */ + struct AllocationList_tag *ALp_Next; + + /* + * Count the number of mallocs. + */ + long st_Sequence; + + /* + * The memory pointer allocated. If set to NULL, then an invalid request + * was made. The invalid pointer also. + */ + void *vp_Alloced; + void *vp_BadRequest; + + /* + * The size in bytes of the allocated memory. + */ + size_t st_Bytes; + + /* + * The source location of specific event (calloc, malloc, free). realloc + * kept separate since will track last realloc on pointer. + */ + SourceLocation SL_memory; + SourceLocation SL_realloc; + } AllocationList; /* * Global variable declarations @@ -126,24 +127,24 @@ typedef struct AllocationList_tag { */ #ifdef malloc #undef malloc -#endif /* malloc */ +#endif /* malloc */ #define malloc(st_bytes) LYLeakMalloc(st_bytes, __FILE__, __LINE__) #ifdef calloc #undef calloc -#endif /* calloc */ +#endif /* calloc */ #define calloc(st_number, st_bytes) LYLeakCalloc(st_number, st_bytes, \ __FILE__, __LINE__) #ifdef realloc #undef realloc -#endif /* realloc */ +#endif /* realloc */ #define realloc(vp_alloced, st_newbytes) LYLeakRealloc(vp_alloced, \ st_newbytes, __FILE__, __LINE__) #ifdef free #undef free -#endif /* free */ +#endif /* free */ #define free(vp_alloced) LYLeakFree(vp_alloced, __FILE__, __LINE__) /* @@ -152,12 +153,12 @@ typedef struct AllocationList_tag { */ #ifdef StrAllocCopy #undef StrAllocCopy -#endif /* StrAllocCopy */ +#endif /* StrAllocCopy */ #define StrAllocCopy(dest, src) LYLeakSACopy(&(dest), src, __FILE__, __LINE__) #ifdef StrAllocCat #undef StrAllocCat -#endif /* StrAllocCat */ +#endif /* StrAllocCat */ #define StrAllocCat(dest, src) LYLeakSACat(&(dest), src, __FILE__, __LINE__) #define mark_malloced(a,size) LYLeak_mark_malloced(a,size, __FILE__, __LINE__) @@ -166,22 +167,22 @@ typedef struct AllocationList_tag { #ifdef HTSprintf0 #undef HTSprintf0 -#endif /* HTSprintf0 */ +#endif /* HTSprintf0 */ #define HTSprintf0 (Get_htsprintf0_fn(__FILE__,__LINE__)) #ifdef HTSprintf #undef HTSprintf -#endif /* HTSprintf */ +#endif /* HTSprintf */ #define HTSprintf (Get_htsprintf_fn(__FILE__,__LINE__)) -#endif /* LY_FIND_LEAKS_EXTENDED and not NO_EXTENDED_MEMORY_TRACKING */ +#endif /* LY_FIND_LEAKS_EXTENDED and not NO_EXTENDED_MEMORY_TRACKING */ -#else /* LY_FIND_LEAKS && !NO_MEMORY_TRACKING */ +#else /* LY_FIND_LEAKS && !NO_MEMORY_TRACKING */ #define mark_malloced(a,size) /* no-op */ #define LYLeakSequence() (-1) -#endif /* LY_FIND_LEAKS && !NO_MEMORY_TRACKING */ +#endif /* LY_FIND_LEAKS && !NO_MEMORY_TRACKING */ #if defined(LY_FIND_LEAKS) #define PUBLIC_IF_FIND_LEAKS /* nothing */ @@ -194,46 +195,49 @@ typedef struct AllocationList_tag { * See the appropriate source file for usage. */ #ifndef LYLeakSequence -extern long LYLeakSequence(void); + extern long LYLeakSequence(void); #endif -extern void LYLeaks(void); + extern void LYLeaks(void); #ifdef LY_FIND_LEAKS_EXTENDED -extern AllocationList *LYLeak_mark_malloced(void *vp_alloced, - size_t st_bytes, - const char *cp_File, - const short ssi_Line); -#endif /* LY_FIND_LEAKS_EXTENDED */ -extern void *LYLeakMalloc(size_t st_bytes, const char *cp_File, - const short ssi_Line); -extern void *LYLeakCalloc(size_t st_number, size_t st_bytes, const char *cp_File, - const short ssi_Line); -extern void *LYLeakRealloc(void *vp_alloced, - size_t st_newbytes, + extern AllocationList *LYLeak_mark_malloced(void *vp_alloced, + size_t st_bytes, + const char *cp_File, + const short ssi_Line); +#endif /* LY_FIND_LEAKS_EXTENDED */ + extern void *LYLeakMalloc(size_t st_bytes, const char *cp_File, + const short ssi_Line); + extern void *LYLeakCalloc(size_t st_number, size_t st_bytes, const char *cp_File, + const short ssi_Line); + extern void *LYLeakRealloc(void *vp_alloced, + size_t st_newbytes, + const char *cp_File, + const short ssi_Line); + extern void LYLeakFree(void *vp_alloced, const char *cp_File, const short ssi_Line); -extern void LYLeakFree(void *vp_alloced, - const char *cp_File, - const short ssi_Line); -extern char *LYLeakSACopy(char **dest, - const char *src, - const char *cp_File, - const short ssi_Line); -extern char *LYLeakSACat(char **dest, - const char *src, - const char *cp_File, - const short ssi_Line); + extern char *LYLeakSACopy(char **dest, + const char *src, + const char *cp_File, + const short ssi_Line); + extern char *LYLeakSACat(char **dest, + const char *src, + const char *cp_File, + const short ssi_Line); #ifdef LY_FIND_LEAKS_EXTENDED /* * Trick to get tracking of var arg functions without relying on var arg * preprocessor macros: */ -typedef char *HTSprintflike(char **, const char *,...); -extern HTSprintflike *Get_htsprintf_fn(const char *cp_File, - const short ssi_Line); -extern HTSprintflike *Get_htsprintf0_fn(const char *cp_File, - const short ssi_Line); -#endif /* LY_FIND_LEAKS_EXTENDED */ - -#endif /* __LYLEAKS_H */ + typedef char *HTSprintflike(char **, const char *,...); + extern HTSprintflike *Get_htsprintf_fn(const char *cp_File, + const short ssi_Line); + extern HTSprintflike *Get_htsprintf0_fn(const char *cp_File, + const short ssi_Line); +#endif /* LY_FIND_LEAKS_EXTENDED */ + +#ifdef __cplusplus +} +#endif +#endif /* __LYLEAKS_H */ diff --git a/WWW/Library/Implementation/LYexit.h b/WWW/Library/Implementation/LYexit.h index 7f134d83..09414880 100644 --- a/WWW/Library/Implementation/LYexit.h +++ b/WWW/Library/Implementation/LYexit.h @@ -27,36 +27,33 @@ #include <HTUtils.h> #endif +#ifdef __cplusplus +extern "C" { +#endif /* * Constant defines */ #ifdef exit #undef exit #endif - #define exit(code) LYexit(code) - #define atexit LYatexit #define ATEXITSIZE 50 - /* * Data structures - */ - -/* - * Global variable declarations - */ - -/* - * Macros - */ - -/* - * Function declarations - */ -extern void reset_signals(void); -extern void exit_immediately(int status) GCC_NORETURN; -extern void LYexit(int status) GCC_NORETURN; -extern int LYatexit(void (*function) (void)); - -#endif /* __LYEXIT_H */ + *//* + * Global variable declarations + *//* + * Macros + *//* + * Function declarations + */ extern void outofmem(const char *fname, const char *func); + extern void reset_signals(void); + extern void exit_immediately(int status) GCC_NORETURN; + extern void LYexit(int status) GCC_NORETURN; + extern int LYatexit(void (*function) (void)); + +#ifdef __cplusplus +} +#endif +#endif /* __LYEXIT_H */ diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c index 988c8d6f..eae3db3d 100644 --- a/WWW/Library/Implementation/SGML.c +++ b/WWW/Library/Implementation/SGML.c @@ -26,6 +26,7 @@ #include <UCAux.h> #include <HTChunk.h> +#include <HTUtils.h> #include <LYCharSets.h> #include <LYCharVals.h> /* S/390 -- gil -- 0635 */ @@ -901,7 +902,7 @@ static void handle_sgmlatt(HTStream *context) * Convenience macros - tags (elements) are identified sometimes by an int or * enum value ('TAGNUM'), sometimes by a pointer to HTTag ('TAGP'). - kw */ -#define TAGNUM_OF_TAGP(t) (t - context->dtd->tags) +#define TAGNUM_OF_TAGP(t) (HTMLElement) (t - context->dtd->tags) #define TAGP_OF_TAGNUM(e) (context->dtd->tags + e) /* @@ -916,7 +917,7 @@ static void handle_sgmlatt(HTStream *context) #define ALT_TAGNUM(e) ((e == HTML_OBJECT) ? HTML_ALT_OBJECT : e) /* return 'TAGNUM' of the normal mode for 'TAGNUM' e which may be alt. */ -#define NORMAL_TAGNUM(e) (((int)(e) >= HTML_ELEMENTS) ? HTML_OBJECT : e) +#define NORMAL_TAGNUM(e) (((int)(e) >= HTML_ELEMENTS) ? HTML_OBJECT : (HTMLElement)e) /* More convenience stuff. - kw */ #define ALT_TAGP_OF_TAGNUM(e) TAGP_OF_TAGNUM(ALT_TAGNUM(e)) @@ -4909,7 +4910,8 @@ void TO_SJIS(const unsigned char *arg, { unsigned char *euc; - euc = malloc(strlen((const char *) arg) + 1); + euc = typeMallocn(unsigned char, strlen((const char *) arg) + 1); + #ifdef CJK_EX if (!euc) outofmem(__FILE__, "TO_SJIS"); @@ -4931,7 +4933,7 @@ void TO_JIS(const unsigned char *arg, jis[0] = 0; return; } - euc = malloc(strlen((const char *) arg) + 1); + euc = typeMallocn(unsigned char, strlen((const char *)arg) + 1); #ifdef CJK_EX if (!euc) outofmem(__FILE__, "TO_JIS"); diff --git a/WWW/Library/Implementation/SGML.h b/WWW/Library/Implementation/SGML.h index 2c75b088..c595dc91 100644 --- a/WWW/Library/Implementation/SGML.h +++ b/WWW/Library/Implementation/SGML.h @@ -21,39 +21,41 @@ #include <HTAnchor.h> #include <LYJustify.h> +#ifdef __cplusplus +extern "C" { +#endif /* SGML content types - */ -typedef enum { - SGML_EMPTY, /* No content. */ - SGML_LITTERAL, /* Literal character data. Recognize exact close tag only. + */ typedef enum { + SGML_EMPTY, /* No content. */ + SGML_LITTERAL, /* Literal character data. Recognize exact close tag only. Old www server compatibility only! Not SGML */ - SGML_CDATA, /* Character data. Recognize </ only. + SGML_CDATA, /* Character data. Recognize </ only. (But we treat it just as SGML_LITTERAL.) */ - SGML_SCRIPT, /* Like CDATA, but allow it to be a comment */ - SGML_RCDATA, /* Replaceable character data. Should recognize </ and &ref; + SGML_SCRIPT, /* Like CDATA, but allow it to be a comment */ + SGML_RCDATA, /* Replaceable character data. Should recognize </ and &ref; (but we treat it like SGML_MIXED for old times' sake). */ - SGML_MIXED, /* Elements and parsed character data. + SGML_MIXED, /* Elements and parsed character data. Recognize all markup. */ - SGML_ELEMENT, /* Any data found should be regarded as an error. + SGML_ELEMENT, /* Any data found should be regarded as an error. (But we treat it just like SGML_MIXED.) */ - SGML_PCDATA /* Should contain no elements but &ref; is parsed. + SGML_PCDATA /* Should contain no elements but &ref; is parsed. (We treat it like SGML_CDATA wrt. contained tags i.e. pass them on literally, i.e. like we should treat SGML_RCDATA) (added by KW). */ -} SGMLContent; + } SGMLContent; -typedef struct { - const char *name; /* The name of the attribute */ + typedef struct { + const char *name; /* The name of the attribute */ #ifdef USE_PRETTYSRC - char type; /* code of the type of the attribute. Code + char type; /* code of the type of the attribute. Code values are in HTMLDTD.h */ #endif -} attr; + } attr; -typedef int TagClass; + typedef int TagClass; /* textflow */ #define Tgc_FONTlike 0x00001 /* S,STRIKE,I,B,TT,U,BIG,SMALL,STYLE,BLINK;BR,TAB */ @@ -91,7 +93,7 @@ typedef int TagClass; /* Some more properties of tags (or rather, elements) and rules how to deal with them. - kw */ -typedef int TagFlags; + typedef int TagFlags; #define Tgf_endO 0x00001 /* end tag can be Omitted */ #define Tgf_startO 0x00002 /* start tag can be Omitted */ @@ -124,46 +126,46 @@ typedef int TagFlags; * except for that which opens a matching closing tag. * */ -typedef struct _tag HTTag; -struct _tag { - const char *name; /* The name of the tag */ + typedef struct _tag HTTag; + struct _tag { + const char *name; /* The name of the tag */ #ifdef USE_COLOR_STYLE - int name_len; /* The length of the name */ + int name_len; /* The length of the name */ #endif #ifdef EXP_JUSTIFY_ELTS - BOOL can_justify; /* justification allowed? */ + BOOL can_justify; /* justification allowed? */ #endif - attr *attributes; /* The list of acceptable attributes */ - int number_of_attributes; /* Number of possible attributes */ - SGMLContent contents; /* End only on end tag @@ */ - TagClass tagclass; - TagClass contains; /* which classes of elements this one can contain directly */ - TagClass icontains; /* which classes of elements this one can contain indirectly */ - TagClass contained; /* in which classes can this tag be contained ? */ - TagClass icontained; /* in which classes can this tag be indirectly contained ? */ - TagClass canclose; /* which classes of elements can this one close + attr *attributes; /* The list of acceptable attributes */ + int number_of_attributes; /* Number of possible attributes */ + SGMLContent contents; /* End only on end tag @@ */ + TagClass tagclass; + TagClass contains; /* which classes of elements this one can contain directly */ + TagClass icontains; /* which classes of elements this one can contain indirectly */ + TagClass contained; /* in which classes can this tag be contained ? */ + TagClass icontained; /* in which classes can this tag be indirectly contained ? */ + TagClass canclose; /* which classes of elements can this one close if something looks wrong ? */ - TagFlags flags; -}; + TagFlags flags; + }; /* DTD Information * --------------- * * Not the whole DTD, but all this parser uses of it. */ -typedef struct { - HTTag *tags; /* Must be in strcmp order by name */ - int number_of_tags; - const char **entity_names; /* Must be in strcmp order by name */ - size_t number_of_entities; - /* "entity_names" table probably unused, - * see comments in HTMLDTD.c near the top - */ -} SGML_dtd; + typedef struct { + HTTag *tags; /* Must be in strcmp order by name */ + int number_of_tags; + const char **entity_names; /* Must be in strcmp order by name */ + size_t number_of_entities; + /* "entity_names" table probably unused, + * see comments in HTMLDTD.c near the top + */ + } SGML_dtd; /* SGML context passed to parsers */ -typedef struct _HTSGMLContext *HTSGMLContext; /* Hidden */ + typedef struct _HTSGMLContext *HTSGMLContext; /* Hidden */ /*__________________________________________________________________________ */ @@ -187,44 +189,44 @@ Structured Object definition Maybe the callerData is enough info to pass along. */ -typedef struct _HTStructured HTStructured; + typedef struct _HTStructured HTStructured; -typedef struct _HTStructuredClass { + typedef struct _HTStructuredClass { - const char *name; /* Just for diagnostics */ + const char *name; /* Just for diagnostics */ - void (*_free) (HTStructured * me); + void (*_free) (HTStructured * me); - void (*_abort) (HTStructured * me, HTError e); + void (*_abort) (HTStructured * me, HTError e); - void (*put_character) (HTStructured * me, char ch); + void (*put_character) (HTStructured * me, char ch); - void (*put_string) (HTStructured * me, const char *str); + void (*put_string) (HTStructured * me, const char *str); - void (*_write) (HTStructured * me, const char *str, - int len); + void (*_write) (HTStructured * me, const char *str, + int len); - int (*start_element) (HTStructured * me, int element_number, - const BOOL *attribute_present, - const char **attribute_value, - int charset, - char **include); + int (*start_element) (HTStructured * me, int element_number, + const BOOL *attribute_present, + const char **attribute_value, + int charset, + char **include); - int (*end_element) (HTStructured * me, int element_number, - char **include); + int (*end_element) (HTStructured * me, int element_number, + char **include); - int (*put_entity) (HTStructured * me, int entity_number); + int (*put_entity) (HTStructured * me, int entity_number); -} HTStructuredClass; + } HTStructuredClass; /* Equivalents to the following functions possibly could be generalised into additional HTStructuredClass members. For now they don't do anything target-specific. - kw */ -extern BOOLEAN LYCheckForCSI(HTParentAnchor *anchor, char **url); -extern void LYDoCSI(char *url, const char *comment, char **csi); -extern BOOLEAN LYCommentHacks(HTParentAnchor *anchor, const char *comment); + extern BOOLEAN LYCheckForCSI(HTParentAnchor *anchor, char **url); + extern void LYDoCSI(char *url, const char *comment, char **csi); + extern BOOLEAN LYCommentHacks(HTParentAnchor *anchor, const char *comment); /* @@ -233,8 +235,8 @@ Find a Tag by Name Returns a pointer to the tag within the DTD. */ -extern HTTag *SGMLFindTag(const SGML_dtd * dtd, - const char *string); + extern HTTag *SGMLFindTag(const SGML_dtd * dtd, + const char *string); /* @@ -249,10 +251,13 @@ Create an SGML parser * On exit, * The default tag starter has been processed. */ -extern HTStream *SGML_new(const SGML_dtd * dtd, - HTParentAnchor *anchor, - HTStructured * target); + extern HTStream *SGML_new(const SGML_dtd * dtd, + HTParentAnchor *anchor, + HTStructured * target); -extern const HTStreamClass SGMLParser; + extern const HTStreamClass SGMLParser; -#endif /* SGML_H */ +#ifdef __cplusplus +} +#endif +#endif /* SGML_H */ diff --git a/WWW/Library/Implementation/UCAux.h b/WWW/Library/Implementation/UCAux.h index 06db09b6..c962095e 100644 --- a/WWW/Library/Implementation/UCAux.h +++ b/WWW/Library/Implementation/UCAux.h @@ -5,63 +5,69 @@ #include <HTUtils.h> #endif -extern BOOL UCCanUniTranslateFrom(int from); -extern BOOL UCCanTranslateUniTo(int to); -extern BOOL UCCanTranslateFromTo(int from, int to); -extern BOOL UCNeedNotTranslate(int from, - int to); - -struct _UCTransParams { - BOOL transp; - BOOL do_cjk; - BOOL decode_utf8; - BOOL output_utf8; - BOOL use_raw_char_in; - BOOL strip_raw_char_in; - BOOL pass_160_173_raw; - BOOL do_8bitraw; - BOOL trans_to_uni; - BOOL trans_C0_to_uni; - BOOL repl_translated_C0; - BOOL trans_from_uni; -}; -typedef struct _UCTransParams UCTransParams; - #ifndef UCDEFS_H #include <UCDefs.h> #endif /* UCDEFS_H */ -extern void UCSetTransParams(UCTransParams * pT, int cs_in, - const LYUCcharset *p_in, - int cs_out, - const LYUCcharset *p_out); - -extern void UCTransParams_clear(UCTransParams * pT); - -extern void UCSetBoxChars(int cset, - int *pvert_out, - int *phori_out, - int vert_in, - int hori_in); - #ifndef HTSTREAM_H #include <HTStream.h> #endif /* HTSTREAM_H */ -typedef void putc_func_t(HTStream *me, - char ch); - #ifndef UCMAP_H #include <UCMap.h> #endif /* UCMAP_H */ -extern BOOL UCPutUtf8_charstring(HTStream *target, - putc_func_t * actions, - UCode_t code); +#ifdef __cplusplus +extern "C" { +#endif + extern BOOL UCCanUniTranslateFrom(int from); + extern BOOL UCCanTranslateUniTo(int to); + extern BOOL UCCanTranslateFromTo(int from, int to); + extern BOOL UCNeedNotTranslate(int from, + int to); + + struct _UCTransParams { + BOOL transp; + BOOL do_cjk; + BOOL decode_utf8; + BOOL output_utf8; + BOOL use_raw_char_in; + BOOL strip_raw_char_in; + BOOL pass_160_173_raw; + BOOL do_8bitraw; + BOOL trans_to_uni; + BOOL trans_C0_to_uni; + BOOL repl_translated_C0; + BOOL trans_from_uni; + }; + typedef struct _UCTransParams UCTransParams; + + extern void UCSetTransParams(UCTransParams * pT, int cs_in, + const LYUCcharset *p_in, + int cs_out, + const LYUCcharset *p_out); + + extern void UCTransParams_clear(UCTransParams * pT); + + extern void UCSetBoxChars(int cset, + int *pvert_out, + int *phori_out, + int vert_in, + int hori_in); -extern BOOL UCConvertUniToUtf8(UCode_t code, - char *buffer); + typedef void putc_func_t(HTStream *me, + char ch); -extern UCode_t UCGetUniFromUtf8String(char **ppuni); + extern BOOL UCPutUtf8_charstring(HTStream *target, + putc_func_t * actions, + UCode_t code); -#endif /* UCAUX_H */ + extern BOOL UCConvertUniToUtf8(UCode_t code, + char *buffer); + + extern UCode_t UCGetUniFromUtf8String(char **ppuni); + +#ifdef __cplusplus +} +#endif +#endif /* UCAUX_H */ diff --git a/WWW/Library/Implementation/UCMap.h b/WWW/Library/Implementation/UCMap.h index b45e99cc..7f074d3c 100644 --- a/WWW/Library/Implementation/UCMap.h +++ b/WWW/Library/Implementation/UCMap.h @@ -5,49 +5,52 @@ #include <HTUtils.h> #endif -typedef long UCode_t; - -extern int UCTransUniChar(UCode_t unicode, - int charset_out); -extern int UCTransUniCharStr(char *outbuf, - int buflen, - UCode_t unicode, - int charset_out, - int chk_single_flag); -extern int UCTransChar(char ch_in, - int charset_in, - int charset_out); -extern int UCReverseTransChar(char ch_out, - int charset_in, +#ifdef __cplusplus +extern "C" { +#endif + typedef long UCode_t; + + extern int UCTransUniChar(UCode_t unicode, int charset_out); -extern int UCTransCharStr(char *outbuf, - int buflen, - char ch_in, - int charset_in, - int charset_out, - int chk_single_flag); -extern UCode_t UCTransToUni(char ch_in, - int charset_in); -extern int UCGetRawUniMode_byLYhndl(int i); -extern int UCGetLYhndl_byMIME(const char *p); /* returns -1 if name not recognized */ -extern int safeUCGetLYhndl_byMIME(const char *p); /* returns LATIN1 if name not recognized */ + extern int UCTransUniCharStr(char *outbuf, + int buflen, + UCode_t unicode, + int charset_out, + int chk_single_flag); + extern int UCTransChar(char ch_in, + int charset_in, + int charset_out); + extern int UCReverseTransChar(char ch_out, + int charset_in, + int charset_out); + extern int UCTransCharStr(char *outbuf, + int buflen, + char ch_in, + int charset_in, + int charset_out, + int chk_single_flag); + extern UCode_t UCTransToUni(char ch_in, + int charset_in); + extern int UCGetRawUniMode_byLYhndl(int i); + extern int UCGetLYhndl_byMIME(const char *p); /* returns -1 if name not recognized */ + extern int safeUCGetLYhndl_byMIME(const char *p); /* returns LATIN1 if name not recognized */ #ifdef EXP_LOCALE_CHARSET -extern void LYFindLocaleCharset(void); + extern void LYFindLocaleCharset(void); #endif -extern int UCLYhndl_for_unspec; -extern int UCLYhndl_for_unrec; -extern int UCLYhndl_HTFile_for_unspec; -extern int UCLYhndl_HTFile_for_unrec; + extern int UCLYhndl_for_unspec; + extern int UCLYhndl_for_unrec; + extern int UCLYhndl_HTFile_for_unspec; + extern int UCLYhndl_HTFile_for_unrec; /* easy to type: */ -extern int LATIN1; /* UCGetLYhndl_byMIME("iso-8859-1") */ -extern int US_ASCII; /* UCGetLYhndl_byMIME("us-ascii") */ -extern int UTF8_handle; /* UCGetLYhndl_byMIME("utf-8") */ + extern int LATIN1; /* UCGetLYhndl_byMIME("iso-8859-1") */ + extern int US_ASCII; /* UCGetLYhndl_byMIME("us-ascii") */ + extern int UTF8_handle; /* UCGetLYhndl_byMIME("utf-8") */ #undef TRANSPARENT /* defined on Solaris in <sys/stream.h> */ -extern int TRANSPARENT; /* UCGetLYhndl_byMIME("x-transparent") */ + extern int TRANSPARENT; /* UCGetLYhndl_byMIME("x-transparent") */ /* In general, Lynx translates letters from document charset to display charset. @@ -79,4 +82,7 @@ those unrecognized MIME names are assumed as LATIN1 (via safeUCGetLYhndl...). #define UCTRANS_NOTFOUND (-4) -#endif /* UCMAP_H */ +#ifdef __cplusplus +} +#endif +#endif /* UCMAP_H */ diff --git a/WWW/Library/Implementation/makefile.in b/WWW/Library/Implementation/makefile.in index ad4d99d8..37e0b4d3 100644 --- a/WWW/Library/Implementation/makefile.in +++ b/WWW/Library/Implementation/makefile.in @@ -176,6 +176,9 @@ clean : rm -f core *.core *.leaks *.[oi] *.bak tags TAGS rm -f $(LOB)/*$o +tags: + ctags *.[ch] + # Common code # ----------- diff --git a/WWW/Library/Implementation/www_tcp.h b/WWW/Library/Implementation/www_tcp.h index 25a48776..bf99ce76 100644 --- a/WWW/Library/Implementation/www_tcp.h +++ b/WWW/Library/Implementation/www_tcp.h @@ -696,6 +696,8 @@ typedef unsigned short mode_t; #define DECL_SYS_ERRLIST 1 #endif +#define socklen_t int /* used for default LY_SOCKLEN definition */ + #endif /* !HAVE_CONFIG_H */ #ifdef HAVE_LIBINTL_H diff --git a/aclocal.m4 b/aclocal.m4 index 8ec5d7d5..aae0dfdd 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -4,7 +4,7 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us> dnl and Philippe De Muyter <phdm@macqel.be> dnl dnl Created: 1997/1/28 -dnl Updated: 2004/10/17 +dnl Updated: 2005/1/1 dnl dnl The autoconf used in Lynx development is GNU autoconf 2.13 or 2.52, patched dnl by Tom Dickey. See your local GNU archives, and this URL: @@ -866,7 +866,7 @@ if test "$cf_cv_bool_defs" = no ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BUILD_CC version: 3 updated: 2004/02/17 20:55:59 +dnl CF_BUILD_CC version: 4 updated: 2004/11/27 16:03:59 dnl ----------- dnl If we're cross-compiling, allow the user to override the tools and their dnl options. The configure script is oriented toward identifying the host @@ -910,6 +910,12 @@ if test "$cross_compiling" = yes ; then # this assumes we're on Unix. BUILD_EXEEXT= BUILD_OBJEXT=o + + if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '$(CC)' ) ; then + AC_MSG_ERROR([Cross-build requires two compilers. +Use --with-build-cc to specify the native compiler.]) + fi + else : ${BUILD_CC:='$(CC)'} : ${BUILD_CPP:='$(CPP)'} @@ -1232,6 +1238,36 @@ fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_CHECK_TYPE version: 1 updated: 2005/01/01 12:49:48 +dnl ------------- +dnl Add a 3rd parameter to AC_CHECK_TYPE, working around autoconf 2.5x's +dnl deliberate incompatibility. +dnl $1 = name of type to check for +dnl $2 = default type +dnl $3 = additional #include's and related preprocessor lines. +AC_DEFUN([CF_CHECK_TYPE], +[ +ifdef([m4_version_compare],[ + AC_CHECK_TYPE([$1],ac_cv_type_$1=yes,ac_cv_type_$1=no,[$3]) + ],[ + AC_MSG_CHECKING(for $1) + AC_TRY_COMPILE([ +#if STDC_HEADERS +#include <stdlib.h> +#include <stddef.h> +#endif +$3 +],[ + static $1 dummy; if (sizeof(dummy)) return 0; else return 1;], + ac_cv_type_$1=yes, + ac_cv_type_$1=no) + AC_MSG_RESULT($ac_cv_type_$1) +])dnl +if test $ac_cv_type_$1 = no; then + AC_DEFINE($1, $2) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_COLOR_CURSES version: 6 updated: 2002/10/27 18:21:42 dnl --------------- dnl Check if curses supports color. (Note that while SVr3 curses supports @@ -1810,7 +1846,7 @@ done ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FIND_LIBRARY version: 7 updated: 2000/04/13 21:38:04 +dnl CF_FIND_LIBRARY version: 8 updated: 2004/11/23 20:14:58 dnl --------------- dnl Look for a non-standard library, given parameters for AC_TRY_LINK. We dnl prefer a standard location, and use -L options only if we do not find the @@ -1820,7 +1856,7 @@ dnl $2 = library class, usually the same as library name dnl $3 = includes dnl $4 = code fragment to compile/link dnl $5 = corresponding function-name -dnl $6 = flag, nonnull if failure causes an error-exit +dnl $6 = flag, nonnull if failure should not cause an error-exit dnl dnl Sets the variable "$cf_libdir" as a side-effect, so we can see if we had dnl to use a -L option. @@ -2177,7 +2213,7 @@ if test "$GCC" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 16 updated: 2004/07/23 14:40:34 +dnl CF_GCC_WARNINGS version: 18 updated: 2004/12/03 20:51:07 dnl --------------- dnl Check if the compiler supports useful warning options. There's a few that dnl we don't use, simply because they're too noisy: @@ -2198,8 +2234,27 @@ dnl If $with_ext_const is "yes", add a check for -Wwrite-strings dnl AC_DEFUN([CF_GCC_WARNINGS], [ +AC_REQUIRE([CF_INTEL_COMPILER]) AC_REQUIRE([CF_GCC_VERSION]) -if test "$GCC" = yes +if test "$INTEL_COMPILER" = yes +then +# The "-wdXXX" options suppress warnings: +# remark #1419: external declaration in primary source file +# remark #193: zero used for undefined preprocessing identifier +# remark #593: variable "curs_sb_left_arrow" was set but never used +# remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits +# remark #869: parameter "tw" was never referenced +# remark #981: operands are evaluated in unspecified order +# warning #269: invalid format string conversion + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall \ + -wd1419 \ + -wd193 \ + -wd279 \ + -wd593 \ + -wd810 \ + -wd869 \ + -wd981" +elif test "$GCC" = yes then cat > conftest.$ac_ext <<EOF #line __oline__ "configure" @@ -2350,7 +2405,7 @@ if test "$cf_x509_support" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNU_SOURCE version: 3 updated: 2000/10/29 23:30:53 +dnl CF_GNU_SOURCE version: 4 updated: 2004/12/03 20:43:00 dnl ------------- dnl Check if we must define _GNU_SOURCE to get a reasonable value for dnl _XOPEN_SOURCE, upon which many POSIX definitions depend. This is a defect @@ -2360,6 +2415,9 @@ dnl dnl Well, yes we could work around it... AC_DEFUN([CF_GNU_SOURCE], [ +AC_REQUIRE([CF_INTEL_COMPILER]) + +if test "$INTEL_COMPILER" = no ; then AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[ AC_TRY_COMPILE([#include <sys/types.h>],[ #ifndef _XOPEN_SOURCE @@ -2378,6 +2436,7 @@ make an error ]) ]) test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" +fi ])dnl dnl --------------------------------------------------------------------------- dnl CF_HEADER_PATH version: 8 updated: 2002/11/10 14:46:59 @@ -2462,6 +2521,40 @@ else fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_INTEL_COMPILER version: 1 updated: 2004/12/03 20:27:48 +dnl ----------------- +dnl Check if the given compiler is really the Intel compiler for Linux. +dnl It tries to imitate gcc, but does not return an error when it finds a +dnl mismatch between prototypes, e.g., as exercised by CF_MISSING_CHECK. +dnl +dnl This macro should be run "soon" after AC_PROG_CC, to ensure that it is +dnl not mistaken for gcc. +AC_DEFUN([CF_INTEL_COMPILER],[ +AC_REQUIRE([AC_PROG_CC]) + +INTEL_COMPILER=no + +if test "$GCC" = yes ; then + case $host_os in + linux*|gnu*) + AC_MSG_CHECKING(if this is really Intel compiler) + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -no-gcc" + AC_TRY_COMPILE([],[ +#ifdef __INTEL_COMPILER +#else +make an error +#endif +],[INTEL_COMPILER=yes +cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +],[]) + CFLAGS="$cf_save_CFLAGS" + AC_MSG_RESULT($INTEL_COMPILER) + ;; + esac +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_LASTLOG version: 4 updated: 2002/10/27 23:21:42 dnl ---------- dnl Check for header defining _PATH_LASTLOG, or failing that, see if the lastlog @@ -4464,7 +4557,7 @@ AC_TRY_LINK([ test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 14 updated: 2004/10/17 10:43:13 +dnl CF_XOPEN_SOURCE version: 15 updated: 2004/11/23 15:41:32 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality. @@ -4489,7 +4582,7 @@ freebsd*) #(vi hpux*) #(vi CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE" ;; -irix6.*) #(vi +irix[[56]].*) #(vi CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" ;; linux*|gnu*) #(vi diff --git a/config.guess b/config.guess index 5bc2b783..82294713 100755 --- a/config.guess +++ b/config.guess @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2004-06-24' +timestamp='2004-11-12' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -53,7 +53,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -203,9 +203,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; cats:OpenBSD:*:*) echo arm-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -230,18 +227,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in mvmeppc:OpenBSD:*:*) echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} + echo mips64-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -328,6 +319,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit 0 ;; *:OS400:*:*) echo powerpc-ibm-os400 exit 0 ;; @@ -351,7 +345,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; esac ;; @@ -833,6 +827,12 @@ EOF cris:Linux:*:*) echo cris-axis-linux-gnu exit 0 ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit 0 ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -1081,7 +1081,7 @@ EOF exit 0 ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1179,9 +1179,10 @@ EOF echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - case `uname -p` in + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; @@ -1249,7 +1250,10 @@ EOF A*) echo alpha-dec-vms && exit 0 ;; I*) echo ia64-dec-vms && exit 0 ;; V*) echo vax-dec-vms && exit 0 ;; - esac + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/config.hin b/config.hin index 1e274453..34ddc231 100644 --- a/config.hin +++ b/config.hin @@ -257,6 +257,7 @@ #undef mode_t /* AC_TYPE_MODE_T */ #undef off_t /* AC_TYPE_OFF_T */ #undef pid_t /* AC_TYPE_PID_T */ +#undef socklen_t /* CF_CHECK_TYPE(socklen_t,...) */ #undef uid_t /* AC_TYPE_UID_T */ #undef ut_name /* CF_UTMP */ #undef ut_xstatus /* CF_UTMP_UT_XSTATUS */ diff --git a/config.sub b/config.sub index 4ebd8fab..0f84ac2c 100755 --- a/config.sub +++ b/config.sub @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2004-06-24' +timestamp='2004-11-30' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -70,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -267,7 +267,7 @@ case $basic_machine in | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -343,8 +343,8 @@ case $basic_machine in | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -457,6 +457,9 @@ case $basic_machine in crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; @@ -486,6 +489,10 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -1026,6 +1033,10 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1294,6 +1305,9 @@ case $os in -kaos*) os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) diff --git a/configure b/configure index 661c66a5..7ff27dc9 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in 2.8.6dev.6. +# From configure.in 2.8.6dev.9. # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20030208. # @@ -1221,7 +1221,7 @@ fi; PACKAGE=lynx # $Format: "VERSION=$ProjectVersion$"$ -VERSION=2.8.6dev.9 +VERSION=2.8.6dev.10 test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'` @@ -2431,6 +2431,15 @@ fi; # this assumes we're on Unix. BUILD_EXEEXT= BUILD_OBJEXT=o + + if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '$(CC)' ) ; then + { { echo "$as_me:2436: error: Cross-build requires two compilers. +Use --with-build-cc to specify the native compiler." >&5 +echo "$as_me: error: Cross-build requires two compilers. +Use --with-build-cc to specify the native compiler." >&2;} + { (exit 1); exit 1; }; } + fi + else : ${BUILD_CC:='$(CC)'} : ${BUILD_CPP:='$(CPP)'} @@ -2445,7 +2454,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:2448: checking for $ac_word" >&5 +echo "$as_me:2457: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2460,7 +2469,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:2463: found $ac_dir/$ac_word" >&5 +echo "$as_me:2472: found $ac_dir/$ac_word" >&5 break done @@ -2468,10 +2477,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:2471: result: $RANLIB" >&5 + echo "$as_me:2480: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:2474: result: no" >&5 + echo "$as_me:2483: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2480,7 +2489,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:2483: checking for $ac_word" >&5 +echo "$as_me:2492: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2495,7 +2504,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:2498: found $ac_dir/$ac_word" >&5 +echo "$as_me:2507: found $ac_dir/$ac_word" >&5 break done @@ -2504,10 +2513,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:2507: result: $ac_ct_RANLIB" >&5 + echo "$as_me:2516: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:2510: result: no" >&5 + echo "$as_me:2519: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2519,7 +2528,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:2522: checking for $ac_word" >&5 +echo "$as_me:2531: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2534,7 +2543,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AR="${ac_tool_prefix}ar" -echo "$as_me:2537: found $ac_dir/$ac_word" >&5 +echo "$as_me:2546: found $ac_dir/$ac_word" >&5 break done @@ -2542,10 +2551,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:2545: result: $AR" >&5 + echo "$as_me:2554: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:2548: result: no" >&5 + echo "$as_me:2557: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2554,7 +2563,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:2557: checking for $ac_word" >&5 +echo "$as_me:2566: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2569,7 +2578,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:2572: found $ac_dir/$ac_word" >&5 +echo "$as_me:2581: found $ac_dir/$ac_word" >&5 break done @@ -2578,10 +2587,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:2581: result: $ac_ct_AR" >&5 + echo "$as_me:2590: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:2584: result: no" >&5 + echo "$as_me:2593: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2594,10 +2603,10 @@ if test "${cf_cv_subst_AR_OPTS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "$as_me:2597: checking for archiver options (symbol AR_OPTS)" >&5 +echo "$as_me:2606: checking for archiver options (symbol AR_OPTS)" >&5 echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6 test -z "$AR_OPTS" && AR_OPTS=rv -echo "$as_me:2600: result: $AR_OPTS" >&5 +echo "$as_me:2609: result: $AR_OPTS" >&5 echo "${ECHO_T}$AR_OPTS" >&6 cf_cv_subst_AR_OPTS=$AR_OPTS @@ -2605,7 +2614,7 @@ fi AR_OPTS=${cf_cv_subst_AR_OPTS} -echo "$as_me:2608: checking if you want to see long compiling messages" >&5 +echo "$as_me:2617: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -2639,7 +2648,7 @@ else ECHO_CC='' fi; -echo "$as_me:2642: result: $enableval" >&5 +echo "$as_me:2651: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 # special case for WWW/* @@ -2649,7 +2658,7 @@ else DONT_ECHO_CC='' fi -echo "$as_me:2652: checking if you want to check memory-leaks" >&5 +echo "$as_me:2661: checking if you want to check memory-leaks" >&5 echo $ECHO_N "checking if you want to check memory-leaks... $ECHO_C" >&6 # Check whether --enable-find-leaks or --disable-find-leaks was given. @@ -2666,7 +2675,7 @@ else with_leak_checks=no fi; -echo "$as_me:2669: result: $with_leak_checks" >&5 +echo "$as_me:2678: result: $with_leak_checks" >&5 echo "${ECHO_T}$with_leak_checks" >&6 test "$with_leak_checks" = "yes" && cat >>confdefs.h <<\EOF #define LY_FIND_LEAKS 1 @@ -2675,7 +2684,7 @@ EOF # The comment about adding -g to $CFLAGS is unclear. Autoconf tries to add # a -g flag; we remove it if the user's $CFLAGS was not set and debugging is # disabled. -echo "$as_me:2678: checking if you want to enable debug-code" >&5 +echo "$as_me:2687: checking if you want to enable debug-code" >&5 echo $ECHO_N "checking if you want to enable debug-code... $ECHO_C" >&6 # Check whether --enable-debug or --disable-debug was given. @@ -2692,7 +2701,7 @@ else with_debug=no fi; -echo "$as_me:2695: result: $with_debug" >&5 +echo "$as_me:2704: result: $with_debug" >&5 echo "${ECHO_T}$with_debug" >&6 if test "$with_debug" = "yes" ; then case $host_os in @@ -2717,7 +2726,7 @@ else esac fi -echo "$as_me:2720: checking if you want to enable lynx trace code *recommended* " >&5 +echo "$as_me:2729: checking if you want to enable lynx trace code *recommended* " >&5 echo $ECHO_N "checking if you want to enable lynx trace code *recommended* ... $ECHO_C" >&6 # Check whether --enable-trace or --disable-trace was given. @@ -2734,13 +2743,13 @@ else with_trace=yes fi; -echo "$as_me:2737: result: $with_trace" >&5 +echo "$as_me:2746: result: $with_trace" >&5 echo "${ECHO_T}$with_trace" >&6 test $with_trace = no && cat >>confdefs.h <<\EOF #define NO_LYNX_TRACE 1 EOF -echo "$as_me:2743: checking if you want verbose trace code" >&5 +echo "$as_me:2752: checking if you want verbose trace code" >&5 echo $ECHO_N "checking if you want verbose trace code... $ECHO_C" >&6 # Check whether --enable-vertrace or --disable-vertrace was given. @@ -2757,7 +2766,7 @@ else with_vertrace=no fi; -echo "$as_me:2760: result: $with_vertrace" >&5 +echo "$as_me:2769: result: $with_vertrace" >&5 echo "${ECHO_T}$with_vertrace" >&6 test $with_vertrace = yes && cat >>confdefs.h <<\EOF #define LY_TRACELINE __LINE__ @@ -2765,7 +2774,7 @@ EOF if test -n "$GCC" then -echo "$as_me:2768: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:2777: checking if you want to turn on gcc warnings" >&5 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -2782,7 +2791,7 @@ else with_warnings=no fi; -echo "$as_me:2785: result: $with_warnings" >&5 +echo "$as_me:2794: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "$with_warnings" = "yes" then @@ -2805,10 +2814,10 @@ cat > conftest.i <<EOF EOF if test "$GCC" = yes then - { echo "$as_me:2808: checking for $CC __attribute__ directives..." >&5 + { echo "$as_me:2817: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > conftest.$ac_ext <<EOF -#line 2811 "configure" +#line 2820 "configure" #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -2846,12 +2855,12 @@ EOF EOF ;; esac - if { (eval echo "$as_me:2849: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:2858: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2852: \$? = $ac_status" >&5 + echo "$as_me:2861: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:2854: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:2863: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h fi @@ -2862,23 +2871,94 @@ fi rm -rf conftest* fi +INTEL_COMPILER=no + +if test "$GCC" = yes ; then + case $host_os in + linux*|gnu*) + echo "$as_me:2879: checking if this is really Intel compiler" >&5 +echo $ECHO_N "checking if this is really Intel compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -no-gcc" + cat >conftest.$ac_ext <<_ACEOF +#line 2884 "configure" +#include "confdefs.h" + +int +main () +{ + +#ifdef __INTEL_COMPILER +#else +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2904: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2907: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2910: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + INTEL_COMPILER=yes +cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" + echo "$as_me:2921: result: $INTEL_COMPILER" >&5 +echo "${ECHO_T}$INTEL_COMPILER" >&6 + ;; + esac +fi + GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:2867: checking version of $CC" >&5 + echo "$as_me:2929: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:2871: result: $GCC_VERSION" >&5 + echo "$as_me:2933: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi -if test "$GCC" = yes +if test "$INTEL_COMPILER" = yes +then +# The "-wdXXX" options suppress warnings: +# remark #1419: external declaration in primary source file +# remark #193: zero used for undefined preprocessing identifier +# remark #593: variable "curs_sb_left_arrow" was set but never used +# remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits +# remark #869: parameter "tw" was never referenced +# remark #981: operands are evaluated in unspecified order +# warning #269: invalid format string conversion + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall \ + -wd1419 \ + -wd193 \ + -wd279 \ + -wd593 \ + -wd810 \ + -wd869 \ + -wd981" +elif test "$GCC" = yes then cat > conftest.$ac_ext <<EOF -#line 2878 "configure" +#line 2958 "configure" int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } EOF - { echo "$as_me:2881: checking for $CC warning options..." >&5 + { echo "$as_me:2961: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" @@ -2898,12 +2978,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:2981: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2904: \$? = $ac_status" >&5 + echo "$as_me:2984: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:2906: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:2986: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -2928,7 +3008,7 @@ fi fi fi -echo "$as_me:2931: checking if you want to link with dbmalloc for testing" >&5 +echo "$as_me:3011: checking if you want to link with dbmalloc for testing" >&5 echo $ECHO_N "checking if you want to link with dbmalloc for testing... $ECHO_C" >&6 # Check whether --with-dbmalloc or --without-dbmalloc was given. @@ -2938,11 +3018,11 @@ if test "${with_dbmalloc+set}" = set; then else with_dbmalloc=no fi; -echo "$as_me:2941: result: $with_dbmalloc" >&5 +echo "$as_me:3021: result: $with_dbmalloc" >&5 echo "${ECHO_T}$with_dbmalloc" >&6 if test $with_dbmalloc = yes ; then -echo "$as_me:2945: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:3025: checking for debug_malloc in -ldbmalloc" >&5 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2950,7 +3030,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2953 "configure" +#line 3033 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2969,16 +3049,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2972: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3052: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2975: \$? = $ac_status" >&5 + echo "$as_me:3055: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2978: \"$ac_try\"") >&5 + { (eval echo "$as_me:3058: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2981: \$? = $ac_status" >&5 + echo "$as_me:3061: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -2989,7 +3069,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:2992: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:3072: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then cat >>confdefs.h <<EOF @@ -3002,7 +3082,7 @@ fi fi -echo "$as_me:3005: checking if you want to link with dmalloc for testing" >&5 +echo "$as_me:3085: checking if you want to link with dmalloc for testing" >&5 echo $ECHO_N "checking if you want to link with dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. @@ -3012,11 +3092,11 @@ if test "${with_dmalloc+set}" = set; then else with_dmalloc=no fi; -echo "$as_me:3015: result: $with_dmalloc" >&5 +echo "$as_me:3095: result: $with_dmalloc" >&5 echo "${ECHO_T}$with_dmalloc" >&6 if test $with_dmalloc = yes ; then -echo "$as_me:3019: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:3099: checking for dmalloc_debug in -ldmalloc" >&5 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3024,7 +3104,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3027 "configure" +#line 3107 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3043,16 +3123,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3046: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3126: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3049: \$? = $ac_status" >&5 + echo "$as_me:3129: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3052: \"$ac_try\"") >&5 + { (eval echo "$as_me:3132: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3055: \$? = $ac_status" >&5 + echo "$as_me:3135: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -3063,7 +3143,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3066: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:3146: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then cat >>confdefs.h <<EOF @@ -3080,7 +3160,7 @@ cat >>confdefs.h <<\EOF #define UNIX 1 EOF -echo "$as_me:3083: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:3163: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3088,7 +3168,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 3091 "configure" +#line 3171 "configure" #include "confdefs.h" #include <stdarg.h> #include <stdio.h> @@ -3137,16 +3217,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:3140: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3220: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3143: \$? = $ac_status" >&5 + echo "$as_me:3223: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3146: \"$ac_try\"") >&5 + { (eval echo "$as_me:3226: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3149: \$? = $ac_status" >&5 + echo "$as_me:3229: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -3163,21 +3243,21 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:3166: result: none needed" >&5 + echo "$as_me:3246: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:3169: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:3249: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac -echo "$as_me:3174: checking for an ANSI C-conforming const" >&5 +echo "$as_me:3254: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3180 "configure" +#line 3260 "configure" #include "confdefs.h" int @@ -3235,16 +3315,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3238: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3318: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3241: \$? = $ac_status" >&5 + echo "$as_me:3321: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3244: \"$ac_try\"") >&5 + { (eval echo "$as_me:3324: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3247: \$? = $ac_status" >&5 + echo "$as_me:3327: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -3254,7 +3334,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3257: result: $ac_cv_c_const" >&5 +echo "$as_me:3337: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -3302,7 +3382,7 @@ clix*) # contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also # references -lmalloc and -lbsd. -echo "$as_me:3305: checking for strcmp in -lc_s" >&5 +echo "$as_me:3385: checking for strcmp in -lc_s" >&5 echo $ECHO_N "checking for strcmp in -lc_s... $ECHO_C" >&6 if test "${ac_cv_lib_c_s_strcmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3310,7 +3390,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lc_s $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3313 "configure" +#line 3393 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3329,16 +3409,16 @@ strcmp (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3332: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3412: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3335: \$? = $ac_status" >&5 + echo "$as_me:3415: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3338: \"$ac_try\"") >&5 + { (eval echo "$as_me:3418: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3341: \$? = $ac_status" >&5 + echo "$as_me:3421: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_c_s_strcmp=yes else @@ -3349,7 +3429,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3352: result: $ac_cv_lib_c_s_strcmp" >&5 +echo "$as_me:3432: result: $ac_cv_lib_c_s_strcmp" >&5 echo "${ECHO_T}$ac_cv_lib_c_s_strcmp" >&6 if test $ac_cv_lib_c_s_strcmp = yes; then cat >>confdefs.h <<EOF @@ -3373,13 +3453,16 @@ dgux*) ;; hpux*) TRY_CFLAGS="$TRY_CFLAGS -DSNAKE" - test -z "$GCC" && TRY_CFLAGS="$TRY_CFLAGS -Wp,-H600000" + test -z "$GCC" && TRY_CFLAGS="$TRY_CFLAGS -Wp,-H600000 -DSYS_HPUX" ;; isc*) # -DPOSIX_JC is necessary, else LYBookmark.c never finds out what a mode_t is. TRY_CFLAGS="$TRY_CFLAGS -DISC -DPOSIX_JC" LIBS="$LIBS -linet -lnsl_s -lcposix" ;; +irix6.*) #(vi + TRY_CFLAGS="$TRY_CFLAGS -DSYS_IRIX64" + ;; irix*) # The original makefile used the $CFLAGS option -cckr for some form # of K&R compatibility. However, this causes compilation warnings for @@ -3401,12 +3484,12 @@ openbsd* | ekkobsd* | mirbsd*) osf4*) # The -Olimit flag (see below) is no longer available with # Digital C 5.2, which is bundled with Digital UNIX 4.0. - TRY_CFLAGS="$TRY_CFLAGS -DDSYS5" + TRY_CFLAGS="$TRY_CFLAGS -DDSYS5 -DSYS_TRU64" ;; osf*) # Increase the maximum size of functions that will be optimized. test -z "$GCC" && TRY_CFLAGS="$TRY_CFLAGS -O -Olimit 4000" - TRY_CFLAGS="$TRY_CFLAGS -DDSYS5" + TRY_CFLAGS="$TRY_CFLAGS -DDSYS5 -DSYS_TRU64" ;; sco3.2v5*) test $ac_cv_c_compiler_gnu != yes && TRY_CFLAGS="$TRY_CFLAGS -belf" @@ -3417,14 +3500,14 @@ sco*) # SCO's cc (which is reported to have broken const/volatile). case "$CC" in #(vi cc|*/cc) - { echo "$as_me:3420: WARNING: You should consider using gcc or rcc if available" >&5 + { echo "$as_me:3503: WARNING: You should consider using gcc or rcc if available" >&5 echo "$as_me: WARNING: You should consider using gcc or rcc if available" >&2;} unset ac_cv_prog_CC for ac_prog in gcc rcc 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 "$as_me:3427: checking for $ac_word" >&5 +echo "$as_me:3510: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3439,7 +3522,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_prog" -echo "$as_me:3442: found $ac_dir/$ac_word" >&5 +echo "$as_me:3525: found $ac_dir/$ac_word" >&5 break done @@ -3447,10 +3530,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:3450: result: $CC" >&5 + echo "$as_me:3533: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:3453: result: no" >&5 + echo "$as_me:3536: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3473,23 +3556,23 @@ sony-newsos*) for ac_header in jcurses.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3476: checking for $ac_header" >&5 +echo "$as_me:3559: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3482 "configure" +#line 3565 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3486: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3569: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3492: \$? = $ac_status" >&5 + echo "$as_me:3575: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3508,7 +3591,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:3511: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:3594: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -3536,23 +3619,23 @@ ultrix*) for ac_header in cursesX.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3539: checking for $ac_header" >&5 +echo "$as_me:3622: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3545 "configure" +#line 3628 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3549: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3632: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3555: \$? = $ac_status" >&5 + echo "$as_me:3638: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3571,7 +3654,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:3574: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:3657: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -3588,7 +3671,7 @@ done ;; esac -echo "$as_me:3591: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "$as_me:3674: checking for ${CC-cc} option to accept ANSI C" >&5 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6 if test "${cf_cv_ansi_cc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3682,7 +3765,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >conftest.$ac_ext <<_ACEOF -#line 3685 "configure" +#line 3768 "configure" #include "confdefs.h" #ifndef CC_HAS_PROTOS @@ -3703,16 +3786,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3706: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3789: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3709: \$? = $ac_status" >&5 + echo "$as_me:3792: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3712: \"$ac_try\"") >&5 + { (eval echo "$as_me:3795: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3715: \$? = $ac_status" >&5 + echo "$as_me:3798: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ansi_cc="$cf_arg"; break else @@ -3725,7 +3808,7 @@ CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" fi -echo "$as_me:3728: result: $cf_cv_ansi_cc" >&5 +echo "$as_me:3811: result: $cf_cv_ansi_cc" >&5 echo "${ECHO_T}$cf_cv_ansi_cc" >&6 if test "$cf_cv_ansi_cc" != "no"; then @@ -3808,7 +3891,7 @@ fi fi if test "$cf_cv_ansi_cc" = "no"; then - { { echo "$as_me:3811: error: Your compiler does not appear to recognize prototypes. + { { echo "$as_me:3894: error: Your compiler does not appear to recognize prototypes. You have the following choices: a. adjust your compiler options b. get an up-to-date compiler @@ -3824,7 +3907,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:3827: checking for $ac_word" >&5 +echo "$as_me:3910: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3839,7 +3922,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:3842: found $ac_dir/$ac_word" >&5 +echo "$as_me:3925: found $ac_dir/$ac_word" >&5 break done @@ -3847,10 +3930,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3850: result: $RANLIB" >&5 + echo "$as_me:3933: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3853: result: no" >&5 + echo "$as_me:3936: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3859,7 +3942,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:3862: checking for $ac_word" >&5 +echo "$as_me:3945: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3874,7 +3957,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:3877: found $ac_dir/$ac_word" >&5 +echo "$as_me:3960: found $ac_dir/$ac_word" >&5 break done @@ -3883,10 +3966,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:3886: result: $ac_ct_RANLIB" >&5 + echo "$as_me:3969: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:3889: result: no" >&5 + echo "$as_me:3972: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3895,13 +3978,13 @@ else RANLIB="$ac_cv_prog_RANLIB" fi -echo "$as_me:3898: checking for ANSI C header files" >&5 +echo "$as_me:3981: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3904 "configure" +#line 3987 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -3909,13 +3992,13 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:3912: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3995: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3918: \$? = $ac_status" >&5 + echo "$as_me:4001: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3937,7 +4020,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 3940 "configure" +#line 4023 "configure" #include "confdefs.h" #include <string.h> @@ -3955,7 +4038,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 <<_ACEOF -#line 3958 "configure" +#line 4041 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3976,7 +4059,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 3979 "configure" +#line 4062 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -4002,15 +4085,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4005: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4088: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4008: \$? = $ac_status" >&5 + echo "$as_me:4091: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4010: \"$ac_try\"") >&5 + { (eval echo "$as_me:4093: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4013: \$? = $ac_status" >&5 + echo "$as_me:4096: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -4023,7 +4106,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:4026: result: $ac_cv_header_stdc" >&5 +echo "$as_me:4109: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -4033,7 +4116,7 @@ EOF fi -echo "$as_me:4036: checking for inline" >&5 +echo "$as_me:4119: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4041,7 +4124,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 4044 "configure" +#line 4127 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -4050,16 +4133,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4053: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4136: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4056: \$? = $ac_status" >&5 + echo "$as_me:4139: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4059: \"$ac_try\"") >&5 + { (eval echo "$as_me:4142: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4062: \$? = $ac_status" >&5 + echo "$as_me:4145: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -4070,7 +4153,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:4073: result: $ac_cv_c_inline" >&5 +echo "$as_me:4156: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -4091,28 +4174,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4094: checking for $ac_header" >&5 +echo "$as_me:4177: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4100 "configure" +#line 4183 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4106: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4189: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4109: \$? = $ac_status" >&5 + echo "$as_me:4192: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4112: \"$ac_try\"") >&5 + { (eval echo "$as_me:4195: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4115: \$? = $ac_status" >&5 + echo "$as_me:4198: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -4122,7 +4205,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4125: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4208: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -4132,13 +4215,13 @@ EOF fi done -echo "$as_me:4135: checking for off_t" >&5 +echo "$as_me:4218: checking for off_t" >&5 echo $ECHO_N "checking for off_t... $ECHO_C" >&6 if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4141 "configure" +#line 4224 "configure" #include "confdefs.h" $ac_includes_default int @@ -4153,16 +4236,16 @@ if (sizeof (off_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4156: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4239: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4159: \$? = $ac_status" >&5 + echo "$as_me:4242: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4162: \"$ac_try\"") >&5 + { (eval echo "$as_me:4245: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4165: \$? = $ac_status" >&5 + echo "$as_me:4248: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_off_t=yes else @@ -4172,7 +4255,7 @@ ac_cv_type_off_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4175: result: $ac_cv_type_off_t" >&5 +echo "$as_me:4258: result: $ac_cv_type_off_t" >&5 echo "${ECHO_T}$ac_cv_type_off_t" >&6 if test $ac_cv_type_off_t = yes; then : @@ -4184,13 +4267,13 @@ EOF fi -echo "$as_me:4187: checking for size_t" >&5 +echo "$as_me:4270: checking for size_t" >&5 echo $ECHO_N "checking for size_t... $ECHO_C" >&6 if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4193 "configure" +#line 4276 "configure" #include "confdefs.h" $ac_includes_default int @@ -4205,16 +4288,16 @@ if (sizeof (size_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4208: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4291: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4211: \$? = $ac_status" >&5 + echo "$as_me:4294: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4214: \"$ac_try\"") >&5 + { (eval echo "$as_me:4297: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4217: \$? = $ac_status" >&5 + echo "$as_me:4300: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_size_t=yes else @@ -4224,7 +4307,7 @@ ac_cv_type_size_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4227: result: $ac_cv_type_size_t" >&5 +echo "$as_me:4310: result: $ac_cv_type_size_t" >&5 echo "${ECHO_T}$ac_cv_type_size_t" >&6 if test $ac_cv_type_size_t = yes; then : @@ -4238,13 +4321,13 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo "$as_me:4241: checking for working alloca.h" >&5 +echo "$as_me:4324: checking for working alloca.h" >&5 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 if test "${ac_cv_working_alloca_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4247 "configure" +#line 4330 "configure" #include "confdefs.h" #include <alloca.h> int @@ -4256,16 +4339,16 @@ char *p = (char *) alloca (2 * sizeof (int)); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4259: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4342: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4262: \$? = $ac_status" >&5 + echo "$as_me:4345: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4265: \"$ac_try\"") >&5 + { (eval echo "$as_me:4348: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4268: \$? = $ac_status" >&5 + echo "$as_me:4351: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_working_alloca_h=yes else @@ -4275,7 +4358,7 @@ ac_cv_working_alloca_h=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4278: result: $ac_cv_working_alloca_h" >&5 +echo "$as_me:4361: result: $ac_cv_working_alloca_h" >&5 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 if test $ac_cv_working_alloca_h = yes; then @@ -4285,13 +4368,13 @@ EOF fi -echo "$as_me:4288: checking for alloca" >&5 +echo "$as_me:4371: checking for alloca" >&5 echo $ECHO_N "checking for alloca... $ECHO_C" >&6 if test "${ac_cv_func_alloca_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4294 "configure" +#line 4377 "configure" #include "confdefs.h" #ifdef __GNUC__ # define alloca __builtin_alloca @@ -4323,16 +4406,16 @@ char *p = (char *) alloca (1); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4326: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4409: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4329: \$? = $ac_status" >&5 + echo "$as_me:4412: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4332: \"$ac_try\"") >&5 + { (eval echo "$as_me:4415: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4335: \$? = $ac_status" >&5 + echo "$as_me:4418: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_alloca_works=yes else @@ -4342,7 +4425,7 @@ ac_cv_func_alloca_works=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4345: result: $ac_cv_func_alloca_works" >&5 +echo "$as_me:4428: result: $ac_cv_func_alloca_works" >&5 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 if test $ac_cv_func_alloca_works = yes; then @@ -4363,13 +4446,13 @@ cat >>confdefs.h <<\EOF #define C_ALLOCA 1 EOF -echo "$as_me:4366: checking whether \`alloca.c' needs Cray hooks" >&5 +echo "$as_me:4449: checking whether \`alloca.c' needs Cray hooks" >&5 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 if test "${ac_cv_os_cray+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4372 "configure" +#line 4455 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -4387,18 +4470,18 @@ fi rm -f conftest* fi -echo "$as_me:4390: result: $ac_cv_os_cray" >&5 +echo "$as_me:4473: result: $ac_cv_os_cray" >&5 echo "${ECHO_T}$ac_cv_os_cray" >&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:4395: checking for $ac_func" >&5 +echo "$as_me:4478: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4401 "configure" +#line 4484 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -4429,16 +4512,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4432: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4515: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4435: \$? = $ac_status" >&5 + echo "$as_me:4518: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4438: \"$ac_try\"") >&5 + { (eval echo "$as_me:4521: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4441: \$? = $ac_status" >&5 + echo "$as_me:4524: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -4448,7 +4531,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4451: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:4534: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then @@ -4462,7 +4545,7 @@ fi done fi -echo "$as_me:4465: checking stack direction for C alloca" >&5 +echo "$as_me:4548: checking stack direction for C alloca" >&5 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 if test "${ac_cv_c_stack_direction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4471,7 +4554,7 @@ else ac_cv_c_stack_direction=0 else cat >conftest.$ac_ext <<_ACEOF -#line 4474 "configure" +#line 4557 "configure" #include "confdefs.h" int find_stack_direction () @@ -4494,15 +4577,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4497: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4580: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4500: \$? = $ac_status" >&5 + echo "$as_me:4583: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4502: \"$ac_try\"") >&5 + { (eval echo "$as_me:4585: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4505: \$? = $ac_status" >&5 + echo "$as_me:4588: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_stack_direction=1 else @@ -4514,7 +4597,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:4517: result: $ac_cv_c_stack_direction" >&5 +echo "$as_me:4600: result: $ac_cv_c_stack_direction" >&5 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 cat >>confdefs.h <<EOF @@ -4526,23 +4609,23 @@ fi for ac_header in stdlib.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4529: checking for $ac_header" >&5 +echo "$as_me:4612: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4535 "configure" +#line 4618 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4539: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4622: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:4545: \$? = $ac_status" >&5 + echo "$as_me:4628: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4561,7 +4644,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4564: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4647: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -4574,13 +4657,13 @@ done for ac_func in getpagesize do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:4577: checking for $ac_func" >&5 +echo "$as_me:4660: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4583 "configure" +#line 4666 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -4611,16 +4694,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4614: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4697: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4617: \$? = $ac_status" >&5 + echo "$as_me:4700: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4620: \"$ac_try\"") >&5 + { (eval echo "$as_me:4703: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4623: \$? = $ac_status" >&5 + echo "$as_me:4706: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -4630,7 +4713,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4633: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:4716: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -4640,7 +4723,7 @@ EOF fi done -echo "$as_me:4643: checking for working mmap" >&5 +echo "$as_me:4726: checking for working mmap" >&5 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4649,7 +4732,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat >conftest.$ac_ext <<_ACEOF -#line 4652 "configure" +#line 4735 "configure" #include "confdefs.h" $ac_includes_default /* Thanks to Mike Haertel and Jim Avera for this test. @@ -4776,15 +4859,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4779: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4862: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4782: \$? = $ac_status" >&5 + echo "$as_me:4865: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4784: \"$ac_try\"") >&5 + { (eval echo "$as_me:4867: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4787: \$? = $ac_status" >&5 + echo "$as_me:4870: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mmap_fixed_mapped=yes else @@ -4796,7 +4879,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:4799: result: $ac_cv_func_mmap_fixed_mapped" >&5 +echo "$as_me:4882: result: $ac_cv_func_mmap_fixed_mapped" >&5 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 if test $ac_cv_func_mmap_fixed_mapped = yes; then @@ -4807,13 +4890,13 @@ EOF fi rm -f conftest.mmap - echo "$as_me:4810: checking whether we are using the GNU C Library 2.1 or newer" >&5 + echo "$as_me:4893: checking whether we are using the GNU C Library 2.1 or newer" >&5 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6 if test "${ac_cv_gnu_library_2_1+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4816 "configure" +#line 4899 "configure" #include "confdefs.h" #include <features.h> @@ -4833,7 +4916,7 @@ fi rm -f conftest* fi -echo "$as_me:4836: result: $ac_cv_gnu_library_2_1" >&5 +echo "$as_me:4919: result: $ac_cv_gnu_library_2_1" >&5 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6 GLIBC21="$ac_cv_gnu_library_2_1" @@ -4862,23 +4945,23 @@ for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4865: checking for $ac_header" >&5 +echo "$as_me:4948: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4871 "configure" +#line 4954 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4875: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4958: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:4881: \$? = $ac_status" >&5 + echo "$as_me:4964: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4897,7 +4980,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4900: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4983: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -4912,13 +4995,13 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ strdup strtoul tsearch __argz_count __argz_stringify __argz_next do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:4915: checking for $ac_func" >&5 +echo "$as_me:4998: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4921 "configure" +#line 5004 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -4949,16 +5032,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4952: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5035: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4955: \$? = $ac_status" >&5 + echo "$as_me:5038: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4958: \"$ac_try\"") >&5 + { (eval echo "$as_me:5041: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4961: \$? = $ac_status" >&5 + echo "$as_me:5044: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -4968,7 +5051,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4971: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5054: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -4989,7 +5072,7 @@ if test "${with_libiconv_prefix+set}" = set; then fi; - echo "$as_me:4992: checking for iconv" >&5 + echo "$as_me:5075: checking for iconv" >&5 echo $ECHO_N "checking for iconv... $ECHO_C" >&6 if test "${am_cv_func_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4998,7 +5081,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat >conftest.$ac_ext <<_ACEOF -#line 5001 "configure" +#line 5084 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -5013,16 +5096,16 @@ iconv_t cd = iconv_open("",""); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5016: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5099: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5019: \$? = $ac_status" >&5 + echo "$as_me:5102: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5022: \"$ac_try\"") >&5 + { (eval echo "$as_me:5105: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5025: \$? = $ac_status" >&5 + echo "$as_me:5108: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_func_iconv=yes else @@ -5034,7 +5117,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat >conftest.$ac_ext <<_ACEOF -#line 5037 "configure" +#line 5120 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -5049,16 +5132,16 @@ iconv_t cd = iconv_open("",""); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5052: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5135: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5055: \$? = $ac_status" >&5 + echo "$as_me:5138: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5058: \"$ac_try\"") >&5 + { (eval echo "$as_me:5141: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5061: \$? = $ac_status" >&5 + echo "$as_me:5144: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -5071,7 +5154,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi fi -echo "$as_me:5074: result: $am_cv_func_iconv" >&5 +echo "$as_me:5157: result: $am_cv_func_iconv" >&5 echo "${ECHO_T}$am_cv_func_iconv" >&6 if test "$am_cv_func_iconv" = yes; then @@ -5079,14 +5162,14 @@ cat >>confdefs.h <<\EOF #define HAVE_ICONV 1 EOF - echo "$as_me:5082: checking for iconv declaration" >&5 + echo "$as_me:5165: checking for iconv declaration" >&5 echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6 if test "${am_cv_proto_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5089 "configure" +#line 5172 "configure" #include "confdefs.h" #include <stdlib.h> @@ -5110,16 +5193,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5113: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5196: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5116: \$? = $ac_status" >&5 + echo "$as_me:5199: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5119: \"$ac_try\"") >&5 + { (eval echo "$as_me:5202: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5122: \$? = $ac_status" >&5 + echo "$as_me:5205: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_proto_iconv_arg1="" else @@ -5132,7 +5215,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - echo "$as_me:5135: result: ${ac_t:- + echo "$as_me:5218: result: ${ac_t:- }$am_cv_proto_iconv" >&5 echo "${ECHO_T}${ac_t:- }$am_cv_proto_iconv" >&6 @@ -5147,13 +5230,13 @@ EOF LIBICONV="-liconv" fi - echo "$as_me:5150: checking for nl_langinfo and CODESET" >&5 + echo "$as_me:5233: checking for nl_langinfo and CODESET" >&5 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5156 "configure" +#line 5239 "configure" #include "confdefs.h" #include <langinfo.h> int @@ -5165,16 +5248,16 @@ char* cs = nl_langinfo(CODESET); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5168: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5251: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5171: \$? = $ac_status" >&5 + echo "$as_me:5254: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5174: \"$ac_try\"") >&5 + { (eval echo "$as_me:5257: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5177: \$? = $ac_status" >&5 + echo "$as_me:5260: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else @@ -5185,7 +5268,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5188: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:5271: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then @@ -5196,13 +5279,13 @@ EOF fi if test $ac_cv_header_locale_h = yes; then - echo "$as_me:5199: checking for LC_MESSAGES" >&5 + echo "$as_me:5282: checking for LC_MESSAGES" >&5 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 if test "${am_cv_val_LC_MESSAGES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5205 "configure" +#line 5288 "configure" #include "confdefs.h" #include <locale.h> int @@ -5214,16 +5297,16 @@ return LC_MESSAGES } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5217: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5300: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5220: \$? = $ac_status" >&5 + echo "$as_me:5303: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5223: \"$ac_try\"") >&5 + { (eval echo "$as_me:5306: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5226: \$? = $ac_status" >&5 + echo "$as_me:5309: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_val_LC_MESSAGES=yes else @@ -5233,7 +5316,7 @@ am_cv_val_LC_MESSAGES=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5236: result: $am_cv_val_LC_MESSAGES" >&5 +echo "$as_me:5319: result: $am_cv_val_LC_MESSAGES" >&5 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 if test $am_cv_val_LC_MESSAGES = yes; then @@ -5243,7 +5326,7 @@ EOF fi fi - echo "$as_me:5246: checking whether NLS is requested" >&5 + echo "$as_me:5329: checking whether NLS is requested" >&5 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 # Check whether --enable-nls or --disable-nls was given. @@ -5253,7 +5336,7 @@ if test "${enable_nls+set}" = set; then else USE_NLS=no fi; - echo "$as_me:5256: result: $USE_NLS" >&5 + echo "$as_me:5339: result: $USE_NLS" >&5 echo "${ECHO_T}$USE_NLS" >&6 BUILD_INCLUDED_LIBINTL=no @@ -5266,7 +5349,7 @@ cat >>confdefs.h <<\EOF #define ENABLE_NLS 1 EOF - echo "$as_me:5269: checking whether included gettext is requested" >&5 + echo "$as_me:5352: checking whether included gettext is requested" >&5 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 # Check whether --with-included-gettext or --without-included-gettext was given. @@ -5276,30 +5359,30 @@ if test "${with_included_gettext+set}" = set; then else nls_cv_force_use_gnu_gettext=no fi; - echo "$as_me:5279: result: $nls_cv_force_use_gnu_gettext" >&5 + echo "$as_me:5362: result: $nls_cv_force_use_gnu_gettext" >&5 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then CATOBJEXT=NONE - echo "$as_me:5286: checking for libintl.h" >&5 + echo "$as_me:5369: checking for libintl.h" >&5 echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 if test "${ac_cv_header_libintl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5292 "configure" +#line 5375 "configure" #include "confdefs.h" #include <libintl.h> _ACEOF -if { (eval echo "$as_me:5296: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5379: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5302: \$? = $ac_status" >&5 + echo "$as_me:5385: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5318,16 +5401,16 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5321: result: $ac_cv_header_libintl_h" >&5 +echo "$as_me:5404: result: $ac_cv_header_libintl_h" >&5 echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 if test $ac_cv_header_libintl_h = yes; then - echo "$as_me:5324: checking for GNU gettext in libc" >&5 + echo "$as_me:5407: checking for GNU gettext in libc" >&5 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 if test "${gt_cv_func_gnugettext1_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5330 "configure" +#line 5413 "configure" #include "confdefs.h" #include <libintl.h> extern int _nl_msg_cat_cntr; @@ -5341,16 +5424,16 @@ return (int) gettext ("") + _nl_msg_cat_cntr } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5344: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5427: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5347: \$? = $ac_status" >&5 + echo "$as_me:5430: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5350: \"$ac_try\"") >&5 + { (eval echo "$as_me:5433: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5353: \$? = $ac_status" >&5 + echo "$as_me:5436: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_func_gnugettext1_libc=yes else @@ -5360,11 +5443,11 @@ gt_cv_func_gnugettext1_libc=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5363: result: $gt_cv_func_gnugettext1_libc" >&5 +echo "$as_me:5446: result: $gt_cv_func_gnugettext1_libc" >&5 echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6 if test "$gt_cv_func_gnugettext1_libc" != "yes"; then - echo "$as_me:5367: checking for GNU gettext in libintl" >&5 + echo "$as_me:5450: checking for GNU gettext in libintl" >&5 echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6 if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5372,7 +5455,7 @@ else gt_save_LIBS="$LIBS" LIBS="$LIBS -lintl $LIBICONV" cat >conftest.$ac_ext <<_ACEOF -#line 5375 "configure" +#line 5458 "configure" #include "confdefs.h" #include <libintl.h> extern int _nl_msg_cat_cntr; @@ -5386,16 +5469,16 @@ return (int) gettext ("") + _nl_msg_cat_cntr } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5389: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5472: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5392: \$? = $ac_status" >&5 + echo "$as_me:5475: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5395: \"$ac_try\"") >&5 + { (eval echo "$as_me:5478: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5398: \$? = $ac_status" >&5 + echo "$as_me:5481: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_func_gnugettext1_libintl=yes else @@ -5406,7 +5489,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$gt_save_LIBS" fi -echo "$as_me:5409: result: $gt_cv_func_gnugettext1_libintl" >&5 +echo "$as_me:5492: result: $gt_cv_func_gnugettext1_libintl" >&5 echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 fi @@ -5428,13 +5511,13 @@ EOF for ac_func in dcgettext do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5431: checking for $ac_func" >&5 +echo "$as_me:5514: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5437 "configure" +#line 5520 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5465,16 +5548,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5468: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5551: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5471: \$? = $ac_status" >&5 + echo "$as_me:5554: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5474: \"$ac_try\"") >&5 + { (eval echo "$as_me:5557: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5477: \$? = $ac_status" >&5 + echo "$as_me:5560: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5484,7 +5567,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5487: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5570: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -5499,7 +5582,7 @@ done # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -echo "$as_me:5502: checking for $ac_word" >&5 +echo "$as_me:5585: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5526,16 +5609,16 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then - echo "$as_me:5529: result: $MSGFMT" >&5 + echo "$as_me:5612: result: $MSGFMT" >&5 echo "${ECHO_T}$MSGFMT" >&6 else - echo "$as_me:5532: result: no" >&5 + echo "$as_me:5615: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -echo "$as_me:5538: checking for $ac_word" >&5 +echo "$as_me:5621: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5552,7 +5635,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_GMSGFMT="$ac_dir/$ac_word" - echo "$as_me:5555: found $ac_dir/$ac_word" >&5 + echo "$as_me:5638: found $ac_dir/$ac_word" >&5 break fi done @@ -5564,17 +5647,17 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - echo "$as_me:5567: result: $GMSGFMT" >&5 + echo "$as_me:5650: result: $GMSGFMT" >&5 echo "${ECHO_T}$GMSGFMT" >&6 else - echo "$as_me:5570: result: no" >&5 + echo "$as_me:5653: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -echo "$as_me:5577: checking for $ac_word" >&5 +echo "$as_me:5660: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5601,10 +5684,10 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - echo "$as_me:5604: result: $XGETTEXT" >&5 + echo "$as_me:5687: result: $XGETTEXT" >&5 echo "${ECHO_T}$XGETTEXT" >&6 else - echo "$as_me:5607: result: no" >&5 + echo "$as_me:5690: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5620,7 +5703,7 @@ fi if test "$nls_cv_use_gnu_gettext" = "yes"; then if test ! -d $srcdir/intl ; then - { { echo "$as_me:5623: error: no NLS library is packaged with this application" >&5 + { { echo "$as_me:5706: error: no NLS library is packaged with this application" >&5 echo "$as_me: error: no NLS library is packaged with this application" >&2;} { (exit 1); exit 1; }; } fi @@ -5628,7 +5711,7 @@ echo "$as_me: error: no NLS library is packaged with this application" >&2;} # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -echo "$as_me:5631: checking for $ac_word" >&5 +echo "$as_me:5714: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5655,16 +5738,16 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then - echo "$as_me:5658: result: $MSGFMT" >&5 + echo "$as_me:5741: result: $MSGFMT" >&5 echo "${ECHO_T}$MSGFMT" >&6 else - echo "$as_me:5661: result: no" >&5 + echo "$as_me:5744: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -echo "$as_me:5667: checking for $ac_word" >&5 +echo "$as_me:5750: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5681,7 +5764,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_GMSGFMT="$ac_dir/$ac_word" - echo "$as_me:5684: found $ac_dir/$ac_word" >&5 + echo "$as_me:5767: found $ac_dir/$ac_word" >&5 break fi done @@ -5693,17 +5776,17 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - echo "$as_me:5696: result: $GMSGFMT" >&5 + echo "$as_me:5779: result: $GMSGFMT" >&5 echo "${ECHO_T}$GMSGFMT" >&6 else - echo "$as_me:5699: result: no" >&5 + echo "$as_me:5782: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -echo "$as_me:5706: checking for $ac_word" >&5 +echo "$as_me:5789: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5730,10 +5813,10 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - echo "$as_me:5733: result: $XGETTEXT" >&5 + echo "$as_me:5816: result: $XGETTEXT" >&5 echo "${ECHO_T}$XGETTEXT" >&6 else - echo "$as_me:5736: result: no" >&5 + echo "$as_me:5819: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5748,7 +5831,7 @@ fi if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then : ; else - echo "$as_me:5751: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 + echo "$as_me:5834: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6 GMSGFMT=":" fi @@ -5758,7 +5841,7 @@ echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6 if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then : ; else - echo "$as_me:5761: result: found xgettext program is not GNU xgettext; ignore it" >&5 + echo "$as_me:5844: result: found xgettext program is not GNU xgettext; ignore it" >&5 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 XGETTEXT=":" fi @@ -5778,7 +5861,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 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 "$as_me:5781: checking for $ac_word" >&5 +echo "$as_me:5864: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_INTLBISON+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5793,7 +5876,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_INTLBISON="$ac_prog" -echo "$as_me:5796: found $ac_dir/$ac_word" >&5 +echo "$as_me:5879: found $ac_dir/$ac_word" >&5 break done @@ -5801,10 +5884,10 @@ fi fi INTLBISON=$ac_cv_prog_INTLBISON if test -n "$INTLBISON"; then - echo "$as_me:5804: result: $INTLBISON" >&5 + echo "$as_me:5887: result: $INTLBISON" >&5 echo "${ECHO_T}$INTLBISON" >&6 else - echo "$as_me:5807: result: no" >&5 + echo "$as_me:5890: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5814,7 +5897,7 @@ done if test -z "$INTLBISON"; then ac_verc_fail=yes else - echo "$as_me:5817: checking version of bison" >&5 + echo "$as_me:5900: checking version of bison" >&5 echo $ECHO_N "checking version of bison... $ECHO_C" >&6 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in @@ -5823,7 +5906,7 @@ echo $ECHO_N "checking version of bison... $ECHO_C" >&6 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac - echo "$as_me:5826: result: $ac_prog_version" >&5 + echo "$as_me:5909: result: $ac_prog_version" >&5 echo "${ECHO_T}$ac_prog_version" >&6 fi if test $ac_verc_fail = yes; then @@ -5849,7 +5932,7 @@ echo "${ECHO_T}$ac_prog_version" >&6 if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else - echo "$as_me:5852: checking for catalogs to be installed" >&5 + echo "$as_me:5935: checking for catalogs to be installed" >&5 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do @@ -5869,7 +5952,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 fi done LINGUAS=$NEW_LINGUAS - echo "$as_me:5872: result: $LINGUAS" >&5 + echo "$as_me:5955: result: $LINGUAS" >&5 echo "${ECHO_T}$LINGUAS" >&6 fi @@ -5902,7 +5985,7 @@ cf_makefile=makefile use_our_messages=no if test "$USE_NLS" = yes ; then if test -d $srcdir/po ; then -echo "$as_me:5905: checking if we should use included message-library" >&5 +echo "$as_me:5988: checking if we should use included message-library" >&5 echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6 # Check whether --enable-included-msgs or --disable-included-msgs was given. @@ -5913,7 +5996,7 @@ else use_our_messages=yes fi; fi -echo "$as_me:5916: result: $use_our_messages" >&5 +echo "$as_me:5999: result: $use_our_messages" >&5 echo "${ECHO_T}$use_our_messages" >&6 fi @@ -5954,23 +6037,23 @@ else for ac_header in libintl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5957: checking for $ac_header" >&5 +echo "$as_me:6040: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5963 "configure" +#line 6046 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5967: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:6050: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5973: \$? = $ac_status" >&5 + echo "$as_me:6056: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5989,7 +6072,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5992: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:6075: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -6065,7 +6148,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%` ;; *) - { { echo "$as_me:6068: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:6151: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -6073,7 +6156,7 @@ esac eval NLS_DATADIR="$withval" -echo "$as_me:6076: checking if you want full utility pathnames" >&5 +echo "$as_me:6159: checking if you want full utility pathnames" >&5 echo $ECHO_N "checking if you want full utility pathnames... $ECHO_C" >&6 # Check whether --enable-full-paths or --disable-full-paths was given. @@ -6090,13 +6173,13 @@ else with_full_paths=yes fi; -echo "$as_me:6093: result: $with_full_paths" >&5 +echo "$as_me:6176: result: $with_full_paths" >&5 echo "${ECHO_T}$with_full_paths" >&6 test $with_full_paths = no && cat >>confdefs.h <<\EOF #define USE_EXECVP 1 EOF -echo "$as_me:6099: checking for system mailer" >&5 +echo "$as_me:6182: checking for system mailer" >&5 echo $ECHO_N "checking for system mailer... $ECHO_C" >&6 if test "${cf_cv_SYSTEM_MAIL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6116,13 +6199,13 @@ else fi -echo "$as_me:6119: result: $cf_cv_SYSTEM_MAIL" >&5 +echo "$as_me:6202: result: $cf_cv_SYSTEM_MAIL" >&5 echo "${ECHO_T}$cf_cv_SYSTEM_MAIL" >&6 cat >>confdefs.h <<EOF #define SYSTEM_MAIL "$cf_cv_SYSTEM_MAIL" EOF -echo "$as_me:6125: checking system mail flags" >&5 +echo "$as_me:6208: checking system mail flags" >&5 echo $ECHO_N "checking system mail flags... $ECHO_C" >&6 if test "${cf_cv_system_mail_flags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6138,7 +6221,7 @@ else fi -echo "$as_me:6141: result: $cf_cv_system_mail_flags" >&5 +echo "$as_me:6224: result: $cf_cv_system_mail_flags" >&5 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6 cat >>confdefs.h <<EOF #define SYSTEM_MAIL_FLAGS "$cf_cv_system_mail_flags" @@ -6165,19 +6248,20 @@ freebsd*) #(vi hpux*) #(vi CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE" ;; -irix6.*) #(vi +irix[56].*) #(vi CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" ;; linux*|gnu*) #(vi -echo "$as_me:6173: checking if we must define _GNU_SOURCE" >&5 +if test "$INTEL_COMPILER" = no ; then +echo "$as_me:6257: checking if we must define _GNU_SOURCE" >&5 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6180 "configure" +#line 6264 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -6192,16 +6276,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6195: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6279: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6198: \$? = $ac_status" >&5 + echo "$as_me:6282: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6201: \"$ac_try\"") >&5 + { (eval echo "$as_me:6285: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6204: \$? = $ac_status" >&5 + echo "$as_me:6288: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -6210,7 +6294,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 6213 "configure" +#line 6297 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -6225,16 +6309,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6228: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6312: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6231: \$? = $ac_status" >&5 + echo "$as_me:6315: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6234: \"$ac_try\"") >&5 + { (eval echo "$as_me:6318: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6237: \$? = $ac_status" >&5 + echo "$as_me:6321: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -6249,9 +6333,10 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6252: result: $cf_cv_gnu_source" >&5 +echo "$as_me:6336: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" +fi ;; mirbsd*) #(vi @@ -6273,14 +6358,14 @@ solaris*) #(vi CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" ;; *) - echo "$as_me:6276: checking if we should define _XOPEN_SOURCE" >&5 + echo "$as_me:6361: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6283 "configure" +#line 6368 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -6295,16 +6380,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6298: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6383: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6301: \$? = $ac_status" >&5 + echo "$as_me:6386: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6304: \"$ac_try\"") >&5 + { (eval echo "$as_me:6389: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6307: \$? = $ac_status" >&5 + echo "$as_me:6392: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -6313,7 +6398,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 6316 "configure" +#line 6401 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -6328,16 +6413,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6331: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6416: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6334: \$? = $ac_status" >&5 + echo "$as_me:6419: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6337: \"$ac_try\"") >&5 + { (eval echo "$as_me:6422: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6340: \$? = $ac_status" >&5 + echo "$as_me:6425: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -6352,21 +6437,21 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6355: result: $cf_cv_xopen_source" >&5 +echo "$as_me:6440: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 test "$cf_cv_xopen_source" != no && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_cv_xopen_source" cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -echo "$as_me:6360: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:6445: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "(line 6366) testing if the symbol is already defined go no further ..." 1>&5 +echo "(line 6451) testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 6369 "configure" +#line 6454 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -6381,16 +6466,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6384: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6469: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6387: \$? = $ac_status" >&5 + echo "$as_me:6472: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6390: \"$ac_try\"") >&5 + { (eval echo "$as_me:6475: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6393: \$? = $ac_status" >&5 + echo "$as_me:6478: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -6408,15 +6493,15 @@ case .$cf_POSIX_C_SOURCE in ;; esac -echo "(line 6411) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "(line 6496) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source" -echo "(line 6416) testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "(line 6501) testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 6419 "configure" +#line 6504 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -6431,16 +6516,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6434: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6519: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6437: \$? = $ac_status" >&5 + echo "$as_me:6522: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6440: \"$ac_try\"") >&5 + { (eval echo "$as_me:6525: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6443: \$? = $ac_status" >&5 + echo "$as_me:6528: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6455,7 +6540,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6458: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:6543: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 test "$cf_cv_posix_c_source" != no && CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source" @@ -6542,7 +6627,7 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 6545 "configure" +#line 6630 "configure" #include "confdefs.h" #include <stdio.h> int @@ -6554,16 +6639,16 @@ printf("Hello world"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6557: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6642: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6560: \$? = $ac_status" >&5 + echo "$as_me:6645: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6563: \"$ac_try\"") >&5 + { (eval echo "$as_me:6648: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6566: \$? = $ac_status" >&5 + echo "$as_me:6651: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6584,7 +6669,7 @@ fi ### Look for network libraries first, since some functions (such as gethostname) ### are used in a lot of places. -echo "$as_me:6587: checking if you want ssl library" >&5 +echo "$as_me:6672: checking if you want ssl library" >&5 echo $ECHO_N "checking if you want ssl library... $ECHO_C" >&6 if test "${cf_cv_use_libssl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6599,11 +6684,11 @@ else fi; fi -echo "$as_me:6602: result: $cf_cv_use_libssl" >&5 +echo "$as_me:6687: result: $cf_cv_use_libssl" >&5 echo "${ECHO_T}$cf_cv_use_libssl" >&6 if test "x$cf_cv_use_libssl" = "xno" ; then -echo "$as_me:6606: checking if you want experimental gnutls support" >&5 +echo "$as_me:6691: checking if you want experimental gnutls support" >&5 echo $ECHO_N "checking if you want experimental gnutls support... $ECHO_C" >&6 if test "${cf_cv_use_libgnutls+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6618,11 +6703,11 @@ else fi; fi -echo "$as_me:6621: result: $cf_cv_use_libgnutls" >&5 +echo "$as_me:6706: result: $cf_cv_use_libgnutls" >&5 echo "${ECHO_T}$cf_cv_use_libgnutls" >&6 fi -echo "$as_me:6625: checking if you want socks library" >&5 +echo "$as_me:6710: checking if you want socks library" >&5 echo $ECHO_N "checking if you want socks library... $ECHO_C" >&6 if test "${cf_cv_use_libsocks+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6637,10 +6722,10 @@ else fi; fi -echo "$as_me:6640: result: $cf_cv_use_libsocks" >&5 +echo "$as_me:6725: result: $cf_cv_use_libsocks" >&5 echo "${ECHO_T}$cf_cv_use_libsocks" >&6 -echo "$as_me:6643: checking if you want socks5 library" >&5 +echo "$as_me:6728: checking if you want socks5 library" >&5 echo $ECHO_N "checking if you want socks5 library... $ECHO_C" >&6 if test "${cf_cv_use_libsocks5+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6655,7 +6740,7 @@ else fi; fi -echo "$as_me:6658: result: $cf_cv_use_libsocks5" >&5 +echo "$as_me:6743: result: $cf_cv_use_libsocks5" >&5 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6 if test "x$cf_cv_use_libsocks" != xno ; then @@ -6673,7 +6758,7 @@ no|yes) #(vi test -d $cf_cv_use_libsocks/../include && CPPFLAGS="$CPPFLAGS -I$cf_cv_use_libsocks/../include" fi else - { echo "$as_me:6676: WARNING: expected a directory: $cf_cv_use_libsocks" >&5 + { echo "$as_me:6761: WARNING: expected a directory: $cf_cv_use_libsocks" >&5 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libsocks" >&2;} fi ;; @@ -6716,7 +6801,7 @@ cat >>confdefs.h <<\EOF EOF cat >conftest.$ac_ext <<_ACEOF -#line 6719 "configure" +#line 6804 "configure" #include "confdefs.h" #include <stdio.h> @@ -6730,22 +6815,22 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6733: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6818: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6736: \$? = $ac_status" >&5 + echo "$as_me:6821: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6739: \"$ac_try\"") >&5 + { (eval echo "$as_me:6824: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6742: \$? = $ac_status" >&5 + echo "$as_me:6827: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:6748: error: Cannot link with socks library" >&5 +{ { echo "$as_me:6833: error: Cannot link with socks library" >&5 echo "$as_me: error: Cannot link with socks library" >&2;} { (exit 1); exit 1; }; } fi @@ -6766,7 +6851,7 @@ no|yes) #(vi test -d $cf_cv_use_libsocks5/../include && CPPFLAGS="$CPPFLAGS -I$cf_cv_use_libsocks5/../include" fi else - { echo "$as_me:6769: WARNING: expected a directory: $cf_cv_use_libsocks5" >&5 + { echo "$as_me:6854: WARNING: expected a directory: $cf_cv_use_libsocks5" >&5 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libsocks5" >&2;} fi ;; @@ -6780,11 +6865,11 @@ cat >>confdefs.h <<\EOF #define SOCKS 1 EOF -echo "$as_me:6783: checking if the socks library uses socks4 prefix" >&5 +echo "$as_me:6868: checking if the socks library uses socks4 prefix" >&5 echo $ECHO_N "checking if the socks library uses socks4 prefix... $ECHO_C" >&6 cf_use_socks4=error cat >conftest.$ac_ext <<_ACEOF -#line 6787 "configure" +#line 6872 "configure" #include "confdefs.h" #include <socks.h> @@ -6798,16 +6883,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6801: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6886: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6804: \$? = $ac_status" >&5 + echo "$as_me:6889: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6807: \"$ac_try\"") >&5 + { (eval echo "$as_me:6892: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6810: \$? = $ac_status" >&5 + echo "$as_me:6895: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\EOF #define USE_SOCKS4_PREFIX 1 @@ -6818,7 +6903,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 6821 "configure" +#line 6906 "configure" #include "confdefs.h" #include <socks.h> int @@ -6830,29 +6915,29 @@ SOCKSinit((char *)0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6833: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6918: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6836: \$? = $ac_status" >&5 + echo "$as_me:6921: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6839: \"$ac_try\"") >&5 + { (eval echo "$as_me:6924: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6842: \$? = $ac_status" >&5 + echo "$as_me:6927: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_use_socks4=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:6848: error: Cannot link with socks5 library" >&5 +{ { echo "$as_me:6933: error: Cannot link with socks5 library" >&5 echo "$as_me: error: Cannot link with socks5 library" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:6855: result: $cf_use_socks4" >&5 +echo "$as_me:6940: result: $cf_use_socks4" >&5 echo "${ECHO_T}$cf_use_socks4" >&6 if test "$cf_use_socks4" = "yes" ; then cat >>confdefs.h <<\EOF @@ -6905,10 +6990,10 @@ EOF EOF fi -echo "$as_me:6908: checking if socks5p.h is available" >&5 +echo "$as_me:6993: checking if socks5p.h is available" >&5 echo $ECHO_N "checking if socks5p.h is available... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 6911 "configure" +#line 6996 "configure" #include "confdefs.h" #define INCLUDE_PROTOTYPES @@ -6923,16 +7008,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6926: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7011: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6929: \$? = $ac_status" >&5 + echo "$as_me:7014: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6932: \"$ac_try\"") >&5 + { (eval echo "$as_me:7017: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6935: \$? = $ac_status" >&5 + echo "$as_me:7020: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_use_socks5p_h=yes else @@ -6941,7 +7026,7 @@ cat conftest.$ac_ext >&5 cf_use_socks5p_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:6944: result: $cf_use_socks5p_h" >&5 +echo "$as_me:7029: result: $cf_use_socks5p_h" >&5 echo "${ECHO_T}$cf_use_socks5p_h" >&6 test "$cf_use_socks5p_h" = yes && cat >>confdefs.h <<\EOF #define INCLUDE_PROTOTYPES 1 @@ -6950,13 +7035,13 @@ EOF else cf_test_netlibs=no -echo "$as_me:6953: checking for network libraries" >&5 +echo "$as_me:7038: checking for network libraries" >&5 echo $ECHO_N "checking for network libraries... $ECHO_C" >&6 if test "${cf_cv_netlibs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "$as_me:6959: result: working..." >&5 +echo "$as_me:7044: result: working..." >&5 echo "${ECHO_T}working..." >&6 cf_cv_netlibs="" cf_test_netlibs=yes @@ -6964,13 +7049,13 @@ cf_test_netlibs=yes for ac_func in gethostname do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6967: checking for $ac_func" >&5 +echo "$as_me:7052: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6973 "configure" +#line 7058 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7001,16 +7086,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7004: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7089: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7007: \$? = $ac_status" >&5 + echo "$as_me:7092: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7010: \"$ac_try\"") >&5 + { (eval echo "$as_me:7095: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7013: \$? = $ac_status" >&5 + echo "$as_me:7098: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7020,7 +7105,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7023: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7108: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -7029,7 +7114,7 @@ EOF else -echo "$as_me:7032: checking for gethostname in -lnsl" >&5 +echo "$as_me:7117: checking for gethostname in -lnsl" >&5 echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7037,7 +7122,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $cf_cv_netlibs $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7040 "configure" +#line 7125 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7056,16 +7141,16 @@ gethostname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7059: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7144: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7062: \$? = $ac_status" >&5 + echo "$as_me:7147: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7065: \"$ac_try\"") >&5 + { (eval echo "$as_me:7150: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7068: \$? = $ac_status" >&5 + echo "$as_me:7153: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostname=yes else @@ -7076,7 +7161,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7079: result: $ac_cv_lib_nsl_gethostname" >&5 +echo "$as_me:7164: result: $ac_cv_lib_nsl_gethostname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6 if test $ac_cv_lib_nsl_gethostname = yes; then @@ -7093,7 +7178,7 @@ else ac_cv_func_gethostname=unknown unset ac_cv_func_gethostname 2>/dev/null -echo "$as_me:7096: checking for gethostname in -lsocket" >&5 +echo "$as_me:7181: checking for gethostname in -lsocket" >&5 echo $ECHO_N "checking for gethostname in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_gethostname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7101,7 +7186,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $cf_cv_netlibs $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7104 "configure" +#line 7189 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7120,16 +7205,16 @@ gethostname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7123: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7208: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7126: \$? = $ac_status" >&5 + echo "$as_me:7211: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7129: \"$ac_try\"") >&5 + { (eval echo "$as_me:7214: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7132: \$? = $ac_status" >&5 + echo "$as_me:7217: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_gethostname=yes else @@ -7140,7 +7225,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7143: result: $ac_cv_lib_socket_gethostname" >&5 +echo "$as_me:7228: result: $ac_cv_lib_socket_gethostname" >&5 echo "${ECHO_T}$ac_cv_lib_socket_gethostname" >&6 if test $ac_cv_lib_socket_gethostname = yes; then @@ -7168,7 +7253,7 @@ done # FIXME: sequent needs this library (i.e., -lsocket -linet -lnsl), but # I don't know the entrypoints - 97/7/22 TD # AC_HAVE_LIBRARY(inet,cf_cv_netlibs="-linet $cf_cv_netlibs") -echo "$as_me:7171: checking for main in -linet" >&5 +echo "$as_me:7256: checking for main in -linet" >&5 echo $ECHO_N "checking for main in -linet... $ECHO_C" >&6 if test "${ac_cv_lib_inet_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7176,7 +7261,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-linet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7179 "configure" +#line 7264 "configure" #include "confdefs.h" int @@ -7188,16 +7273,16 @@ main (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7191: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7276: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7194: \$? = $ac_status" >&5 + echo "$as_me:7279: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7197: \"$ac_try\"") >&5 + { (eval echo "$as_me:7282: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7200: \$? = $ac_status" >&5 + echo "$as_me:7285: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_inet_main=yes else @@ -7208,7 +7293,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7211: result: $ac_cv_lib_inet_main" >&5 +echo "$as_me:7296: result: $ac_cv_lib_inet_main" >&5 echo "${ECHO_T}$ac_cv_lib_inet_main" >&6 if test $ac_cv_lib_inet_main = yes; then cf_cv_netlibs="-linet $cf_cv_netlibs" @@ -7220,13 +7305,13 @@ if test "$ac_cv_func_lsocket" != no ; then for ac_func in socket do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:7223: checking for $ac_func" >&5 +echo "$as_me:7308: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7229 "configure" +#line 7314 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7257,16 +7342,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7260: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7345: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7263: \$? = $ac_status" >&5 + echo "$as_me:7348: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7266: \"$ac_try\"") >&5 + { (eval echo "$as_me:7351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7269: \$? = $ac_status" >&5 + echo "$as_me:7354: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7276,7 +7361,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7279: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7364: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -7285,7 +7370,7 @@ EOF else -echo "$as_me:7288: checking for socket in -lsocket" >&5 +echo "$as_me:7373: checking for socket in -lsocket" >&5 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_socket+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7293,7 +7378,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $cf_cv_netlibs $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7296 "configure" +#line 7381 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7312,16 +7397,16 @@ socket (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7315: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7400: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7318: \$? = $ac_status" >&5 + echo "$as_me:7403: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7321: \"$ac_try\"") >&5 + { (eval echo "$as_me:7406: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7324: \$? = $ac_status" >&5 + echo "$as_me:7409: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_socket=yes else @@ -7332,7 +7417,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7335: result: $ac_cv_lib_socket_socket" >&5 +echo "$as_me:7420: result: $ac_cv_lib_socket_socket" >&5 echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 if test $ac_cv_lib_socket_socket = yes; then @@ -7349,7 +7434,7 @@ else ac_cv_func_socket=unknown unset ac_cv_func_socket 2>/dev/null -echo "$as_me:7352: checking for socket in -lbsd" >&5 +echo "$as_me:7437: checking for socket in -lbsd" >&5 echo $ECHO_N "checking for socket in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_socket+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7357,7 +7442,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $cf_cv_netlibs $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7360 "configure" +#line 7445 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7376,16 +7461,16 @@ socket (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7379: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7464: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7382: \$? = $ac_status" >&5 + echo "$as_me:7467: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7385: \"$ac_try\"") >&5 + { (eval echo "$as_me:7470: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7388: \$? = $ac_status" >&5 + echo "$as_me:7473: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_socket=yes else @@ -7396,7 +7481,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7399: result: $ac_cv_lib_bsd_socket" >&5 +echo "$as_me:7484: result: $ac_cv_lib_bsd_socket" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_socket" >&6 if test $ac_cv_lib_bsd_socket = yes; then @@ -7426,13 +7511,13 @@ fi for ac_func in gethostbyname do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:7429: checking for $ac_func" >&5 +echo "$as_me:7514: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7435 "configure" +#line 7520 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7463,16 +7548,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7466: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7551: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7469: \$? = $ac_status" >&5 + echo "$as_me:7554: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7472: \"$ac_try\"") >&5 + { (eval echo "$as_me:7557: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7475: \$? = $ac_status" >&5 + echo "$as_me:7560: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7482,7 +7567,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7485: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7570: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -7491,7 +7576,7 @@ EOF else -echo "$as_me:7494: checking for gethostbyname in -lnsl" >&5 +echo "$as_me:7579: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7499,7 +7584,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $cf_cv_netlibs $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7502 "configure" +#line 7587 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7518,16 +7603,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7521: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7606: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7524: \$? = $ac_status" >&5 + echo "$as_me:7609: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7527: \"$ac_try\"") >&5 + { (eval echo "$as_me:7612: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7530: \$? = $ac_status" >&5 + echo "$as_me:7615: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -7538,7 +7623,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7541: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:7626: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test $ac_cv_lib_nsl_gethostbyname = yes; then @@ -7565,13 +7650,13 @@ done for ac_func in strcasecmp do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:7568: checking for $ac_func" >&5 +echo "$as_me:7653: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7574 "configure" +#line 7659 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7602,16 +7687,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7605: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7690: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7608: \$? = $ac_status" >&5 + echo "$as_me:7693: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7611: \"$ac_try\"") >&5 + { (eval echo "$as_me:7696: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7614: \$? = $ac_status" >&5 + echo "$as_me:7699: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7621,7 +7706,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7624: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7709: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -7630,7 +7715,7 @@ EOF else -echo "$as_me:7633: checking for strcasecmp in -lresolv" >&5 +echo "$as_me:7718: checking for strcasecmp in -lresolv" >&5 echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6 if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7638,7 +7723,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $cf_cv_netlibs $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7641 "configure" +#line 7726 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7657,16 +7742,16 @@ strcasecmp (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7660: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7745: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7663: \$? = $ac_status" >&5 + echo "$as_me:7748: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7666: \"$ac_try\"") >&5 + { (eval echo "$as_me:7751: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7669: \$? = $ac_status" >&5 + echo "$as_me:7754: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_resolv_strcasecmp=yes else @@ -7677,7 +7762,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7680: result: $ac_cv_lib_resolv_strcasecmp" >&5 +echo "$as_me:7765: result: $ac_cv_lib_resolv_strcasecmp" >&5 echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6 if test $ac_cv_lib_resolv_strcasecmp = yes; then @@ -7706,14 +7791,14 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6 fi -echo "$as_me:7709: checking for inet_aton function" >&5 +echo "$as_me:7794: checking for inet_aton function" >&5 echo $ECHO_N "checking for inet_aton function... $ECHO_C" >&6 if test "${cf_cv_have_inet_aton+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7716 "configure" +#line 7801 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -7729,16 +7814,16 @@ inet_aton(0, (struct in_addr *)0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7732: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7817: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7735: \$? = $ac_status" >&5 + echo "$as_me:7820: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7738: \"$ac_try\"") >&5 + { (eval echo "$as_me:7823: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7741: \$? = $ac_status" >&5 + echo "$as_me:7826: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_inet_aton=yes else @@ -7748,7 +7833,7 @@ cf_cv_have_inet_aton=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7751: result: $cf_cv_have_inet_aton" >&5 +echo "$as_me:7836: result: $cf_cv_have_inet_aton" >&5 echo "${ECHO_T}$cf_cv_have_inet_aton" >&6 if test "$cf_cv_have_inet_aton" = yes ; then cat >>confdefs.h <<\EOF @@ -7756,14 +7841,14 @@ if test "$cf_cv_have_inet_aton" = yes ; then EOF else - echo "$as_me:7759: checking for inet_addr function" >&5 + echo "$as_me:7844: checking for inet_addr function" >&5 echo $ECHO_N "checking for inet_addr function... $ECHO_C" >&6 if test "${cf_cv_have_inet_addr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7766 "configure" +#line 7851 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -7779,16 +7864,16 @@ inet_addr(0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7782: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7867: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7785: \$? = $ac_status" >&5 + echo "$as_me:7870: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7788: \"$ac_try\"") >&5 + { (eval echo "$as_me:7873: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7791: \$? = $ac_status" >&5 + echo "$as_me:7876: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_inet_addr=yes else @@ -7798,10 +7883,10 @@ cf_cv_have_inet_addr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7801: result: $cf_cv_have_inet_addr" >&5 +echo "$as_me:7886: result: $cf_cv_have_inet_addr" >&5 echo "${ECHO_T}$cf_cv_have_inet_addr" >&6 if test "$cf_cv_have_inet_addr" = no ; then - echo "$as_me:7804: checking for library with inet_addr" >&5 + echo "$as_me:7889: checking for library with inet_addr" >&5 echo $ECHO_N "checking for library with inet_addr... $ECHO_C" >&6 if test "${cf_cv_lib_inet_addr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7812,7 +7897,7 @@ else do LIBS="$cf_save_LIBS $cf_inetlib" cat >conftest.$ac_ext <<_ACEOF -#line 7815 "configure" +#line 7900 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -7828,16 +7913,16 @@ inet_addr(0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7831: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7916: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7834: \$? = $ac_status" >&5 + echo "$as_me:7919: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7837: \"$ac_try\"") >&5 + { (eval echo "$as_me:7922: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7840: \$? = $ac_status" >&5 + echo "$as_me:7925: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_lib_inet_addr=$cf_inetlib else @@ -7851,12 +7936,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:7854: result: $cf_cv_lib_inet_addr" >&5 +echo "$as_me:7939: result: $cf_cv_lib_inet_addr" >&5 echo "${ECHO_T}$cf_cv_lib_inet_addr" >&6 if test "$cf_cv_lib_inet_addr" != no ; then LIBS="$LIBS $cf_cv_lib_inet_addr" else - { echo "$as_me:7859: WARNING: Unable to find library for inet_addr function" >&5 + { echo "$as_me:7944: WARNING: Unable to find library for inet_addr function" >&5 echo "$as_me: WARNING: Unable to find library for inet_addr function" >&2;} fi fi @@ -7871,7 +7956,7 @@ no) #(vi ;; yes) #(vi -echo "$as_me:7874: checking for SSL_get_version in -lssl" >&5 +echo "$as_me:7959: checking for SSL_get_version in -lssl" >&5 echo $ECHO_N "checking for SSL_get_version in -lssl... $ECHO_C" >&6 if test "${ac_cv_lib_ssl_SSL_get_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7879,7 +7964,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lssl -lcrypto $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7882 "configure" +#line 7967 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7898,16 +7983,16 @@ SSL_get_version (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7901: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7986: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7904: \$? = $ac_status" >&5 + echo "$as_me:7989: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7907: \"$ac_try\"") >&5 + { (eval echo "$as_me:7992: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7910: \$? = $ac_status" >&5 + echo "$as_me:7995: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ssl_SSL_get_version=yes else @@ -7918,7 +8003,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7921: result: $ac_cv_lib_ssl_SSL_get_version" >&5 +echo "$as_me:8006: result: $ac_cv_lib_ssl_SSL_get_version" >&5 echo "${ECHO_T}$ac_cv_lib_ssl_SSL_get_version" >&6 if test $ac_cv_lib_ssl_SSL_get_version = yes; then cat >>confdefs.h <<EOF @@ -7935,7 +8020,7 @@ else cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library" else - { { echo "$as_me:7938: error: cannot find ssl library" >&5 + { { echo "$as_me:8023: error: cannot find ssl library" >&5 echo "$as_me: error: cannot find ssl library" >&2;} { (exit 1); exit 1; }; } fi @@ -7950,13 +8035,13 @@ fi elif test -d $cf_cv_use_libssl/../include ; then cf_ssl_root=$cf_cv_use_libssl/.. else - { { echo "$as_me:7953: error: cannot find ssl library under $cf_cv_use_libssl" >&5 + { { echo "$as_me:8038: error: cannot find ssl library under $cf_cv_use_libssl" >&5 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;} { (exit 1); exit 1; }; } fi cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library" else - { echo "$as_me:7959: WARNING: expected a directory: $cf_cv_use_libssl" >&5 + { echo "$as_me:8044: WARNING: expected a directory: $cf_cv_use_libssl" >&5 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libssl" >&2;} fi ;; @@ -8040,10 +8125,10 @@ fi fi if test "$cf_ssl_subincs" = yes ; then -echo "$as_me:8043: checking for openssl include directory" >&5 +echo "$as_me:8128: checking for openssl include directory" >&5 echo $ECHO_N "checking for openssl include directory... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 8046 "configure" +#line 8131 "configure" #include "confdefs.h" #include <stdio.h> @@ -8057,16 +8142,16 @@ SSL_shutdown((SSL *)0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8060: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8145: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8063: \$? = $ac_status" >&5 + echo "$as_me:8148: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8066: \"$ac_try\"") >&5 + { (eval echo "$as_me:8151: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8069: \$? = $ac_status" >&5 + echo "$as_me:8154: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_openssl_incl=yes else @@ -8075,7 +8160,7 @@ cat conftest.$ac_ext >&5 cf_openssl_incl=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:8078: result: $cf_openssl_incl" >&5 +echo "$as_me:8163: result: $cf_openssl_incl" >&5 echo "${ECHO_T}$cf_openssl_incl" >&6 test "$cf_openssl_incl" = yes && cat >>confdefs.h <<\EOF #define USE_OPENSSL_INCL 1 @@ -8083,10 +8168,10 @@ EOF fi -echo "$as_me:8086: checking if we can link to ssl library" >&5 +echo "$as_me:8171: checking if we can link to ssl library" >&5 echo $ECHO_N "checking if we can link to ssl library... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 8089 "configure" +#line 8174 "configure" #include "confdefs.h" #include <stdio.h> @@ -8105,16 +8190,16 @@ SSL_shutdown((SSL *)0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8108: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8193: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8111: \$? = $ac_status" >&5 + echo "$as_me:8196: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8114: \"$ac_try\"") >&5 + { (eval echo "$as_me:8199: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8117: \$? = $ac_status" >&5 + echo "$as_me:8202: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_ssl_library=yes else @@ -8123,7 +8208,7 @@ cat conftest.$ac_ext >&5 cf_ssl_library=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:8126: result: $cf_ssl_library" >&5 +echo "$as_me:8211: result: $cf_ssl_library" >&5 echo "${ECHO_T}$cf_ssl_library" >&6 if test "$cf_ssl_library" = yes ; then cat >>confdefs.h <<\EOF @@ -8135,7 +8220,7 @@ EOF EOF else - { { echo "$as_me:8138: error: Cannot link with ssl library" >&5 + { { echo "$as_me:8223: error: Cannot link with ssl library" >&5 echo "$as_me: error: Cannot link with ssl library" >&2;} { (exit 1); exit 1; }; } fi @@ -8143,7 +8228,7 @@ fi elif test "x$cf_cv_use_libgnutls" != xno ; then cf_ssl_library="-lgnutls -lcrypt" -echo "$as_me:8146: checking if we know what directory gnutls is in" >&5 +echo "$as_me:8231: checking if we know what directory gnutls is in" >&5 echo $ECHO_N "checking if we know what directory gnutls is in... $ECHO_C" >&6 case "$cf_cv_use_libgnutls" in #(vi no) #(vi @@ -8151,7 +8236,7 @@ no) #(vi ;; yes) #(vi -echo "$as_me:8154: checking for gnutls_init in -lgnutls" >&5 +echo "$as_me:8239: checking for gnutls_init in -lgnutls" >&5 echo $ECHO_N "checking for gnutls_init in -lgnutls... $ECHO_C" >&6 if test "${ac_cv_lib_gnutls_gnutls_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8159,7 +8244,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgnutls -lgnutls-extra -lgnutls -lcrypt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8162 "configure" +#line 8247 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8178,16 +8263,16 @@ gnutls_init (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8181: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8266: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8184: \$? = $ac_status" >&5 + echo "$as_me:8269: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8187: \"$ac_try\"") >&5 + { (eval echo "$as_me:8272: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8190: \$? = $ac_status" >&5 + echo "$as_me:8275: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gnutls_gnutls_init=yes else @@ -8198,7 +8283,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8201: result: $ac_cv_lib_gnutls_gnutls_init" >&5 +echo "$as_me:8286: result: $ac_cv_lib_gnutls_gnutls_init" >&5 echo "${ECHO_T}$ac_cv_lib_gnutls_gnutls_init" >&6 if test $ac_cv_lib_gnutls_gnutls_init = yes; then cat >>confdefs.h <<EOF @@ -8214,7 +8299,7 @@ else test -n "$verbose" && echo " assume it is in $cf_ssl_root" 1>&6 else - { { echo "$as_me:8217: error: cannot find gnutls library" >&5 + { { echo "$as_me:8302: error: cannot find gnutls library" >&5 echo "$as_me: error: cannot find gnutls library" >&2;} { (exit 1); exit 1; }; } fi @@ -8229,17 +8314,17 @@ fi elif test -d $cf_cv_use_libgnutls/../include ; then cf_ssl_root=$cf_cv_use_libgnutls/.. else - { { echo "$as_me:8232: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5 + { { echo "$as_me:8317: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;} { (exit 1); exit 1; }; } fi else - { echo "$as_me:8237: WARNING: expected a directory: $cf_cv_use_libgnutls" >&5 + { echo "$as_me:8322: WARNING: expected a directory: $cf_cv_use_libgnutls" >&5 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libgnutls" >&2;} fi ;; esac -echo "$as_me:8242: result: $cf_ssl_root" >&5 +echo "$as_me:8327: result: $cf_ssl_root" >&5 echo "${ECHO_T}$cf_ssl_root" >&6 LIBS="$cf_ssl_library $LIBS" @@ -8320,7 +8405,7 @@ fi fi fi -echo "$as_me:8323: checking for SSL_connect in -lgnutls-openssl" >&5 +echo "$as_me:8408: checking for SSL_connect in -lgnutls-openssl" >&5 echo $ECHO_N "checking for SSL_connect in -lgnutls-openssl... $ECHO_C" >&6 if test "${ac_cv_lib_gnutls_openssl_SSL_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8328,7 +8413,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgnutls-openssl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8331 "configure" +#line 8416 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8347,16 +8432,16 @@ SSL_connect (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8350: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8435: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8353: \$? = $ac_status" >&5 + echo "$as_me:8438: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8356: \"$ac_try\"") >&5 + { (eval echo "$as_me:8441: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8359: \$? = $ac_status" >&5 + echo "$as_me:8444: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gnutls_openssl_SSL_connect=yes else @@ -8367,12 +8452,12 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8370: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5 +echo "$as_me:8455: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5 echo "${ECHO_T}$ac_cv_lib_gnutls_openssl_SSL_connect" >&6 if test $ac_cv_lib_gnutls_openssl_SSL_connect = yes; then LIBS="-lgnutls-openssl $LIBS" else - echo "$as_me:8375: checking for SSL_connect in -lgnutls-extra" >&5 + echo "$as_me:8460: checking for SSL_connect in -lgnutls-extra" >&5 echo $ECHO_N "checking for SSL_connect in -lgnutls-extra... $ECHO_C" >&6 if test "${ac_cv_lib_gnutls_extra_SSL_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8380,7 +8465,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgnutls-extra $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8383 "configure" +#line 8468 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8399,16 +8484,16 @@ SSL_connect (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8402: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8487: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8405: \$? = $ac_status" >&5 + echo "$as_me:8490: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8408: \"$ac_try\"") >&5 + { (eval echo "$as_me:8493: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8411: \$? = $ac_status" >&5 + echo "$as_me:8496: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gnutls_extra_SSL_connect=yes else @@ -8419,12 +8504,12 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8422: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5 +echo "$as_me:8507: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5 echo "${ECHO_T}$ac_cv_lib_gnutls_extra_SSL_connect" >&6 if test $ac_cv_lib_gnutls_extra_SSL_connect = yes; then LIBS="-lgnutls-extra $LIBS" else - { { echo "$as_me:8427: error: cannot find gnutls openssl functions" >&5 + { { echo "$as_me:8512: error: cannot find gnutls openssl functions" >&5 echo "$as_me: error: cannot find gnutls openssl functions" >&2;} { (exit 1); exit 1; }; } fi @@ -8432,10 +8517,10 @@ fi fi if test "$cf_ssl_subincs" = yes ; then -echo "$as_me:8435: checking for gnutls include directory" >&5 +echo "$as_me:8520: checking for gnutls include directory" >&5 echo $ECHO_N "checking for gnutls include directory... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 8438 "configure" +#line 8523 "configure" #include "confdefs.h" #include <stdio.h> @@ -8449,16 +8534,16 @@ SSL_shutdown((SSL *)0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8452: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8537: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8455: \$? = $ac_status" >&5 + echo "$as_me:8540: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8458: \"$ac_try\"") >&5 + { (eval echo "$as_me:8543: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8461: \$? = $ac_status" >&5 + echo "$as_me:8546: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_openssl_incl=yes else @@ -8467,7 +8552,7 @@ cat conftest.$ac_ext >&5 cf_openssl_incl=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:8470: result: $cf_openssl_incl" >&5 +echo "$as_me:8555: result: $cf_openssl_incl" >&5 echo "${ECHO_T}$cf_openssl_incl" >&6 test "$cf_openssl_incl" = yes && cat >>confdefs.h <<\EOF #define USE_GNUTLS_INCL 1 @@ -8475,10 +8560,10 @@ EOF fi -echo "$as_me:8478: checking if we can link to gnutls library" >&5 +echo "$as_me:8563: checking if we can link to gnutls library" >&5 echo $ECHO_N "checking if we can link to gnutls library... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 8481 "configure" +#line 8566 "configure" #include "confdefs.h" #include <stdio.h> @@ -8497,16 +8582,16 @@ SSL_shutdown((SSL *)0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8500: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8585: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8503: \$? = $ac_status" >&5 + echo "$as_me:8588: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8506: \"$ac_try\"") >&5 + { (eval echo "$as_me:8591: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8509: \$? = $ac_status" >&5 + echo "$as_me:8594: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_ssl_library=yes else @@ -8515,7 +8600,7 @@ cat conftest.$ac_ext >&5 cf_ssl_library=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:8518: result: $cf_ssl_library" >&5 +echo "$as_me:8603: result: $cf_ssl_library" >&5 echo "${ECHO_T}$cf_ssl_library" >&6 if test "$cf_ssl_library" = yes ; then cat >>confdefs.h <<\EOF @@ -8523,15 +8608,15 @@ if test "$cf_ssl_library" = yes ; then EOF else - { { echo "$as_me:8526: error: Cannot link with gnutls library" >&5 + { { echo "$as_me:8611: error: Cannot link with gnutls library" >&5 echo "$as_me: error: Cannot link with gnutls library" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:8531: checking for X509 support" >&5 +echo "$as_me:8616: checking for X509 support" >&5 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 8534 "configure" +#line 8619 "configure" #include "confdefs.h" #include <stdio.h> @@ -8551,16 +8636,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(X509_STORE_CTX *0)); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8554: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8639: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8557: \$? = $ac_status" >&5 + echo "$as_me:8642: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8560: \"$ac_try\"") >&5 + { (eval echo "$as_me:8645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8563: \$? = $ac_status" >&5 + echo "$as_me:8648: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_x509_support=no else @@ -8568,7 +8653,7 @@ else cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:8571: result: $cf_x509_support" >&5 +echo "$as_me:8656: result: $cf_x509_support" >&5 echo "${ECHO_T}$cf_x509_support" >&6 if test "$cf_x509_support" = yes ; then cat >>confdefs.h <<\EOF @@ -8579,7 +8664,7 @@ fi fi -echo "$as_me:8582: checking for screen type" >&5 +echo "$as_me:8667: checking for screen type" >&5 echo $ECHO_N "checking for screen type... $ECHO_C" >&6 if test "${cf_cv_screen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8593,7 +8678,7 @@ case $withval in curses|ncurses|ncursesw|pdcurses|slang) cf_cv_screen=$withval ;; -*) { { echo "$as_me:8596: error: Unexpected value" >&5 +*) { { echo "$as_me:8681: error: Unexpected value" >&5 echo "$as_me: error: Unexpected value" >&2;} { (exit 1); exit 1; }; } ;; @@ -8602,7 +8687,7 @@ else cf_cv_screen=curses fi; fi -echo "$as_me:8605: result: $cf_cv_screen" >&5 +echo "$as_me:8690: result: $cf_cv_screen" >&5 echo "${ECHO_T}$cf_cv_screen" >&6 case $cf_cv_screen in @@ -8631,7 +8716,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%` ;; *) - { { echo "$as_me:8634: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:8719: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -8648,7 +8733,7 @@ esac case $cf_cv_screen in curses) -echo "$as_me:8651: checking for extra include directories" >&5 +echo "$as_me:8736: checking for extra include directories" >&5 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 if test "${cf_cv_curses_incdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8668,11 +8753,11 @@ sunos3*|sunos4*) esac fi -echo "$as_me:8671: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:8756: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS" -echo "$as_me:8675: checking if we have identified curses headers" >&5 +echo "$as_me:8760: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8686,7 +8771,7 @@ for cf_header in \ ncurses/ncurses.h do cat >conftest.$ac_ext <<_ACEOF -#line 8689 "configure" +#line 8774 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -8698,16 +8783,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8701: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8786: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8704: \$? = $ac_status" >&5 + echo "$as_me:8789: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8707: \"$ac_try\"") >&5 + { (eval echo "$as_me:8792: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8710: \$? = $ac_status" >&5 + echo "$as_me:8795: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -8718,11 +8803,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:8721: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:8806: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:8725: error: No curses header-files found" >&5 + { { echo "$as_me:8810: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -8732,23 +8817,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:8735: checking for $ac_header" >&5 +echo "$as_me:8820: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8741 "configure" +#line 8826 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:8745: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:8830: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:8751: \$? = $ac_status" >&5 + echo "$as_me:8836: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8767,7 +8852,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:8770: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:8855: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -8777,7 +8862,7 @@ EOF fi done -echo "$as_me:8780: checking for ncurses version" >&5 +echo "$as_me:8865: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8803,10 +8888,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:8806: \"$cf_try\"") >&5 + { (eval echo "$as_me:8891: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:8809: \$? = $ac_status" >&5 + echo "$as_me:8894: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -8816,7 +8901,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 8819 "configure" +#line 8904 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -8841,15 +8926,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:8844: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8929: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8847: \$? = $ac_status" >&5 + echo "$as_me:8932: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:8849: \"$ac_try\"") >&5 + { (eval echo "$as_me:8934: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8852: \$? = $ac_status" >&5 + echo "$as_me:8937: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -8863,16 +8948,16 @@ fi rm -f $cf_tempfile fi -echo "$as_me:8866: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:8951: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:8872: checking if we have identified curses libraries" >&5 +echo "$as_me:8957: checking if we have identified curses libraries" >&5 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 8875 "configure" +#line 8960 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -8884,16 +8969,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8887: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8972: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8890: \$? = $ac_status" >&5 + echo "$as_me:8975: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8893: \"$ac_try\"") >&5 + { (eval echo "$as_me:8978: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8896: \$? = $ac_status" >&5 + echo "$as_me:8981: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -8902,13 +8987,13 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:8905: result: $cf_result" >&5 +echo "$as_me:8990: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case $host_os in #(vi freebsd*) #(vi - echo "$as_me:8911: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:8996: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8916,7 +9001,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8919 "configure" +#line 9004 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8935,16 +9020,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8938: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9023: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8941: \$? = $ac_status" >&5 + echo "$as_me:9026: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8944: \"$ac_try\"") >&5 + { (eval echo "$as_me:9029: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8947: \$? = $ac_status" >&5 + echo "$as_me:9032: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -8955,7 +9040,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8958: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:9043: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then LIBS="-lmytinfo $LIBS" @@ -8963,7 +9048,7 @@ fi ;; hpux10.*|hpux11.*) #(vi - echo "$as_me:8966: checking for initscr in -lcur_colr" >&5 + echo "$as_me:9051: checking for initscr in -lcur_colr" >&5 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8971,7 +9056,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8974 "configure" +#line 9059 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8990,16 +9075,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8993: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9078: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8996: \$? = $ac_status" >&5 + echo "$as_me:9081: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8999: \"$ac_try\"") >&5 + { (eval echo "$as_me:9084: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9002: \$? = $ac_status" >&5 + echo "$as_me:9087: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cur_colr_initscr=yes else @@ -9010,7 +9095,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9013: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:9098: result: $ac_cv_lib_cur_colr_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 if test $ac_cv_lib_cur_colr_initscr = yes; then @@ -9019,7 +9104,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then else - echo "$as_me:9022: checking for initscr in -lHcurses" >&5 + echo "$as_me:9107: checking for initscr in -lHcurses" >&5 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9027,7 +9112,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9030 "configure" +#line 9115 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9046,16 +9131,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9049: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9134: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9052: \$? = $ac_status" >&5 + echo "$as_me:9137: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9055: \"$ac_try\"") >&5 + { (eval echo "$as_me:9140: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9058: \$? = $ac_status" >&5 + echo "$as_me:9143: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Hcurses_initscr=yes else @@ -9066,7 +9151,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9069: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:9154: result: $ac_cv_lib_Hcurses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 if test $ac_cv_lib_Hcurses_initscr = yes; then @@ -9104,13 +9189,13 @@ 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 "$as_me:9107: checking for tgoto" >&5 + echo "$as_me:9192: checking for tgoto" >&5 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 if test "${ac_cv_func_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9113 "configure" +#line 9198 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto (); below. */ @@ -9141,16 +9226,16 @@ f = tgoto; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9144: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9229: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9147: \$? = $ac_status" >&5 + echo "$as_me:9232: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9150: \"$ac_try\"") >&5 + { (eval echo "$as_me:9235: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9153: \$? = $ac_status" >&5 + echo "$as_me:9238: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_tgoto=yes else @@ -9160,7 +9245,7 @@ ac_cv_func_tgoto=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9163: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:9248: result: $ac_cv_func_tgoto" >&5 echo "${ECHO_T}$ac_cv_func_tgoto" >&6 if test $ac_cv_func_tgoto = yes; then cf_term_lib=predefined @@ -9169,7 +9254,7 @@ else for cf_term_lib in $cf_check_list termcap termlib unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:9172: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:9257: checking for tgoto in -l$cf_term_lib" >&5 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9177,7 +9262,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9180 "configure" +#line 9265 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9196,16 +9281,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9199: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9284: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9202: \$? = $ac_status" >&5 + echo "$as_me:9287: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9205: \"$ac_try\"") >&5 + { (eval echo "$as_me:9290: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9208: \$? = $ac_status" >&5 + echo "$as_me:9293: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -9216,7 +9301,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9219: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:9304: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then break @@ -9231,7 +9316,7 @@ fi for cf_curs_lib in $cf_check_list xcurses jcurses unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh` -echo "$as_me:9234: checking for initscr in -l$cf_curs_lib" >&5 +echo "$as_me:9319: checking for initscr in -l$cf_curs_lib" >&5 echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9239,7 +9324,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_curs_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9242 "configure" +#line 9327 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9258,16 +9343,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9261: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9346: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9264: \$? = $ac_status" >&5 + echo "$as_me:9349: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9267: \"$ac_try\"") >&5 + { (eval echo "$as_me:9352: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9270: \$? = $ac_status" >&5 + echo "$as_me:9355: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -9278,23 +9363,23 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9281: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:9366: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then break fi done - test $cf_curs_lib = unknown && { { echo "$as_me:9288: error: no curses library found" >&5 + test $cf_curs_lib = unknown && { { echo "$as_me:9373: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then - echo "$as_me:9294: checking if we can link with $cf_curs_lib library" >&5 + echo "$as_me:9379: checking if we can link with $cf_curs_lib library" >&5 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 9297 "configure" +#line 9382 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -9306,16 +9391,16 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9309: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9394: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9312: \$? = $ac_status" >&5 + echo "$as_me:9397: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9315: \"$ac_try\"") >&5 + { (eval echo "$as_me:9400: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9318: \$? = $ac_status" >&5 + echo "$as_me:9403: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -9324,18 +9409,18 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:9327: result: $cf_result" >&5 + echo "$as_me:9412: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 - test $cf_result = no && { { echo "$as_me:9329: error: Cannot link curses library" >&5 + test $cf_result = no && { { echo "$as_me:9414: error: Cannot link curses library" >&5 echo "$as_me: error: Cannot link curses library" >&2;} { (exit 1); exit 1; }; } elif test "$cf_curs_lib" = "$cf_term_lib" ; then : elif test "$cf_term_lib" != predefined ; then - echo "$as_me:9335: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:9420: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 9338 "configure" +#line 9423 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -9347,16 +9432,16 @@ initscr(); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9350: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9435: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9353: \$? = $ac_status" >&5 + echo "$as_me:9438: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9356: \"$ac_try\"") >&5 + { (eval echo "$as_me:9441: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9359: \$? = $ac_status" >&5 + echo "$as_me:9444: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else @@ -9365,7 +9450,7 @@ cat conftest.$ac_ext >&5 LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9368 "configure" +#line 9453 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -9377,16 +9462,16 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9380: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9465: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9383: \$? = $ac_status" >&5 + echo "$as_me:9468: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9386: \"$ac_try\"") >&5 + { (eval echo "$as_me:9471: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9389: \$? = $ac_status" >&5 + echo "$as_me:9474: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -9398,13 +9483,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:9401: result: $cf_result" >&5 + echo "$as_me:9486: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 fi fi fi -echo "$as_me:9407: checking for curses performance tradeoff" >&5 +echo "$as_me:9492: checking for curses performance tradeoff" >&5 echo $ECHO_N "checking for curses performance tradeoff... $ECHO_C" >&6 if test "${cf_cv_curs_performance+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9412,7 +9497,7 @@ else cf_cv_curs_performance=no cat >conftest.$ac_ext <<_ACEOF -#line 9415 "configure" +#line 9500 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -9431,20 +9516,20 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9434: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9519: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9437: \$? = $ac_status" >&5 + echo "$as_me:9522: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9440: \"$ac_try\"") >&5 + { (eval echo "$as_me:9525: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9443: \$? = $ac_status" >&5 + echo "$as_me:9528: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >conftest.$ac_ext <<_ACEOF -#line 9447 "configure" +#line 9532 "configure" #include "confdefs.h" #define CURS_PERFORMANCE @@ -9464,16 +9549,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9467: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9552: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9470: \$? = $ac_status" >&5 + echo "$as_me:9555: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9473: \"$ac_try\"") >&5 + { (eval echo "$as_me:9558: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9476: \$? = $ac_status" >&5 + echo "$as_me:9561: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curs_performance=yes else @@ -9488,20 +9573,20 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9491: result: $cf_cv_curs_performance" >&5 +echo "$as_me:9576: result: $cf_cv_curs_performance" >&5 echo "${ECHO_T}$cf_cv_curs_performance" >&6 test $cf_cv_curs_performance = yes && cat >>confdefs.h <<\EOF #define CURS_PERFORMANCE 1 EOF -echo "$as_me:9497: checking for curses touchline function" >&5 +echo "$as_me:9582: checking for curses touchline function" >&5 echo $ECHO_N "checking for curses touchline function... $ECHO_C" >&6 if test "${cf_cv_curs_touchline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9504 "configure" +#line 9589 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -9514,23 +9599,23 @@ touchline(stdscr, 1,2,3); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9517: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9602: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9520: \$? = $ac_status" >&5 + echo "$as_me:9605: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9523: \"$ac_try\"") >&5 + { (eval echo "$as_me:9608: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9526: \$? = $ac_status" >&5 + echo "$as_me:9611: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curs_touchline=bsd else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 9533 "configure" +#line 9618 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -9543,16 +9628,16 @@ touchline(stdscr, 1,2); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9546: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9631: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9549: \$? = $ac_status" >&5 + echo "$as_me:9634: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9552: \"$ac_try\"") >&5 + { (eval echo "$as_me:9637: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9555: \$? = $ac_status" >&5 + echo "$as_me:9640: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curs_touchline=sysv else @@ -9564,7 +9649,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9567: result: $cf_cv_curs_touchline" >&5 +echo "$as_me:9652: result: $cf_cv_curs_touchline" >&5 echo "${ECHO_T}$cf_cv_curs_touchline" >&6 case "$cf_cv_curs_touchline" in #(vi bsd) #(vi @@ -9590,7 +9675,7 @@ test -n "$cf_cv_curses_dir" && \ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" -echo "$as_me:9593: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:9678: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9602,7 +9687,7 @@ else do cat >conftest.$ac_ext <<_ACEOF -#line 9605 "configure" +#line 9690 "configure" #include "confdefs.h" #include <$cf_header> @@ -9626,16 +9711,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9629: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9714: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9632: \$? = $ac_status" >&5 + echo "$as_me:9717: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9635: \"$ac_try\"") >&5 + { (eval echo "$as_me:9720: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9638: \$? = $ac_status" >&5 + echo "$as_me:9723: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -9650,13 +9735,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:9653: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:9738: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:9659: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:9744: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9751,7 +9836,7 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 9754 "configure" +#line 9839 "configure" #include "confdefs.h" #include <stdio.h> int @@ -9763,16 +9848,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9766: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9851: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9769: \$? = $ac_status" >&5 + echo "$as_me:9854: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9772: \"$ac_try\"") >&5 + { (eval echo "$as_me:9857: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9775: \$? = $ac_status" >&5 + echo "$as_me:9860: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9799,7 +9884,7 @@ done do cat >conftest.$ac_ext <<_ACEOF -#line 9802 "configure" +#line 9887 "configure" #include "confdefs.h" #include <$cf_header> @@ -9823,16 +9908,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9826: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9911: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9829: \$? = $ac_status" >&5 + echo "$as_me:9914: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9832: \"$ac_try\"") >&5 + { (eval echo "$as_me:9917: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9835: \$? = $ac_status" >&5 + echo "$as_me:9920: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -9853,12 +9938,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9856: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9941: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:9861: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:9946: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` @@ -9880,7 +9965,7 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 9883 "configure" +#line 9968 "configure" #include "confdefs.h" #include <stdio.h> int @@ -9892,16 +9977,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9895: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9980: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9898: \$? = $ac_status" >&5 + echo "$as_me:9983: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9901: \"$ac_try\"") >&5 + { (eval echo "$as_me:9986: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9904: \$? = $ac_status" >&5 + echo "$as_me:9989: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9952,7 +10037,7 @@ EOF ;; esac -echo "$as_me:9955: checking for ncurses version" >&5 +echo "$as_me:10040: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9978,10 +10063,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:9981: \"$cf_try\"") >&5 + { (eval echo "$as_me:10066: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:9984: \$? = $ac_status" >&5 + echo "$as_me:10069: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -9991,7 +10076,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 9994 "configure" +#line 10079 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10016,15 +10101,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:10019: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10104: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10022: \$? = $ac_status" >&5 + echo "$as_me:10107: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10024: \"$ac_try\"") >&5 + { (eval echo "$as_me:10109: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10027: \$? = $ac_status" >&5 + echo "$as_me:10112: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -10038,7 +10123,7 @@ fi rm -f $cf_tempfile fi -echo "$as_me:10041: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:10126: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 @@ -10050,7 +10135,7 @@ cf_nculib_root=ncurses # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:10053: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:10138: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10058,7 +10143,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10061 "configure" +#line 10146 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10077,16 +10162,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10080: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10165: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10083: \$? = $ac_status" >&5 + echo "$as_me:10168: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10086: \"$ac_try\"") >&5 + { (eval echo "$as_me:10171: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10089: \$? = $ac_status" >&5 + echo "$as_me:10174: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -10097,10 +10182,10 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10100: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:10185: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test $ac_cv_lib_gpm_Gpm_Open = yes; then - echo "$as_me:10103: checking for initscr in -lgpm" >&5 + echo "$as_me:10188: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10108,7 +10193,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10111 "configure" +#line 10196 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10127,16 +10212,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10130: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10215: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10133: \$? = $ac_status" >&5 + echo "$as_me:10218: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10136: \"$ac_try\"") >&5 + { (eval echo "$as_me:10221: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10139: \$? = $ac_status" >&5 + echo "$as_me:10224: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -10147,7 +10232,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10150: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:10235: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test $ac_cv_lib_gpm_initscr = yes; then LIBS="$cf_ncurses_SAVE" @@ -10162,7 +10247,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). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:10165: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:10250: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10170,7 +10255,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10173 "configure" +#line 10258 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10189,16 +10274,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10192: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10277: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10195: \$? = $ac_status" >&5 + echo "$as_me:10280: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10198: \"$ac_try\"") >&5 + { (eval echo "$as_me:10283: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10201: \$? = $ac_status" >&5 + echo "$as_me:10286: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -10209,7 +10294,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10212: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:10297: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -10228,13 +10313,13 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:10231: checking for initscr" >&5 + echo "$as_me:10316: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10237 "configure" +#line 10322 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -10265,16 +10350,16 @@ f = initscr; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10268: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10353: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10271: \$? = $ac_status" >&5 + echo "$as_me:10356: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10274: \"$ac_try\"") >&5 + { (eval echo "$as_me:10359: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10277: \$? = $ac_status" >&5 + echo "$as_me:10362: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -10284,18 +10369,18 @@ ac_cv_func_initscr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10287: result: $ac_cv_func_initscr" >&5 +echo "$as_me:10372: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test $ac_cv_func_initscr = yes; then eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:10294: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:10379: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10298 "configure" +#line 10383 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -10307,25 +10392,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10310: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10395: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10313: \$? = $ac_status" >&5 + echo "$as_me:10398: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10316: \"$ac_try\"") >&5 + { (eval echo "$as_me:10401: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10319: \$? = $ac_status" >&5 + echo "$as_me:10404: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:10321: result: yes" >&5 + echo "$as_me:10406: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:10328: result: no" >&5 +echo "$as_me:10413: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search="" @@ -10385,11 +10470,11 @@ test -d /usr && { for cf_libdir in $cf_search do - echo "$as_me:10388: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:10473: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10392 "configure" +#line 10477 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -10401,25 +10486,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10404: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10489: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10407: \$? = $ac_status" >&5 + echo "$as_me:10492: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10410: \"$ac_try\"") >&5 + { (eval echo "$as_me:10495: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10413: \$? = $ac_status" >&5 + echo "$as_me:10498: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:10415: result: yes" >&5 + echo "$as_me:10500: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:10422: result: no" >&5 +echo "$as_me:10507: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -10434,7 +10519,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:10437: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:10522: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -10442,7 +10527,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:10445: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:10530: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -10452,7 +10537,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >conftest.$ac_ext <<_ACEOF -#line 10455 "configure" +#line 10540 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -10464,23 +10549,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10467: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10552: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10470: \$? = $ac_status" >&5 + echo "$as_me:10555: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10473: \"$ac_try\"") >&5 + { (eval echo "$as_me:10558: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10476: \$? = $ac_status" >&5 + echo "$as_me:10561: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:10478: result: yes" >&5 + echo "$as_me:10563: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:10483: result: no" >&5 +echo "$as_me:10568: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -10493,7 +10578,7 @@ cat >>confdefs.h <<EOF #define $cf_nculib_ROOT 1 EOF -echo "$as_me:10496: checking for ncurses version" >&5 +echo "$as_me:10581: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10519,10 +10604,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:10522: \"$cf_try\"") >&5 + { (eval echo "$as_me:10607: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:10525: \$? = $ac_status" >&5 + echo "$as_me:10610: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -10532,7 +10617,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 10535 "configure" +#line 10620 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10557,15 +10642,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:10560: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10645: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10563: \$? = $ac_status" >&5 + echo "$as_me:10648: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10565: \"$ac_try\"") >&5 + { (eval echo "$as_me:10650: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10568: \$? = $ac_status" >&5 + echo "$as_me:10653: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -10579,7 +10664,7 @@ fi rm -f $cf_tempfile fi -echo "$as_me:10582: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:10667: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 @@ -10588,7 +10673,7 @@ EOF ;; ncursesw) -echo "$as_me:10591: checking for multibyte character support" >&5 +echo "$as_me:10676: checking for multibyte character support" >&5 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 if test "${cf_cv_utf8_lib+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10596,7 +10681,7 @@ else cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10599 "configure" +#line 10684 "configure" #include "confdefs.h" #include <stdlib.h> @@ -10609,16 +10694,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10612: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10697: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10615: \$? = $ac_status" >&5 + echo "$as_me:10700: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10618: \"$ac_try\"") >&5 + { (eval echo "$as_me:10703: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10621: \$? = $ac_status" >&5 + echo "$as_me:10706: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_utf8_lib=yes else @@ -10626,7 +10711,7 @@ else cat conftest.$ac_ext >&5 LIBS="-lutf8 $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10629 "configure" +#line 10714 "configure" #include "confdefs.h" #include <libutf8.h> @@ -10639,16 +10724,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10642: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10727: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10645: \$? = $ac_status" >&5 + echo "$as_me:10730: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10648: \"$ac_try\"") >&5 + { (eval echo "$as_me:10733: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10651: \$? = $ac_status" >&5 + echo "$as_me:10736: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_utf8_lib=add-on else @@ -10662,7 +10747,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10665: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:10750: result: $cf_cv_utf8_lib" >&5 echo "${ECHO_T}$cf_cv_utf8_lib" >&6 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between @@ -10681,7 +10766,7 @@ test -n "$cf_cv_curses_dir" && \ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" -echo "$as_me:10684: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:10769: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10693,7 +10778,7 @@ else do cat >conftest.$ac_ext <<_ACEOF -#line 10696 "configure" +#line 10781 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -10725,16 +10810,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10728: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10813: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10731: \$? = $ac_status" >&5 + echo "$as_me:10816: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10734: \"$ac_try\"") >&5 + { (eval echo "$as_me:10819: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10737: \$? = $ac_status" >&5 + echo "$as_me:10822: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -10749,13 +10834,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:10752: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:10837: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:10758: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:10843: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10850,7 +10935,7 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 10853 "configure" +#line 10938 "configure" #include "confdefs.h" #include <stdio.h> int @@ -10862,16 +10947,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10865: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10950: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10868: \$? = $ac_status" >&5 + echo "$as_me:10953: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10871: \"$ac_try\"") >&5 + { (eval echo "$as_me:10956: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10874: \$? = $ac_status" >&5 + echo "$as_me:10959: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -10898,7 +10983,7 @@ done do cat >conftest.$ac_ext <<_ACEOF -#line 10901 "configure" +#line 10986 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -10930,16 +11015,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10933: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11018: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10936: \$? = $ac_status" >&5 + echo "$as_me:11021: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10939: \"$ac_try\"") >&5 + { (eval echo "$as_me:11024: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10942: \$? = $ac_status" >&5 + echo "$as_me:11027: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -10960,12 +11045,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10963: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11048: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:10968: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:11053: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` @@ -10987,7 +11072,7 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 10990 "configure" +#line 11075 "configure" #include "confdefs.h" #include <stdio.h> int @@ -10999,16 +11084,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11002: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11087: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11005: \$? = $ac_status" >&5 + echo "$as_me:11090: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11008: \"$ac_try\"") >&5 + { (eval echo "$as_me:11093: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11011: \$? = $ac_status" >&5 + echo "$as_me:11096: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -11059,7 +11144,7 @@ EOF ;; esac -echo "$as_me:11062: checking for ncurses version" >&5 +echo "$as_me:11147: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11085,10 +11170,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:11088: \"$cf_try\"") >&5 + { (eval echo "$as_me:11173: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:11091: \$? = $ac_status" >&5 + echo "$as_me:11176: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -11098,7 +11183,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 11101 "configure" +#line 11186 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -11123,15 +11208,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11126: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11211: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11129: \$? = $ac_status" >&5 + echo "$as_me:11214: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11131: \"$ac_try\"") >&5 + { (eval echo "$as_me:11216: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11134: \$? = $ac_status" >&5 + echo "$as_me:11219: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -11145,7 +11230,7 @@ fi rm -f $cf_tempfile fi -echo "$as_me:11148: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:11233: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 @@ -11157,7 +11242,7 @@ cf_nculib_root=ncursesw # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:11160: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:11245: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11165,7 +11250,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11168 "configure" +#line 11253 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11184,16 +11269,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11187: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11272: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11190: \$? = $ac_status" >&5 + echo "$as_me:11275: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11193: \"$ac_try\"") >&5 + { (eval echo "$as_me:11278: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11196: \$? = $ac_status" >&5 + echo "$as_me:11281: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -11204,10 +11289,10 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11207: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:11292: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test $ac_cv_lib_gpm_Gpm_Open = yes; then - echo "$as_me:11210: checking for initscr in -lgpm" >&5 + echo "$as_me:11295: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11215,7 +11300,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11218 "configure" +#line 11303 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11234,16 +11319,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11237: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11322: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11240: \$? = $ac_status" >&5 + echo "$as_me:11325: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11243: \"$ac_try\"") >&5 + { (eval echo "$as_me:11328: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11246: \$? = $ac_status" >&5 + echo "$as_me:11331: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -11254,7 +11339,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11257: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:11342: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test $ac_cv_lib_gpm_initscr = yes; then LIBS="$cf_ncurses_SAVE" @@ -11269,7 +11354,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). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:11272: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:11357: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11277,7 +11362,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11280 "configure" +#line 11365 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11296,16 +11381,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11299: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11384: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11302: \$? = $ac_status" >&5 + echo "$as_me:11387: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11305: \"$ac_try\"") >&5 + { (eval echo "$as_me:11390: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11308: \$? = $ac_status" >&5 + echo "$as_me:11393: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -11316,7 +11401,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11319: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:11404: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -11335,13 +11420,13 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:11338: checking for initscr" >&5 + echo "$as_me:11423: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11344 "configure" +#line 11429 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -11372,16 +11457,16 @@ f = initscr; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11375: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11460: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11378: \$? = $ac_status" >&5 + echo "$as_me:11463: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11381: \"$ac_try\"") >&5 + { (eval echo "$as_me:11466: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11384: \$? = $ac_status" >&5 + echo "$as_me:11469: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -11391,18 +11476,18 @@ ac_cv_func_initscr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11394: result: $ac_cv_func_initscr" >&5 +echo "$as_me:11479: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test $ac_cv_func_initscr = yes; then eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:11401: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:11486: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11405 "configure" +#line 11490 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -11414,25 +11499,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11417: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11502: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11420: \$? = $ac_status" >&5 + echo "$as_me:11505: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11423: \"$ac_try\"") >&5 + { (eval echo "$as_me:11508: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11426: \$? = $ac_status" >&5 + echo "$as_me:11511: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:11428: result: yes" >&5 + echo "$as_me:11513: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:11435: result: no" >&5 +echo "$as_me:11520: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search="" @@ -11492,11 +11577,11 @@ test -d /usr && { for cf_libdir in $cf_search do - echo "$as_me:11495: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:11580: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11499 "configure" +#line 11584 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -11508,25 +11593,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11511: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11596: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11514: \$? = $ac_status" >&5 + echo "$as_me:11599: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11517: \"$ac_try\"") >&5 + { (eval echo "$as_me:11602: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11520: \$? = $ac_status" >&5 + echo "$as_me:11605: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:11522: result: yes" >&5 + echo "$as_me:11607: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:11529: result: no" >&5 +echo "$as_me:11614: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -11541,7 +11626,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:11544: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:11629: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -11549,7 +11634,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:11552: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:11637: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -11559,7 +11644,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >conftest.$ac_ext <<_ACEOF -#line 11562 "configure" +#line 11647 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -11571,23 +11656,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11574: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11659: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11577: \$? = $ac_status" >&5 + echo "$as_me:11662: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11580: \"$ac_try\"") >&5 + { (eval echo "$as_me:11665: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11583: \$? = $ac_status" >&5 + echo "$as_me:11668: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:11585: result: yes" >&5 + echo "$as_me:11670: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:11590: result: no" >&5 +echo "$as_me:11675: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -11600,7 +11685,7 @@ cat >>confdefs.h <<EOF #define $cf_nculib_ROOT 1 EOF -echo "$as_me:11603: checking for ncurses version" >&5 +echo "$as_me:11688: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11626,10 +11711,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:11629: \"$cf_try\"") >&5 + { (eval echo "$as_me:11714: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:11632: \$? = $ac_status" >&5 + echo "$as_me:11717: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -11639,7 +11724,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 11642 "configure" +#line 11727 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -11664,15 +11749,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11667: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11752: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11670: \$? = $ac_status" >&5 + echo "$as_me:11755: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11672: \"$ac_try\"") >&5 + { (eval echo "$as_me:11757: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11675: \$? = $ac_status" >&5 + echo "$as_me:11760: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -11686,7 +11771,7 @@ fi rm -f $cf_tempfile fi -echo "$as_me:11689: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:11774: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 @@ -11699,14 +11784,14 @@ pdcurses) ;; slang) -echo "$as_me:11702: checking for slang header file" >&5 +echo "$as_me:11787: checking for slang header file" >&5 echo $ECHO_N "checking for slang header file... $ECHO_C" >&6 if test "${cf_cv_slang_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11709 "configure" +#line 11794 "configure" #include "confdefs.h" #include <slang.h> int @@ -11718,16 +11803,16 @@ printf("%s\n", SLANG_VERSION) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11721: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11806: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11724: \$? = $ac_status" >&5 + echo "$as_me:11809: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11727: \"$ac_try\"") >&5 + { (eval echo "$as_me:11812: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11730: \$? = $ac_status" >&5 + echo "$as_me:11815: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_slang_header=predefined else @@ -11817,14 +11902,14 @@ test -d "$oldincludedir" && { done test -n "$cf_cv_slang_header" && break done - test -z "$cf_cv_slang_header" && { { echo "$as_me:11820: error: not found" >&5 + test -z "$cf_cv_slang_header" && { { echo "$as_me:11905: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11827: result: $cf_cv_slang_header" >&5 +echo "$as_me:11912: result: $cf_cv_slang_header" >&5 echo "${ECHO_T}$cf_cv_slang_header" >&6 cat >>confdefs.h <<\EOF #define USE_SLANG 1 @@ -11850,7 +11935,7 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 11853 "configure" +#line 11938 "configure" #include "confdefs.h" #include <stdio.h> int @@ -11862,16 +11947,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11865: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11950: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11868: \$? = $ac_status" >&5 + echo "$as_me:11953: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11871: \"$ac_try\"") >&5 + { (eval echo "$as_me:11956: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11874: \$? = $ac_status" >&5 + echo "$as_me:11959: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -11897,14 +11982,14 @@ esac # There's an unofficial set of patches for slang that gives it some limited # UTF8 capability. Unfortunately it won't compile unless one defines UTF8. -echo "$as_me:11900: checking if we must define UTF8" >&5 +echo "$as_me:11985: checking if we must define UTF8" >&5 echo $ECHO_N "checking if we must define UTF8... $ECHO_C" >&6 if test "${cf_cv_slang_utf8+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11907 "configure" +#line 11992 "configure" #include "confdefs.h" #include <slang.h> @@ -11917,16 +12002,16 @@ SLtt_get_screen_size() } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11920: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12005: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11923: \$? = $ac_status" >&5 + echo "$as_me:12008: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11926: \"$ac_try\"") >&5 + { (eval echo "$as_me:12011: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11929: \$? = $ac_status" >&5 + echo "$as_me:12014: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_slang_utf8=no else @@ -11934,7 +12019,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 11937 "configure" +#line 12022 "configure" #include "confdefs.h" #define UTF8 @@ -11948,16 +12033,16 @@ SLtt_get_screen_size() } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11951: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12036: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11954: \$? = $ac_status" >&5 + echo "$as_me:12039: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11957: \"$ac_try\"") >&5 + { (eval echo "$as_me:12042: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11960: \$? = $ac_status" >&5 + echo "$as_me:12045: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_slang_utf8=yes else @@ -11970,7 +12055,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11973: result: $cf_cv_slang_utf8" >&5 +echo "$as_me:12058: result: $cf_cv_slang_utf8" >&5 echo "${ECHO_T}$cf_cv_slang_utf8" >&6 if test "$cf_cv_slang_utf8" = yes ; then @@ -11988,7 +12073,7 @@ else cf_cv_termlib=none cat >conftest.$ac_ext <<_ACEOF -#line 11991 "configure" +#line 12076 "configure" #include "confdefs.h" int @@ -12000,19 +12085,19 @@ char *x=(char*)tgoto("",0,0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12003: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12088: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12006: \$? = $ac_status" >&5 + echo "$as_me:12091: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12009: \"$ac_try\"") >&5 + { (eval echo "$as_me:12094: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12012: \$? = $ac_status" >&5 + echo "$as_me:12097: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >conftest.$ac_ext <<_ACEOF -#line 12015 "configure" +#line 12100 "configure" #include "confdefs.h" int @@ -12024,16 +12109,16 @@ int x=tigetstr("") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12027: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12112: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12030: \$? = $ac_status" >&5 + echo "$as_me:12115: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12033: \"$ac_try\"") >&5 + { (eval echo "$as_me:12118: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12036: \$? = $ac_status" >&5 + echo "$as_me:12121: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_termlib=terminfo else @@ -12057,10 +12142,10 @@ if test "$cf_cv_termlib" = none; then LIBS="-l$cf_lib $cf_save_LIBS" for cf_func in tigetstr tgetstr do - echo "$as_me:12060: checking for $cf_func in -l$cf_lib" >&5 + echo "$as_me:12145: checking for $cf_func in -l$cf_lib" >&5 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 12063 "configure" +#line 12148 "configure" #include "confdefs.h" int @@ -12072,16 +12157,16 @@ int x=$cf_func("") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12075: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12160: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12078: \$? = $ac_status" >&5 + echo "$as_me:12163: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12081: \"$ac_try\"") >&5 + { (eval echo "$as_me:12166: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12084: \$? = $ac_status" >&5 + echo "$as_me:12169: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -12090,7 +12175,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:12093: result: $cf_result" >&5 + echo "$as_me:12178: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then if test "$cf_func" = tigetstr ; then @@ -12107,7 +12192,7 @@ echo "${ECHO_T}$cf_result" >&6 fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. - echo "$as_me:12110: checking for initscr in -lcurses" >&5 + echo "$as_me:12195: checking for initscr in -lcurses" >&5 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 if test "${ac_cv_lib_curses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12115,7 +12200,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12118 "configure" +#line 12203 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12134,16 +12219,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12137: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12222: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12140: \$? = $ac_status" >&5 + echo "$as_me:12225: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12143: \"$ac_try\"") >&5 + { (eval echo "$as_me:12228: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12146: \$? = $ac_status" >&5 + echo "$as_me:12231: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_curses_initscr=yes else @@ -12154,13 +12239,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12157: result: $ac_cv_lib_curses_initscr" >&5 +echo "$as_me:12242: result: $ac_cv_lib_curses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 if test $ac_cv_lib_curses_initscr = yes; then LIBS="$LIBS -lcurses" cf_cv_termlib=termcap fi - echo "$as_me:12163: checking for tgoto in -ltermcap" >&5 + echo "$as_me:12248: checking for tgoto in -ltermcap" >&5 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12168,7 +12253,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ltermcap $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12171 "configure" +#line 12256 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12187,16 +12272,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12190: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12275: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12193: \$? = $ac_status" >&5 + echo "$as_me:12278: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12196: \"$ac_try\"") >&5 + { (eval echo "$as_me:12281: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12199: \$? = $ac_status" >&5 + echo "$as_me:12284: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_termcap_tgoto=yes else @@ -12207,7 +12292,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12210: result: $ac_cv_lib_termcap_tgoto" >&5 +echo "$as_me:12295: result: $ac_cv_lib_termcap_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6 if test $ac_cv_lib_termcap_tgoto = yes; then LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap @@ -12218,20 +12303,20 @@ fi fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$cf_cv_termlib" = none; then - { echo "$as_me:12221: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 + { echo "$as_me:12306: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;} fi fi cf_slang_LIBS2="$LIBS" -echo "$as_me:12228: checking for acos" >&5 +echo "$as_me:12313: checking for acos" >&5 echo $ECHO_N "checking for acos... $ECHO_C" >&6 if test "${ac_cv_func_acos+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12234 "configure" +#line 12319 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char acos (); below. */ @@ -12262,16 +12347,16 @@ f = acos; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12265: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12350: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12268: \$? = $ac_status" >&5 + echo "$as_me:12353: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12271: \"$ac_try\"") >&5 + { (eval echo "$as_me:12356: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12274: \$? = $ac_status" >&5 + echo "$as_me:12359: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_acos=yes else @@ -12281,13 +12366,13 @@ ac_cv_func_acos=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12284: result: $ac_cv_func_acos" >&5 +echo "$as_me:12369: result: $ac_cv_func_acos" >&5 echo "${ECHO_T}$ac_cv_func_acos" >&6 if test $ac_cv_func_acos = yes; then : else -echo "$as_me:12290: checking for acos in -lm" >&5 +echo "$as_me:12375: checking for acos in -lm" >&5 echo $ECHO_N "checking for acos in -lm... $ECHO_C" >&6 if test "${ac_cv_lib_m_acos+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12295,7 +12380,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12298 "configure" +#line 12383 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12314,16 +12399,16 @@ acos (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12317: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12402: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12320: \$? = $ac_status" >&5 + echo "$as_me:12405: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12323: \"$ac_try\"") >&5 + { (eval echo "$as_me:12408: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12326: \$? = $ac_status" >&5 + echo "$as_me:12411: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_m_acos=yes else @@ -12334,7 +12419,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12337: result: $ac_cv_lib_m_acos" >&5 +echo "$as_me:12422: result: $ac_cv_lib_m_acos" >&5 echo "${ECHO_T}$ac_cv_lib_m_acos" >&6 if test $ac_cv_lib_m_acos = yes; then @@ -12360,13 +12445,13 @@ os2*) eval 'cf_cv_have_lib_'video'=no' cf_libdir="" - echo "$as_me:12363: checking for v_init" >&5 + echo "$as_me:12448: checking for v_init" >&5 echo $ECHO_N "checking for v_init... $ECHO_C" >&6 if test "${ac_cv_func_v_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12369 "configure" +#line 12454 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char v_init (); below. */ @@ -12397,16 +12482,16 @@ f = v_init; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12400: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12485: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12403: \$? = $ac_status" >&5 + echo "$as_me:12488: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12406: \"$ac_try\"") >&5 + { (eval echo "$as_me:12491: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12409: \$? = $ac_status" >&5 + echo "$as_me:12494: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_v_init=yes else @@ -12416,18 +12501,18 @@ ac_cv_func_v_init=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12419: result: $ac_cv_func_v_init" >&5 +echo "$as_me:12504: result: $ac_cv_func_v_init" >&5 echo "${ECHO_T}$ac_cv_func_v_init" >&6 if test $ac_cv_func_v_init = yes; then eval 'cf_cv_have_lib_'video'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:12426: checking for v_init in -lvideo" >&5 + echo "$as_me:12511: checking for v_init in -lvideo" >&5 echo $ECHO_N "checking for v_init in -lvideo... $ECHO_C" >&6 LIBS="-lvideo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12430 "configure" +#line 12515 "configure" #include "confdefs.h" #include <sys/video.h> int @@ -12439,25 +12524,25 @@ v_init() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12442: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12527: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12445: \$? = $ac_status" >&5 + echo "$as_me:12530: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12448: \"$ac_try\"") >&5 + { (eval echo "$as_me:12533: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12451: \$? = $ac_status" >&5 + echo "$as_me:12536: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:12453: result: yes" >&5 + echo "$as_me:12538: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'video'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:12460: result: no" >&5 +echo "$as_me:12545: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search="" @@ -12517,11 +12602,11 @@ test -d /usr && { for cf_libdir in $cf_search do - echo "$as_me:12520: checking for -lvideo in $cf_libdir" >&5 + echo "$as_me:12605: checking for -lvideo in $cf_libdir" >&5 echo $ECHO_N "checking for -lvideo in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -lvideo $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12524 "configure" +#line 12609 "configure" #include "confdefs.h" #include <sys/video.h> int @@ -12533,25 +12618,25 @@ v_init() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12536: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12621: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12539: \$? = $ac_status" >&5 + echo "$as_me:12624: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12542: \"$ac_try\"") >&5 + { (eval echo "$as_me:12627: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12545: \$? = $ac_status" >&5 + echo "$as_me:12630: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:12547: result: yes" >&5 + echo "$as_me:12632: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'video'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:12554: result: no" >&5 +echo "$as_me:12639: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -12566,7 +12651,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'video if test $cf_found_library = no ; then - { { echo "$as_me:12569: error: Cannot link video library" >&5 + { { echo "$as_me:12654: error: Cannot link video library" >&5 echo "$as_me: error: Cannot link video library" >&2;} { (exit 1); exit 1; }; } fi @@ -12576,13 +12661,13 @@ esac eval 'cf_cv_have_lib_'slang'=no' cf_libdir="" - echo "$as_me:12579: checking for SLtt_get_screen_size" >&5 + echo "$as_me:12664: checking for SLtt_get_screen_size" >&5 echo $ECHO_N "checking for SLtt_get_screen_size... $ECHO_C" >&6 if test "${ac_cv_func_SLtt_get_screen_size+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12585 "configure" +#line 12670 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char SLtt_get_screen_size (); below. */ @@ -12613,16 +12698,16 @@ f = SLtt_get_screen_size; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12616: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12701: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12619: \$? = $ac_status" >&5 + echo "$as_me:12704: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12622: \"$ac_try\"") >&5 + { (eval echo "$as_me:12707: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12625: \$? = $ac_status" >&5 + echo "$as_me:12710: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_SLtt_get_screen_size=yes else @@ -12632,18 +12717,18 @@ ac_cv_func_SLtt_get_screen_size=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12635: result: $ac_cv_func_SLtt_get_screen_size" >&5 +echo "$as_me:12720: result: $ac_cv_func_SLtt_get_screen_size" >&5 echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6 if test $ac_cv_func_SLtt_get_screen_size = yes; then eval 'cf_cv_have_lib_'slang'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:12642: checking for SLtt_get_screen_size in -lslang" >&5 + echo "$as_me:12727: checking for SLtt_get_screen_size in -lslang" >&5 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang... $ECHO_C" >&6 LIBS="-lslang $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12646 "configure" +#line 12731 "configure" #include "confdefs.h" #include <slang.h> int @@ -12655,25 +12740,25 @@ SLtt_get_screen_size() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12658: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12743: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12661: \$? = $ac_status" >&5 + echo "$as_me:12746: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12664: \"$ac_try\"") >&5 + { (eval echo "$as_me:12749: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12667: \$? = $ac_status" >&5 + echo "$as_me:12752: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:12669: result: yes" >&5 + echo "$as_me:12754: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'slang'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:12676: result: no" >&5 +echo "$as_me:12761: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search="" @@ -12733,11 +12818,11 @@ test -d /usr && { for cf_libdir in $cf_search do - echo "$as_me:12736: checking for -lslang in $cf_libdir" >&5 + echo "$as_me:12821: checking for -lslang in $cf_libdir" >&5 echo $ECHO_N "checking for -lslang in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -lslang $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12740 "configure" +#line 12825 "configure" #include "confdefs.h" #include <slang.h> int @@ -12749,25 +12834,25 @@ SLtt_get_screen_size() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12752: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12837: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12755: \$? = $ac_status" >&5 + echo "$as_me:12840: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12758: \"$ac_try\"") >&5 + { (eval echo "$as_me:12843: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12761: \$? = $ac_status" >&5 + echo "$as_me:12846: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:12763: result: yes" >&5 + echo "$as_me:12848: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'slang'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:12770: result: no" >&5 +echo "$as_me:12855: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -12782,13 +12867,13 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'slang if test $cf_found_library = no ; then - { { echo "$as_me:12785: error: Cannot link slang library" >&5 + { { echo "$as_me:12870: error: Cannot link slang library" >&5 echo "$as_me: error: Cannot link slang library" >&2;} { (exit 1); exit 1; }; } fi cf_slang_LIBS3="$LIBS" -echo "$as_me:12791: checking if we can link slang without termcap" >&5 +echo "$as_me:12876: checking if we can link slang without termcap" >&5 echo $ECHO_N "checking if we can link slang without termcap... $ECHO_C" >&6 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%^.%%'` @@ -12797,7 +12882,7 @@ else fi LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'` cat >conftest.$ac_ext <<_ACEOF -#line 12800 "configure" +#line 12885 "configure" #include "confdefs.h" #include <slang.h> int @@ -12809,16 +12894,16 @@ SLtt_get_screen_size() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12812: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12897: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12815: \$? = $ac_status" >&5 + echo "$as_me:12900: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12818: \"$ac_try\"") >&5 + { (eval echo "$as_me:12903: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12821: \$? = $ac_status" >&5 + echo "$as_me:12906: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -12827,18 +12912,18 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:12830: result: $cf_result" >&5 +echo "$as_me:12915: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test $cf_result = no && LIBS="$cf_slang_LIBS3" -echo "$as_me:12834: checking if we must tell slang this is UNIX" >&5 +echo "$as_me:12919: checking if we must tell slang this is UNIX" >&5 echo $ECHO_N "checking if we must tell slang this is UNIX... $ECHO_C" >&6 if test "${cf_cv_slang_unix+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12841 "configure" +#line 12926 "configure" #include "confdefs.h" #include <slang.h> int @@ -12857,16 +12942,16 @@ SLang_TT_Baud_Rate = 1 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12860: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12945: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12863: \$? = $ac_status" >&5 + echo "$as_me:12948: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12866: \"$ac_try\"") >&5 + { (eval echo "$as_me:12951: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12869: \$? = $ac_status" >&5 + echo "$as_me:12954: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_slang_unix=yes else @@ -12877,7 +12962,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12880: result: $cf_cv_slang_unix" >&5 +echo "$as_me:12965: result: $cf_cv_slang_unix" >&5 echo "${ECHO_T}$cf_cv_slang_unix" >&6 test $cf_cv_slang_unix = yes && cat >>confdefs.h <<\EOF #define REAL_UNIX_SYSTEM 1 @@ -12889,19 +12974,19 @@ esac eval cf_libdir=$libdir cf_libdir=`echo $cf_libdir | sed -e s%'^NONE/'%$prefix/% -e s%'^NONE/'%$ac_default_prefix/%` -echo "$as_me:12892: checking for location of config-file" >&5 +echo "$as_me:12977: checking for location of config-file" >&5 echo $ECHO_N "checking for location of config-file... $ECHO_C" >&6 LYNX_CFG_FILE=$cf_libdir/lynx.cfg cat >>confdefs.h <<EOF #define LYNX_CFG_FILE "$LYNX_CFG_FILE" EOF -echo "$as_me:12899: result: $LYNX_CFG_FILE" >&5 +echo "$as_me:12984: result: $LYNX_CFG_FILE" >&5 echo "${ECHO_T}$LYNX_CFG_FILE" >&6 CHARSET_DEFS= -echo "$as_me:12904: checking if you want only a few charsets" >&5 +echo "$as_me:12989: checking if you want only a few charsets" >&5 echo $ECHO_N "checking if you want only a few charsets... $ECHO_C" >&6 # Check whether --with-charsets or --without-charsets was given. @@ -12913,7 +12998,7 @@ else fi; if test -n "$cf_charsets" ; then - echo "$as_me:12916: result: yes" >&5 + echo "$as_me:13001: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\EOF #define ALL_CHARSETS 0 @@ -12958,17 +13043,17 @@ EOF fi done else - echo "$as_me:12961: result: no" >&5 + echo "$as_me:13046: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:12965: checking for ANSI C header files" >&5 +echo "$as_me:13050: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12971 "configure" +#line 13056 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -12976,13 +13061,13 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:12979: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13064: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:12985: \$? = $ac_status" >&5 + echo "$as_me:13070: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13004,7 +13089,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 13007 "configure" +#line 13092 "configure" #include "confdefs.h" #include <string.h> @@ -13022,7 +13107,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 <<_ACEOF -#line 13025 "configure" +#line 13110 "configure" #include "confdefs.h" #include <stdlib.h> @@ -13043,7 +13128,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 13046 "configure" +#line 13131 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -13069,15 +13154,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:13072: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13157: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13075: \$? = $ac_status" >&5 + echo "$as_me:13160: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13077: \"$ac_try\"") >&5 + { (eval echo "$as_me:13162: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13080: \$? = $ac_status" >&5 + echo "$as_me:13165: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -13090,7 +13175,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:13093: result: $ac_cv_header_stdc" >&5 +echo "$as_me:13178: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -13100,13 +13185,13 @@ EOF fi -echo "$as_me:13103: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:13188: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13109 "configure" +#line 13194 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -13122,16 +13207,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13125: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13210: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13128: \$? = $ac_status" >&5 + echo "$as_me:13213: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13131: \"$ac_try\"") >&5 + { (eval echo "$as_me:13216: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13134: \$? = $ac_status" >&5 + echo "$as_me:13219: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -13141,7 +13226,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13144: result: $ac_cv_header_time" >&5 +echo "$as_me:13229: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -13154,13 +13239,13 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:13157: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:13242: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13163 "configure" +#line 13248 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -13175,16 +13260,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13178: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13263: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13181: \$? = $ac_status" >&5 + echo "$as_me:13266: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13184: \"$ac_try\"") >&5 + { (eval echo "$as_me:13269: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13187: \$? = $ac_status" >&5 + echo "$as_me:13272: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -13194,7 +13279,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13197: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13282: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -13207,7 +13292,7 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:13210: checking for opendir in -ldir" >&5 + echo "$as_me:13295: checking for opendir in -ldir" >&5 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13215,7 +13300,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13218 "configure" +#line 13303 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13234,16 +13319,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13237: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13322: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13240: \$? = $ac_status" >&5 + echo "$as_me:13325: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13243: \"$ac_try\"") >&5 + { (eval echo "$as_me:13328: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13246: \$? = $ac_status" >&5 + echo "$as_me:13331: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -13254,14 +13339,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13257: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:13342: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 if test $ac_cv_lib_dir_opendir = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:13264: checking for opendir in -lx" >&5 + echo "$as_me:13349: checking for opendir in -lx" >&5 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 if test "${ac_cv_lib_x_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13269,7 +13354,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13272 "configure" +#line 13357 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13288,16 +13373,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13291: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13376: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13294: \$? = $ac_status" >&5 + echo "$as_me:13379: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13297: \"$ac_try\"") >&5 + { (eval echo "$as_me:13382: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13300: \$? = $ac_status" >&5 + echo "$as_me:13385: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -13308,7 +13393,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13311: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:13396: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 if test $ac_cv_lib_x_opendir = yes; then LIBS="$LIBS -lx" @@ -13336,23 +13421,23 @@ for ac_header in \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:13339: checking for $ac_header" >&5 +echo "$as_me:13424: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13345 "configure" +#line 13430 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:13349: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13434: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:13355: \$? = $ac_status" >&5 + echo "$as_me:13440: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13371,7 +13456,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13374: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13459: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -13381,14 +13466,14 @@ EOF fi done -echo "$as_me:13384: checking termio.h and termios.h" >&5 +echo "$as_me:13469: checking termio.h and termios.h" >&5 echo $ECHO_N "checking termio.h and termios.h... $ECHO_C" >&6 if test "${cf_cv_termio_and_termios+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13391 "configure" +#line 13476 "configure" #include "confdefs.h" #if HAVE_TERMIO_H @@ -13406,16 +13491,16 @@ putchar (0x0a) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13409: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13494: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13412: \$? = $ac_status" >&5 + echo "$as_me:13497: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13415: \"$ac_try\"") >&5 + { (eval echo "$as_me:13500: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13418: \$? = $ac_status" >&5 + echo "$as_me:13503: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_termio_and_termios=yes else @@ -13426,20 +13511,20 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13429: result: $cf_cv_termio_and_termios" >&5 +echo "$as_me:13514: result: $cf_cv_termio_and_termios" >&5 echo "${ECHO_T}$cf_cv_termio_and_termios" >&6 test $cf_cv_termio_and_termios = no && cat >>confdefs.h <<\EOF #define TERMIO_AND_TERMIOS 1 EOF -echo "$as_me:13435: checking for sigaction and structs" >&5 +echo "$as_me:13520: checking for sigaction and structs" >&5 echo $ECHO_N "checking for sigaction and structs... $ECHO_C" >&6 if test "${cf_cv_func_sigaction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13442 "configure" +#line 13527 "configure" #include "confdefs.h" #include <sys/types.h> @@ -13459,16 +13544,16 @@ struct sigaction act; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13462: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13547: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13465: \$? = $ac_status" >&5 + echo "$as_me:13550: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13468: \"$ac_try\"") >&5 + { (eval echo "$as_me:13553: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13471: \$? = $ac_status" >&5 + echo "$as_me:13556: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_sigaction=yes else @@ -13479,7 +13564,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13482: result: $cf_cv_func_sigaction" >&5 +echo "$as_me:13567: result: $cf_cv_func_sigaction" >&5 echo "${ECHO_T}$cf_cv_func_sigaction" >&6 test "$cf_cv_func_sigaction" = yes && cat >>confdefs.h <<\EOF #define HAVE_SIGACTION 1 @@ -13488,23 +13573,23 @@ EOF for ac_header in sys/wait.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:13491: checking for $ac_header" >&5 +echo "$as_me:13576: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13497 "configure" +#line 13582 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:13501: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13586: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:13507: \$? = $ac_status" >&5 + echo "$as_me:13592: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13523,7 +13608,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13526: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13611: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -13544,23 +13629,23 @@ else for ac_header in wait.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:13547: checking for $ac_header" >&5 +echo "$as_me:13632: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13553 "configure" +#line 13638 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:13557: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13642: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:13563: \$? = $ac_status" >&5 + echo "$as_me:13648: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13579,7 +13664,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13582: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13667: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -13592,23 +13677,23 @@ done for ac_header in waitstatus.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:13595: checking for $ac_header" >&5 +echo "$as_me:13680: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13601 "configure" +#line 13686 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:13605: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13690: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:13611: \$? = $ac_status" >&5 + echo "$as_me:13696: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13627,7 +13712,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13630: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13715: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -13649,14 +13734,14 @@ cf_wait_headers="$cf_wait_headers fi fi -echo "$as_me:13652: checking for union wait" >&5 +echo "$as_me:13737: checking for union wait" >&5 echo $ECHO_N "checking for union wait... $ECHO_C" >&6 if test "${cf_cv_type_unionwait+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13659 "configure" +#line 13744 "configure" #include "confdefs.h" $cf_wait_headers int @@ -13672,16 +13757,16 @@ int x; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13675: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13760: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13678: \$? = $ac_status" >&5 + echo "$as_me:13763: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13681: \"$ac_try\"") >&5 + { (eval echo "$as_me:13766: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13684: \$? = $ac_status" >&5 + echo "$as_me:13769: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&5 @@ -13691,7 +13776,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 13694 "configure" +#line 13779 "configure" #include "confdefs.h" $cf_wait_headers int @@ -13711,16 +13796,16 @@ union wait x; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13714: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13799: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13717: \$? = $ac_status" >&5 + echo "$as_me:13802: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13720: \"$ac_try\"") >&5 + { (eval echo "$as_me:13805: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13723: \$? = $ac_status" >&5 + echo "$as_me:13808: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&5 @@ -13735,7 +13820,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13738: result: $cf_cv_type_unionwait" >&5 +echo "$as_me:13823: result: $cf_cv_type_unionwait" >&5 echo "${ECHO_T}$cf_cv_type_unionwait" >&6 test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF #define HAVE_TYPE_UNIONWAIT 1 @@ -13743,14 +13828,14 @@ EOF if test $cf_cv_type_unionwait = yes; then - echo "$as_me:13746: checking if union wait can be used as wait-arg" >&5 + echo "$as_me:13831: checking if union wait can be used as wait-arg" >&5 echo $ECHO_N "checking if union wait can be used as wait-arg... $ECHO_C" >&6 if test "${cf_cv_arg_union_wait+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13753 "configure" +#line 13838 "configure" #include "confdefs.h" $cf_wait_headers int @@ -13762,16 +13847,16 @@ union wait x; wait(&x) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13765: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13850: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13768: \$? = $ac_status" >&5 + echo "$as_me:13853: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13771: \"$ac_try\"") >&5 + { (eval echo "$as_me:13856: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13774: \$? = $ac_status" >&5 + echo "$as_me:13859: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_arg_union_wait=yes else @@ -13783,20 +13868,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:13786: result: $cf_cv_arg_union_wait" >&5 + echo "$as_me:13871: result: $cf_cv_arg_union_wait" >&5 echo "${ECHO_T}$cf_cv_arg_union_wait" >&6 test $cf_cv_arg_union_wait = yes && cat >>confdefs.h <<\EOF #define WAIT_USES_UNION 1 EOF - echo "$as_me:13792: checking if union wait can be used as waitpid-arg" >&5 + echo "$as_me:13877: checking if union wait can be used as waitpid-arg" >&5 echo $ECHO_N "checking if union wait can be used as waitpid-arg... $ECHO_C" >&6 if test "${cf_cv_arg_union_waitpid+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13799 "configure" +#line 13884 "configure" #include "confdefs.h" $cf_wait_headers int @@ -13808,16 +13893,16 @@ union wait x; waitpid(0, &x, 0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13811: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13896: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13814: \$? = $ac_status" >&5 + echo "$as_me:13899: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13817: \"$ac_try\"") >&5 + { (eval echo "$as_me:13902: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13820: \$? = $ac_status" >&5 + echo "$as_me:13905: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_arg_union_waitpid=yes else @@ -13829,7 +13914,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:13832: result: $cf_cv_arg_union_waitpid" >&5 + echo "$as_me:13917: result: $cf_cv_arg_union_waitpid" >&5 echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6 test $cf_cv_arg_union_waitpid = yes && cat >>confdefs.h <<\EOF #define WAITPID_USES_UNION 1 @@ -13840,23 +13925,23 @@ fi for ac_header in stdarg.h varargs.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:13843: checking for $ac_header" >&5 +echo "$as_me:13928: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13849 "configure" +#line 13934 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:13853: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13938: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:13859: \$? = $ac_status" >&5 + echo "$as_me:13944: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13875,7 +13960,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13878: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13963: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -13885,14 +13970,14 @@ EOF fi done -echo "$as_me:13888: checking for standard varargs" >&5 +echo "$as_me:13973: checking for standard varargs" >&5 echo $ECHO_N "checking for standard varargs... $ECHO_C" >&6 if test "${cf_cv_ansi_varargs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13895 "configure" +#line 13980 "configure" #include "confdefs.h" #if HAVE_STDARG_H @@ -13912,16 +13997,16 @@ return 0;} int foo(char *fmt,...){va_list args;va_start(args,fmt);va_end(args) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13915: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14000: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13918: \$? = $ac_status" >&5 + echo "$as_me:14003: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13921: \"$ac_try\"") >&5 + { (eval echo "$as_me:14006: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13924: \$? = $ac_status" >&5 + echo "$as_me:14009: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ansi_varargs=yes else @@ -13933,19 +14018,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13936: result: $cf_cv_ansi_varargs" >&5 +echo "$as_me:14021: result: $cf_cv_ansi_varargs" >&5 echo "${ECHO_T}$cf_cv_ansi_varargs" >&6 test $cf_cv_ansi_varargs = yes && cat >>confdefs.h <<\EOF #define ANSI_VARARGS 1 EOF -echo "$as_me:13942: checking for uid_t in sys/types.h" >&5 +echo "$as_me:14027: checking for uid_t in sys/types.h" >&5 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 if test "${ac_cv_type_uid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13948 "configure" +#line 14033 "configure" #include "confdefs.h" #include <sys/types.h> @@ -13959,7 +14044,7 @@ fi rm -f conftest* fi -echo "$as_me:13962: result: $ac_cv_type_uid_t" >&5 +echo "$as_me:14047: result: $ac_cv_type_uid_t" >&5 echo "${ECHO_T}$ac_cv_type_uid_t" >&6 if test $ac_cv_type_uid_t = no; then @@ -13973,7 +14058,7 @@ EOF fi -echo "$as_me:13976: checking type of array argument to getgroups" >&5 +echo "$as_me:14061: checking type of array argument to getgroups" >&5 echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6 if test "${ac_cv_type_getgroups+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13982,7 +14067,7 @@ else ac_cv_type_getgroups=cross else cat >conftest.$ac_ext <<_ACEOF -#line 13985 "configure" +#line 14070 "configure" #include "confdefs.h" /* Thanks to Mike Rendell for this test. */ #include <sys/types.h> @@ -14008,15 +14093,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14011: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14096: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14014: \$? = $ac_status" >&5 + echo "$as_me:14099: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14016: \"$ac_try\"") >&5 + { (eval echo "$as_me:14101: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14019: \$? = $ac_status" >&5 + echo "$as_me:14104: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_getgroups=gid_t else @@ -14029,7 +14114,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_type_getgroups = cross; then cat >conftest.$ac_ext <<_ACEOF -#line 14032 "configure" +#line 14117 "configure" #include "confdefs.h" #include <unistd.h> @@ -14044,20 +14129,20 @@ rm -f conftest* fi fi -echo "$as_me:14047: result: $ac_cv_type_getgroups" >&5 +echo "$as_me:14132: result: $ac_cv_type_getgroups" >&5 echo "${ECHO_T}$ac_cv_type_getgroups" >&6 cat >>confdefs.h <<EOF #define GETGROUPS_T $ac_cv_type_getgroups EOF -echo "$as_me:14054: checking for pid_t" >&5 +echo "$as_me:14139: checking for pid_t" >&5 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14060 "configure" +#line 14145 "configure" #include "confdefs.h" $ac_includes_default int @@ -14072,16 +14157,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14075: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14160: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14078: \$? = $ac_status" >&5 + echo "$as_me:14163: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14081: \"$ac_try\"") >&5 + { (eval echo "$as_me:14166: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14084: \$? = $ac_status" >&5 + echo "$as_me:14169: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -14091,7 +14176,7 @@ ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14094: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:14179: result: $ac_cv_type_pid_t" >&5 echo "${ECHO_T}$ac_cv_type_pid_t" >&6 if test $ac_cv_type_pid_t = yes; then : @@ -14103,13 +14188,13 @@ EOF fi -echo "$as_me:14106: checking for uid_t in sys/types.h" >&5 +echo "$as_me:14191: checking for uid_t in sys/types.h" >&5 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 if test "${ac_cv_type_uid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14112 "configure" +#line 14197 "configure" #include "confdefs.h" #include <sys/types.h> @@ -14123,7 +14208,7 @@ fi rm -f conftest* fi -echo "$as_me:14126: result: $ac_cv_type_uid_t" >&5 +echo "$as_me:14211: result: $ac_cv_type_uid_t" >&5 echo "${ECHO_T}$ac_cv_type_uid_t" >&6 if test $ac_cv_type_uid_t = no; then @@ -14137,13 +14222,13 @@ EOF fi -echo "$as_me:14140: checking for mode_t" >&5 +echo "$as_me:14225: checking for mode_t" >&5 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 if test "${ac_cv_type_mode_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14146 "configure" +#line 14231 "configure" #include "confdefs.h" $ac_includes_default int @@ -14158,16 +14243,16 @@ if (sizeof (mode_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14161: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14246: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14164: \$? = $ac_status" >&5 + echo "$as_me:14249: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14167: \"$ac_try\"") >&5 + { (eval echo "$as_me:14252: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14170: \$? = $ac_status" >&5 + echo "$as_me:14255: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_mode_t=yes else @@ -14177,7 +14262,7 @@ ac_cv_type_mode_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14180: result: $ac_cv_type_mode_t" >&5 +echo "$as_me:14265: result: $ac_cv_type_mode_t" >&5 echo "${ECHO_T}$ac_cv_type_mode_t" >&6 if test $ac_cv_type_mode_t = yes; then : @@ -14189,15 +14274,71 @@ EOF fi + echo "$as_me:14277: checking for socklen_t" >&5 +echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 +if test "${ac_cv_type_socklen_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 14283 "configure" +#include "confdefs.h" +#include <sys/socket.h> + +int +main () +{ +if ((socklen_t *) 0) + return 0; +if (sizeof (socklen_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:14299: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:14302: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:14305: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14308: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_socklen_t=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_socklen_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:14318: result: $ac_cv_type_socklen_t" >&5 +echo "${ECHO_T}$ac_cv_type_socklen_t" >&6 +if test $ac_cv_type_socklen_t = yes; then + ac_cv_type_socklen_t=yes +else + ac_cv_type_socklen_t=no +fi + + if test $ac_cv_type_socklen_t = no; then + cat >>confdefs.h <<\EOF +#define socklen_t int +EOF + +fi + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo "$as_me:14194: checking for working alloca.h" >&5 +echo "$as_me:14335: checking for working alloca.h" >&5 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 if test "${ac_cv_working_alloca_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14200 "configure" +#line 14341 "configure" #include "confdefs.h" #include <alloca.h> int @@ -14209,16 +14350,16 @@ char *p = (char *) alloca (2 * sizeof (int)); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14212: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14353: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14215: \$? = $ac_status" >&5 + echo "$as_me:14356: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14218: \"$ac_try\"") >&5 + { (eval echo "$as_me:14359: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14221: \$? = $ac_status" >&5 + echo "$as_me:14362: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_working_alloca_h=yes else @@ -14228,7 +14369,7 @@ ac_cv_working_alloca_h=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14231: result: $ac_cv_working_alloca_h" >&5 +echo "$as_me:14372: result: $ac_cv_working_alloca_h" >&5 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 if test $ac_cv_working_alloca_h = yes; then @@ -14238,13 +14379,13 @@ EOF fi -echo "$as_me:14241: checking for alloca" >&5 +echo "$as_me:14382: checking for alloca" >&5 echo $ECHO_N "checking for alloca... $ECHO_C" >&6 if test "${ac_cv_func_alloca_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14247 "configure" +#line 14388 "configure" #include "confdefs.h" #ifdef __GNUC__ # define alloca __builtin_alloca @@ -14276,16 +14417,16 @@ char *p = (char *) alloca (1); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14279: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14420: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14282: \$? = $ac_status" >&5 + echo "$as_me:14423: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14285: \"$ac_try\"") >&5 + { (eval echo "$as_me:14426: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14288: \$? = $ac_status" >&5 + echo "$as_me:14429: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_alloca_works=yes else @@ -14295,7 +14436,7 @@ ac_cv_func_alloca_works=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14298: result: $ac_cv_func_alloca_works" >&5 +echo "$as_me:14439: result: $ac_cv_func_alloca_works" >&5 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 if test $ac_cv_func_alloca_works = yes; then @@ -14316,13 +14457,13 @@ cat >>confdefs.h <<\EOF #define C_ALLOCA 1 EOF -echo "$as_me:14319: checking whether \`alloca.c' needs Cray hooks" >&5 +echo "$as_me:14460: checking whether \`alloca.c' needs Cray hooks" >&5 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 if test "${ac_cv_os_cray+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14325 "configure" +#line 14466 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -14340,18 +14481,18 @@ fi rm -f conftest* fi -echo "$as_me:14343: result: $ac_cv_os_cray" >&5 +echo "$as_me:14484: result: $ac_cv_os_cray" >&5 echo "${ECHO_T}$ac_cv_os_cray" >&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:14348: checking for $ac_func" >&5 +echo "$as_me:14489: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14354 "configure" +#line 14495 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -14382,16 +14523,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14385: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14526: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14388: \$? = $ac_status" >&5 + echo "$as_me:14529: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14391: \"$ac_try\"") >&5 + { (eval echo "$as_me:14532: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14394: \$? = $ac_status" >&5 + echo "$as_me:14535: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -14401,7 +14542,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14404: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:14545: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then @@ -14415,7 +14556,7 @@ fi done fi -echo "$as_me:14418: checking stack direction for C alloca" >&5 +echo "$as_me:14559: checking stack direction for C alloca" >&5 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 if test "${ac_cv_c_stack_direction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14424,7 +14565,7 @@ else ac_cv_c_stack_direction=0 else cat >conftest.$ac_ext <<_ACEOF -#line 14427 "configure" +#line 14568 "configure" #include "confdefs.h" int find_stack_direction () @@ -14447,15 +14588,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14450: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14591: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14453: \$? = $ac_status" >&5 + echo "$as_me:14594: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14455: \"$ac_try\"") >&5 + { (eval echo "$as_me:14596: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14458: \$? = $ac_status" >&5 + echo "$as_me:14599: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_stack_direction=1 else @@ -14467,7 +14608,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:14470: result: $ac_cv_c_stack_direction" >&5 +echo "$as_me:14611: result: $ac_cv_c_stack_direction" >&5 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 cat >>confdefs.h <<EOF @@ -14479,23 +14620,23 @@ fi for ac_header in unistd.h vfork.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:14482: checking for $ac_header" >&5 +echo "$as_me:14623: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14488 "configure" +#line 14629 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14492: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14633: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:14498: \$? = $ac_status" >&5 + echo "$as_me:14639: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14514,7 +14655,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14517: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:14658: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -14527,13 +14668,13 @@ done for ac_func in fork vfork do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:14530: checking for $ac_func" >&5 +echo "$as_me:14671: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14536 "configure" +#line 14677 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -14564,16 +14705,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14567: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14708: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14570: \$? = $ac_status" >&5 + echo "$as_me:14711: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14573: \"$ac_try\"") >&5 + { (eval echo "$as_me:14714: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14576: \$? = $ac_status" >&5 + echo "$as_me:14717: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -14583,7 +14724,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14586: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:14727: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -14595,7 +14736,7 @@ done ac_cv_func_fork_works=$ac_cv_func_fork if test "x$ac_cv_func_fork" = xyes; then - echo "$as_me:14598: checking for working fork" >&5 + echo "$as_me:14739: checking for working fork" >&5 echo $ECHO_N "checking for working fork... $ECHO_C" >&6 if test "${ac_cv_func_fork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14618,15 +14759,15 @@ else } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14621: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14762: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14624: \$? = $ac_status" >&5 + echo "$as_me:14765: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14626: \"$ac_try\"") >&5 + { (eval echo "$as_me:14767: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14629: \$? = $ac_status" >&5 + echo "$as_me:14770: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fork_works=yes else @@ -14638,7 +14779,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:14641: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:14782: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -14652,12 +14793,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:14655: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:14796: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} fi ac_cv_func_vfork_works=$ac_cv_func_vfork if test "x$ac_cv_func_vfork" = xyes; then - echo "$as_me:14660: checking for working vfork" >&5 + echo "$as_me:14801: checking for working vfork" >&5 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 if test "${ac_cv_func_vfork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14666,7 +14807,7 @@ else ac_cv_func_vfork_works=cross else cat >conftest.$ac_ext <<_ACEOF -#line 14669 "configure" +#line 14810 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -14763,15 +14904,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14766: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14907: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14769: \$? = $ac_status" >&5 + echo "$as_me:14910: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14771: \"$ac_try\"") >&5 + { (eval echo "$as_me:14912: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14774: \$? = $ac_status" >&5 + echo "$as_me:14915: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_vfork_works=yes else @@ -14783,13 +14924,13 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:14786: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:14927: result: $ac_cv_func_vfork_works" >&5 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 fi; if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_vfork_works=ac_cv_func_vfork - { echo "$as_me:14792: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:14933: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} fi @@ -14814,14 +14955,14 @@ EOF fi -echo "$as_me:14817: checking if we should use fcntl or ioctl" >&5 +echo "$as_me:14958: checking if we should use fcntl or ioctl" >&5 echo $ECHO_N "checking if we should use fcntl or ioctl... $ECHO_C" >&6 if test "${cf_cv_fionbio+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14824 "configure" +#line 14965 "configure" #include "confdefs.h" #include <sys/types.h> @@ -14838,16 +14979,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14841: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14982: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14844: \$? = $ac_status" >&5 + echo "$as_me:14985: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14847: \"$ac_try\"") >&5 + { (eval echo "$as_me:14988: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14850: \$? = $ac_status" >&5 + echo "$as_me:14991: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fionbio=ioctl else @@ -14855,7 +14996,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 14858 "configure" +#line 14999 "configure" #include "confdefs.h" #include <sys/types.h> @@ -14877,16 +15018,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14880: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15021: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14883: \$? = $ac_status" >&5 + echo "$as_me:15024: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14886: \"$ac_try\"") >&5 + { (eval echo "$as_me:15027: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14889: \$? = $ac_status" >&5 + echo "$as_me:15030: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fionbio=fcntl else @@ -14899,20 +15040,20 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14902: result: $cf_cv_fionbio" >&5 +echo "$as_me:15043: result: $cf_cv_fionbio" >&5 echo "${ECHO_T}$cf_cv_fionbio" >&6 test "$cf_cv_fionbio" = "fcntl" && cat >>confdefs.h <<\EOF #define USE_FCNTL 1 EOF -echo "$as_me:14908: checking for broken/missing definition of remove" >&5 +echo "$as_me:15049: checking for broken/missing definition of remove" >&5 echo $ECHO_N "checking for broken/missing definition of remove... $ECHO_C" >&6 if test "${cf_cv_baddef_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14915 "configure" +#line 15056 "configure" #include "confdefs.h" #include <stdio.h> int @@ -14924,23 +15065,23 @@ remove("dummy") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14927: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15068: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14930: \$? = $ac_status" >&5 + echo "$as_me:15071: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14933: \"$ac_try\"") >&5 + { (eval echo "$as_me:15074: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14936: \$? = $ac_status" >&5 + echo "$as_me:15077: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_baddef_remove=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 14943 "configure" +#line 15084 "configure" #include "confdefs.h" #include <stdio.h> int __unlink(name) { return unlink(name); } @@ -14953,16 +15094,16 @@ remove("dummy") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14956: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15097: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14959: \$? = $ac_status" >&5 + echo "$as_me:15100: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14962: \"$ac_try\"") >&5 + { (eval echo "$as_me:15103: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14965: \$? = $ac_status" >&5 + echo "$as_me:15106: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_baddef_remove=yes else @@ -14977,20 +15118,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14980: result: $cf_cv_baddef_remove" >&5 +echo "$as_me:15121: result: $cf_cv_baddef_remove" >&5 echo "${ECHO_T}$cf_cv_baddef_remove" >&6 test "$cf_cv_baddef_remove" != no && cat >>confdefs.h <<\EOF #define NEED_REMOVE 1 EOF -echo "$as_me:14986: checking for lstat" >&5 +echo "$as_me:15127: checking for lstat" >&5 echo $ECHO_N "checking for lstat... $ECHO_C" >&6 if test "${ac_cv_func_lstat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14993 "configure" +#line 15134 "configure" #include "confdefs.h" #include <sys/types.h> @@ -15004,16 +15145,16 @@ lstat(".", (struct stat *)0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15007: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15148: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15010: \$? = $ac_status" >&5 + echo "$as_me:15151: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15013: \"$ac_try\"") >&5 + { (eval echo "$as_me:15154: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15016: \$? = $ac_status" >&5 + echo "$as_me:15157: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_lstat=yes else @@ -15025,7 +15166,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15028: result: $ac_cv_func_lstat " >&5 +echo "$as_me:15169: result: $ac_cv_func_lstat " >&5 echo "${ECHO_T}$ac_cv_func_lstat " >&6 if test $ac_cv_func_lstat = yes; then cat >>confdefs.h <<\EOF @@ -15057,13 +15198,13 @@ for ac_func in \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:15060: checking for $ac_func" >&5 +echo "$as_me:15201: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15066 "configure" +#line 15207 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -15094,16 +15235,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15097: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15238: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15100: \$? = $ac_status" >&5 + echo "$as_me:15241: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15103: \"$ac_try\"") >&5 + { (eval echo "$as_me:15244: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15106: \$? = $ac_status" >&5 + echo "$as_me:15247: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -15113,7 +15254,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15116: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:15257: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -15129,13 +15270,13 @@ for ac_func in \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:15132: checking for $ac_func" >&5 +echo "$as_me:15273: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15138 "configure" +#line 15279 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -15166,16 +15307,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15169: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15310: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15172: \$? = $ac_status" >&5 + echo "$as_me:15313: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15175: \"$ac_try\"") >&5 + { (eval echo "$as_me:15316: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15178: \$? = $ac_status" >&5 + echo "$as_me:15319: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -15185,7 +15326,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15188: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:15329: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -15197,7 +15338,7 @@ else fi done -echo "$as_me:15200: checking for random-integer functions" >&5 +echo "$as_me:15341: checking for random-integer functions" >&5 echo $ECHO_N "checking for random-integer functions... $ECHO_C" >&6 if test "${cf_cv_srand_func+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15209,7 +15350,7 @@ do cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'` cf_rand_func=`echo $cf_func | sed -e 's%.*/%%'` cat >conftest.$ac_ext <<_ACEOF -#line 15212 "configure" +#line 15353 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -15228,16 +15369,16 @@ long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15231: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15372: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15234: \$? = $ac_status" >&5 + echo "$as_me:15375: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15237: \"$ac_try\"") >&5 + { (eval echo "$as_me:15378: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15240: \$? = $ac_status" >&5 + echo "$as_me:15381: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_srand_func=$cf_func break @@ -15249,10 +15390,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:15252: result: $cf_cv_srand_func" >&5 +echo "$as_me:15393: result: $cf_cv_srand_func" >&5 echo "${ECHO_T}$cf_cv_srand_func" >&6 if test "$cf_cv_srand_func" != unknown ; then - echo "$as_me:15255: checking for range of random-integers" >&5 + echo "$as_me:15396: checking for range of random-integers" >&5 echo $ECHO_N "checking for range of random-integers... $ECHO_C" >&6 if test "${cf_cv_rand_max+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15273,7 +15414,7 @@ else ;; esac cat >conftest.$ac_ext <<_ACEOF -#line 15276 "configure" +#line 15417 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -15292,16 +15433,16 @@ long x = $cf_cv_rand_max } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15295: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15436: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15298: \$? = $ac_status" >&5 + echo "$as_me:15439: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15301: \"$ac_try\"") >&5 + { (eval echo "$as_me:15442: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15304: \$? = $ac_status" >&5 + echo "$as_me:15445: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -15312,7 +15453,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15315: result: $cf_cv_rand_max" >&5 +echo "$as_me:15456: result: $cf_cv_rand_max" >&5 echo "${ECHO_T}$cf_cv_rand_max" >&6 cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'` cf_rand_func=`echo $cf_func | sed -e 's%.*/%%'` @@ -15336,13 +15477,13 @@ fi for ac_func in strstr do -echo "$as_me:15339: checking for $ac_func declaration" >&5 +echo "$as_me:15480: checking for $ac_func declaration" >&5 echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6 if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15345 "configure" +#line 15486 "configure" #include "confdefs.h" #include <string.h> int @@ -15356,20 +15497,20 @@ extern int ${ac_func}(); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15359: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15500: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15362: \$? = $ac_status" >&5 + echo "$as_me:15503: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15365: \"$ac_try\"") >&5 + { (eval echo "$as_me:15506: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15368: \$? = $ac_status" >&5 + echo "$as_me:15509: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >conftest.$ac_ext <<_ACEOF -#line 15372 "configure" +#line 15513 "configure" #include "confdefs.h" #include <string.h> int @@ -15383,16 +15524,16 @@ int (*p)() = ${ac_func}; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15386: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15527: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15389: \$? = $ac_status" >&5 + echo "$as_me:15530: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15392: \"$ac_try\"") >&5 + { (eval echo "$as_me:15533: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15395: \$? = $ac_status" >&5 + echo "$as_me:15536: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "ac_cv_func_decl_$ac_func=yes" @@ -15413,11 +15554,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then - echo "$as_me:15416: result: yes" >&5 + echo "$as_me:15557: result: yes" >&5 echo "${ECHO_T}yes" >&6 : else - echo "$as_me:15420: result: no" >&5 + echo "$as_me:15561: result: no" >&5 echo "${ECHO_T}no" >&6 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -15432,13 +15573,13 @@ done for ac_func in getgrgid getgrnam do -echo "$as_me:15435: checking for $ac_func declaration" >&5 +echo "$as_me:15576: checking for $ac_func declaration" >&5 echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6 if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15441 "configure" +#line 15582 "configure" #include "confdefs.h" #include <stdio.h> @@ -15454,20 +15595,20 @@ extern int ${ac_func}(); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15457: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15598: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15460: \$? = $ac_status" >&5 + echo "$as_me:15601: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15463: \"$ac_try\"") >&5 + { (eval echo "$as_me:15604: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15466: \$? = $ac_status" >&5 + echo "$as_me:15607: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >conftest.$ac_ext <<_ACEOF -#line 15470 "configure" +#line 15611 "configure" #include "confdefs.h" #include <stdio.h> @@ -15483,16 +15624,16 @@ int (*p)() = ${ac_func}; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15486: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15627: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15489: \$? = $ac_status" >&5 + echo "$as_me:15630: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15492: \"$ac_try\"") >&5 + { (eval echo "$as_me:15633: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15495: \$? = $ac_status" >&5 + echo "$as_me:15636: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "ac_cv_func_decl_$ac_func=yes" @@ -15513,11 +15654,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then - echo "$as_me:15516: result: yes" >&5 + echo "$as_me:15657: result: yes" >&5 echo "${ECHO_T}yes" >&6 : else - echo "$as_me:15520: result: no" >&5 + echo "$as_me:15661: result: no" >&5 echo "${ECHO_T}no" >&6 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -15529,14 +15670,14 @@ EOF fi done -echo "$as_me:15532: checking if TRUE/FALSE are defined" >&5 +echo "$as_me:15673: checking if TRUE/FALSE are defined" >&5 echo $ECHO_N "checking if TRUE/FALSE are defined... $ECHO_C" >&6 if test "${cf_cv_bool_defs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15539 "configure" +#line 15680 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -15550,16 +15691,16 @@ int x = TRUE, y = FALSE } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15553: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15694: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15556: \$? = $ac_status" >&5 + echo "$as_me:15697: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15559: \"$ac_try\"") >&5 + { (eval echo "$as_me:15700: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15562: \$? = $ac_status" >&5 + echo "$as_me:15703: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_bool_defs=yes else @@ -15570,7 +15711,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15573: result: $cf_cv_bool_defs" >&5 +echo "$as_me:15714: result: $cf_cv_bool_defs" >&5 echo "${ECHO_T}$cf_cv_bool_defs" >&6 if test "$cf_cv_bool_defs" = no ; then cat >>confdefs.h <<\EOF @@ -15583,14 +15724,14 @@ EOF fi -echo "$as_me:15586: checking if external errno is declared" >&5 +echo "$as_me:15727: checking if external errno is declared" >&5 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15593 "configure" +#line 15734 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -15608,16 +15749,16 @@ long x = (long) errno } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15611: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15752: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15614: \$? = $ac_status" >&5 + echo "$as_me:15755: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15617: \"$ac_try\"") >&5 + { (eval echo "$as_me:15758: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15620: \$? = $ac_status" >&5 + echo "$as_me:15761: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else @@ -15628,7 +15769,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15631: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:15772: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -15643,14 +15784,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:15646: checking if external errno exists" >&5 +echo "$as_me:15787: checking if external errno exists" >&5 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 if test "${cf_cv_have_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15653 "configure" +#line 15794 "configure" #include "confdefs.h" #undef errno @@ -15665,16 +15806,16 @@ errno = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15668: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15809: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15671: \$? = $ac_status" >&5 + echo "$as_me:15812: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15674: \"$ac_try\"") >&5 + { (eval echo "$as_me:15815: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15677: \$? = $ac_status" >&5 + echo "$as_me:15818: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_errno=yes else @@ -15685,7 +15826,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15688: result: $cf_cv_have_errno" >&5 +echo "$as_me:15829: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -15698,7 +15839,7 @@ EOF fi -echo "$as_me:15701: checking if we can set errno" >&5 +echo "$as_me:15842: checking if we can set errno" >&5 echo $ECHO_N "checking if we can set errno... $ECHO_C" >&6 if test "${cf_cv_set_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15706,7 +15847,7 @@ else if test "$cross_compiling" = yes; then cat >conftest.$ac_ext <<_ACEOF -#line 15709 "configure" +#line 15850 "configure" #include "confdefs.h" #include <errno.h> int @@ -15718,16 +15859,16 @@ errno = 255 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15721: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15862: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15724: \$? = $ac_status" >&5 + echo "$as_me:15865: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15727: \"$ac_try\"") >&5 + { (eval echo "$as_me:15868: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15730: \$? = $ac_status" >&5 + echo "$as_me:15871: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_set_errno=maybe else @@ -15738,7 +15879,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 15741 "configure" +#line 15882 "configure" #include "confdefs.h" #include <errno.h> @@ -15749,15 +15890,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15752: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15893: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15755: \$? = $ac_status" >&5 + echo "$as_me:15896: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15757: \"$ac_try\"") >&5 + { (eval echo "$as_me:15898: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15760: \$? = $ac_status" >&5 + echo "$as_me:15901: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_set_errno=yes else @@ -15770,20 +15911,20 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:15773: result: $cf_cv_set_errno" >&5 +echo "$as_me:15914: result: $cf_cv_set_errno" >&5 echo "${ECHO_T}$cf_cv_set_errno" >&6 test "$cf_cv_set_errno" != no && cat >>confdefs.h <<\EOF #define CAN_SET_ERRNO 1 EOF -echo "$as_me:15779: checking for setlocale()" >&5 +echo "$as_me:15920: checking for setlocale()" >&5 echo $ECHO_N "checking for setlocale()... $ECHO_C" >&6 if test "${cf_cv_locale+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15786 "configure" +#line 15927 "configure" #include "confdefs.h" #include <locale.h> int @@ -15795,16 +15936,16 @@ setlocale(LC_ALL, "") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15798: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15939: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15801: \$? = $ac_status" >&5 + echo "$as_me:15942: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15804: \"$ac_try\"") >&5 + { (eval echo "$as_me:15945: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15807: \$? = $ac_status" >&5 + echo "$as_me:15948: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_locale=yes else @@ -15816,21 +15957,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15819: result: $cf_cv_locale" >&5 +echo "$as_me:15960: result: $cf_cv_locale" >&5 echo "${ECHO_T}$cf_cv_locale" >&6 test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF #define LOCALE 1 EOF } -echo "$as_me:15826: checking if NGROUPS is defined" >&5 +echo "$as_me:15967: checking if NGROUPS is defined" >&5 echo $ECHO_N "checking if NGROUPS is defined... $ECHO_C" >&6 if test "${cf_cv_ngroups+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15833 "configure" +#line 15974 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -15849,23 +15990,23 @@ int x = NGROUPS } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15852: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15993: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15855: \$? = $ac_status" >&5 + echo "$as_me:15996: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15858: \"$ac_try\"") >&5 + { (eval echo "$as_me:15999: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15861: \$? = $ac_status" >&5 + echo "$as_me:16002: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ngroups=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 15868 "configure" +#line 16009 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -15884,16 +16025,16 @@ int x = NGROUPS_MAX } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15887: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16028: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15890: \$? = $ac_status" >&5 + echo "$as_me:16031: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15893: \"$ac_try\"") >&5 + { (eval echo "$as_me:16034: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15896: \$? = $ac_status" >&5 + echo "$as_me:16037: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ngroups=NGROUPS_MAX else @@ -15905,7 +16046,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:15908: result: $cf_cv_ngroups" >&5 +echo "$as_me:16049: result: $cf_cv_ngroups" >&5 echo "${ECHO_T}$cf_cv_ngroups" >&6 fi @@ -15922,14 +16063,14 @@ EOF fi -echo "$as_me:15925: checking if external sys_nerr is declared" >&5 +echo "$as_me:16066: checking if external sys_nerr is declared" >&5 echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_sys_nerr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15932 "configure" +#line 16073 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -15947,16 +16088,16 @@ long x = (long) sys_nerr } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15950: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16091: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15953: \$? = $ac_status" >&5 + echo "$as_me:16094: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15956: \"$ac_try\"") >&5 + { (eval echo "$as_me:16097: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15959: \$? = $ac_status" >&5 + echo "$as_me:16100: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_sys_nerr=yes else @@ -15967,7 +16108,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15970: result: $cf_cv_dcl_sys_nerr" >&5 +echo "$as_me:16111: result: $cf_cv_dcl_sys_nerr" >&5 echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6 if test "$cf_cv_dcl_sys_nerr" = no ; then @@ -15982,14 +16123,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:15985: checking if external sys_nerr exists" >&5 +echo "$as_me:16126: checking if external sys_nerr exists" >&5 echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6 if test "${cf_cv_have_sys_nerr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15992 "configure" +#line 16133 "configure" #include "confdefs.h" #undef sys_nerr @@ -16004,16 +16145,16 @@ sys_nerr = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16007: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16148: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16010: \$? = $ac_status" >&5 + echo "$as_me:16151: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16013: \"$ac_try\"") >&5 + { (eval echo "$as_me:16154: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16016: \$? = $ac_status" >&5 + echo "$as_me:16157: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_sys_nerr=yes else @@ -16024,7 +16165,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16027: result: $cf_cv_have_sys_nerr" >&5 +echo "$as_me:16168: result: $cf_cv_have_sys_nerr" >&5 echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6 if test "$cf_cv_have_sys_nerr" = yes ; then @@ -16037,14 +16178,14 @@ EOF fi -echo "$as_me:16040: checking if external sys_errlist is declared" >&5 +echo "$as_me:16181: checking if external sys_errlist is declared" >&5 echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_sys_errlist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16047 "configure" +#line 16188 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -16062,16 +16203,16 @@ long x = (long) sys_errlist } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16065: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16206: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16068: \$? = $ac_status" >&5 + echo "$as_me:16209: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16071: \"$ac_try\"") >&5 + { (eval echo "$as_me:16212: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16074: \$? = $ac_status" >&5 + echo "$as_me:16215: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_sys_errlist=yes else @@ -16082,7 +16223,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16085: result: $cf_cv_dcl_sys_errlist" >&5 +echo "$as_me:16226: result: $cf_cv_dcl_sys_errlist" >&5 echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6 if test "$cf_cv_dcl_sys_errlist" = no ; then @@ -16097,14 +16238,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:16100: checking if external sys_errlist exists" >&5 +echo "$as_me:16241: checking if external sys_errlist exists" >&5 echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6 if test "${cf_cv_have_sys_errlist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16107 "configure" +#line 16248 "configure" #include "confdefs.h" #undef sys_errlist @@ -16119,16 +16260,16 @@ sys_errlist = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16122: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16263: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16125: \$? = $ac_status" >&5 + echo "$as_me:16266: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16128: \"$ac_try\"") >&5 + { (eval echo "$as_me:16269: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16131: \$? = $ac_status" >&5 + echo "$as_me:16272: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_sys_errlist=yes else @@ -16139,7 +16280,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16142: result: $cf_cv_have_sys_errlist" >&5 +echo "$as_me:16283: result: $cf_cv_have_sys_errlist" >&5 echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6 if test "$cf_cv_have_sys_errlist" = yes ; then @@ -16155,23 +16296,23 @@ fi for ac_header in lastlog.h paths.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:16158: checking for $ac_header" >&5 +echo "$as_me:16299: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16164 "configure" +#line 16305 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16168: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16309: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:16174: \$? = $ac_status" >&5 + echo "$as_me:16315: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16190,7 +16331,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16193: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16334: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -16200,14 +16341,14 @@ EOF fi done -echo "$as_me:16203: checking for lastlog path" >&5 +echo "$as_me:16344: checking for lastlog path" >&5 echo $ECHO_N "checking for lastlog path... $ECHO_C" >&6 if test "${cf_cv_path_lastlog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16210 "configure" +#line 16351 "configure" #include "confdefs.h" #include <sys/types.h> @@ -16227,16 +16368,16 @@ char *path = _PATH_LASTLOG } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16230: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16371: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16233: \$? = $ac_status" >&5 + echo "$as_me:16374: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16236: \"$ac_try\"") >&5 + { (eval echo "$as_me:16377: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16239: \$? = $ac_status" >&5 + echo "$as_me:16380: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_path_lastlog="_PATH_LASTLOG" else @@ -16251,13 +16392,13 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16254: result: $cf_cv_path_lastlog" >&5 +echo "$as_me:16395: result: $cf_cv_path_lastlog" >&5 echo "${ECHO_T}$cf_cv_path_lastlog" >&6 test $cf_cv_path_lastlog != no && cat >>confdefs.h <<\EOF #define USE_LASTLOG 1 EOF -echo "$as_me:16260: checking for utmp implementation" >&5 +echo "$as_me:16401: checking for utmp implementation" >&5 echo $ECHO_N "checking for utmp implementation... $ECHO_C" >&6 if test "${cf_cv_have_utmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16274,7 +16415,7 @@ cf_utmp_includes=" #endif " cat >conftest.$ac_ext <<_ACEOF -#line 16277 "configure" +#line 16418 "configure" #include "confdefs.h" $cf_utmp_includes int @@ -16288,16 +16429,16 @@ struct $cf_header x; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16291: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16432: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16294: \$? = $ac_status" >&5 + echo "$as_me:16435: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16297: \"$ac_try\"") >&5 + { (eval echo "$as_me:16438: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16300: \$? = $ac_status" >&5 + echo "$as_me:16441: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp=$cf_header break @@ -16306,7 +16447,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 16309 "configure" +#line 16450 "configure" #include "confdefs.h" $cf_utmp_includes int @@ -16320,16 +16461,16 @@ struct $cf_header x; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16323: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16464: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16326: \$? = $ac_status" >&5 + echo "$as_me:16467: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16329: \"$ac_try\"") >&5 + { (eval echo "$as_me:16470: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16332: \$? = $ac_status" >&5 + echo "$as_me:16473: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp=$cf_header break @@ -16344,7 +16485,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:16347: result: $cf_cv_have_utmp" >&5 +echo "$as_me:16488: result: $cf_cv_have_utmp" >&5 echo "${ECHO_T}$cf_cv_have_utmp" >&6 if test $cf_cv_have_utmp != no ; then @@ -16357,14 +16498,14 @@ EOF EOF if test $cf_cv_have_utmp != no ; then -echo "$as_me:16360: checking if utmp.ut_host is declared" >&5 +echo "$as_me:16501: checking if utmp.ut_host is declared" >&5 echo $ECHO_N "checking if utmp.ut_host is declared... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16367 "configure" +#line 16508 "configure" #include "confdefs.h" #include <sys/types.h> @@ -16378,16 +16519,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16381: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16522: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16384: \$? = $ac_status" >&5 + echo "$as_me:16525: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16387: \"$ac_try\"") >&5 + { (eval echo "$as_me:16528: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16390: \$? = $ac_status" >&5 + echo "$as_me:16531: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_host=yes else @@ -16399,7 +16540,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16402: result: $cf_cv_have_utmp_ut_host" >&5 +echo "$as_me:16543: result: $cf_cv_have_utmp_ut_host" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6 test $cf_cv_have_utmp_ut_host != no && cat >>confdefs.h <<\EOF #define HAVE_UTMP_UT_HOST 1 @@ -16408,7 +16549,7 @@ EOF fi if test $cf_cv_have_utmp != no ; then -echo "$as_me:16411: checking if utmp.ut_name is declared" >&5 +echo "$as_me:16552: checking if utmp.ut_name is declared" >&5 echo $ECHO_N "checking if utmp.ut_name is declared... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_name+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16425,7 +16566,7 @@ cf_utmp_includes=" " for cf_header in ut_name ut_user ; do cat >conftest.$ac_ext <<_ACEOF -#line 16428 "configure" +#line 16569 "configure" #include "confdefs.h" $cf_utmp_includes int @@ -16439,16 +16580,16 @@ struct $cf_cv_have_utmp x; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16442: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16583: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16445: \$? = $ac_status" >&5 + echo "$as_me:16586: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16448: \"$ac_try\"") >&5 + { (eval echo "$as_me:16589: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16451: \$? = $ac_status" >&5 + echo "$as_me:16592: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_name=$cf_header break @@ -16460,12 +16601,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:16463: result: $cf_cv_have_utmp_ut_name" >&5 +echo "$as_me:16604: result: $cf_cv_have_utmp_ut_name" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6 case $cf_cv_have_utmp_ut_name in #(vi no) #(vi - { { echo "$as_me:16468: error: Cannot find declaration for ut.ut_name" >&5 + { { echo "$as_me:16609: error: Cannot find declaration for ut.ut_name" >&5 echo "$as_me: error: Cannot find declaration for ut.ut_name" >&2;} { (exit 1); exit 1; }; } ;; @@ -16479,7 +16620,7 @@ esac fi if test $cf_cv_have_utmp != no ; then -echo "$as_me:16482: checking for exit-status in $cf_cv_have_utmp" >&5 +echo "$as_me:16623: checking for exit-status in $cf_cv_have_utmp" >&5 echo $ECHO_N "checking for exit-status in $cf_cv_have_utmp... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_xstatus+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16492,7 +16633,7 @@ for cf_result in \ ut_exit.ut_exit do cat >conftest.$ac_ext <<_ACEOF -#line 16495 "configure" +#line 16636 "configure" #include "confdefs.h" #include <sys/types.h> @@ -16506,16 +16647,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16509: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16650: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16512: \$? = $ac_status" >&5 + echo "$as_me:16653: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16515: \"$ac_try\"") >&5 + { (eval echo "$as_me:16656: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16518: \$? = $ac_status" >&5 + echo "$as_me:16659: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_xstatus=$cf_result break @@ -16528,7 +16669,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:16531: result: $cf_cv_have_utmp_ut_xstatus" >&5 +echo "$as_me:16672: result: $cf_cv_have_utmp_ut_xstatus" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6 if test $cf_cv_have_utmp_ut_xstatus != no ; then cat >>confdefs.h <<\EOF @@ -16543,14 +16684,14 @@ fi fi if test $cf_cv_have_utmp != no ; then -echo "$as_me:16546: checking if utmp.ut_xtime is declared" >&5 +echo "$as_me:16687: checking if utmp.ut_xtime is declared" >&5 echo $ECHO_N "checking if utmp.ut_xtime is declared... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_xtime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16553 "configure" +#line 16694 "configure" #include "confdefs.h" #include <sys/types.h> @@ -16564,23 +16705,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16567: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16708: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16570: \$? = $ac_status" >&5 + echo "$as_me:16711: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16573: \"$ac_try\"") >&5 + { (eval echo "$as_me:16714: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16576: \$? = $ac_status" >&5 + echo "$as_me:16717: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_xtime=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 16583 "configure" +#line 16724 "configure" #include "confdefs.h" #include <sys/types.h> @@ -16594,16 +16735,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16597: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16738: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16600: \$? = $ac_status" >&5 + echo "$as_me:16741: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16603: \"$ac_try\"") >&5 + { (eval echo "$as_me:16744: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16606: \$? = $ac_status" >&5 + echo "$as_me:16747: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_xtime=define else @@ -16617,7 +16758,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16620: result: $cf_cv_have_utmp_ut_xtime" >&5 +echo "$as_me:16761: result: $cf_cv_have_utmp_ut_xtime" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6 if test $cf_cv_have_utmp_ut_xtime != no ; then cat >>confdefs.h <<\EOF @@ -16634,14 +16775,14 @@ fi fi if test $cf_cv_have_utmp != no ; then -echo "$as_me:16637: checking if utmp.ut_session is declared" >&5 +echo "$as_me:16778: checking if utmp.ut_session is declared" >&5 echo $ECHO_N "checking if utmp.ut_session is declared... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_session+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16644 "configure" +#line 16785 "configure" #include "confdefs.h" #include <sys/types.h> @@ -16655,16 +16796,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16658: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16799: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16661: \$? = $ac_status" >&5 + echo "$as_me:16802: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16664: \"$ac_try\"") >&5 + { (eval echo "$as_me:16805: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16667: \$? = $ac_status" >&5 + echo "$as_me:16808: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_session=yes else @@ -16675,7 +16816,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16678: result: $cf_cv_have_utmp_ut_session" >&5 +echo "$as_me:16819: result: $cf_cv_have_utmp_ut_session" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6 if test $cf_cv_have_utmp_ut_session != no ; then cat >>confdefs.h <<\EOF @@ -16685,7 +16826,7 @@ EOF fi fi -echo "$as_me:16688: checking if $cf_cv_have_utmp is SYSV flavor" >&5 +echo "$as_me:16829: checking if $cf_cv_have_utmp is SYSV flavor" >&5 echo $ECHO_N "checking if $cf_cv_have_utmp is SYSV flavor... $ECHO_C" >&6 if test "${cf_cv_sysv_utmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16693,7 +16834,7 @@ else test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx" cat >conftest.$ac_ext <<_ACEOF -#line 16696 "configure" +#line 16837 "configure" #include "confdefs.h" #include <sys/types.h> @@ -16712,16 +16853,16 @@ struct $cf_cv_have_utmp x; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16715: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16856: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16718: \$? = $ac_status" >&5 + echo "$as_me:16859: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16721: \"$ac_try\"") >&5 + { (eval echo "$as_me:16862: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16724: \$? = $ac_status" >&5 + echo "$as_me:16865: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sysv_utmp=yes else @@ -16732,7 +16873,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16735: result: $cf_cv_sysv_utmp" >&5 +echo "$as_me:16876: result: $cf_cv_sysv_utmp" >&5 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6 test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF #define USE_SYSV_UTMP 1 @@ -16740,14 +16881,14 @@ EOF fi -echo "$as_me:16743: checking if external h_errno exists" >&5 +echo "$as_me:16884: checking if external h_errno exists" >&5 echo $ECHO_N "checking if external h_errno exists... $ECHO_C" >&6 if test "${cf_cv_have_h_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16750 "configure" +#line 16891 "configure" #include "confdefs.h" #undef h_errno @@ -16762,16 +16903,16 @@ h_errno = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16765: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16906: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16768: \$? = $ac_status" >&5 + echo "$as_me:16909: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16771: \"$ac_try\"") >&5 + { (eval echo "$as_me:16912: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16774: \$? = $ac_status" >&5 + echo "$as_me:16915: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_h_errno=yes else @@ -16782,7 +16923,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16785: result: $cf_cv_have_h_errno" >&5 +echo "$as_me:16926: result: $cf_cv_have_h_errno" >&5 echo "${ECHO_T}$cf_cv_have_h_errno" >&6 if test "$cf_cv_have_h_errno" = yes ; then @@ -16795,7 +16936,7 @@ EOF fi -echo "$as_me:16798: checking if bibp: URLs should be supported" >&5 +echo "$as_me:16939: checking if bibp: URLs should be supported" >&5 echo $ECHO_N "checking if bibp: URLs should be supported... $ECHO_C" >&6 # Check whether --enable-bibp-urls or --disable-bibp-urls was given. @@ -16812,13 +16953,13 @@ else use_bibp_urls=yes fi; -echo "$as_me:16815: result: $use_bibp_urls" >&5 +echo "$as_me:16956: result: $use_bibp_urls" >&5 echo "${ECHO_T}$use_bibp_urls" >&6 test $use_bibp_urls = no && cat >>confdefs.h <<\EOF #define DISABLE_BIBP 1 EOF -echo "$as_me:16821: checking if configuration info should be browsable" >&5 +echo "$as_me:16962: checking if configuration info should be browsable" >&5 echo $ECHO_N "checking if configuration info should be browsable... $ECHO_C" >&6 # Check whether --enable-config-info or --disable-config-info was given. @@ -16835,13 +16976,13 @@ else use_config_info=yes fi; -echo "$as_me:16838: result: $use_config_info" >&5 +echo "$as_me:16979: result: $use_config_info" >&5 echo "${ECHO_T}$use_config_info" >&6 test $use_config_info = no && cat >>confdefs.h <<\EOF #define NO_CONFIG_INFO 1 EOF -echo "$as_me:16844: checking if new-style forms-based options screen should be used" >&5 +echo "$as_me:16985: checking if new-style forms-based options screen should be used" >&5 echo $ECHO_N "checking if new-style forms-based options screen should be used... $ECHO_C" >&6 # Check whether --enable-forms-options or --disable-forms-options was given. @@ -16858,13 +16999,13 @@ else use_forms_options=yes fi; -echo "$as_me:16861: result: $use_forms_options" >&5 +echo "$as_me:17002: result: $use_forms_options" >&5 echo "${ECHO_T}$use_forms_options" >&6 test $use_forms_options = no && cat >>confdefs.h <<\EOF #define NO_OPTION_FORMS 1 EOF -echo "$as_me:16867: checking if old-style options menu should be used" >&5 +echo "$as_me:17008: checking if old-style options menu should be used" >&5 echo $ECHO_N "checking if old-style options menu should be used... $ECHO_C" >&6 # Check whether --enable-menu-options or --disable-menu-options was given. @@ -16881,13 +17022,13 @@ else use_menu_options=yes fi; -echo "$as_me:16884: result: $use_menu_options" >&5 +echo "$as_me:17025: result: $use_menu_options" >&5 echo "${ECHO_T}$use_menu_options" >&6 test $use_menu_options = no && cat >>confdefs.h <<\EOF #define NO_OPTION_MENU 1 EOF -echo "$as_me:16890: checking if experimental address-list page should be used" >&5 +echo "$as_me:17031: checking if experimental address-list page should be used" >&5 echo $ECHO_N "checking if experimental address-list page should be used... $ECHO_C" >&6 # Check whether --enable-addrlist-page or --disable-addrlist-page was given. @@ -16904,13 +17045,13 @@ else use_addrlist_page=no fi; -echo "$as_me:16907: result: $use_addrlist_page" >&5 +echo "$as_me:17048: result: $use_addrlist_page" >&5 echo "${ECHO_T}$use_addrlist_page" >&6 test $use_addrlist_page != no && cat >>confdefs.h <<\EOF #define EXP_ADDRLIST_PAGE 1 EOF -echo "$as_me:16913: checking if experimental charset-selection logic should be used" >&5 +echo "$as_me:17054: checking if experimental charset-selection logic should be used" >&5 echo $ECHO_N "checking if experimental charset-selection logic should be used... $ECHO_C" >&6 # Check whether --enable-charset-choice or --disable-charset-choice was given. @@ -16927,13 +17068,13 @@ else use_charset_choice=no fi; -echo "$as_me:16930: result: $use_charset_choice" >&5 +echo "$as_me:17071: result: $use_charset_choice" >&5 echo "${ECHO_T}$use_charset_choice" >&6 test $use_charset_choice != no && cat >>confdefs.h <<\EOF #define EXP_CHARSET_CHOICE 1 EOF -echo "$as_me:16936: checking if experimental CJK logic should be used" >&5 +echo "$as_me:17077: checking if experimental CJK logic should be used" >&5 echo $ECHO_N "checking if experimental CJK logic should be used... $ECHO_C" >&6 # Check whether --enable-cjk or --disable-cjk was given. @@ -16950,13 +17091,13 @@ else use_cjk=no fi; -echo "$as_me:16953: result: $use_cjk" >&5 +echo "$as_me:17094: result: $use_cjk" >&5 echo "${ECHO_T}$use_cjk" >&6 test $use_cjk != no && cat >>confdefs.h <<\EOF #define CJK_EX 1 EOF -echo "$as_me:16959: checking if experimental Japanese UTF-8 logic should be used" >&5 +echo "$as_me:17100: checking if experimental Japanese UTF-8 logic should be used" >&5 echo $ECHO_N "checking if experimental Japanese UTF-8 logic should be used... $ECHO_C" >&6 # Check whether --enable-japanese-utf8 or --disable-japanese-utf8 was given. @@ -16973,14 +17114,14 @@ else use_ja_utf8=no fi; -echo "$as_me:16976: result: $use_ja_utf8" >&5 +echo "$as_me:17117: result: $use_ja_utf8" >&5 echo "${ECHO_T}$use_ja_utf8" >&6 if test $use_ja_utf8 != no ; then cat >>confdefs.h <<\EOF #define EXP_JAPANESEUTF8_SUPPORT 1 EOF -echo "$as_me:16983: checking for libiconv_open in -liconv" >&5 +echo "$as_me:17124: checking for libiconv_open in -liconv" >&5 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16988,7 +17129,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-liconv $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16991 "configure" +#line 17132 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17007,16 +17148,16 @@ libiconv_open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17010: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17151: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17013: \$? = $ac_status" >&5 + echo "$as_me:17154: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17016: \"$ac_try\"") >&5 + { (eval echo "$as_me:17157: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17019: \$? = $ac_status" >&5 + echo "$as_me:17160: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_iconv_libiconv_open=yes else @@ -17027,7 +17168,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17030: result: $ac_cv_lib_iconv_libiconv_open" >&5 +echo "$as_me:17171: result: $ac_cv_lib_iconv_libiconv_open" >&5 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6 if test $ac_cv_lib_iconv_libiconv_open = yes; then cat >>confdefs.h <<EOF @@ -17040,7 +17181,7 @@ fi fi -echo "$as_me:17043: checking if color-style code should be used" >&5 +echo "$as_me:17184: checking if color-style code should be used" >&5 echo $ECHO_N "checking if color-style code should be used... $ECHO_C" >&6 # Check whether --enable-color-style or --disable-color-style was given. @@ -17060,7 +17201,7 @@ fi; case $use_color_style in no) - echo "$as_me:17063: result: no" >&5 + echo "$as_me:17204: result: no" >&5 echo "${ECHO_T}no" >&6 INSTALL_LSS= ;; @@ -17069,17 +17210,17 @@ echo "${ECHO_T}no" >&6 #define USE_COLOR_STYLE 1 EOF - echo "$as_me:17072: result: yes" >&5 + echo "$as_me:17213: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:17075: checking for location of style-sheet file" >&5 + echo "$as_me:17216: checking for location of style-sheet file" >&5 echo $ECHO_N "checking for location of style-sheet file... $ECHO_C" >&6 LYNX_LSS_FILE=$cf_libdir/lynx.lss cat >>confdefs.h <<EOF #define LYNX_LSS_FILE "$LYNX_LSS_FILE" EOF - echo "$as_me:17082: result: $LYNX_LSS_FILE" >&5 + echo "$as_me:17223: result: $LYNX_LSS_FILE" >&5 echo "${ECHO_T}$LYNX_LSS_FILE" >&6 INSTALL_LSS=install-lss ;; @@ -17093,7 +17234,7 @@ curses|slang|ncurses*) esac if test "$use_dft_colors" != no ; then -echo "$as_me:17096: checking if you want to use default-colors" >&5 +echo "$as_me:17237: checking if you want to use default-colors" >&5 echo $ECHO_N "checking if you want to use default-colors... $ECHO_C" >&6 # Check whether --enable-default-colors or --disable-default-colors was given. @@ -17110,7 +17251,7 @@ else use_dft_colors=no fi; -echo "$as_me:17113: result: $use_dft_colors" >&5 +echo "$as_me:17254: result: $use_dft_colors" >&5 echo "${ECHO_T}$use_dft_colors" >&6 test $use_dft_colors = "yes" && cat >>confdefs.h <<\EOF #define USE_DEFAULT_COLORS 1 @@ -17118,7 +17259,7 @@ EOF fi -echo "$as_me:17121: checking if experimental htmlized lynx.cfg should be built" >&5 +echo "$as_me:17262: checking if experimental htmlized lynx.cfg should be built" >&5 echo $ECHO_N "checking if experimental htmlized lynx.cfg should be built... $ECHO_C" >&6 # Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given. @@ -17135,7 +17276,7 @@ else use_exp_htmlized_cfg=no fi; -echo "$as_me:17138: result: $use_exp_htmlized_cfg" >&5 +echo "$as_me:17279: result: $use_exp_htmlized_cfg" >&5 echo "${ECHO_T}$use_exp_htmlized_cfg" >&6 LYNXCFG_MAKE='' @@ -17146,7 +17287,7 @@ if test $use_exp_htmlized_cfg = no ; then fi ### check for ipv6 support -echo "$as_me:17149: checking whether to enable ipv6" >&5 +echo "$as_me:17290: checking whether to enable ipv6" >&5 echo $ECHO_N "checking whether to enable ipv6... $ECHO_C" >&6 # Check whether --enable-ipv6 or --disable-ipv6 was given. @@ -17162,11 +17303,11 @@ EOF else enableval=no fi; -echo "$as_me:17165: result: $enableval" >&5 +echo "$as_me:17306: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" = "yes"; then -echo "$as_me:17169: checking ipv6 stack type" >&5 +echo "$as_me:17310: checking ipv6 stack type" >&5 echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6 if test "${cf_cv_ipv6type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17187,7 +17328,7 @@ do ;; inria) #(vi cat >conftest.$ac_ext <<_ACEOF -#line 17190 "configure" +#line 17331 "configure" #include "confdefs.h" #include <netinet/in.h> @@ -17204,7 +17345,7 @@ rm -f conftest* ;; kame) #(vi cat >conftest.$ac_ext <<_ACEOF -#line 17207 "configure" +#line 17348 "configure" #include "confdefs.h" #include <netinet/in.h> @@ -17221,7 +17362,7 @@ rm -f conftest* ;; linux-glibc) #(vi cat >conftest.$ac_ext <<_ACEOF -#line 17224 "configure" +#line 17365 "configure" #include "confdefs.h" #include <features.h> @@ -17247,7 +17388,7 @@ rm -f conftest* ;; toshiba) #(vi cat >conftest.$ac_ext <<_ACEOF -#line 17250 "configure" +#line 17391 "configure" #include "confdefs.h" #include <sys/param.h> @@ -17264,7 +17405,7 @@ rm -f conftest* ;; v6d) #(vi cat >conftest.$ac_ext <<_ACEOF -#line 17267 "configure" +#line 17408 "configure" #include "confdefs.h" #include </usr/local/v6/include/sys/v6config.h> @@ -17281,7 +17422,7 @@ rm -f conftest* ;; zeta) cat >conftest.$ac_ext <<_ACEOF -#line 17284 "configure" +#line 17425 "configure" #include "confdefs.h" #include <sys/param.h> @@ -17303,13 +17444,13 @@ rm -f conftest* done fi -echo "$as_me:17306: result: $cf_cv_ipv6type" >&5 +echo "$as_me:17447: result: $cf_cv_ipv6type" >&5 echo "${ECHO_T}$cf_cv_ipv6type" >&6 cf_ipv6lib=none cf_ipv6dir=none -echo "$as_me:17312: checking for IPv6 library if required" >&5 +echo "$as_me:17453: checking for IPv6 library if required" >&5 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6 case $cf_cv_ipv6type in #(vi solaris) #(vi @@ -17339,13 +17480,13 @@ zeta) cf_ipv6dir=v6 ;; esac -echo "$as_me:17342: result: $cf_ipv6lib" >&5 +echo "$as_me:17483: result: $cf_ipv6lib" >&5 echo "${ECHO_T}$cf_ipv6lib" >&6 if test "$cf_ipv6lib" != "none"; then cat >conftest.$ac_ext <<_ACEOF -#line 17348 "configure" +#line 17489 "configure" #include "confdefs.h" #include <sys/types.h> @@ -17361,16 +17502,16 @@ getaddrinfo(0, 0, 0, 0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17364: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17505: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17367: \$? = $ac_status" >&5 + echo "$as_me:17508: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17370: \"$ac_try\"") >&5 + { (eval echo "$as_me:17511: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17373: \$? = $ac_status" >&5 + echo "$as_me:17514: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -17464,13 +17605,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext eval 'cf_cv_have_lib_'$cf_ipv6lib'=no' cf_libdir="" - echo "$as_me:17467: checking for getaddrinfo" >&5 + echo "$as_me:17608: checking for getaddrinfo" >&5 echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6 if test "${ac_cv_func_getaddrinfo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 17473 "configure" +#line 17614 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getaddrinfo (); below. */ @@ -17501,16 +17642,16 @@ f = getaddrinfo; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17504: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17645: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17507: \$? = $ac_status" >&5 + echo "$as_me:17648: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17510: \"$ac_try\"") >&5 + { (eval echo "$as_me:17651: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17513: \$? = $ac_status" >&5 + echo "$as_me:17654: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_getaddrinfo=yes else @@ -17520,18 +17661,18 @@ ac_cv_func_getaddrinfo=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17523: result: $ac_cv_func_getaddrinfo" >&5 +echo "$as_me:17664: result: $ac_cv_func_getaddrinfo" >&5 echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6 if test $ac_cv_func_getaddrinfo = yes; then eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:17530: checking for getaddrinfo in -l$cf_ipv6lib" >&5 + echo "$as_me:17671: checking for getaddrinfo in -l$cf_ipv6lib" >&5 echo $ECHO_N "checking for getaddrinfo in -l$cf_ipv6lib... $ECHO_C" >&6 LIBS="-l$cf_ipv6lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 17534 "configure" +#line 17675 "configure" #include "confdefs.h" #include <sys/types.h> @@ -17547,25 +17688,25 @@ getaddrinfo(0, 0, 0, 0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17550: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17691: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17553: \$? = $ac_status" >&5 + echo "$as_me:17694: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17556: \"$ac_try\"") >&5 + { (eval echo "$as_me:17697: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17559: \$? = $ac_status" >&5 + echo "$as_me:17700: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:17561: result: yes" >&5 + echo "$as_me:17702: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:17568: result: no" >&5 +echo "$as_me:17709: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search="" @@ -17625,11 +17766,11 @@ test -d /usr && { for cf_libdir in $cf_search do - echo "$as_me:17628: checking for -l$cf_ipv6lib in $cf_libdir" >&5 + echo "$as_me:17769: checking for -l$cf_ipv6lib in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_ipv6lib in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 17632 "configure" +#line 17773 "configure" #include "confdefs.h" #include <sys/types.h> @@ -17645,25 +17786,25 @@ getaddrinfo(0, 0, 0, 0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17648: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17789: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17651: \$? = $ac_status" >&5 + echo "$as_me:17792: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17654: \"$ac_try\"") >&5 + { (eval echo "$as_me:17795: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17657: \$? = $ac_status" >&5 + echo "$as_me:17798: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:17659: result: yes" >&5 + echo "$as_me:17800: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:17666: result: no" >&5 +echo "$as_me:17807: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -17678,7 +17819,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib if test $cf_found_library = no ; then - { { echo "$as_me:17681: error: No $cf_ipv6lib library found, cannot continue. You must fetch lib$cf_ipv6lib.a + { { echo "$as_me:17822: error: No $cf_ipv6lib library found, cannot continue. You must fetch lib$cf_ipv6lib.a from an appropriate IPv6 kit and compile beforehand." >&5 echo "$as_me: error: No $cf_ipv6lib library found, cannot continue. You must fetch lib$cf_ipv6lib.a from an appropriate IPv6 kit and compile beforehand." >&2;} @@ -17686,7 +17827,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;} fi fi -echo "$as_me:17689: checking working getaddrinfo" >&5 +echo "$as_me:17830: checking working getaddrinfo" >&5 echo $ECHO_N "checking working getaddrinfo... $ECHO_C" >&6 if test "${cf_cv_getaddrinfo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17696,7 +17837,7 @@ if test "$cross_compiling" = yes; then cf_cv_getaddrinfo=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 17699 "configure" +#line 17840 "configure" #include "confdefs.h" #include <sys/types.h> @@ -17776,15 +17917,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17779: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17920: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17782: \$? = $ac_status" >&5 + echo "$as_me:17923: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17784: \"$ac_try\"") >&5 + { (eval echo "$as_me:17925: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17787: \$? = $ac_status" >&5 + echo "$as_me:17928: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_getaddrinfo=yes else @@ -17797,7 +17938,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:17800: result: $cf_cv_getaddrinfo" >&5 +echo "$as_me:17941: result: $cf_cv_getaddrinfo" >&5 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6 if test "$cf_cv_getaddrinfo" = yes ; then cat >>confdefs.h <<\EOF @@ -17812,12 +17953,12 @@ fi if test "$cf_cv_getaddrinfo" != "yes"; then if test "$cf_cv_ipv6type" != "linux"; then - { echo "$as_me:17815: WARNING: You must get working getaddrinfo() function, + { echo "$as_me:17956: WARNING: You must get working getaddrinfo() function, or you can specify \"--disable-ipv6\"" >&5 echo "$as_me: WARNING: You must get working getaddrinfo() function, or you can specify \"--disable-ipv6\"" >&2;} else - { echo "$as_me:17820: WARNING: The getaddrinfo() implementation on your system seems be buggy. + { echo "$as_me:17961: WARNING: The getaddrinfo() implementation on your system seems be buggy. You should upgrade your system library to the newest version of GNU C library (aka glibc)." >&5 echo "$as_me: WARNING: The getaddrinfo() implementation on your system seems be buggy. @@ -17828,7 +17969,7 @@ fi fi -echo "$as_me:17831: checking if experimental element-justification logic should be used" >&5 +echo "$as_me:17972: checking if experimental element-justification logic should be used" >&5 echo $ECHO_N "checking if experimental element-justification logic should be used... $ECHO_C" >&6 # Check whether --enable-justify-elts or --disable-justify-elts was given. @@ -17845,13 +17986,13 @@ else use_exp_justify_elts=no fi; -echo "$as_me:17848: result: $use_exp_justify_elts" >&5 +echo "$as_me:17989: result: $use_exp_justify_elts" >&5 echo "${ECHO_T}$use_exp_justify_elts" >&6 test $use_exp_justify_elts != no && cat >>confdefs.h <<\EOF #define EXP_JUSTIFY_ELTS 1 EOF -echo "$as_me:17854: checking if experimental keyboard-layout logic should be used" >&5 +echo "$as_me:17995: checking if experimental keyboard-layout logic should be used" >&5 echo $ECHO_N "checking if experimental keyboard-layout logic should be used... $ECHO_C" >&6 # Check whether --enable-kbd-layout or --disable-kbd-layout was given. @@ -17868,13 +18009,13 @@ else use_kbd_layout=no fi; -echo "$as_me:17871: result: $use_kbd_layout" >&5 +echo "$as_me:18012: result: $use_kbd_layout" >&5 echo "${ECHO_T}$use_kbd_layout" >&6 test $use_kbd_layout != no && cat >>confdefs.h <<\EOF #define EXP_KEYBOARD_LAYOUT 1 EOF -echo "$as_me:17877: checking if experimental locale-charset selection logic should be used" >&5 +echo "$as_me:18018: checking if experimental locale-charset selection logic should be used" >&5 echo $ECHO_N "checking if experimental locale-charset selection logic should be used... $ECHO_C" >&6 # Check whether --enable-locale-charset or --disable-locale-charset was given. @@ -17891,13 +18032,13 @@ else use_locale_charset=yes fi; -echo "$as_me:17894: result: $use_locale_charset" >&5 +echo "$as_me:18035: result: $use_locale_charset" >&5 echo "${ECHO_T}$use_locale_charset" >&6 test $use_locale_charset != no && cat >>confdefs.h <<\EOF #define EXP_LOCALE_CHARSET 1 EOF -echo "$as_me:17900: checking if experimental nested-table logic should be used" >&5 +echo "$as_me:18041: checking if experimental nested-table logic should be used" >&5 echo $ECHO_N "checking if experimental nested-table logic should be used... $ECHO_C" >&6 # Check whether --enable-nested-tables or --disable-nested-tables was given. @@ -17914,13 +18055,13 @@ else use_nested_tables=no fi; -echo "$as_me:17917: result: $use_nested_tables" >&5 +echo "$as_me:18058: result: $use_nested_tables" >&5 echo "${ECHO_T}$use_nested_tables" >&6 test $use_nested_tables != no && cat >>confdefs.h <<\EOF #define EXP_NESTED_TABLES 1 EOF -echo "$as_me:17923: checking if scrollbar code should be used" >&5 +echo "$as_me:18064: checking if scrollbar code should be used" >&5 echo $ECHO_N "checking if scrollbar code should be used... $ECHO_C" >&6 # Check whether --enable-scrollbar or --disable-scrollbar was given. @@ -17937,10 +18078,10 @@ else use_scrollbar=no fi; -echo "$as_me:17940: result: $use_scrollbar" >&5 +echo "$as_me:18081: result: $use_scrollbar" >&5 echo "${ECHO_T}$use_scrollbar" >&6 -echo "$as_me:17943: checking if alternative line-edit bindings should be used" >&5 +echo "$as_me:18084: checking if alternative line-edit bindings should be used" >&5 echo $ECHO_N "checking if alternative line-edit bindings should be used... $ECHO_C" >&6 # Check whether --enable-alt-bindings or --disable-alt-bindings was given. @@ -17957,13 +18098,13 @@ else use_alt_bindings=yes fi; -echo "$as_me:17960: result: $use_alt_bindings" >&5 +echo "$as_me:18101: result: $use_alt_bindings" >&5 echo "${ECHO_T}$use_alt_bindings" >&6 test $use_alt_bindings != no && cat >>confdefs.h <<\EOF #define EXP_ALT_BINDINGS 1 EOF -echo "$as_me:17966: checking if you want to use extended HTML DTD logic" >&5 +echo "$as_me:18107: checking if you want to use extended HTML DTD logic" >&5 echo $ECHO_N "checking if you want to use extended HTML DTD logic... $ECHO_C" >&6 # Check whether --enable-extended-dtd or --disable-extended-dtd was given. @@ -17980,13 +18121,13 @@ else use_ext_htmldtd=yes fi; -echo "$as_me:17983: result: $use_ext_htmldtd" >&5 +echo "$as_me:18124: result: $use_ext_htmldtd" >&5 echo "${ECHO_T}$use_ext_htmldtd" >&6 test $use_ext_htmldtd = "no" && cat >>confdefs.h <<\EOF #define NO_EXTENDED_HTMLDTD 1 EOF -echo "$as_me:17989: checking if file-upload logic should be used" >&5 +echo "$as_me:18130: checking if file-upload logic should be used" >&5 echo $ECHO_N "checking if file-upload logic should be used... $ECHO_C" >&6 # Check whether --enable-file-upload or --disable-file-upload was given. @@ -18003,13 +18144,13 @@ else use_file_upload=yes fi; -echo "$as_me:18006: result: $use_file_upload" >&5 +echo "$as_me:18147: result: $use_file_upload" >&5 echo "${ECHO_T}$use_file_upload" >&6 test $use_file_upload != no && cat >>confdefs.h <<\EOF #define USE_FILE_UPLOAD 1 EOF -echo "$as_me:18012: checking if partial-display should be used" >&5 +echo "$as_me:18153: checking if partial-display should be used" >&5 echo $ECHO_N "checking if partial-display should be used... $ECHO_C" >&6 # Check whether --enable-partial or --disable-partial was given. @@ -18026,13 +18167,13 @@ else use_partial_display=yes fi; -echo "$as_me:18029: result: $use_partial_display" >&5 +echo "$as_me:18170: result: $use_partial_display" >&5 echo "${ECHO_T}$use_partial_display" >&6 test $use_partial_display != no && cat >>confdefs.h <<\EOF #define DISP_PARTIAL 1 EOF -echo "$as_me:18035: checking if persistent-cookie logic should be used" >&5 +echo "$as_me:18176: checking if persistent-cookie logic should be used" >&5 echo $ECHO_N "checking if persistent-cookie logic should be used... $ECHO_C" >&6 # Check whether --enable-persistent-cookies or --disable-persistent-cookies was given. @@ -18049,13 +18190,13 @@ else use_filed_cookies=yes fi; -echo "$as_me:18052: result: $use_filed_cookies" >&5 +echo "$as_me:18193: result: $use_filed_cookies" >&5 echo "${ECHO_T}$use_filed_cookies" >&6 test $use_filed_cookies != no && cat >>confdefs.h <<\EOF #define USE_PERSISTENT_COOKIES 1 EOF -echo "$as_me:18058: checking if html source should be colorized" >&5 +echo "$as_me:18199: checking if html source should be colorized" >&5 echo $ECHO_N "checking if html source should be colorized... $ECHO_C" >&6 # Check whether --enable-prettysrc or --disable-prettysrc was given. @@ -18072,13 +18213,13 @@ else use_prettysrc=yes fi; -echo "$as_me:18075: result: $use_prettysrc" >&5 +echo "$as_me:18216: result: $use_prettysrc" >&5 echo "${ECHO_T}$use_prettysrc" >&6 test $use_prettysrc != no && cat >>confdefs.h <<\EOF #define USE_PRETTYSRC 1 EOF -echo "$as_me:18081: checking if read-progress message should show ETA" >&5 +echo "$as_me:18222: checking if read-progress message should show ETA" >&5 echo $ECHO_N "checking if read-progress message should show ETA... $ECHO_C" >&6 # Check whether --enable-read-eta or --disable-read-eta was given. @@ -18095,13 +18236,13 @@ else use_read_eta=yes fi; -echo "$as_me:18098: result: $use_read_eta" >&5 +echo "$as_me:18239: result: $use_read_eta" >&5 echo "${ECHO_T}$use_read_eta" >&6 test $use_read_eta != no && cat >>confdefs.h <<\EOF #define USE_READPROGRESS 1 EOF -echo "$as_me:18104: checking if source caching should be used" >&5 +echo "$as_me:18245: checking if source caching should be used" >&5 echo $ECHO_N "checking if source caching should be used... $ECHO_C" >&6 # Check whether --enable-source-cache or --disable-source-cache was given. @@ -18118,13 +18259,13 @@ else use_source_cache=yes fi; -echo "$as_me:18121: result: $use_source_cache" >&5 +echo "$as_me:18262: result: $use_source_cache" >&5 echo "${ECHO_T}$use_source_cache" >&6 test $use_source_cache != no && cat >>confdefs.h <<\EOF #define USE_SOURCE_CACHE 1 EOF -echo "$as_me:18127: checking if you want to use external commands" >&5 +echo "$as_me:18268: checking if you want to use external commands" >&5 echo $ECHO_N "checking if you want to use external commands... $ECHO_C" >&6 # Check whether --enable-externs or --disable-externs was given. @@ -18141,7 +18282,7 @@ else use_externs=no fi; -echo "$as_me:18144: result: $use_externs" >&5 +echo "$as_me:18285: result: $use_externs" >&5 echo "${ECHO_T}$use_externs" >&6 if test $use_externs != "no" ; then cat >>confdefs.h <<\EOF @@ -18151,7 +18292,7 @@ EOF LIBOBJS="$LIBOBJS LYExtern\$o" fi -echo "$as_me:18154: checking if you want to use setfont support" >&5 +echo "$as_me:18295: checking if you want to use setfont support" >&5 echo $ECHO_N "checking if you want to use setfont support... $ECHO_C" >&6 # Check whether --enable-font-switch or --disable-font-switch was given. @@ -18168,13 +18309,13 @@ else use_setfont=no fi; -echo "$as_me:18171: result: $use_setfont" >&5 +echo "$as_me:18312: result: $use_setfont" >&5 echo "${ECHO_T}$use_setfont" >&6 test $use_setfont = yes && cat >>confdefs.h <<\EOF #define EXP_CHARTRANS_AUTOSWITCH 1 EOF -echo "$as_me:18177: checking if you want cgi-link support" >&5 +echo "$as_me:18318: checking if you want cgi-link support" >&5 echo $ECHO_N "checking if you want cgi-link support... $ECHO_C" >&6 # Check whether --enable-cgi-links or --disable-cgi-links was given. @@ -18190,10 +18331,10 @@ EOF else enableval=no fi; -echo "$as_me:18193: result: $enableval" >&5 +echo "$as_me:18334: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:18196: checking if you want change-exec support" >&5 +echo "$as_me:18337: checking if you want change-exec support" >&5 echo $ECHO_N "checking if you want change-exec support... $ECHO_C" >&6 # Check whether --enable-change-exec or --disable-change-exec was given. @@ -18210,13 +18351,13 @@ else use_change_exec=no fi; -echo "$as_me:18213: result: $use_change_exec" >&5 +echo "$as_me:18354: result: $use_change_exec" >&5 echo "${ECHO_T}$use_change_exec" >&6 test $use_change_exec = yes && cat >>confdefs.h <<\EOF #define ENABLE_OPTS_CHANGE_EXEC 1 EOF -echo "$as_me:18219: checking if you want exec-links support" >&5 +echo "$as_me:18360: checking if you want exec-links support" >&5 echo $ECHO_N "checking if you want exec-links support... $ECHO_C" >&6 # Check whether --enable-exec-links or --disable-exec-links was given. @@ -18233,13 +18374,13 @@ else use_exec_links=$enableval fi; -echo "$as_me:18236: result: $use_exec_links" >&5 +echo "$as_me:18377: result: $use_exec_links" >&5 echo "${ECHO_T}$use_exec_links" >&6 test $use_exec_links = yes && cat >>confdefs.h <<\EOF #define EXEC_LINKS 1 EOF -echo "$as_me:18242: checking if you want exec-scripts support" >&5 +echo "$as_me:18383: checking if you want exec-scripts support" >&5 echo $ECHO_N "checking if you want exec-scripts support... $ECHO_C" >&6 # Check whether --enable-exec-scripts or --disable-exec-scripts was given. @@ -18256,13 +18397,13 @@ else use_exec_scripts=$enableval fi; -echo "$as_me:18259: result: $use_exec_scripts" >&5 +echo "$as_me:18400: result: $use_exec_scripts" >&5 echo "${ECHO_T}$use_exec_scripts" >&6 test $use_exec_scripts = yes && cat >>confdefs.h <<\EOF #define EXEC_SCRIPTS 1 EOF -echo "$as_me:18265: checking if you want internal-links feature" >&5 +echo "$as_me:18406: checking if you want internal-links feature" >&5 echo $ECHO_N "checking if you want internal-links feature... $ECHO_C" >&6 # Check whether --enable-internal-links or --disable-internal-links was given. @@ -18279,13 +18420,13 @@ else use_internal_links=no fi; -echo "$as_me:18282: result: $use_internal_links" >&5 +echo "$as_me:18423: result: $use_internal_links" >&5 echo "${ECHO_T}$use_internal_links" >&6 test $use_internal_links = no && cat >>confdefs.h <<\EOF #define DONT_TRACK_INTERNAL_LINKS 1 EOF -echo "$as_me:18288: checking if you want to fork NSL requests" >&5 +echo "$as_me:18429: checking if you want to fork NSL requests" >&5 echo $ECHO_N "checking if you want to fork NSL requests... $ECHO_C" >&6 # Check whether --enable-nsl-fork or --disable-nsl-fork was given. @@ -18302,13 +18443,13 @@ else use_nsl_fork=no fi; -echo "$as_me:18305: result: $use_nsl_fork" >&5 +echo "$as_me:18446: result: $use_nsl_fork" >&5 echo "${ECHO_T}$use_nsl_fork" >&6 test $use_nsl_fork = yes && cat >>confdefs.h <<\EOF #define NSL_FORK 1 EOF -echo "$as_me:18311: checking if you want to log URL requests via syslog" >&5 +echo "$as_me:18452: checking if you want to log URL requests via syslog" >&5 echo $ECHO_N "checking if you want to log URL requests via syslog... $ECHO_C" >&6 # Check whether --enable-syslog or --disable-syslog was given. @@ -18325,13 +18466,13 @@ else use_syslog=no fi; -echo "$as_me:18328: result: $use_syslog" >&5 +echo "$as_me:18469: result: $use_syslog" >&5 echo "${ECHO_T}$use_syslog" >&6 test $use_syslog = yes && cat >>confdefs.h <<\EOF #define SYSLOG_REQUESTED_URLS 1 EOF -echo "$as_me:18334: checking if you want to underline links" >&5 +echo "$as_me:18475: checking if you want to underline links" >&5 echo $ECHO_N "checking if you want to underline links... $ECHO_C" >&6 # Check whether --enable-underlines or --disable-underlines was given. @@ -18348,7 +18489,7 @@ else use_underline=no fi; -echo "$as_me:18351: result: $use_underline" >&5 +echo "$as_me:18492: result: $use_underline" >&5 echo "${ECHO_T}$use_underline" >&6 test $use_underline = yes && cat >>confdefs.h <<\EOF #define UNDERLINE_LINKS 1 @@ -18358,7 +18499,7 @@ test $use_underline = no && cat >>confdefs.h <<\EOF #define UNDERLINE_LINKS 0 EOF -echo "$as_me:18361: checking if help files should be gzip'ed" >&5 +echo "$as_me:18502: checking if help files should be gzip'ed" >&5 echo $ECHO_N "checking if help files should be gzip'ed... $ECHO_C" >&6 # Check whether --enable-gzip-help or --disable-gzip-help was given. @@ -18375,10 +18516,10 @@ else use_gzip_help=no fi; -echo "$as_me:18378: result: $use_gzip_help" >&5 +echo "$as_me:18519: result: $use_gzip_help" >&5 echo "${ECHO_T}$use_gzip_help" >&6 -echo "$as_me:18381: checking if you want to use libbz2 for decompression of some bzip2 files" >&5 +echo "$as_me:18522: checking if you want to use libbz2 for decompression of some bzip2 files" >&5 echo $ECHO_N "checking if you want to use libbz2 for decompression of some bzip2 files... $ECHO_C" >&6 # Check whether --with-bzlib or --without-bzlib was given. @@ -18388,15 +18529,15 @@ if test "${with_bzlib+set}" = set; then else use_bzlib=no fi; -echo "$as_me:18391: result: $use_bzlib" >&5 +echo "$as_me:18532: result: $use_bzlib" >&5 echo "${ECHO_T}$use_bzlib" >&6 if test ".$use_bzlib" != ".no" ; then -echo "$as_me:18396: checking if we need to add -I option to get bzlib.h" >&5 +echo "$as_me:18537: checking if we need to add -I option to get bzlib.h" >&5 echo $ECHO_N "checking if we need to add -I option to get bzlib.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 18399 "configure" +#line 18540 "configure" #include "confdefs.h" #include <zlib.h> int @@ -18408,24 +18549,24 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18411: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18552: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18414: \$? = $ac_status" >&5 + echo "$as_me:18555: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18417: \"$ac_try\"") >&5 + { (eval echo "$as_me:18558: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18420: \$? = $ac_status" >&5 + echo "$as_me:18561: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:18422: result: no" >&5 + echo "$as_me:18563: result: no" >&5 echo "${ECHO_T}no" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:18428: result: yes" >&5 +echo "$as_me:18569: result: yes" >&5 echo "${ECHO_T}yes" >&6 cf_search="" @@ -18582,13 +18723,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext eval 'cf_cv_have_lib_'bz2'=no' cf_libdir="" - echo "$as_me:18585: checking for BZ2_bzopen" >&5 + echo "$as_me:18726: checking for BZ2_bzopen" >&5 echo $ECHO_N "checking for BZ2_bzopen... $ECHO_C" >&6 if test "${ac_cv_func_BZ2_bzopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 18591 "configure" +#line 18732 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char BZ2_bzopen (); below. */ @@ -18619,16 +18760,16 @@ f = BZ2_bzopen; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18622: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18763: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18625: \$? = $ac_status" >&5 + echo "$as_me:18766: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18628: \"$ac_try\"") >&5 + { (eval echo "$as_me:18769: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18631: \$? = $ac_status" >&5 + echo "$as_me:18772: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_BZ2_bzopen=yes else @@ -18638,18 +18779,18 @@ ac_cv_func_BZ2_bzopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18641: result: $ac_cv_func_BZ2_bzopen" >&5 +echo "$as_me:18782: result: $ac_cv_func_BZ2_bzopen" >&5 echo "${ECHO_T}$ac_cv_func_BZ2_bzopen" >&6 if test $ac_cv_func_BZ2_bzopen = yes; then eval 'cf_cv_have_lib_'bz2'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:18648: checking for BZ2_bzopen in -lbz2" >&5 + echo "$as_me:18789: checking for BZ2_bzopen in -lbz2" >&5 echo $ECHO_N "checking for BZ2_bzopen in -lbz2... $ECHO_C" >&6 LIBS="-lbz2 $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18652 "configure" +#line 18793 "configure" #include "confdefs.h" #include <stdio.h> @@ -18663,25 +18804,25 @@ BZ2_bzopen("name","mode") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18666: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18807: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18669: \$? = $ac_status" >&5 + echo "$as_me:18810: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18672: \"$ac_try\"") >&5 + { (eval echo "$as_me:18813: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18675: \$? = $ac_status" >&5 + echo "$as_me:18816: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:18677: result: yes" >&5 + echo "$as_me:18818: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'bz2'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:18684: result: no" >&5 +echo "$as_me:18825: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search="" @@ -18741,11 +18882,11 @@ test -d /usr && { for cf_libdir in $cf_search do - echo "$as_me:18744: checking for -lbz2 in $cf_libdir" >&5 + echo "$as_me:18885: checking for -lbz2 in $cf_libdir" >&5 echo $ECHO_N "checking for -lbz2 in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -lbz2 $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18748 "configure" +#line 18889 "configure" #include "confdefs.h" #include <stdio.h> @@ -18759,25 +18900,25 @@ BZ2_bzopen("name","mode") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18762: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18903: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18765: \$? = $ac_status" >&5 + echo "$as_me:18906: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18768: \"$ac_try\"") >&5 + { (eval echo "$as_me:18909: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18771: \$? = $ac_status" >&5 + echo "$as_me:18912: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:18773: result: yes" >&5 + echo "$as_me:18914: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'bz2'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:18780: result: no" >&5 +echo "$as_me:18921: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -18792,7 +18933,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'bz2 if test $cf_found_library = no ; then - { { echo "$as_me:18795: error: Cannot link bz2 library" >&5 + { { echo "$as_me:18936: error: Cannot link bz2 library" >&5 echo "$as_me: error: Cannot link bz2 library" >&2;} { (exit 1); exit 1; }; } fi @@ -18803,7 +18944,7 @@ EOF fi -echo "$as_me:18806: checking if you want to use zlib for decompression of some gzip files" >&5 +echo "$as_me:18947: checking if you want to use zlib for decompression of some gzip files" >&5 echo $ECHO_N "checking if you want to use zlib for decompression of some gzip files... $ECHO_C" >&6 # Check whether --with-zlib or --without-zlib was given. @@ -18813,15 +18954,15 @@ if test "${with_zlib+set}" = set; then else use_zlib=no fi; -echo "$as_me:18816: result: $use_zlib" >&5 +echo "$as_me:18957: result: $use_zlib" >&5 echo "${ECHO_T}$use_zlib" >&6 if test ".$use_zlib" != ".no" ; then -echo "$as_me:18821: checking if we need to add -I option to get zlib.h" >&5 +echo "$as_me:18962: checking if we need to add -I option to get zlib.h" >&5 echo $ECHO_N "checking if we need to add -I option to get zlib.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 18824 "configure" +#line 18965 "configure" #include "confdefs.h" #include <zlib.h> int @@ -18833,24 +18974,24 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18836: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18977: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18839: \$? = $ac_status" >&5 + echo "$as_me:18980: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18842: \"$ac_try\"") >&5 + { (eval echo "$as_me:18983: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18845: \$? = $ac_status" >&5 + echo "$as_me:18986: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:18847: result: no" >&5 + echo "$as_me:18988: result: no" >&5 echo "${ECHO_T}no" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:18853: result: yes" >&5 +echo "$as_me:18994: result: yes" >&5 echo "${ECHO_T}yes" >&6 cf_search="" @@ -19007,13 +19148,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext eval 'cf_cv_have_lib_'z'=no' cf_libdir="" - echo "$as_me:19010: checking for gzopen" >&5 + echo "$as_me:19151: checking for gzopen" >&5 echo $ECHO_N "checking for gzopen... $ECHO_C" >&6 if test "${ac_cv_func_gzopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 19016 "configure" +#line 19157 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gzopen (); below. */ @@ -19044,16 +19185,16 @@ f = gzopen; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19047: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19188: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19050: \$? = $ac_status" >&5 + echo "$as_me:19191: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19053: \"$ac_try\"") >&5 + { (eval echo "$as_me:19194: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19056: \$? = $ac_status" >&5 + echo "$as_me:19197: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gzopen=yes else @@ -19063,18 +19204,18 @@ ac_cv_func_gzopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:19066: result: $ac_cv_func_gzopen" >&5 +echo "$as_me:19207: result: $ac_cv_func_gzopen" >&5 echo "${ECHO_T}$ac_cv_func_gzopen" >&6 if test $ac_cv_func_gzopen = yes; then eval 'cf_cv_have_lib_'z'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:19073: checking for gzopen in -lz" >&5 + echo "$as_me:19214: checking for gzopen in -lz" >&5 echo $ECHO_N "checking for gzopen in -lz... $ECHO_C" >&6 LIBS="-lz $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 19077 "configure" +#line 19218 "configure" #include "confdefs.h" #include <zlib.h> int @@ -19086,25 +19227,25 @@ gzopen("name","mode") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19089: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19230: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19092: \$? = $ac_status" >&5 + echo "$as_me:19233: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19095: \"$ac_try\"") >&5 + { (eval echo "$as_me:19236: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19098: \$? = $ac_status" >&5 + echo "$as_me:19239: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:19100: result: yes" >&5 + echo "$as_me:19241: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'z'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:19107: result: no" >&5 +echo "$as_me:19248: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search="" @@ -19164,11 +19305,11 @@ test -d /usr && { for cf_libdir in $cf_search do - echo "$as_me:19167: checking for -lz in $cf_libdir" >&5 + echo "$as_me:19308: checking for -lz in $cf_libdir" >&5 echo $ECHO_N "checking for -lz in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -lz $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 19171 "configure" +#line 19312 "configure" #include "confdefs.h" #include <zlib.h> int @@ -19180,25 +19321,25 @@ gzopen("name","mode") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19183: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19324: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19186: \$? = $ac_status" >&5 + echo "$as_me:19327: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19189: \"$ac_try\"") >&5 + { (eval echo "$as_me:19330: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19192: \$? = $ac_status" >&5 + echo "$as_me:19333: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:19194: result: yes" >&5 + echo "$as_me:19335: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'z'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:19201: result: no" >&5 +echo "$as_me:19342: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -19213,7 +19354,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'z if test $cf_found_library = no ; then - { { echo "$as_me:19216: error: Cannot link z library" >&5 + { { echo "$as_me:19357: error: Cannot link z library" >&5 echo "$as_me: error: Cannot link z library" >&2;} { (exit 1); exit 1; }; } fi @@ -19224,7 +19365,7 @@ EOF fi -echo "$as_me:19227: checking if you want to exclude FINGER code" >&5 +echo "$as_me:19368: checking if you want to exclude FINGER code" >&5 echo $ECHO_N "checking if you want to exclude FINGER code... $ECHO_C" >&6 # Check whether --enable-finger or --disable-finger was given. @@ -19241,13 +19382,13 @@ else use_finger=no fi; -echo "$as_me:19244: result: $use_finger" >&5 +echo "$as_me:19385: result: $use_finger" >&5 echo "${ECHO_T}$use_finger" >&6 test $use_finger != "no" && cat >>confdefs.h <<\EOF #define DISABLE_FINGER 1 EOF -echo "$as_me:19250: checking if you want to exclude GOPHER code" >&5 +echo "$as_me:19391: checking if you want to exclude GOPHER code" >&5 echo $ECHO_N "checking if you want to exclude GOPHER code... $ECHO_C" >&6 # Check whether --enable-gopher or --disable-gopher was given. @@ -19264,13 +19405,13 @@ else use_gopher=no fi; -echo "$as_me:19267: result: $use_gopher" >&5 +echo "$as_me:19408: result: $use_gopher" >&5 echo "${ECHO_T}$use_gopher" >&6 test $use_gopher != "no" && cat >>confdefs.h <<\EOF #define DISABLE_GOPHER 1 EOF -echo "$as_me:19273: checking if you want to exclude NEWS code" >&5 +echo "$as_me:19414: checking if you want to exclude NEWS code" >&5 echo $ECHO_N "checking if you want to exclude NEWS code... $ECHO_C" >&6 # Check whether --enable-news or --disable-news was given. @@ -19287,13 +19428,13 @@ else use_news=no fi; -echo "$as_me:19290: result: $use_news" >&5 +echo "$as_me:19431: result: $use_news" >&5 echo "${ECHO_T}$use_news" >&6 test $use_news != "no" && cat >>confdefs.h <<\EOF #define DISABLE_NEWS 1 EOF -echo "$as_me:19296: checking if you want to exclude FTP code" >&5 +echo "$as_me:19437: checking if you want to exclude FTP code" >&5 echo $ECHO_N "checking if you want to exclude FTP code... $ECHO_C" >&6 # Check whether --enable-ftp or --disable-ftp was given. @@ -19310,7 +19451,7 @@ else use_ftp=no fi; -echo "$as_me:19313: result: $use_ftp" >&5 +echo "$as_me:19454: result: $use_ftp" >&5 echo "${ECHO_T}$use_ftp" >&6 test $use_ftp != "no" && cat >>confdefs.h <<\EOF #define DISABLE_FTP 1 @@ -19318,7 +19459,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 "$as_me:19321: checking if directory-editor code should be used" >&5 +echo "$as_me:19462: checking if directory-editor code should be used" >&5 echo $ECHO_N "checking if directory-editor code should be used... $ECHO_C" >&6 # Check whether --enable-dired or --disable-dired was given. @@ -19335,7 +19476,7 @@ else use_dired=yes fi; -echo "$as_me:19338: result: $use_dired" >&5 +echo "$as_me:19479: result: $use_dired" >&5 echo "${ECHO_T}$use_dired" >&6 if test ".$use_dired" != ".no" ; then @@ -19344,7 +19485,7 @@ if test ".$use_dired" != ".no" ; then #define DIRED_SUPPORT 1 EOF - echo "$as_me:19347: checking if you wish to allow extracting from archives via DirEd" >&5 + echo "$as_me:19488: checking if you wish to allow extracting from archives via DirEd" >&5 echo $ECHO_N "checking if you wish to allow extracting from archives via DirEd... $ECHO_C" >&6 # Check whether --enable-dired-dearchive or --disable-dired-dearchive was given. @@ -19360,10 +19501,10 @@ EOF else enableval=yes fi; - echo "$as_me:19363: result: $enableval" >&5 + echo "$as_me:19504: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 - echo "$as_me:19366: checking if DirEd mode should override keys" >&5 + echo "$as_me:19507: checking if DirEd mode should override keys" >&5 echo $ECHO_N "checking if DirEd mode should override keys... $ECHO_C" >&6 # Check whether --enable-dired-override or --disable-dired-override was given. @@ -19385,10 +19526,10 @@ else EOF fi; - echo "$as_me:19388: result: $enableval" >&5 + echo "$as_me:19529: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 - echo "$as_me:19391: checking if you wish to allow permissions commands via DirEd" >&5 + echo "$as_me:19532: checking if you wish to allow permissions commands via DirEd" >&5 echo $ECHO_N "checking if you wish to allow permissions commands via DirEd... $ECHO_C" >&6 # Check whether --enable-dired-permit or --disable-dired-permit was given. @@ -19410,10 +19551,10 @@ else EOF fi; - echo "$as_me:19413: result: $enableval" >&5 + echo "$as_me:19554: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 - echo "$as_me:19416: checking if you wish to allow executable-permission commands via DirEd" >&5 + echo "$as_me:19557: checking if you wish to allow executable-permission commands via DirEd" >&5 echo $ECHO_N "checking if you wish to allow executable-permission commands via DirEd... $ECHO_C" >&6 # Check whether --enable-dired-xpermit or --disable-dired-xpermit was given. @@ -19429,10 +19570,10 @@ EOF else enableval=yes fi; - echo "$as_me:19432: result: $enableval" >&5 + echo "$as_me:19573: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 - echo "$as_me:19435: checking if you wish to allow \"tar\" commands from DirEd" >&5 + echo "$as_me:19576: checking if you wish to allow \"tar\" commands from DirEd" >&5 echo $ECHO_N "checking if you wish to allow \"tar\" commands from DirEd... $ECHO_C" >&6 # Check whether --enable-dired-tar or --disable-dired-tar was given. @@ -19454,10 +19595,10 @@ else EOF fi; - echo "$as_me:19457: result: $enableval" >&5 + echo "$as_me:19598: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 - echo "$as_me:19460: checking if you wish to allow \"uudecode\" commands from DirEd" >&5 + echo "$as_me:19601: checking if you wish to allow \"uudecode\" commands from DirEd" >&5 echo $ECHO_N "checking if you wish to allow \"uudecode\" commands from DirEd... $ECHO_C" >&6 # Check whether --enable-dired-uudecode or --disable-dired-uudecode was given. @@ -19479,10 +19620,10 @@ else EOF fi; - echo "$as_me:19482: result: $enableval" >&5 + echo "$as_me:19623: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 - echo "$as_me:19485: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5 + echo "$as_me:19626: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5 echo $ECHO_N "checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd... $ECHO_C" >&6 # Check whether --enable-dired-zip or --disable-dired-zip was given. @@ -19504,10 +19645,10 @@ else EOF fi; - echo "$as_me:19507: result: $enableval" >&5 + echo "$as_me:19648: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 - echo "$as_me:19510: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5 + echo "$as_me:19651: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5 echo $ECHO_N "checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd... $ECHO_C" >&6 # Check whether --enable-dired-gzip or --disable-dired-gzip was given. @@ -19529,11 +19670,11 @@ else EOF fi; - echo "$as_me:19532: result: $enableval" >&5 + echo "$as_me:19673: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 fi -echo "$as_me:19536: checking if you want long-directory listings" >&5 +echo "$as_me:19677: checking if you want long-directory listings" >&5 echo $ECHO_N "checking if you want long-directory listings... $ECHO_C" >&6 # Check whether --enable-long-list or --disable-long-list was given. @@ -19555,10 +19696,10 @@ else EOF fi; -echo "$as_me:19558: result: $enableval" >&5 +echo "$as_me:19699: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:19561: checking if parent-directory references are permitted" >&5 +echo "$as_me:19702: checking if parent-directory references are permitted" >&5 echo $ECHO_N "checking if parent-directory references are permitted... $ECHO_C" >&6 # Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given. @@ -19574,7 +19715,7 @@ EOF else enableval=yes fi; -echo "$as_me:19577: result: $enableval" >&5 +echo "$as_me:19718: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 test -z "$TELNET" && TELNET=telnet @@ -19582,7 +19723,7 @@ for ac_prog in $TELNET telnet 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 "$as_me:19585: checking for $ac_word" >&5 +echo "$as_me:19726: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TELNET+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19599,7 +19740,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TELNET="$ac_dir/$ac_word" - echo "$as_me:19602: found $ac_dir/$ac_word" >&5 + echo "$as_me:19743: found $ac_dir/$ac_word" >&5 break fi done @@ -19610,10 +19751,10 @@ fi TELNET=$ac_cv_path_TELNET if test -n "$TELNET"; then - echo "$as_me:19613: result: $TELNET" >&5 + echo "$as_me:19754: result: $TELNET" >&5 echo "${ECHO_T}$TELNET" >&6 else - echo "$as_me:19616: result: no" >&5 + echo "$as_me:19757: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19675,7 +19816,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 19678) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 19819) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <<EOF #define TELNET_PATH "$cf_path_prog" @@ -19692,7 +19833,7 @@ for ac_prog in $TN3270 tn3270 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 "$as_me:19695: checking for $ac_word" >&5 +echo "$as_me:19836: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TN3270+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19709,7 +19850,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TN3270="$ac_dir/$ac_word" - echo "$as_me:19712: found $ac_dir/$ac_word" >&5 + echo "$as_me:19853: found $ac_dir/$ac_word" >&5 break fi done @@ -19720,10 +19861,10 @@ fi TN3270=$ac_cv_path_TN3270 if test -n "$TN3270"; then - echo "$as_me:19723: result: $TN3270" >&5 + echo "$as_me:19864: result: $TN3270" >&5 echo "${ECHO_T}$TN3270" >&6 else - echo "$as_me:19726: result: no" >&5 + echo "$as_me:19867: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19785,7 +19926,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 19788) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 19929) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <<EOF #define TN3270_PATH "$cf_path_prog" @@ -19802,7 +19943,7 @@ for ac_prog in $RLOGIN rlogin 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 "$as_me:19805: checking for $ac_word" >&5 +echo "$as_me:19946: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_RLOGIN+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19819,7 +19960,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_RLOGIN="$ac_dir/$ac_word" - echo "$as_me:19822: found $ac_dir/$ac_word" >&5 + echo "$as_me:19963: found $ac_dir/$ac_word" >&5 break fi done @@ -19830,10 +19971,10 @@ fi RLOGIN=$ac_cv_path_RLOGIN if test -n "$RLOGIN"; then - echo "$as_me:19833: result: $RLOGIN" >&5 + echo "$as_me:19974: result: $RLOGIN" >&5 echo "${ECHO_T}$RLOGIN" >&6 else - echo "$as_me:19836: result: no" >&5 + echo "$as_me:19977: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19895,7 +20036,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 19898) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 20039) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <<EOF #define RLOGIN_PATH "$cf_path_prog" @@ -19912,7 +20053,7 @@ for ac_prog in $MV mv 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 "$as_me:19915: checking for $ac_word" >&5 +echo "$as_me:20056: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_MV+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19929,7 +20070,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_MV="$ac_dir/$ac_word" - echo "$as_me:19932: found $ac_dir/$ac_word" >&5 + echo "$as_me:20073: found $ac_dir/$ac_word" >&5 break fi done @@ -19940,10 +20081,10 @@ fi MV=$ac_cv_path_MV if test -n "$MV"; then - echo "$as_me:19943: result: $MV" >&5 + echo "$as_me:20084: result: $MV" >&5 echo "${ECHO_T}$MV" >&6 else - echo "$as_me:19946: result: no" >&5 + echo "$as_me:20087: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20005,7 +20146,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 20008) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 20149) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <<EOF #define MV_PATH "$cf_path_prog" @@ -20022,7 +20163,7 @@ for ac_prog in $GZIP gzip 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 "$as_me:20025: checking for $ac_word" >&5 +echo "$as_me:20166: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GZIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20039,7 +20180,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_GZIP="$ac_dir/$ac_word" - echo "$as_me:20042: found $ac_dir/$ac_word" >&5 + echo "$as_me:20183: found $ac_dir/$ac_word" >&5 break fi done @@ -20050,10 +20191,10 @@ fi GZIP=$ac_cv_path_GZIP if test -n "$GZIP"; then - echo "$as_me:20053: result: $GZIP" >&5 + echo "$as_me:20194: result: $GZIP" >&5 echo "${ECHO_T}$GZIP" >&6 else - echo "$as_me:20056: result: no" >&5 + echo "$as_me:20197: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20115,7 +20256,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 20118) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 20259) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <<EOF #define GZIP_PATH "$cf_path_prog" @@ -20132,7 +20273,7 @@ for ac_prog in $UNCOMPRESS gunzip 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 "$as_me:20135: checking for $ac_word" >&5 +echo "$as_me:20276: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_UNCOMPRESS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20149,7 +20290,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_UNCOMPRESS="$ac_dir/$ac_word" - echo "$as_me:20152: found $ac_dir/$ac_word" >&5 + echo "$as_me:20293: found $ac_dir/$ac_word" >&5 break fi done @@ -20160,10 +20301,10 @@ fi UNCOMPRESS=$ac_cv_path_UNCOMPRESS if test -n "$UNCOMPRESS"; then - echo "$as_me:20163: result: $UNCOMPRESS" >&5 + echo "$as_me:20304: result: $UNCOMPRESS" >&5 echo "${ECHO_T}$UNCOMPRESS" >&6 else - echo "$as_me:20166: result: no" >&5 + echo "$as_me:20307: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20225,7 +20366,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 20228) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 20369) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <<EOF #define UNCOMPRESS_PATH "$cf_path_prog" @@ -20242,7 +20383,7 @@ for ac_prog in $UNZIP unzip 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 "$as_me:20245: checking for $ac_word" >&5 +echo "$as_me:20386: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_UNZIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20259,7 +20400,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_UNZIP="$ac_dir/$ac_word" - echo "$as_me:20262: found $ac_dir/$ac_word" >&5 + echo "$as_me:20403: found $ac_dir/$ac_word" >&5 break fi done @@ -20270,10 +20411,10 @@ fi UNZIP=$ac_cv_path_UNZIP if test -n "$UNZIP"; then - echo "$as_me:20273: result: $UNZIP" >&5 + echo "$as_me:20414: result: $UNZIP" >&5 echo "${ECHO_T}$UNZIP" >&6 else - echo "$as_me:20276: result: no" >&5 + echo "$as_me:20417: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20335,7 +20476,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 20338) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 20479) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <<EOF #define UNZIP_PATH "$cf_path_prog" @@ -20352,7 +20493,7 @@ for ac_prog in $BZIP2 bzip2 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 "$as_me:20355: checking for $ac_word" >&5 +echo "$as_me:20496: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_BZIP2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20369,7 +20510,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_BZIP2="$ac_dir/$ac_word" - echo "$as_me:20372: found $ac_dir/$ac_word" >&5 + echo "$as_me:20513: found $ac_dir/$ac_word" >&5 break fi done @@ -20380,10 +20521,10 @@ fi BZIP2=$ac_cv_path_BZIP2 if test -n "$BZIP2"; then - echo "$as_me:20383: result: $BZIP2" >&5 + echo "$as_me:20524: result: $BZIP2" >&5 echo "${ECHO_T}$BZIP2" >&6 else - echo "$as_me:20386: result: no" >&5 + echo "$as_me:20527: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20445,7 +20586,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 20448) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 20589) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <<EOF #define BZIP2_PATH "$cf_path_prog" @@ -20462,7 +20603,7 @@ for ac_prog in $TAR tar pax gtar gnutar bsdtar star 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 "$as_me:20465: checking for $ac_word" >&5 +echo "$as_me:20606: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TAR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20479,7 +20620,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TAR="$ac_dir/$ac_word" - echo "$as_me:20482: found $ac_dir/$ac_word" >&5 + echo "$as_me:20623: found $ac_dir/$ac_word" >&5 break fi done @@ -20490,10 +20631,10 @@ fi TAR=$ac_cv_path_TAR if test -n "$TAR"; then - echo "$as_me:20493: result: $TAR" >&5 + echo "$as_me:20634: result: $TAR" >&5 echo "${ECHO_T}$TAR" >&6 else - echo "$as_me:20496: result: no" >&5 + echo "$as_me:20637: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20555,7 +20696,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 20558) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 20699) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <<EOF #define TAR_PATH "$cf_path_prog" @@ -20612,7 +20753,7 @@ for ac_prog in $COMPRESS compress 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 "$as_me:20615: checking for $ac_word" >&5 +echo "$as_me:20756: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_COMPRESS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20629,7 +20770,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_COMPRESS="$ac_dir/$ac_word" - echo "$as_me:20632: found $ac_dir/$ac_word" >&5 + echo "$as_me:20773: found $ac_dir/$ac_word" >&5 break fi done @@ -20640,10 +20781,10 @@ fi COMPRESS=$ac_cv_path_COMPRESS if test -n "$COMPRESS"; then - echo "$as_me:20643: result: $COMPRESS" >&5 + echo "$as_me:20784: result: $COMPRESS" >&5 echo "${ECHO_T}$COMPRESS" >&6 else - echo "$as_me:20646: result: no" >&5 + echo "$as_me:20787: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20705,7 +20846,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 20708) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 20849) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <<EOF #define COMPRESS_PATH "$cf_path_prog" @@ -20722,7 +20863,7 @@ for ac_prog in $RM rm 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 "$as_me:20725: checking for $ac_word" >&5 +echo "$as_me:20866: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_RM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20739,7 +20880,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_RM="$ac_dir/$ac_word" - echo "$as_me:20742: found $ac_dir/$ac_word" >&5 + echo "$as_me:20883: found $ac_dir/$ac_word" >&5 break fi done @@ -20750,10 +20891,10 @@ fi RM=$ac_cv_path_RM if test -n "$RM"; then - echo "$as_me:20753: result: $RM" >&5 + echo "$as_me:20894: result: $RM" >&5 echo "${ECHO_T}$RM" >&6 else - echo "$as_me:20756: result: no" >&5 + echo "$as_me:20897: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20815,7 +20956,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 20818) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 20959) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <<EOF #define RM_PATH "$cf_path_prog" @@ -20832,7 +20973,7 @@ for ac_prog in $UUDECODE uudecode 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 "$as_me:20835: checking for $ac_word" >&5 +echo "$as_me:20976: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_UUDECODE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20849,7 +20990,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_UUDECODE="$ac_dir/$ac_word" - echo "$as_me:20852: found $ac_dir/$ac_word" >&5 + echo "$as_me:20993: found $ac_dir/$ac_word" >&5 break fi done @@ -20860,10 +21001,10 @@ fi UUDECODE=$ac_cv_path_UUDECODE if test -n "$UUDECODE"; then - echo "$as_me:20863: result: $UUDECODE" >&5 + echo "$as_me:21004: result: $UUDECODE" >&5 echo "${ECHO_T}$UUDECODE" >&6 else - echo "$as_me:20866: result: no" >&5 + echo "$as_me:21007: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20925,7 +21066,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 20928) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 21069) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <<EOF #define UUDECODE_PATH "$cf_path_prog" @@ -20942,7 +21083,7 @@ for ac_prog in $ZCAT zcat 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 "$as_me:20945: checking for $ac_word" >&5 +echo "$as_me:21086: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ZCAT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20959,7 +21100,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ZCAT="$ac_dir/$ac_word" - echo "$as_me:20962: found $ac_dir/$ac_word" >&5 + echo "$as_me:21103: found $ac_dir/$ac_word" >&5 break fi done @@ -20970,10 +21111,10 @@ fi ZCAT=$ac_cv_path_ZCAT if test -n "$ZCAT"; then - echo "$as_me:20973: result: $ZCAT" >&5 + echo "$as_me:21114: result: $ZCAT" >&5 echo "${ECHO_T}$ZCAT" >&6 else - echo "$as_me:20976: result: no" >&5 + echo "$as_me:21117: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21035,7 +21176,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 21038) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 21179) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <<EOF #define ZCAT_PATH "$cf_path_prog" @@ -21052,7 +21193,7 @@ for ac_prog in $ZIP zip 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 "$as_me:21055: checking for $ac_word" >&5 +echo "$as_me:21196: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ZIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21069,7 +21210,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ZIP="$ac_dir/$ac_word" - echo "$as_me:21072: found $ac_dir/$ac_word" >&5 + echo "$as_me:21213: found $ac_dir/$ac_word" >&5 break fi done @@ -21080,10 +21221,10 @@ fi ZIP=$ac_cv_path_ZIP if test -n "$ZIP"; then - echo "$as_me:21083: result: $ZIP" >&5 + echo "$as_me:21224: result: $ZIP" >&5 echo "${ECHO_T}$ZIP" >&6 else - echo "$as_me:21086: result: no" >&5 + echo "$as_me:21227: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21145,7 +21286,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 21148) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 21289) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <<EOF #define ZIP_PATH "$cf_path_prog" @@ -21172,7 +21313,7 @@ for ac_prog in $INSTALL install 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 "$as_me:21175: checking for $ac_word" >&5 +echo "$as_me:21316: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_INSTALL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21189,7 +21330,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_INSTALL="$ac_dir/$ac_word" - echo "$as_me:21192: found $ac_dir/$ac_word" >&5 + echo "$as_me:21333: found $ac_dir/$ac_word" >&5 break fi done @@ -21200,10 +21341,10 @@ fi INSTALL=$ac_cv_path_INSTALL if test -n "$INSTALL"; then - echo "$as_me:21203: result: $INSTALL" >&5 + echo "$as_me:21344: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 else - echo "$as_me:21206: result: no" >&5 + echo "$as_me:21347: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21265,7 +21406,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 21268) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 21409) testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <<EOF #define INSTALL_PATH "$cf_path_prog" @@ -21291,7 +21432,7 @@ fi if test $cf_cv_screen = pdcurses ; then - echo "$as_me:21294: checking for X" >&5 + echo "$as_me:21435: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -21388,17 +21529,17 @@ if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF -#line 21391 "configure" +#line 21532 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> _ACEOF -if { (eval echo "$as_me:21395: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:21536: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:21401: \$? = $ac_status" >&5 + echo "$as_me:21542: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -21431,7 +21572,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 21434 "configure" +#line 21575 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> int @@ -21443,16 +21584,16 @@ XtMalloc (0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21446: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21587: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21449: \$? = $ac_status" >&5 + echo "$as_me:21590: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21452: \"$ac_try\"") >&5 + { (eval echo "$as_me:21593: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21455: \$? = $ac_status" >&5 + echo "$as_me:21596: \$? = $ac_status" >&5 (exit $ac_status); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -21490,7 +21631,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:21493: result: $have_x" >&5 + echo "$as_me:21634: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -21500,7 +21641,7 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:21503: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:21644: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -21524,11 +21665,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:21527: checking whether -R must be followed by a space" >&5 + echo "$as_me:21668: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 21531 "configure" +#line 21672 "configure" #include "confdefs.h" int @@ -21540,16 +21681,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21543: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21684: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21546: \$? = $ac_status" >&5 + echo "$as_me:21687: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21549: \"$ac_try\"") >&5 + { (eval echo "$as_me:21690: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21552: \$? = $ac_status" >&5 + echo "$as_me:21693: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_nospace=yes else @@ -21559,13 +21700,13 @@ ac_R_nospace=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then - echo "$as_me:21562: result: no" >&5 + echo "$as_me:21703: result: no" >&5 echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 21568 "configure" +#line 21709 "configure" #include "confdefs.h" int @@ -21577,16 +21718,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21580: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21721: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21583: \$? = $ac_status" >&5 + echo "$as_me:21724: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21586: \"$ac_try\"") >&5 + { (eval echo "$as_me:21727: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21589: \$? = $ac_status" >&5 + echo "$as_me:21730: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_space=yes else @@ -21596,11 +21737,11 @@ ac_R_space=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then - echo "$as_me:21599: result: yes" >&5 + echo "$as_me:21740: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:21603: result: neither works" >&5 + echo "$as_me:21744: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -21620,7 +21761,7 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >conftest.$ac_ext <<_ACEOF -#line 21623 "configure" +#line 21764 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21639,22 +21780,22 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21642: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21783: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21645: \$? = $ac_status" >&5 + echo "$as_me:21786: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21648: \"$ac_try\"") >&5 + { (eval echo "$as_me:21789: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21651: \$? = $ac_status" >&5 + echo "$as_me:21792: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:21657: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:21798: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21662,7 +21803,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 21665 "configure" +#line 21806 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21681,16 +21822,16 @@ dnet_ntoa (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21684: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21825: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21687: \$? = $ac_status" >&5 + echo "$as_me:21828: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21690: \"$ac_try\"") >&5 + { (eval echo "$as_me:21831: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21693: \$? = $ac_status" >&5 + echo "$as_me:21834: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -21701,14 +21842,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21704: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:21845: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:21711: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:21852: checking for dnet_ntoa in -ldnet_stub" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21716,7 +21857,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 21719 "configure" +#line 21860 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21735,16 +21876,16 @@ dnet_ntoa (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21738: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21879: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21741: \$? = $ac_status" >&5 + echo "$as_me:21882: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21744: \"$ac_try\"") >&5 + { (eval echo "$as_me:21885: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21747: \$? = $ac_status" >&5 + echo "$as_me:21888: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -21755,7 +21896,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21758: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:21899: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" @@ -21774,13 +21915,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:21777: checking for gethostbyname" >&5 + echo "$as_me:21918: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 21783 "configure" +#line 21924 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname (); below. */ @@ -21811,16 +21952,16 @@ f = gethostbyname; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21814: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21955: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21817: \$? = $ac_status" >&5 + echo "$as_me:21958: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21820: \"$ac_try\"") >&5 + { (eval echo "$as_me:21961: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21823: \$? = $ac_status" >&5 + echo "$as_me:21964: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gethostbyname=yes else @@ -21830,11 +21971,11 @@ ac_cv_func_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:21833: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:21974: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:21837: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:21978: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21842,7 +21983,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 21845 "configure" +#line 21986 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21861,16 +22002,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21864: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22005: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21867: \$? = $ac_status" >&5 + echo "$as_me:22008: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21870: \"$ac_try\"") >&5 + { (eval echo "$as_me:22011: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21873: \$? = $ac_status" >&5 + echo "$as_me:22014: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -21881,14 +22022,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21884: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:22025: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:21891: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:22032: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21896,7 +22037,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 21899 "configure" +#line 22040 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21915,16 +22056,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21918: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22059: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21921: \$? = $ac_status" >&5 + echo "$as_me:22062: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21924: \"$ac_try\"") >&5 + { (eval echo "$as_me:22065: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21927: \$? = $ac_status" >&5 + echo "$as_me:22068: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -21935,7 +22076,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21938: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:22079: result: $ac_cv_lib_bsd_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" @@ -21951,13 +22092,13 @@ fi # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:21954: checking for connect" >&5 + echo "$as_me:22095: checking for connect" >&5 echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 21960 "configure" +#line 22101 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect (); below. */ @@ -21988,16 +22129,16 @@ f = connect; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21991: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22132: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21994: \$? = $ac_status" >&5 + echo "$as_me:22135: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21997: \"$ac_try\"") >&5 + { (eval echo "$as_me:22138: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22000: \$? = $ac_status" >&5 + echo "$as_me:22141: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_connect=yes else @@ -22007,11 +22148,11 @@ ac_cv_func_connect=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:22010: result: $ac_cv_func_connect" >&5 +echo "$as_me:22151: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo "$as_me:22014: checking for connect in -lsocket" >&5 + echo "$as_me:22155: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22019,7 +22160,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 22022 "configure" +#line 22163 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22038,16 +22179,16 @@ connect (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22041: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22182: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22044: \$? = $ac_status" >&5 + echo "$as_me:22185: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22047: \"$ac_try\"") >&5 + { (eval echo "$as_me:22188: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22050: \$? = $ac_status" >&5 + echo "$as_me:22191: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_connect=yes else @@ -22058,7 +22199,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22061: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:22202: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" @@ -22067,13 +22208,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:22070: checking for remove" >&5 + echo "$as_me:22211: checking for remove" >&5 echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 22076 "configure" +#line 22217 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove (); below. */ @@ -22104,16 +22245,16 @@ f = remove; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22107: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22248: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22110: \$? = $ac_status" >&5 + echo "$as_me:22251: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22113: \"$ac_try\"") >&5 + { (eval echo "$as_me:22254: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22116: \$? = $ac_status" >&5 + echo "$as_me:22257: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_remove=yes else @@ -22123,11 +22264,11 @@ ac_cv_func_remove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:22126: result: $ac_cv_func_remove" >&5 +echo "$as_me:22267: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo "$as_me:22130: checking for remove in -lposix" >&5 + echo "$as_me:22271: checking for remove in -lposix" >&5 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22135,7 +22276,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 22138 "configure" +#line 22279 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22154,16 +22295,16 @@ remove (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22157: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22298: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22160: \$? = $ac_status" >&5 + echo "$as_me:22301: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22163: \"$ac_try\"") >&5 + { (eval echo "$as_me:22304: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22166: \$? = $ac_status" >&5 + echo "$as_me:22307: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_posix_remove=yes else @@ -22174,7 +22315,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22177: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:22318: result: $ac_cv_lib_posix_remove" >&5 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" @@ -22183,13 +22324,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:22186: checking for shmat" >&5 + echo "$as_me:22327: checking for shmat" >&5 echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 22192 "configure" +#line 22333 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat (); below. */ @@ -22220,16 +22361,16 @@ f = shmat; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22223: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22364: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22226: \$? = $ac_status" >&5 + echo "$as_me:22367: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22229: \"$ac_try\"") >&5 + { (eval echo "$as_me:22370: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22232: \$? = $ac_status" >&5 + echo "$as_me:22373: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shmat=yes else @@ -22239,11 +22380,11 @@ ac_cv_func_shmat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:22242: result: $ac_cv_func_shmat" >&5 +echo "$as_me:22383: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo "$as_me:22246: checking for shmat in -lipc" >&5 + echo "$as_me:22387: checking for shmat in -lipc" >&5 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22251,7 +22392,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 22254 "configure" +#line 22395 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22270,16 +22411,16 @@ shmat (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22273: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22414: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22276: \$? = $ac_status" >&5 + echo "$as_me:22417: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22279: \"$ac_try\"") >&5 + { (eval echo "$as_me:22420: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22282: \$? = $ac_status" >&5 + echo "$as_me:22423: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -22290,7 +22431,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22293: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:22434: result: $ac_cv_lib_ipc_shmat" >&5 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" @@ -22308,7 +22449,7 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:22311: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:22452: checking for IceConnectionNumber in -lICE" >&5 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22316,7 +22457,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 22319 "configure" +#line 22460 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22335,16 +22476,16 @@ IceConnectionNumber (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22338: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22479: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22341: \$? = $ac_status" >&5 + echo "$as_me:22482: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22344: \"$ac_try\"") >&5 + { (eval echo "$as_me:22485: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22347: \$? = $ac_status" >&5 + echo "$as_me:22488: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -22355,7 +22496,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22358: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:22499: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" @@ -22449,7 +22590,7 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 22452 "configure" +#line 22593 "configure" #include "confdefs.h" #include <stdio.h> int @@ -22461,16 +22602,16 @@ printf("Hello world"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22464: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22605: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22467: \$? = $ac_status" >&5 + echo "$as_me:22608: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22470: \"$ac_try\"") >&5 + { (eval echo "$as_me:22611: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22473: \$? = $ac_status" >&5 + echo "$as_me:22614: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -22487,13 +22628,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:22490: checking for XOpenDisplay" >&5 +echo "$as_me:22631: checking for XOpenDisplay" >&5 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 if test "${ac_cv_func_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 22496 "configure" +#line 22637 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char XOpenDisplay (); below. */ @@ -22524,16 +22665,16 @@ f = XOpenDisplay; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22527: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22668: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22530: \$? = $ac_status" >&5 + echo "$as_me:22671: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22533: \"$ac_try\"") >&5 + { (eval echo "$as_me:22674: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22536: \$? = $ac_status" >&5 + echo "$as_me:22677: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XOpenDisplay=yes else @@ -22543,13 +22684,13 @@ ac_cv_func_XOpenDisplay=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:22546: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:22687: result: $ac_cv_func_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 if test $ac_cv_func_XOpenDisplay = yes; then : else -echo "$as_me:22552: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:22693: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22557,7 +22698,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 22560 "configure" +#line 22701 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22576,16 +22717,16 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22579: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22720: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22582: \$? = $ac_status" >&5 + echo "$as_me:22723: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22585: \"$ac_try\"") >&5 + { (eval echo "$as_me:22726: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22588: \$? = $ac_status" >&5 + echo "$as_me:22729: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -22596,7 +22737,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22599: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:22740: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test $ac_cv_lib_X11_XOpenDisplay = yes; then LIBS="-lX11 $LIBS" @@ -22604,13 +22745,13 @@ fi fi -echo "$as_me:22607: checking for XtAppInitialize" >&5 +echo "$as_me:22748: checking for XtAppInitialize" >&5 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 if test "${ac_cv_func_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 22613 "configure" +#line 22754 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char XtAppInitialize (); below. */ @@ -22641,16 +22782,16 @@ f = XtAppInitialize; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22644: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22785: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22647: \$? = $ac_status" >&5 + echo "$as_me:22788: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22650: \"$ac_try\"") >&5 + { (eval echo "$as_me:22791: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22653: \$? = $ac_status" >&5 + echo "$as_me:22794: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XtAppInitialize=yes else @@ -22660,13 +22801,13 @@ ac_cv_func_XtAppInitialize=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:22663: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:22804: result: $ac_cv_func_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 if test $ac_cv_func_XtAppInitialize = yes; then : else -echo "$as_me:22669: checking for XtAppInitialize in -lXt" >&5 +echo "$as_me:22810: checking for XtAppInitialize in -lXt" >&5 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22674,7 +22815,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 22677 "configure" +#line 22818 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22693,16 +22834,16 @@ XtAppInitialize (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22696: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22837: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22699: \$? = $ac_status" >&5 + echo "$as_me:22840: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22702: \"$ac_try\"") >&5 + { (eval echo "$as_me:22843: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22705: \$? = $ac_status" >&5 + echo "$as_me:22846: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else @@ -22713,7 +22854,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22716: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:22857: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then cat >>confdefs.h <<\EOF @@ -22727,7 +22868,7 @@ fi fi if test $cf_have_X_LIBS = no ; then - { echo "$as_me:22730: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:22871: WARNING: Unable to successfully link X Toolkit library (-lXt) with test program. You will have to check and add the proper libraries by hand to makefile." >&5 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with @@ -22737,7 +22878,7 @@ fi cf_x_athena=${cf_x_athena-Xaw} -echo "$as_me:22740: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:22881: checking if you want to link with Xaw 3d library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 withval= @@ -22748,14 +22889,14 @@ if test "${with_Xaw3d+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:22751: result: yes" >&5 + echo "$as_me:22892: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:22754: result: no" >&5 + echo "$as_me:22895: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:22758: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:22899: checking if you want to link with neXT Athena library" >&5 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 withval= @@ -22766,14 +22907,14 @@ if test "${with_neXtaw+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:22769: result: yes" >&5 + echo "$as_me:22910: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:22772: result: no" >&5 + echo "$as_me:22913: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:22776: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:22917: checking if you want to link with Athena-Plus library" >&5 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 withval= @@ -22784,14 +22925,14 @@ if test "${with_XawPlus+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:22787: result: yes" >&5 + echo "$as_me:22928: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:22790: result: no" >&5 + echo "$as_me:22931: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:22794: checking for XextCreateExtension in -lXext" >&5 +echo "$as_me:22935: checking for XextCreateExtension in -lXext" >&5 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22799,7 +22940,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 22802 "configure" +#line 22943 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22818,16 +22959,16 @@ XextCreateExtension (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22821: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22962: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22824: \$? = $ac_status" >&5 + echo "$as_me:22965: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22827: \"$ac_try\"") >&5 + { (eval echo "$as_me:22968: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22830: \$? = $ac_status" >&5 + echo "$as_me:22971: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -22838,7 +22979,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22841: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:22982: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then LIBS="-lXext $LIBS" @@ -22860,14 +23001,14 @@ do cf_test=X11/$cf_x_athena_root/SimpleMenu.h if test $cf_path != default ; then CPPFLAGS="-I$cf_path/include $cf_save" - echo "$as_me:22863: checking for $cf_test in $cf_path" >&5 + echo "$as_me:23004: checking for $cf_test in $cf_path" >&5 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 else - echo "$as_me:22866: checking for $cf_test" >&5 + echo "$as_me:23007: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line 22870 "configure" +#line 23011 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> @@ -22881,16 +23022,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22884: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23025: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22887: \$? = $ac_status" >&5 + echo "$as_me:23028: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22890: \"$ac_try\"") >&5 + { (eval echo "$as_me:23031: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22893: \$? = $ac_status" >&5 + echo "$as_me:23034: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -22899,7 +23040,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:22902: result: $cf_result" >&5 + echo "$as_me:23043: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_include=$cf_path @@ -22911,7 +23052,7 @@ echo "${ECHO_T}$cf_result" >&6 done if test -z "$cf_x_athena_include" ; then - { echo "$as_me:22914: WARNING: Unable to successfully find Athena header files with test program" >&5 + { echo "$as_me:23055: WARNING: Unable to successfully find Athena header files with test program" >&5 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} elif test "$cf_x_athena_include" != default ; then CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include" @@ -22936,17 +23077,17 @@ do cf_test=XawSimpleMenuAddGlobalActions if test $cf_path != default ; then LIBS="-L$cf_path/lib $cf_lib $LIBS" - echo "$as_me:22939: checking for $cf_lib in $cf_path" >&5 + echo "$as_me:23080: checking for $cf_lib in $cf_path" >&5 echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6 else LIBS="$cf_lib $LIBS" - echo "$as_me:22943: checking for $cf_test in $cf_lib" >&5 + echo "$as_me:23084: checking for $cf_test in $cf_lib" >&5 echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6 fi cf_SAVE="$LIBS" LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 22949 "configure" +#line 23090 "configure" #include "confdefs.h" int @@ -22958,16 +23099,16 @@ $cf_test() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22961: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23102: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22964: \$? = $ac_status" >&5 + echo "$as_me:23105: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22967: \"$ac_try\"") >&5 + { (eval echo "$as_me:23108: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22970: \$? = $ac_status" >&5 + echo "$as_me:23111: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -22976,7 +23117,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:22979: result: $cf_result" >&5 + echo "$as_me:23120: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_lib="$cf_lib" @@ -22990,7 +23131,7 @@ echo "${ECHO_T}$cf_result" >&6 done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:22993: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:23134: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} { (exit 1); exit 1; }; } fi @@ -23081,7 +23222,7 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 23084 "configure" +#line 23225 "configure" #include "confdefs.h" #include <stdio.h> int @@ -23093,16 +23234,16 @@ printf("Hello world"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23096: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23237: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23099: \$? = $ac_status" >&5 + echo "$as_me:23240: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23102: \"$ac_try\"") >&5 + { (eval echo "$as_me:23243: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23105: \$? = $ac_status" >&5 + echo "$as_me:23246: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -23119,7 +23260,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:23122: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:23263: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23127,7 +23268,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 23130 "configure" +#line 23271 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -23146,16 +23287,16 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23149: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23290: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23152: \$? = $ac_status" >&5 + echo "$as_me:23293: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23155: \"$ac_try\"") >&5 + { (eval echo "$as_me:23296: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23158: \$? = $ac_status" >&5 + echo "$as_me:23299: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -23166,13 +23307,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:23169: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:23310: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test $ac_cv_lib_X11_XOpenDisplay = yes; then LIBS="-lX11 $LIBS" fi -echo "$as_me:23175: checking for XCurses library" >&5 +echo "$as_me:23316: checking for XCurses library" >&5 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6 if test "${cf_cv_lib_XCurses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23180,7 +23321,7 @@ else LIBS="-lXCurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 23183 "configure" +#line 23324 "configure" #include "confdefs.h" #include <xcurses.h> @@ -23195,16 +23336,16 @@ XCursesExit(); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23198: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23339: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23201: \$? = $ac_status" >&5 + echo "$as_me:23342: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23204: \"$ac_try\"") >&5 + { (eval echo "$as_me:23345: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23207: \$? = $ac_status" >&5 + echo "$as_me:23348: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_lib_XCurses=yes else @@ -23215,7 +23356,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:23218: result: $cf_cv_lib_XCurses" >&5 +echo "$as_me:23359: result: $cf_cv_lib_XCurses" >&5 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 if test $cf_cv_lib_XCurses = yes ; then cat >>confdefs.h <<\EOF @@ -23231,14 +23372,14 @@ EOF EOF else - { { echo "$as_me:23234: error: Cannot link with XCurses" >&5 + { { echo "$as_me:23375: error: Cannot link with XCurses" >&5 echo "$as_me: error: Cannot link with XCurses" >&2;} { (exit 1); exit 1; }; } fi else -echo "$as_me:23241: checking if we can include termio.h with curses" >&5 +echo "$as_me:23382: checking if we can include termio.h with curses" >&5 echo $ECHO_N "checking if we can include termio.h with curses... $ECHO_C" >&6 if test "${cf_cv_termio_and_curses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23248,7 +23389,7 @@ else CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation" touch lynx_cfg.h cat >conftest.$ac_ext <<_ACEOF -#line 23251 "configure" +#line 23392 "configure" #include "confdefs.h" #include <LYCurses.h> @@ -23262,16 +23403,16 @@ putchar(0x0a) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23265: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23406: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23268: \$? = $ac_status" >&5 + echo "$as_me:23409: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23271: \"$ac_try\"") >&5 + { (eval echo "$as_me:23412: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23274: \$? = $ac_status" >&5 + echo "$as_me:23415: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_termio_and_curses=yes else @@ -23284,7 +23425,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext rm -f lynx_cfg.h fi -echo "$as_me:23287: result: $cf_cv_termio_and_curses" >&5 +echo "$as_me:23428: result: $cf_cv_termio_and_curses" >&5 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6 test $cf_cv_termio_and_curses = yes && cat >>confdefs.h <<\EOF @@ -23299,23 +23440,23 @@ if test $cf_cv_screen != slang ; then for ac_header in $cf_cv_screen/term.h term.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:23302: checking for $ac_header" >&5 +echo "$as_me:23443: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 23308 "configure" +#line 23449 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:23312: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:23453: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23318: \$? = $ac_status" >&5 + echo "$as_me:23459: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -23334,7 +23475,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:23337: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:23478: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -23344,7 +23485,7 @@ EOF fi done -echo "$as_me:23347: checking if curses supports alternate-character set" >&5 +echo "$as_me:23488: checking if curses supports alternate-character set" >&5 echo $ECHO_N "checking if curses supports alternate-character set... $ECHO_C" >&6 if test "${cf_cv_alt_char_set+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23353,7 +23494,7 @@ else for mapname in acs_map _acs_map do cat >conftest.$ac_ext <<_ACEOF -#line 23356 "configure" +#line 23497 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -23367,16 +23508,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23370: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23511: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23373: \$? = $ac_status" >&5 + echo "$as_me:23514: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23376: \"$ac_try\"") >&5 + { (eval echo "$as_me:23517: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23379: \$? = $ac_status" >&5 + echo "$as_me:23520: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_alt_char_set=$mapname break @@ -23390,20 +23531,20 @@ done fi -echo "$as_me:23393: result: $cf_cv_alt_char_set" >&5 +echo "$as_me:23534: result: $cf_cv_alt_char_set" >&5 echo "${ECHO_T}$cf_cv_alt_char_set" >&6 test $cf_cv_alt_char_set != no && cat >>confdefs.h <<EOF #define ALT_CHAR_SET $cf_cv_alt_char_set EOF -echo "$as_me:23399: checking if curses supports fancy attributes" >&5 +echo "$as_me:23540: checking if curses supports fancy attributes" >&5 echo $ECHO_N "checking if curses supports fancy attributes... $ECHO_C" >&6 if test "${cf_cv_fancy_curses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 23406 "configure" +#line 23547 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -23421,16 +23562,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23424: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23565: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23427: \$? = $ac_status" >&5 + echo "$as_me:23568: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23430: \"$ac_try\"") >&5 + { (eval echo "$as_me:23571: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23433: \$? = $ac_status" >&5 + echo "$as_me:23574: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fancy_curses=yes else @@ -23442,13 +23583,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:23445: result: $cf_cv_fancy_curses" >&5 +echo "$as_me:23586: result: $cf_cv_fancy_curses" >&5 echo "${ECHO_T}$cf_cv_fancy_curses" >&6 test $cf_cv_fancy_curses = yes && cat >>confdefs.h <<\EOF #define FANCY_CURSES 1 EOF -echo "$as_me:23451: checking for function curses_version" >&5 +echo "$as_me:23592: checking for function curses_version" >&5 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6 if test "${cf_cv_func_curses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23458,7 +23599,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_curses_version=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 23461 "configure" +#line 23602 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -23471,15 +23612,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:23474: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23615: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23477: \$? = $ac_status" >&5 + echo "$as_me:23618: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:23479: \"$ac_try\"") >&5 + { (eval echo "$as_me:23620: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23482: \$? = $ac_status" >&5 + echo "$as_me:23623: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_curses_version=yes @@ -23494,21 +23635,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f core fi -echo "$as_me:23497: result: $cf_cv_func_curses_version" >&5 +echo "$as_me:23638: result: $cf_cv_func_curses_version" >&5 echo "${ECHO_T}$cf_cv_func_curses_version" >&6 test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF #define HAVE_CURSES_VERSION 1 EOF if test "$cf_cv_ncurses_version" != no ; then -echo "$as_me:23504: checking for obsolete/broken version of ncurses" >&5 +echo "$as_me:23645: checking for obsolete/broken version of ncurses" >&5 echo $ECHO_N "checking for obsolete/broken version of ncurses... $ECHO_C" >&6 if test "${cf_cv_ncurses_broken+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 23511 "configure" +#line 23652 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -23527,16 +23668,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23530: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23671: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23533: \$? = $ac_status" >&5 + echo "$as_me:23674: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23536: \"$ac_try\"") >&5 + { (eval echo "$as_me:23677: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23539: \$? = $ac_status" >&5 + echo "$as_me:23680: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_broken=no else @@ -23548,10 +23689,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:23551: result: $cf_cv_ncurses_broken" >&5 +echo "$as_me:23692: result: $cf_cv_ncurses_broken" >&5 echo "${ECHO_T}$cf_cv_ncurses_broken" >&6 if test "$cf_cv_ncurses_broken" = yes ; then - { echo "$as_me:23554: WARNING: hmm... you should get an up-to-date version of ncurses" >&5 + { echo "$as_me:23695: WARNING: hmm... you should get an up-to-date version of ncurses" >&5 echo "$as_me: WARNING: hmm... you should get an up-to-date version of ncurses" >&2;} cat >>confdefs.h <<\EOF #define NCURSES_BROKEN 1 @@ -23560,14 +23701,14 @@ EOF fi fi -echo "$as_me:23563: checking if curses supports color attributes" >&5 +echo "$as_me:23704: checking if curses supports color attributes" >&5 echo $ECHO_N "checking if curses supports color attributes... $ECHO_C" >&6 if test "${cf_cv_color_curses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 23570 "configure" +#line 23711 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -23587,16 +23728,16 @@ chtype x = COLOR_BLUE; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23590: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23731: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23593: \$? = $ac_status" >&5 + echo "$as_me:23734: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23596: \"$ac_try\"") >&5 + { (eval echo "$as_me:23737: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23599: \$? = $ac_status" >&5 + echo "$as_me:23740: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_color_curses=yes else @@ -23608,7 +23749,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:23611: result: $cf_cv_color_curses" >&5 +echo "$as_me:23752: result: $cf_cv_color_curses" >&5 echo "${ECHO_T}$cf_cv_color_curses" >&6 if test $cf_cv_color_curses = yes ; then cat >>confdefs.h <<\EOF @@ -23628,23 +23769,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:23631: checking for $ac_header" >&5 +echo "$as_me:23772: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 23637 "configure" +#line 23778 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:23641: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:23782: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23647: \$? = $ac_status" >&5 + echo "$as_me:23788: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -23663,7 +23804,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:23666: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:23807: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -23678,23 +23819,23 @@ if test "$ISC" = yes ; then for ac_header in sys/termio.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:23681: checking for $ac_header" >&5 +echo "$as_me:23822: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 23687 "configure" +#line 23828 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:23691: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:23832: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23697: \$? = $ac_status" >&5 + echo "$as_me:23838: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -23713,7 +23854,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:23716: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:23857: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -23731,10 +23872,10 @@ if test "$ac_cv_header_termios_h" = yes ; then *) termios_bad=maybe ;; esac if test "$termios_bad" = maybe ; then - echo "$as_me:23734: checking whether termios.h needs _POSIX_SOURCE" >&5 + echo "$as_me:23875: checking whether termios.h needs _POSIX_SOURCE" >&5 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 23737 "configure" +#line 23878 "configure" #include "confdefs.h" #include <termios.h> int @@ -23746,16 +23887,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23749: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23890: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23752: \$? = $ac_status" >&5 + echo "$as_me:23893: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23755: \"$ac_try\"") >&5 + { (eval echo "$as_me:23896: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23758: \$? = $ac_status" >&5 + echo "$as_me:23899: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=no else @@ -23763,7 +23904,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 23766 "configure" +#line 23907 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -23777,16 +23918,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23780: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23921: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23783: \$? = $ac_status" >&5 + echo "$as_me:23924: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23786: \"$ac_try\"") >&5 + { (eval echo "$as_me:23927: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23789: \$? = $ac_status" >&5 + echo "$as_me:23930: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=unknown else @@ -23801,12 +23942,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:23804: result: $termios_bad" >&5 + echo "$as_me:23945: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:23809: checking declaration of size-change" >&5 +echo "$as_me:23950: checking declaration of size-change" >&5 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 if test "${cf_cv_sizechange+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23821,7 +23962,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat >conftest.$ac_ext <<_ACEOF -#line 23824 "configure" +#line 23965 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef HAVE_TERMIOS_H @@ -23865,16 +24006,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23868: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24009: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23871: \$? = $ac_status" >&5 + echo "$as_me:24012: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23874: \"$ac_try\"") >&5 + { (eval echo "$as_me:24015: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23877: \$? = $ac_status" >&5 + echo "$as_me:24018: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sizechange=yes else @@ -23893,7 +24034,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:23896: result: $cf_cv_sizechange" >&5 +echo "$as_me:24037: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then cat >>confdefs.h <<\EOF @@ -23910,14 +24051,14 @@ EOF esac fi -echo "$as_me:23913: checking if ttytype is declared in curses library" >&5 +echo "$as_me:24054: checking if ttytype is declared in curses library" >&5 echo $ECHO_N "checking if ttytype is declared in curses library... $ECHO_C" >&6 if test "${cf_cv_have_ttytype+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 23920 "configure" +#line 24061 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -23929,16 +24070,16 @@ char *x = &ttytype[1]; *x = 1 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23932: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24073: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23935: \$? = $ac_status" >&5 + echo "$as_me:24076: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23938: \"$ac_try\"") >&5 + { (eval echo "$as_me:24079: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23941: \$? = $ac_status" >&5 + echo "$as_me:24082: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_ttytype=yes else @@ -23950,20 +24091,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:23953: result: $cf_cv_have_ttytype" >&5 +echo "$as_me:24094: result: $cf_cv_have_ttytype" >&5 echo "${ECHO_T}$cf_cv_have_ttytype" >&6 test $cf_cv_have_ttytype = yes && cat >>confdefs.h <<\EOF #define HAVE_TTYTYPE 1 EOF -echo "$as_me:23959: checking if curses supports wide characters" >&5 +echo "$as_me:24100: checking if curses supports wide characters" >&5 echo $ECHO_N "checking if curses supports wide characters... $ECHO_C" >&6 if test "${cf_cv_widec_curses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 23966 "configure" +#line 24107 "configure" #include "confdefs.h" #include <stdlib.h> @@ -23982,16 +24123,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23985: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24126: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23988: \$? = $ac_status" >&5 + echo "$as_me:24129: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23991: \"$ac_try\"") >&5 + { (eval echo "$as_me:24132: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23994: \$? = $ac_status" >&5 + echo "$as_me:24135: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_widec_curses=yes else @@ -24002,7 +24143,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:24005: result: $cf_cv_widec_curses" >&5 +echo "$as_me:24146: result: $cf_cv_widec_curses" >&5 echo "${ECHO_T}$cf_cv_widec_curses" >&6 if test "$cf_cv_widec_curses" = yes ; then @@ -24011,14 +24152,14 @@ if test "$cf_cv_widec_curses" = yes ; then EOF # This is needed on Tru64 5.0 to declare mbstate_t - echo "$as_me:24014: checking if we must include wchar.h to declare mbstate_t" >&5 + echo "$as_me:24155: checking if we must include wchar.h to declare mbstate_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 if test "${cf_cv_widec_mbstate+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 24021 "configure" +#line 24162 "configure" #include "confdefs.h" #include <stdlib.h> @@ -24032,23 +24173,23 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24035: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24176: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24038: \$? = $ac_status" >&5 + echo "$as_me:24179: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24041: \"$ac_try\"") >&5 + { (eval echo "$as_me:24182: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24044: \$? = $ac_status" >&5 + echo "$as_me:24185: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_widec_mbstate=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 24051 "configure" +#line 24192 "configure" #include "confdefs.h" #include <stdlib.h> @@ -24063,16 +24204,16 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24066: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24207: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24069: \$? = $ac_status" >&5 + echo "$as_me:24210: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24072: \"$ac_try\"") >&5 + { (eval echo "$as_me:24213: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24075: \$? = $ac_status" >&5 + echo "$as_me:24216: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_widec_mbstate=yes else @@ -24084,7 +24225,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:24087: result: $cf_cv_widec_mbstate" >&5 +echo "$as_me:24228: result: $cf_cv_widec_mbstate" >&5 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6 if test "$cf_cv_widec_mbstate" = yes ; then @@ -24103,14 +24244,14 @@ fi fi -echo "$as_me:24106: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "$as_me:24247: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 if test "${cf_cv_need_xopen_extension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 24113 "configure" +#line 24254 "configure" #include "confdefs.h" #include <stdlib.h> @@ -24127,23 +24268,23 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:24130: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24271: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24133: \$? = $ac_status" >&5 + echo "$as_me:24274: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:24136: \"$ac_try\"") >&5 + { (eval echo "$as_me:24277: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24139: \$? = $ac_status" >&5 + echo "$as_me:24280: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_xopen_extension=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 24146 "configure" +#line 24287 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -24161,16 +24302,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:24164: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24305: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24167: \$? = $ac_status" >&5 + echo "$as_me:24308: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:24170: \"$ac_try\"") >&5 + { (eval echo "$as_me:24311: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24173: \$? = $ac_status" >&5 + echo "$as_me:24314: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_xopen_extension=yes else @@ -24182,11 +24323,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:24185: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:24326: result: $cf_cv_need_xopen_extension" >&5 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" -echo "$as_me:24189: checking for term.h" >&5 +echo "$as_me:24330: checking for term.h" >&5 echo $ECHO_N "checking for term.h... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24199,7 +24340,7 @@ for cf_header in \ term.h do cat >conftest.$ac_ext <<_ACEOF -#line 24202 "configure" +#line 24343 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -24213,16 +24354,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24216: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24357: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24219: \$? = $ac_status" >&5 + echo "$as_me:24360: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24222: \"$ac_try\"") >&5 + { (eval echo "$as_me:24363: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24225: \$? = $ac_status" >&5 + echo "$as_me:24366: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break @@ -24235,7 +24376,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:24238: result: $cf_cv_term_header" >&5 +echo "$as_me:24379: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case $cf_cv_term_header in #(vi @@ -24285,10 +24426,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:24288: checking for ${cf_func}" >&5 + echo "$as_me:24429: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "(line 24291) testing ${cf_func} ..." 1>&5 +echo "(line 24432) testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24297,7 +24438,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >conftest.$ac_ext <<_ACEOF -#line 24300 "configure" +#line 24441 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -24331,16 +24472,16 @@ exit(foo == 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:24334: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24475: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24337: \$? = $ac_status" >&5 + echo "$as_me:24478: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:24340: \"$ac_try\"") >&5 + { (eval echo "$as_me:24481: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24343: \$? = $ac_status" >&5 + echo "$as_me:24484: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -24356,7 +24497,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:24359: result: $cf_result" >&5 + echo "$as_me:24500: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result != no; then cat >>confdefs.h <<EOF @@ -24370,12 +24511,12 @@ fi if test $use_color_style != no ; then if test .$cf_cv_color_curses != .yes ; then - { { echo "$as_me:24373: error: Configuration does not support color-styles" >&5 + { { echo "$as_me:24514: error: Configuration does not support color-styles" >&5 echo "$as_me: error: Configuration does not support color-styles" >&2;} { (exit 1); exit 1; }; } fi if test $cf_cv_screen = slang ; then - { { echo "$as_me:24378: error: Configuration does not support color-styles" >&5 + { { echo "$as_me:24519: error: Configuration does not support color-styles" >&5 echo "$as_me: error: Configuration does not support color-styles" >&2;} { (exit 1); exit 1; }; } fi @@ -24383,7 +24524,7 @@ fi if test $use_scrollbar != no ; then if test .$cf_cv_fancy_curses != .yes ; then - { echo "$as_me:24386: WARNING: Configuration does not support ACS_xxx definitions" >&5 + { echo "$as_me:24527: WARNING: Configuration does not support ACS_xxx definitions" >&5 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;} else cat >>confdefs.h <<\EOF @@ -24488,7 +24629,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:24491: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:24632: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -24664,7 +24805,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:24667: error: ambiguous option: $1 + { { echo "$as_me:24808: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -24683,7 +24824,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:24686: error: unrecognized option: $1 + -*) { { echo "$as_me:24827: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -24736,7 +24877,7 @@ do "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "$CONFIG_H" ) CONFIG_HEADERS="$CONFIG_HEADERS $CONFIG_H:config.hin" ;; - *) { { echo "$as_me:24739: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:24880: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -25046,7 +25187,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:25049: creating $ac_file" >&5 + { echo "$as_me:25190: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -25064,7 +25205,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:25067: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:25208: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -25077,7 +25218,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:25080: error: cannot find input file: $f" >&5 + { { echo "$as_me:25221: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -25143,7 +25284,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:25146: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:25287: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -25154,7 +25295,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:25157: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:25298: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -25167,7 +25308,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:25170: error: cannot find input file: $f" >&5 + { { echo "$as_me:25311: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -25285,7 +25426,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:25288: $ac_file is unchanged" >&5 + { echo "$as_me:25429: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/configure.in b/configure.in index acf94d53..a3aa6e55 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us> dnl dnl ask PRCS to plug-in the project-version for the configure-script. dnl $Format: "AC_REVISION($ProjectVersion$)"$ -AC_REVISION(2.8.6dev.9) +AC_REVISION(2.8.6dev.10) # Save the original $CFLAGS so we can distinguish whether the user set those # in the environment, or whether autoconf added -O and -g options: @@ -37,7 +37,7 @@ AC_ARG_WITH(system-type, PACKAGE=lynx dnl ask PRCS to plug-in the project-version for the packages. # $Format: "VERSION=$ProjectVersion$"$ -VERSION=2.8.6dev.9 +VERSION=2.8.6dev.10 AC_SUBST(PACKAGE) AC_SUBST(VERSION) AC_SUBST(DESTDIR) @@ -228,13 +228,16 @@ dgux*) ;; hpux*) TRY_CFLAGS="$TRY_CFLAGS -DSNAKE" - test -z "$GCC" && TRY_CFLAGS="$TRY_CFLAGS -Wp,-H600000" + test -z "$GCC" && TRY_CFLAGS="$TRY_CFLAGS -Wp,-H600000 -DSYS_HPUX" ;; isc*) # -DPOSIX_JC is necessary, else LYBookmark.c never finds out what a mode_t is. TRY_CFLAGS="$TRY_CFLAGS -DISC -DPOSIX_JC" LIBS="$LIBS -linet -lnsl_s -lcposix" ;; +irix6.*) #(vi + TRY_CFLAGS="$TRY_CFLAGS -DSYS_IRIX64" + ;; irix*) # The original makefile used the $CFLAGS option -cckr for some form # of K&R compatibility. However, this causes compilation warnings for @@ -256,12 +259,12 @@ openbsd* | ekkobsd* | mirbsd*) osf4*) # The -Olimit flag (see below) is no longer available with # Digital C 5.2, which is bundled with Digital UNIX 4.0. - TRY_CFLAGS="$TRY_CFLAGS -DDSYS5" + TRY_CFLAGS="$TRY_CFLAGS -DDSYS5 -DSYS_TRU64" ;; osf*) # Increase the maximum size of functions that will be optimized. test -z "$GCC" && TRY_CFLAGS="$TRY_CFLAGS -O -Olimit 4000" - TRY_CFLAGS="$TRY_CFLAGS -DDSYS5" + TRY_CFLAGS="$TRY_CFLAGS -DDSYS5 -DSYS_TRU64" ;; sco3.2v5*) test $ac_cv_prog_gcc != yes && TRY_CFLAGS="$TRY_CFLAGS -belf" @@ -555,6 +558,7 @@ AC_TYPE_GETGROUPS AC_TYPE_PID_T AC_TYPE_UID_T AC_TYPE_MODE_T +CF_CHECK_TYPE(socklen_t, int, [#include <sys/socket.h>]) dnl -------------------------------------------------------------------------- dnl Checks for library units diff --git a/lynx.cfg b/lynx.cfg index 9c5e5732..50f905db 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -3,10 +3,10 @@ # or Lynx_Dir:lynx.cfg (VMS) # # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$ -#PRCS LYNX_VERSION "2.8.6dev.9" +#PRCS LYNX_VERSION "2.8.6dev.10" # # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$ -#PRCS LYNX_DATE "Thu, 30 Dec 2004 04:11:59 -0800" +#PRCS LYNX_DATE "Sun, 02 Jan 2005 15:35:21 -0800" # # Definition pairs are of the form VARIABLE:DEFINITION # NO spaces are allowed between the pair items. diff --git a/makefile.in b/makefile.in index df0717ae..a3f40ebc 100644 --- a/makefile.in +++ b/makefile.in @@ -330,7 +330,7 @@ help_files.sed : makefile $(srcdir)/lynx_help/help_files.txt -e 's%\(.*\)=\(.*\.html\)$$%s=\2=\2$(COMPRESS_EXT)=g%' \ -e 's%\.html=%\\.html=%' \ help_files.tmp | $(FIX_SED) >> $@ - @ECHO_CC@if test -n "$(COMPRESS_EXT)"; then echo 's%\(\$(COMPRESS_EXT)\)*\$(COMPRESS_EXT)%$(COMPRESS_EXT)%g' >> $@; fi + @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) diff --git a/po/ca.po b/po/ca.po index a31fcff6..95bfd30a 100644 --- a/po/ca.po +++ b/po/ca.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx 2.8.5pre15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 2003-07-06 18:12+0200\n" "Last-Translator: Carles Sadurní Anguita <isard@ctv.es>\n" "Language-Team: Catalan <ca@dodds.net>\n" @@ -2791,7 +2791,7 @@ msgstr "El document amb contingut POST no s'ha trobat en la memòria cau. Reenvia msgid "Loading failed, use a previous copy." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "Càrrega incompleta." @@ -2814,7 +2814,7 @@ msgstr "" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "No ha estat possible accedir-hi" @@ -2822,20 +2822,20 @@ msgstr "No ha estat possible accedir-hi" msgid "Unable to access document." msgstr "No ha estat possible accedir al document." -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "Contrasenya de l'usuari %s@%s:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "No ha estat possible connectar amb el servidor FTP" -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "" @@ -2843,24 +2843,24 @@ msgstr "" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "Enllaç simbòlic" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "Rebent directori d'FTP" -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "%d (%5d) bytes transferits" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "Rebent arxiu d'FTP" @@ -3067,45 +3067,45 @@ msgstr "" msgid "Address contains a username: %s" msgstr "L'adreça conté un nom d'usuari: %s" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "Aquest client no admet adreces HTTPS." -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "No ha estat possible connectar amb el servidor." -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 msgid "Retrying connection without TLS." msgstr "S'està reintentant la connexió sense TLS." -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "Error SSL: no s'ha pogut trobar el nom comú en el certificat. Continuem?" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "Error SSL: servidor(%s)!=cert(%s). Voleu continuar?" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "Enviant sol·licitud HTTP." -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "Error inesperat d'escriptura " -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "Sol·licitud HTTP enviada; esperant resposta." -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "Error inesperat de lectura en la xarxa; s'ha avortat la connexió." @@ -3118,7 +3118,7 @@ msgstr "Error inesperat de lectura en la xarxa; s'ha avortat la connexió." #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "" @@ -3128,7 +3128,7 @@ msgstr "" #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "" @@ -3138,27 +3138,27 @@ msgstr "" #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "S'ha obtingut un codi 304 Not Modified inesperat (el document no ha estat modificat)." -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "Estic reintentant amb la informació d'accés." -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "Mostrar el cos del missatge d'error 401?" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "Mostrar el cos del missatge d'error 407?" @@ -3166,7 +3166,7 @@ msgstr "Mostrar el cos del missatge d'error 407?" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "Resposta desconeguda del servidor!" @@ -3346,106 +3346,106 @@ msgstr "Mantenidor" msgid "Host" msgstr "Servidor" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "Memòria exhaurida, visualització interrompuda!" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "Memòria exhaurida, la transferència s'interromprà!" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr " *** MEMÔRIA EXHAURIDA ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "camp o enllaç desconegut" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "camp de text" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "camp de contrasenya" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "quadre de verificació" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "botó de grup" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "botó d'enviament" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "botó de reinici" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "menú emergent" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "camp de formulari ocult" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "àrea de text" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "camp d'entrada d'interval" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "camp de fitxer" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "camp d'enviament de text" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "botó d'enviament d'imatges" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "camp de formulari desconegut" -#: src/GridText.c:10077 +#: src/GridText.c:10074 msgid "Can't open file for uploading" msgstr "No ha estat possible obrir el fitxer que voleu carregar." -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "Enviant %s" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "Trencar les línies per a ajustar a l'espai disponible?" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "Les línies molt llargues han estat tallades!" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "Les línies molt llargues han estat truncades!" @@ -3535,31 +3535,31 @@ msgstr "no" msgid "Y/N/A/V" msgstr "" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "Descripció:" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "Camí:" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(desconegut)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "El document només conté enllaços ocults. Useu el comand L)ist." -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "Source cache error: disc ple?" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "Source cache error: no hi ha prou memòria!" @@ -3668,27 +3668,27 @@ msgstr "" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "Ha fallat la inicialització del terminal: potser és un tipus de terminal desconegut." -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "Terminal =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "Heu d'usar un terminal vt100, 300, etc. amb aquest programa." -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "El terminal especificat és desconegut!" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "Introduïu un tipus de terminal:" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "EL TIPUS DE TERMINAL ESTÀ FIXAT A" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3697,7 +3697,7 @@ msgstr "" "\n" "S'ha produït un error fatal en %s Ver. %s\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3724,40 +3724,40 @@ msgstr "L'editor ha finalitzat amb l'error \"%s\"" msgid "reason unknown." msgstr "per raons desconegudes." -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "Heu descarregat:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "Nom de l'arxiu suggerit:" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "Opcions estàndard per a descàrregues:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "Opcions per a les descàrregues:" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "Guardar al disc" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 #, fuzzy msgid "View temporary file" msgstr "Veure el fitxer" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "La gravació en disc està desactivada." -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "Addicions locals:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "No heu donat cap nom" @@ -4174,19 +4174,19 @@ msgstr "Aquest missatge va ser generat automàticament per" msgid "No system mailer configured" msgstr "" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "No s'ha trobat Winsock." -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "Heu de definir una àrea TMP o TEMP vàlida!" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "No existeix el directori" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4197,7 +4197,7 @@ msgstr "" "El fitxer de configuració %s no està disponible\n" "\n" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4207,7 +4207,7 @@ msgstr "" "\n" "Els jocs de caràcters no estan declarats.\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4215,7 +4215,7 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4226,7 +4226,7 @@ msgstr "" "El fitxer %s no està disponible.\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "Alerta:" @@ -4273,113 +4273,113 @@ msgstr "UTILITZACIÓ: %s [opcions] [arxiu]\n" msgid "Options are:\n" msgstr "Les opcions són:\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s: l'opció no és vàlida: %s\n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "Error intern: l'enllaç del ratolí no és vàlid: %d!" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "Una URL especificada per l'usuari" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "" #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "Pantalla d'ajuda" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "Índex del sistema" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "Entrar en la pantalla principal" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "No hi ha cap document més" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "el joc de caràcters per a aquest document està especificat explicitament" -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "canvia al directori:" -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "Un component del camí no és un directori" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "no ha estat possible canviar de directori" -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "Tornant a analitzar el document amb les opcions actuals..." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "Error fatal: no s'ha pogut obrir el fitxer d'eixida %s\n" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "" -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "" -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 msgid "Current URL is empty." msgstr "La URL actual és buida." -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "No s'ha pogut copiar al porta-retalls." -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "La URL del document s'ha copiat al porta-retalls." -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "La URL de l'enllaç s'ha copiat al porta-retalls." -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "No hi ha cap URL al porta-retalls." -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "-índex-" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx: No s'ha pogut accedir al fitxer inicial" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "lynx: No s'ha trobat el fitxer o no és text/html ni text/plain" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr " Eixint..." -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "-més-" @@ -5332,11 +5332,11 @@ msgstr "Ubicació: " msgid "(Form field)" msgstr "(Camp de formulari)" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "No hi ha enllaços en aquesta pàgina" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 #, fuzzy msgid "Server Headers:" msgstr "Servidor:" @@ -5384,33 +5384,33 @@ msgstr "Carregar a:" msgid "Upload options:" msgstr "Opcions de càrrega:" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "" -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "" -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "Massa fitxers temporals" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 msgid "unknown restriction" msgstr "restricció desconeguda" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "No s'hi han establert restriccions.\n" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "Restriccions:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "No s'ha trobat el directori d'inici (HOME)" diff --git a/po/cs.po b/po/cs.po index 0cfb5a08..52bb8c3a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx 2.8.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 1999-12-11 12:55+0100\n" "Last-Translator: Jiøí Pavlovský <pavlovsk@ff.cuni.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -2793,7 +2793,7 @@ msgstr "Dokument s POST obsahem nenalezen v cache. Odeslat znovu?" msgid "Loading failed, use a previous copy." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "Nahrávání dokonèeno." @@ -2816,7 +2816,7 @@ msgstr "**** HTAccess: Návratový status: %d\n" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "Nelze získat pøístup" @@ -2824,20 +2824,20 @@ msgstr "Nelze získat pøístup" msgid "Unable to access document." msgstr "Nelze získat pøístup k dokumentu." -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "Zadejte heslo pro u¾ivatele %s@%s:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "Nelze navázat spojení s FTP serverem." -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "zavøít hlavní soket" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "hlavní soket" @@ -2845,24 +2845,24 @@ msgstr "hlavní soket" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "Symbol. odkaz" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "Stahuji výpis FTP adresáøe." -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "Pøeneseno bajtù: %d (%5d)" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "datové spojení" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "Stahuji FTP soubor." @@ -3070,46 +3070,46 @@ msgstr "180 000 neúspì¹ných pokusù èíst ze soketu." msgid "Address contains a username: %s" msgstr "" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "Tento klient nepodporuje HTTPS URL." -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "Spojení se vzdáleným poèítaèem nelze navázat." -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 #, fuzzy msgid "Retrying connection without TLS." msgstr "Navazuji %s spojení s %s." -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "Odesílám HTTP po¾adavek." -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "Neoèekávaná chyba pøi zápisu na soket; spojení uzavøeno." -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "HTTP po¾adavek odeslán; èekám na odpovìï" -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "Neoèekávaná chyba pøi ètení ze soketu; spojení uzavøeno." @@ -3122,7 +3122,7 @@ msgstr "Neoèekávaná chyba pøi ètení ze soketu; spojení uzavøeno." #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "Neoèekávané Informaèní hlá¹ení." @@ -3132,7 +3132,7 @@ msgstr "Neoèekávané Informaèní hlá¹ení." #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "Po¾adavek vyøízen. Obsah formuláøe smazán." @@ -3142,27 +3142,27 @@ msgstr "Po¾adavek vyøízen. Obsah formuláøe smazán." #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "Neoèekávané hlá¹ení: 304 Not Modified" -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "Pøesmìrování POST obsahu vy¾aduje souhlas u¾ivatele." -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "Obsahuje POST data. Trvalé pøesmìrování pou¾ívám pouze jako doèasné.\n" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "Zkou¹ím to znovu s proxy autorizací." -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "Zobrazit tìlo 401 hlá¹ení?" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "Zobrazit tìlo 407 hlá¹ení?" @@ -3170,7 +3170,7 @@ msgstr "Zobrazit tìlo 407 hlá¹ení?" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "Neznámé hlá¹ení od serveru!" @@ -3358,107 +3358,107 @@ msgstr "Správce" msgid "Host" msgstr "Poèítaè" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "Do¹la pamì», zobrazení pøeru¹eno!" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "Do¹la pamì», pøenos pøeru¹en!" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr " *** DO©LA PAMÌ« ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "neznámé pole èi odkaz" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "textové vstupní pole" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "vstupní pole pro heslo" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "za¹krtávací políèko" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "pøepínací tlaèítko" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "tlaèítko pro odeslání dat serveru" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "tlaèítko pro obnovení implicitních hodnot" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "vyskakovací menu" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "skryté pole formuláøe" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "textová vstupní oblast" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "vstupní pole pro interval" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "pole pro výbìr souboru" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "tlaèítko pro odeslání textu" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "tlaèítko pro odeslání obrázku" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "pole pro vytvoøení klíèe" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "neznámé pole formuláøe" -#: src/GridText.c:10077 +#: src/GridText.c:10074 #, fuzzy msgid "Can't open file for uploading" msgstr "Soubor pro dekompresi nelze otevøít!" -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "Odesílám %s" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "" @@ -3548,31 +3548,31 @@ msgstr "ne" msgid "Y/N/A/V" msgstr "" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "Popis:" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "(¾ádný)" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "Cesta:" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(neznámá)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "Dokument obsahuje pouze skryté odkazy. Pou¾ijte 'l' pro jejich vypsání." -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "" @@ -3675,27 +3675,27 @@ msgstr "" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "Inicializace terminálu se nezdaøila - neznámý typ terminálu?" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "Terminál =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "Tento program vy¾aduje terminál typu vt100, 200 etc." -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "Typ va¹eho terminálu je neznámý!" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "Zadejte typ terminálu:" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "TYP TERMINÁLU JE NASTAVEN NA" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3704,7 +3704,7 @@ msgstr "" "\n" "V programu %s verze %s nastala fatální chyba.\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3733,40 +3733,40 @@ msgstr "" msgid "reason unknown." msgstr "" -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "Sta¾ený odkaz:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "Doporuèené jméno souboru:" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "Standardní menu nabídek pro stahování:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "Menu nabídek pro stahování:" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "Ulo¾it na disk" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 #, fuzzy msgid "View temporary file" msgstr "Poslat soubor po¹tou" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "Ukládání na disk je zakázáno." -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "Místní roz¹íøení:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "Nebylo zadáno ¾ádné jméno." @@ -4184,19 +4184,19 @@ msgstr "Tato zpráva byla vytvoøena automaticky programem" msgid "No system mailer configured" msgstr "" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "Winsock nenalezen. lituji." -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "MUSÍTE zadat platný TMP èi TEMP prostor!" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr " adresáø" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4207,7 +4207,7 @@ msgstr "" "Konfiguraèní soubor %s je nedostupný.\n" "\n" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4218,7 +4218,7 @@ msgstr "" "Znakové sady Lynxu nejsou deklarovány.\n" "\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4229,7 +4229,7 @@ msgstr "" "Editovací mapy Lynxu nejsou deklarovány.\n" "\n" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4240,7 +4240,7 @@ msgstr "" "Soubor %s není dostupný.\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "" @@ -4285,114 +4285,114 @@ msgstr "Pou¾ití: %s [pøepínaèe] [soubor]\n" msgid "Options are:\n" msgstr "Pøepínaèe:\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s: Chybný pøepínaè %s\n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "URL zadané u¾ivatelem" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "Kódování multipart/form-data není zatím podporováno. Nelze odeslat." #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "Nápovìda" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "Systémový index" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "Vstup na hlavní obrazovku" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "znaková sada tohoto dokumentu je explicitnì zadána, lituji..." -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr " do " -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "Adresáø není dostupný." -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "Znovu zpracovávám dokument za pou¾ití nových nastavení..." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "Fatální chyba - výstupní soubor %s nelze otevøít\n" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "" -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "" -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 #, fuzzy msgid "Current URL is empty." msgstr "Aktuální adresáø:" -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "" -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "" -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr " rejstøík" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx: startovní soubor nelze otevøít" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "lynx: startovní soubor nelze nalézt, nebo není ani typu text/html ani text/plain." -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr " Konèím..." -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "" @@ -5348,11 +5348,11 @@ msgstr "Umístìní: " msgid "(Form field)" msgstr "(Pole formuláøe)" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "Aktuální stránka neobsahuje ¾ádné odkazy" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 #, fuzzy msgid "Server Headers:" msgstr "Server:" @@ -5406,34 +5406,34 @@ msgstr "Poslat na:" msgid "Upload options:" msgstr "Menu voleb posílání:" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "" -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "" -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 #, fuzzy msgid "unknown restriction" msgstr "neznámé pole èi odkaz" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "Popis:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "" diff --git a/po/da.po b/po/da.po index 6603b825..1ef07c5c 100644 --- a/po/da.po +++ b/po/da.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx 2.8.6-dev8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 2004-11-12 17:30+0100\n" "Last-Translator: Morten Bo Johansen <mojo@mbjnet.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -2791,7 +2791,7 @@ msgstr "Dokument med 'POST'-indhold ikke fundet i cache. Genindsend?" msgid "Loading failed, use a previous copy." msgstr "Indlæsning slog fejl, brug en foregående kopi." -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "Indlæsning ikke fuldført." @@ -2814,7 +2814,7 @@ msgstr "**** HTAccess: Statustilbagemelding var: %d\n" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "Kan ikke tilgå" @@ -2822,20 +2822,20 @@ msgstr "Kan ikke tilgå" msgid "Unable to access document." msgstr "Kan ikke tilgå dokument." -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "Indtast adgangskode for bruger %s@%s:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "Kan ikke kontakte FTP-vært." -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "luk primær sokkel" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "sokkel til primær sokkel" @@ -2843,24 +2843,24 @@ msgstr "sokkel til primær sokkel" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "Symbolsk link" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "FTP-filkatalog indlæses." -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "Overført %d bytes (%5d)" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "dataforbindelse åben" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "Modtager FTP-fil." @@ -3067,45 +3067,45 @@ msgstr "Læsning af sokkel slog fejl i 180.000 forsøg." msgid "Address contains a username: %s" msgstr "Adresse indeholder et brugernavn: %s" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "Denne klient kan ikke bruge HTTPS-adresser." -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "Kan ikke forbinde til fremmed vært." -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 msgid "Retrying connection without TLS." msgstr "Forsøger at genetablere forbindelsen uden TLS." -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "SSL-fejl: Kan ikke finde fælles navn i certifikat - fortsæt?" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "SSL-fejl:vært(%s)!=cert(%s) - fortsæt?" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "Sikker %d-bit %s (%s) HTTP-forbindelse" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "Sender HTTP-anmodning." -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "Uventet skrivningsfejl i netværk; forbindelse afbrudt." -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "HTTP-anmodning sendt; venter på svar." -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "Uventet læsningsfejl i netværk; forbindelse afbrudt" @@ -3118,7 +3118,7 @@ msgstr "Uventet læsningsfejl i netværk; forbindelse afbrudt" #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "Modtog uventet \"Informational Status\"." @@ -3128,7 +3128,7 @@ msgstr "Modtog uventet \"Informational Status\"." #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "Anmodning imødekommet. Nulstil indhold." @@ -3138,27 +3138,27 @@ msgstr "Anmodning imødekommet. Nulstil indhold." #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "Modtog uventet 304 \"Not Modified status\"." -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "Omdirigering af POST-indhold kræver brugers godkendelse." -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "Har POST-indhold. Behandler varig omdirigering som midlertidig.\n" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "Prøver igen med oplysning om adgangstilladelse." -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "Vis indhold af 401-meddelelse?" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "Vis indhold af 407-meddelelse?" @@ -3166,7 +3166,7 @@ msgstr "Vis indhold af 407-meddelelse?" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "Ukendt statussvar fra server!" @@ -3354,106 +3354,106 @@ msgstr "Vedligeholder" msgid "Host" msgstr "Vært" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "Hukommelse opbrugt, fremvisning afbrudt!" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "Hukommelse opbrugt, vil afbryde overførsel!" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr " *** HUKOMMELSE OPBRUGT ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "ukendt felt eller link" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "indtast tekst" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "indtast adgangskode" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "afkrydsningsboks" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "radioknap" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "indsendelsesknap" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "nulstillingsknap" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "pop up-menu" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "skjult formularfelt" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "indtast tekst" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "angiv interval" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "angiv fil" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "tekstindsendelsesfelt" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "Billedindsendelsesknap" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "nøglegen-felt" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "ukendt formularfelt" -#: src/GridText.c:10077 +#: src/GridText.c:10074 msgid "Can't open file for uploading" msgstr "Kan ikke åbne fil til upload" -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "Indsender %s" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "Program hænger: TextAnchor-struktur ødelagt - det er bedst at afbryde!" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "Ombryd linjer så de passer til det viste område?" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "Meget lange linjer er blevet ombrudt!" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "Meget lange linjer er blevet afkortet!" @@ -3543,31 +3543,31 @@ msgstr "nej" msgid "Y/N/A/V" msgstr "J/N/A/L" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "Beskrivelse:" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "(ingen)" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "Filsti:" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(ukendt)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "Dokument har kun skjulte links. Brug 'l'istekommandoen." -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "Cache-fejl - diskplads opbrugt?" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "Cache-fejl - ikke nok hukommelse!" @@ -3676,27 +3676,27 @@ msgstr "'cookie_domain_set_flag'-fejl, afbryder program" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "Klargøring af terminal slog fejl - ukendt terminaltype?" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "Terminal =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "Du skal bruge en vt100, 200, etc. terminal med dette program." -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "Din terminaltype er ukendt!" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "Anfør en terminaltype:" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "TERMINAL-TYPE SAT TIL" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3705,7 +3705,7 @@ msgstr "" "\n" "En kritisk fejl opstod i %s Ver. %s\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3737,39 +3737,39 @@ msgstr "Editor returnerede fejlstatus, %s" msgid "reason unknown." msgstr "ukendt årsag." -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "Hentet link:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "Foreslået filnavn:" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "Gængse valgmuligheder ved hjemtagning af filer:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "Valgmuligheder ved download af filer:" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "Gem på disk" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 msgid "View temporary file" msgstr "Vis midlertidig file" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "Gem på disk deaktiveret." -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "Egne tilføjelser:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "Intet navn givet" @@ -4185,19 +4185,19 @@ msgstr "Denne meddelelse blev automatisk lavet af" msgid "No system mailer configured" msgstr "Systemets postprogram er ikke sat op" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "Ingen \"Winsock\" fundet, beklager." -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "Du SKAL definere et gyldigt TMP- eller TEMP-område!" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "Intet sådant filkatalog" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4208,7 +4208,7 @@ msgstr "" "Opsætningsfil %s er ikke tilgængelig.\n" "\n" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4219,7 +4219,7 @@ msgstr "" "Lynx' tegnsæt er ikke angivet.\n" "\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4230,7 +4230,7 @@ msgstr "" "Lynx \"edit map\" er ikke angivet.\n" "\n" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4241,7 +4241,7 @@ msgstr "" "Lynx-fil %s er ikke tilgængelig.\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "Advarsel:" @@ -4286,113 +4286,113 @@ msgstr "BRUG: %s [valgmuligheder] [fil]\n" msgid "Options are:\n" msgstr "Valgmuligheder er:\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s: Ugyldig indstilling: %s\n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "Intern fejl: Ugyldigt muselink %d!" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "En adresse angivet af brugeren" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "Kodningstype \"multipart/form-data\" ej understøttet! Kan ikke indsende." #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "Hjælpeskærm" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "Systemfortegnelse" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "Indgang til hovedskærm" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "Ingen yderligere dokumenter" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "dette dokuments tegnsæt er udtrykkeligt angivet, beklager ..." -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "cd til: " -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "En del af stien er ikke et filkatalog" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "kunne ikke skifte filkatalog." -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "Genfortolker dokument under nuværende indstillinger ..." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "Kritisk fejl - kunne ikke åbne uddatafil %s\n" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "TABEL-centrering slået til." -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "TABEL-centrering slået fra." -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 msgid "Current URL is empty." msgstr "Aktuelle adresse er tom." -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "Kopiering til klippebord slog fejl." -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "Dokumentets adresse overført til klippebord." -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "Linkets adresse overført til klippebord." -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "Ingen adresse ligger på klippebord." -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "-indeks-" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx: Kan ikke få adgang til startfil" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "lynx: startfil fandtes ikke eller er ikke i text/html, text/plain format" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr " Afslutter ..." -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "-mere-" @@ -5330,11 +5330,11 @@ msgstr "Handling:" msgid "(Form field)" msgstr "(Formularfelt)" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "Ingen links på denne side" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 msgid "Server Headers:" msgstr "Server-info:" @@ -5387,33 +5387,33 @@ msgstr "Upload til:" msgid "Upload options:" msgstr "Valgmuligheder for uploads:" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "Hjemtag dokument fra adressen på klippebord." -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "Uventet adgangsprotokol for denne adressetype." -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "For mange tempfiler" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 msgid "unknown restriction" msgstr "ukendt begrænsning" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "Ingen begrænsninger sat.\n" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "Begrænsninger sat:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "Kan ikke finde HOME-katalog" diff --git a/po/de.po b/po/de.po index fd71918e..8fea1229 100644 --- a/po/de.po +++ b/po/de.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx 2.8.6-dev6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 2004-10-14 09:10+0200\n" "Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n" "Language-Team: German <de@li.org>\n" @@ -2822,7 +2822,7 @@ msgstr "Dokument mit POST-Daten nicht im Seitencache gefunden. POST wiederholen? msgid "Loading failed, use a previous copy." msgstr "Laden fehlgeschalten, die vorherige Kopie wird verwendet." -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "Unvollständig geladen." @@ -2845,7 +2845,7 @@ msgstr "**** HTAccess: Der empfangene Statuscode war %d\n" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "Zugriff fehlgeschlagen:" @@ -2853,20 +2853,20 @@ msgstr "Zugriff fehlgeschlagen:" msgid "Unable to access document." msgstr "Zugriff auf Dokument nicht möglich." -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "Password eingeben für User %s@%s:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "Verbindung zum FTP-Host konnte nicht hergestellt werden." -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "close master socket" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "socket for master socket" @@ -2876,24 +2876,24 @@ msgstr "socket for master socket" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "Symbolic Link" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "FTP-Verzeichnis wird empfangen." -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "%d bytes übertragen (%5d)" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "connect for data" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "FTP-Datei wird empfangen." @@ -3101,45 +3101,45 @@ msgstr "Lesefehler nach 180.000 Versuchen." msgid "Address contains a username: %s" msgstr "Adresse mit einem Username: %s" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "Dieses Programm hat keine Unterstützung für HTTPS-URLs." -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "Verbindung zum remote Host konnte nicht hergestellt werden." -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 msgid "Retrying connection without TLS." msgstr "Verbindung erneut versuchen, ohne TLS." -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "SSL-Fehler:Es ist nicht möglich einen allgemeinen Namen im Zertifikat zu finden - Fortfahren?" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "SSL-Fehler:host(%s)!=cert(%s) - Fortfahren?" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "Sichere %d Bit %s (%s) HTTP-Verbindung" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "HTTP Request wird geschickt." -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "Unerwarteter Netzschreibfehler; Verbindung abgebrochen." -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "HTTP Request geschickt; warten auf Antwort." -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "Unerwarteter Netzlesefehler; Verbindung abgebrochen." @@ -3152,7 +3152,7 @@ msgstr "Unerwarteter Netzlesefehler; Verbindung abgebrochen." #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "Unerwarteter Informations-Statuscode empfangen." @@ -3162,7 +3162,7 @@ msgstr "Unerwarteter Informations-Statuscode empfangen." #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "Request ausgeführt. Seiteninhalt zurücksetzen." @@ -3172,27 +3172,27 @@ msgstr "Request ausgeführt. Seiteninhalt zurücksetzen." #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "Unerwarteter Status 304 \"Not Modified\"." -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "Bestätigung ist erforderlich für Umleitung von POST-Daten." -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "POST-Request. Permanente Umleitung wird als temporär behandelt.\n" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "Wir versuchen's noch einmal mit Authorisierungsinfo." -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "Inhalt der 401-Antwort zeigen?" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "Inhalt der 407-Antwort zeigen?" @@ -3200,7 +3200,7 @@ msgstr "Inhalt der 407-Antwort zeigen?" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "Unbekannter Statuscode in Antwort vom Server!" @@ -3388,106 +3388,106 @@ msgstr "Instandhalter" msgid "Host" msgstr "Host" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "zu wenig Hauptspeicher, Anzeige abgebrochen!" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "zu wenig Hauptspeicher, Ãœbertragung wird abgebrochen!" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr " *** MEMORY ERSCHÖPFT ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "unbekanntes Feld oder Link" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "Texteingabefeld" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "Password-Eingabefeld" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "Checkbox" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "Radiobutton" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "Submit-Button" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "Reset-Button" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "Popup-Menü" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "verstecktes Formfeld" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "Texteingaberegion" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "Bereichseingabefeld" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "Dateieingabefeld" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "Textsendefeld" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "Image-Sendefeld" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "\"Keygen\"-Feld" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "unbekanntes Formfeld" -#: src/GridText.c:10077 +#: src/GridText.c:10074 msgid "Can't open file for uploading" msgstr "Datei konnte nicht zum Upload geöffnet werden!" -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "%s wird gesandt" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "Hänger festgestellt: TextAnchor-Konstruktion ist schadhaft - am besten abbrechen!" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "Zeilen umbrechen, um in den sichtbaren Bereich einzupassen?" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "Sehr lange Zeilen wurden umbrochen!" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "Sehr lange Zeilen wurden abgeschnitten!" @@ -3577,31 +3577,31 @@ msgstr "nein" msgid "Y/N/A/V" msgstr "J/N/A/V" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "Beschreibung:" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "(keine)" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "Dateipfad:" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(unbekannt)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "Dokument hat nur versteckte Links. Tastenbefehl 'L' für Liste." -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "Source Cache Fehler - Festplatte voll?" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "Source Cache Fehler - nicht genug Speicher!" @@ -3711,27 +3711,27 @@ msgstr "cookie_domain_flag_set-Fehler, beende das Programm" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "Terminalinitialisierung fehlgeschlagen - unbekannter Terminaltyp?" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "Terminal =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "Ein Textterminal wie VT100, VT200 usw. ist für dieses Programm notwendig." -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "Terminaltyp ist unbekannt!" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "Terminaltyp eingeben:" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "TERMINAL TYPE IS SET TO" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3741,7 +3741,7 @@ msgstr "" " Ein fataler Fehler passierte in %s Ver. %s\n" # Yes, this is incomplete... - kw -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3772,39 +3772,39 @@ msgstr "Editor mit Fehler-Status beendet, %s" msgid "reason unknown." msgstr "Grund nicht bekannt." -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "Geladener Link:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "Vorgeschlagener Dateiname:" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "Normale Download-Optionen:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "Download-Optionen:" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "Speichern auf Disk" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 msgid "View temporary file" msgstr "Temporäre Datei ansehen" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "Speichern auf Disk nicht ermöglicht." -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "Lokale Zusätze:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "Kein Name gegeben" @@ -4225,19 +4225,19 @@ msgstr "Diese Nachricht wurde automatisch generiert von" msgid "No system mailer configured" msgstr "Kein systemweiter Mailer konfiguriert" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "Kein Winsock gefunden, sorry." -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "Es muß ein gültiger Bereich für TMP oder TEMP definiert sein!" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "Verzeichnis nicht vorhanden" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4248,7 +4248,7 @@ msgstr "" "Konfigurationsdatei %s ist nicht zugänglich.\n" "\n" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4259,7 +4259,7 @@ msgstr "" "Lynx-Zeichensätze nicht deklariert.\n" "\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4270,7 +4270,7 @@ msgstr "" "Lynx \"edit map\" nicht deklariert.\n" "\n" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4281,7 +4281,7 @@ msgstr "" "Lynx-Datei %s ist nicht verfügbar.\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "Warnung:" @@ -4329,114 +4329,114 @@ msgstr "AUFRUF: %s [optionen] [datei oder URL]\n" msgid "Options are:\n" msgstr "Optionen sind:\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s: Ungültige Option: %s\n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "Interner Fehler: %d is ungültig für mouse_link!" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "Ein vom Benutzer eingegegener URL" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "Enctype multipart/form-data noch nicht unterstützt! Submission unmöglich." #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "Hilfe-Seite" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "Systemindex" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "Eingang zur Hauptseite" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "Es gibt kein nächstes Dokument" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "Charset für dieses Dokument ist schon explizit angegeben..." -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "cd nach:" -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "Eine Pfadkomponente ist kein Verzeichnis" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "Fehler beim Verzeichniswechsel" # How does one translate reparsing anyway? - kw -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "Dokument wird mit jetzigen Einstellungen reinterpretiert..." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "Fataler Fehler - Ausgabedatei %s konnte nicht geöffnet werden\n" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "TABLE-Zentrierung aktivieren." -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "TABLE-Zentrierung ausschalten." -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 msgid "Current URL is empty." msgstr "Aktueller URL ist leer." -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "Kopieren in das Clipboard fehlgeschlagen." -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "URL des Dokuments in das Clipboard gespeichert." -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "URL des Links in das Clipboard gespeichert." -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "Kein URL in das Clipboard gespeichert." -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "-Index" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx: Unzugängliche Startdatei" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "lynx: Startdatei nicht gefunden oder nicht text/html oder text/plain" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr " Ende..." -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "-mehr-" @@ -5377,11 +5377,11 @@ msgstr "Aktion:" msgid "(Form field)" msgstr "(Formfeld)" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "Keine Links auf dieser Seite" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 msgid "Server Headers:" msgstr "Server-Headers:" @@ -5434,33 +5434,33 @@ msgstr "Upload - wohin:" msgid "Upload options:" msgstr "Upload-Optionen:" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "URL des Download-Dokuments in das Clipboard gespeichert." -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "Unerwartetes Zugangsprotokoll für dieses URL-Schema." -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "Zu viele temporäre Dateien" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 msgid "unknown restriction" msgstr "unbekannte Beschränkung" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "Keine Beschränkungen gesetzt.\n" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "Aktuelle Beschränkungen:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "Das HOME-Verzeichnis ist nicht zu finden" diff --git a/po/et.po b/po/et.po index 3263fc4f..17be049a 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx 2.8.6-dev8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 2004-11-12 13:06+0200\n" "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n" "Language-Team: Estonian <et@li.org>\n" @@ -2788,7 +2788,7 @@ msgstr "POST sisuga dokument puudub puhvrist. Postitan uuesti?" msgid "Loading failed, use a previous copy." msgstr "laadimine ebaõnnestus, kasuta eelmist koopiat." -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "Mittetäielik laadimine." @@ -2811,7 +2811,7 @@ msgstr "**** HTAccess: Tagastatud olek oli: %d\n" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "Ei saa kasutada" @@ -2819,20 +2819,20 @@ msgstr "Ei saa kasutada" msgid "Unable to access document." msgstr "Dokumenti ei saa kasutada." -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "Sisestage kasutaja %s@%s parool:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "Ei õnnestu luua ühendust FTP serveriga." -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "ülem pistiku sulgemine" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "pistik ülem pistikule" @@ -2840,24 +2840,24 @@ msgstr "pistik ülem pistikule" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "Nimeviide" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "Laen FTP kataloogi." -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "Üle kantud %d baiti (%5d)" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "loon andmekanalit" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "Laen FTP faili." @@ -3065,45 +3065,45 @@ msgstr "Pistikust lugemine ebaõnnestus 180 000 katsel." msgid "Address contains a username: %s" msgstr "Aadress sisaldab kasutajanime: %s" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "See klient ei toeta HTTPS URLe." -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "Serveriga ühenduse loomine ebaõnnestus." -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 msgid "Retrying connection without TLS." msgstr "Üritan ühendust uuesti luua TLS kasutamata." -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "SSL viga: Sertifikaadis puudub ühine nimi - jätkan?" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "SSL viga:host(%s)!=sert(%s)-Jätkan?" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "Turvaline %d-bitti %s (%s) HTTP ühendus" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "Saadan HTTP päringu." -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "Ootamatu tõrge võrku kirjutamisel; ühendus katkestati." -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "HTTP päring on saadetud; ootan vastust." -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "Ootamatu tõrge võrgust lugemisel; ühendus katkestati." @@ -3116,7 +3116,7 @@ msgstr "Ootamatu tõrge võrgust lugemisel; ühendus katkestati." #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "Sain ootamatu informatiivse oleku." @@ -3126,7 +3126,7 @@ msgstr "Sain ootamatu informatiivse oleku." #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "Päring täidetud. Algväärtusta sisu." @@ -3136,27 +3136,27 @@ msgstr "Päring täidetud. Algväärtusta sisu." #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "Sain ootamatu oleku, 304 Pole muudetud." -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "POST sisu ümbersuunamine nõuab kasutaja kinnitust." -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "Oman POST sisu. Käsitlen püsivat ümbersuunamist ajutisena.\n" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "Proovin uuesti kasutades autoriseerimise infot." -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "Näitan teate 401 keha?" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "Näitan teate 407 keha?" @@ -3164,7 +3164,7 @@ msgstr "Näitan teate 407 keha?" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "Tundmatu oleku vastus serverilt!" @@ -3352,106 +3352,106 @@ msgstr "Haldaja" msgid "Host" msgstr "Server" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "Mälu on otsas, esitus katkestati!" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "Mälu on otsas, katkestan ülekande!" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr " *** MÄLU ON OTSAS ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "tundmatu väli või viide" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "teksti väli" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "parooli väli" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "märkeruut" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "raadionupp" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "postitamise nupp" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "algväärtustamise nupp" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "hüpikmenüü" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "peidetud vormi väli" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "tekstiala" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "vahemiku väli" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "faili väli" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "teksti postitamise väli" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "pildi postitamise nupp" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "võtme loomise väli" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "tundmatu vormi väli" -#: src/GridText.c:10077 +#: src/GridText.c:10074 msgid "Can't open file for uploading" msgstr "Faili ei õnnestu üleslaadimiseks avada" -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "Postitan %s" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "Tuvastati hangumine: TextAnchor struktuur on vigane - soovitan katkestada!" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "Murran read et mahtuda ekraanile?" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "Väga pikad read on murtud!" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "Väga pikad read on lõigatud!" @@ -3541,31 +3541,31 @@ msgstr "ei" msgid "Y/N/A/V" msgstr "J/E/A/M" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "Kirjeldus:" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "(puudub)" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "Failitee:" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(tundmatu)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "Dokumendis on ainult peidetud viited. Kasuta käsklust 'l'ist." -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "Lähtefaili puhvri viga - ketas on täis?" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "Lähtefaili puhvri viga - mälu on otsas?" @@ -3673,27 +3673,27 @@ msgstr "cookie_domain_flag_set viga, katkestan programmi töö" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "Terminali initsialiseerimine ebaõnnestus - tundmatu terminali tüüp?" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "Terminal =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "Selle programmiga peate kasutama vt100, 200 vms terminali." -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "Teie terminali tüüp on tundmatu!" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "Sisestage terminali tüüp:" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "TERMINALI TÜÜBIKS ON SEATUD" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3702,7 +3702,7 @@ msgstr "" "\n" "Fataalne viga tekkis programmis %s Ver. %s\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3732,39 +3732,39 @@ msgstr "Toimeti lõpetas veakoodiga, %s" msgid "reason unknown." msgstr "põhjus tundmatu." -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "Laetud viide:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "Soovitatav faili nimi:" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "Standardsed allalaadimise võimalused:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "Allalaadimise võimalused:" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "Salvesta kettale" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 msgid "View temporary file" msgstr "Vaata ajutist faili" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "Kettale salvestamine blokeeritud" -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "Lokaalsed lisad:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "Nimi puudub" @@ -4180,19 +4180,19 @@ msgstr "See teade on automaatselt loodud" msgid "No system mailer configured" msgstr "Süsteemset e-posti programmi ei ole seadistatud" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "Winsock puudub, kahju." -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "Te PEATE defineerima kehtiva TMP või TEMP piirkonna!" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "Sellist kataloogi ei ole" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4203,7 +4203,7 @@ msgstr "" "Seadete faili %s ei ole.\n" "\n" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4214,7 +4214,7 @@ msgstr "" "Lynx kooditabeleid ei ole deklareeritud.\n" "\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4225,7 +4225,7 @@ msgstr "" "Lynx kaadri toimeti ei ole deklareeritud.\n" "\n" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4236,7 +4236,7 @@ msgstr "" "Lynx fail %s ei ole kasutatav.\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "Hoiatus:" @@ -4281,113 +4281,113 @@ msgstr "KASUTAMINE: %s [võtmed] [fail]\n" msgid "Options are:\n" msgstr "Võtmed on:\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s: Vigane võti: %s\n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "Sisemine viga: Vigane hiire viide %d!" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "Kasutaja poolt antud URL" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "multipart/form-data kodeering ei ole veel toetatud! Ei saa saata." #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "Abiinfo ekraan" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "Süsteemi indeks" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "Sisenemine põhiekraanile" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "Järgmist dokumenti pole" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "kahjuks on selle dokumendi kooditabel üheselt määratud..." -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "mine kataloogi:" -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "Tee komponent ei ole kataloog" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "kataloogi ei õnnestu vahetada" -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "Parsin dokumendi uuesti jooksvate seadetega..." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "Fataalne viga - ei õnnestu avada väljundfaili %s\n" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "TABELI tsentreerimine lubatud." -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "TABELI tsentreerimine blokeeritud." -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 msgid "Current URL is empty." msgstr "Jooksev URL on tühi." -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "Lõikepuhvrisse kopeerimine ebaõnnestus." -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "Panin dokumendi URLi lõikepuhvrisse." -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "Panin viite URLi lõikepuhvrisse." -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "Lõikepuhvris URLe ei ole." -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "-indeks-" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx: Ei õnnestu laadida esilehte" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "lynx: Esilehte pole või ei ole text/html ega text/plain tüüpi" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr " Lõpetan..." -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "-veel-" @@ -5323,11 +5323,11 @@ msgstr "Tegevus: " msgid "(Form field)" msgstr "(Vormi väli)" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "Jooksval lehel ei ole viiteid" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 msgid "Server Headers:" msgstr "Serveri päised:" @@ -5380,33 +5380,33 @@ msgstr "Lae üles:" msgid "Upload options:" msgstr "Üleslaadimise seaded:" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "Panin dokumendi allalaadimise URLi lõikepuhvrisse." -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "Selle URL skeemiga kasutatakse ootamatut kasutamise protokolli." -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "Liiga palju ajutisi faile" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 msgid "unknown restriction" msgstr "tundmatu piirang" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "Piiranguid pole.\n" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "Seatud piirangud:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "Ei leie HOME kataloogi" diff --git a/po/fr.po b/po/fr.po index 07459cb9..e5957159 100644 --- a/po/fr.po +++ b/po/fr.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx 2.8.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 1999-06-05 15:18-0400\n" "Last-Translator: Jim Spath <jspath@bcpl.net>\n" "Language-Team: (none yet, address for now:) French <lynx-dev@nongnu.org>\n" @@ -2852,7 +2852,7 @@ msgstr "Document avec contenu POST non trouvé dans l'antémémoire. Recommencer?" msgid "Loading failed, use a previous copy." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "Chargement incomplet." @@ -2875,7 +2875,7 @@ msgstr "**** HTAccess: L'état retourné était: %d\n" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "Accès impossible" @@ -2883,20 +2883,20 @@ msgstr "Accès impossible" msgid "Unable to access document." msgstr "Impossible d'accéder au document." -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "Mot de passe pour l'utilisateur %s@%s:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "Impossible d'établir une connexion à l'hôte FTP" -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "fermer le socket maître" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "socket pour le socket maître" @@ -2904,24 +2904,24 @@ msgstr "socket pour le socket maître" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "Lien symbolique" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "Réception du répertoire FTP." -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "%d bytes téléchargées (%5d)" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "connection pour données" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "Réception du fichier FTP" @@ -3128,49 +3128,49 @@ msgstr "La lecture de la socket a échouée pour 180,000 essais" msgid "Address contains a username: %s" msgstr "" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "Ce client n'est pas conçu pour traiter les URL HTTPS" -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "Impossible d'établir une connexion à l'hôte distant" # First %s will be FTP, HTTP or other protocol and second %s will be hostname -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 #, fuzzy msgid "Retrying connection without TLS." msgstr "Connexion %s à %s " -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "Envoi de la requête HTTP" -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "Erreur d'écriture réseau inattendue: connection annulée." -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "Demande acheminée au serveur. Veuillez attendre" # END of Permit FORM # More progress strings follow -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "Erreur de lecture inattendue; connexion interrompue" @@ -3183,7 +3183,7 @@ msgstr "Erreur de lecture inattendue; connexion interrompue" #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "Réception d'information de statut inattendue" @@ -3193,7 +3193,7 @@ msgstr "Réception d'information de statut inattendue" #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "Requête fructueuse. Restauration du contenu." @@ -3203,27 +3203,27 @@ msgstr "Requête fructueuse. Restauration du contenu." #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "Réception inattendue d'un état non modifié 304" -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "La redirection d'un contenu POST nécessite l'accord de l'utilisateur" -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "Contenu POST. La redirection permanente est traitée comme temporaire.\n" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "Nouvel essai avec information d'autorisation d'accès" -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "Visualiser le corps du message 401 ?" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "Afficher le corps du message 407?" @@ -3231,7 +3231,7 @@ msgstr "Afficher le corps du message 407?" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "Réponse d'état inconnue reçue du serveur" @@ -3416,108 +3416,108 @@ msgid "Host" msgstr "Hôte" # src/GridText.c -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "Mémoire insuffisante; interruption de l'affichage." -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "Mémoire saturée, interruption du transfert !" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr " *** MÉMOIRE INSUFFISANTE ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "champ ou lien inconnu" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "champ de saisie de texte" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "champ d'entrée du mot de passe" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "case d'option" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "bouton d'option" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "bouton Envoyer" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "bouton Effacer" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "menu éclair" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "champ de formulaire caché" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "zone d'entrée de texte" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "champ de saisie (range)" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "champ de saisie (file)" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "champ d'envoi (texte)" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "bouton d'envoi (image)" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "champ «keygen»" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "champ de formulaire inconnu" # WWW/Libary/Implementation/HTFile.c -#: src/GridText.c:10077 +#: src/GridText.c:10074 #, fuzzy msgid "Can't open file for uploading" msgstr "Impossible d'ouvrir le fichier pour décompression." -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "Envoi de %s" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "Raccourcir les lignes pour correspondre à la zone d'affichage ?" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "Les très longues lignes ont été es tassées" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "Les très longues lignes ont été es tronquées" @@ -3623,31 +3623,31 @@ msgstr "non" msgid "Y/N/A/V" msgstr "" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "Description :" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "(aucun(e))" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "Chemin de fichier :" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(inconnu)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "Le document ne contient que des liens cachés. Utiliser L) Références." -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "Erreur de cache - disque plein ?" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "Erreur de cache - pas assez de mémoire" @@ -3754,27 +3754,27 @@ msgstr "erreur de mise en place de flag de domaine de cookie, fermeture du progr msgid "Terminal initialisation failed - unknown terminal type?" msgstr "Défaut d'initialisation au terminal; type de terminal inconnu?" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "Terminal =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "Il faut utiliser un terminal vt100, 200, etc. avec ce programme." -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "Votre type de terminal n'est pas reconnu." -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "Entrez un type de terminal" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "TYPE DE TERMINAL RÉGLÉ À" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3783,7 +3783,7 @@ msgstr "" "\n" "Une erreur fatale s'est produite dans %s Ver. %s\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3815,40 +3815,40 @@ msgstr "L'éditeur à retourné un code d'erreur %s" msgid "reason unknown." msgstr "raison inconnue" -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "Lien téléchargé:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "Nom de fichier suggéré" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "Options standard de téléchargement:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "Options de déchargement de fichier :" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "Enregistrement sur disque" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 #, fuzzy msgid "View temporary file" msgstr "Envoyer le fichier par regardez le fichier temporaire" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "Enregistrement sur disque désactivé" -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "Ajout local:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "Aucun nom donné" @@ -4266,19 +4266,19 @@ msgstr "Ce message est généré automatiquement par" msgid "No system mailer configured" msgstr "" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "Pas de Winsock trouvée, désolé." -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "vous DEVEZ définir une zone TMP ou TEMP valide !" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "Pas de tel répertoire" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4290,7 +4290,7 @@ msgstr "" "\n" # src/LYMain.c -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4301,7 +4301,7 @@ msgstr "" "Jeux de caractères Lynx non précisés.\n" "\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4312,7 +4312,7 @@ msgstr "" "Relevé de liens Lynx non déclaré.\n" "\n" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4323,7 +4323,7 @@ msgstr "" "Le fichier Lynx %s n'est pas disponible.\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "Attention:" @@ -4368,114 +4368,114 @@ msgstr "USAGE : %s [options] [fichier]\n" msgid "Options are:\n" msgstr "Les options sont :\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s : Option non valide : %s\n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "Erreur interne: lien pour la souris %d invalide" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "Un URL spécifié par l'utilisateur" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "«Enctype multipart/form-data» non fonctionnel. Envoi impossible." #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "L'écran de Aide" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "Index système" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "Entrée dans l'écran principal" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "charset pour ce document spécifié explicitement, désolé..." -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "changer de répertoire vers:" -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "Une partie du chemin n'est pas un répertoire." -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "Changement de répertoire impossible" -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "Relecture du document avec les paramètres actuels." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "Erreur fatale - impossible d'ouvrir le fichier de sortie %s\n" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "" -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "" -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 #, fuzzy msgid "Current URL is empty." msgstr "Le répertoire courant:" -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "" -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "" -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "-index-" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx : accès impossible au fichier de départ" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "lynx : fichier de départ introuvable ou son mode n'est pas reconnu" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr "Sortie" -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "-suite-" @@ -5434,11 +5434,11 @@ msgstr "Emplacement : " msgid "(Form field)" msgstr "(champ de formulaire)" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "Aucun lien dans la page courante" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 #, fuzzy msgid "Server Headers:" msgstr "Serveur :" @@ -5492,34 +5492,34 @@ msgstr "Téléchargement vers:" msgid "Upload options:" msgstr "Options de chargement de fichier :" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "" -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "Protocole d'accès inattendu pour ce schéma l'URL" -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 #, fuzzy msgid "unknown restriction" msgstr "Pas de restriction définies." -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "Pas de restriction définies.\n" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "Définition de restriction:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "" diff --git a/po/hu.po b/po/hu.po index feff6ae2..71afca54 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx 2.8.6-dev8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 2004-11-14 19:52+0100\n" "Last-Translator: Mihály Gyulai <gyulai@fbi.hu>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" @@ -2789,7 +2789,7 @@ msgstr "POST tartalommal rendelkezõ dokumentum nem található a gyorstárban. Újra msgid "Loading failed, use a previous copy." msgstr "A betöltés sikertelen, korábbi példány használata." -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "A betöltés nem teljes." @@ -2812,7 +2812,7 @@ msgstr "**** HTAccess: Visszatérési állapot: %d\n" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "Nem lehet elérni" @@ -2820,20 +2820,20 @@ msgstr "Nem lehet elérni" msgid "Unable to access document." msgstr "Nem lehet elérni a dokumentumot." -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "Kérem a %s@%s felhasználó jelszavát:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "Nem lehet kapcsolódni az FTP kiszolgálóhoz." -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "a fõ socket bezárása" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "socket a fõ-socket-hez" @@ -2841,24 +2841,24 @@ msgstr "socket a fõ-socket-hez" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "Szimbolikus hivatkozás" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "FTP könyvtár fogadása." -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "Letöltve: %d bájt (%5d)" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "kapcsolás az adatért" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "FTP fájl fogadása." @@ -3066,45 +3066,45 @@ msgstr "Az illesztõpont 180.000 olvasás után is sikertelen." msgid "Address contains a username: %s" msgstr "A cím felhasználói nevet tartalmaz: %s" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "Ez az ügyfél nem támogatja a HTTPS URL-eket." -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "Nem lehet kapcsolódni a távoli számítógéphez." -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 msgid "Retrying connection without TLS." msgstr "Újbóli csatlakozás TLS nélkül." -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "SSL hiba: nem található azonos név a bizonyítványban - folytatjuk?" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "SSL hiba:host(%s)!=cert(%s)-Tovább?" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "Biztonságos %d-bit %s (%s) HTTP csatlakozás" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "HTTP kérés küldése." -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "Váratlan hálózati írási hiba; a csatlakozás megszakítva." -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "HTTP kérés elküldve, várakozás a válaszra." -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "Váratlan hálózati olvasási hiba, a csatlakozás megszakítva." @@ -3117,7 +3117,7 @@ msgstr "Váratlan hálózati olvasási hiba, a csatlakozás megszakítva." #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "Váratlan tájékoztatást kaptam az állapotról." @@ -3127,7 +3127,7 @@ msgstr "Váratlan tájékoztatást kaptam az állapotról." #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "Kérés teljesítve. Állítsa vissza a tartalmat." @@ -3137,27 +3137,27 @@ msgstr "Kérés teljesítve. Állítsa vissza a tartalmat." #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "Váratlan 304-es hiba: Nem lett módosítva az állapot." -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "A POST tartalom átirányításához felhasználói engedély kell." -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "POST tartalom. Az állandó átirányítást átmenetiként kezelem.\n" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "Újra próbálom elérés felhatalmazási információval." -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "Mutassam a 401-es üzenet szövegét?" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "Mutassam a 407-es üzenet szövegét?" @@ -3165,7 +3165,7 @@ msgstr "Mutassam a 407-es üzenet szövegét?" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "A szerver válasza: Ismeretlen állapot!" @@ -3353,106 +3353,106 @@ msgstr "Karbantartó" msgid "Host" msgstr "Kiszolgáló" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "A memória elfogyott, megjelenítés megszakítva!" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "A memória elfogyott, az átvitel meg lesz szakítva!" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr " *** A MEMÓRIA ELFOGYOTT ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "ismeretlen mezõ vagy hivatkozás" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "szöveg bejegyzés mezõ" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "jelszó bejegyzés mezõ" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "jelölõnégyzet" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "választógomb" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "küldõ gomb" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "törlés gomb" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "felbukkanó menü" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "rejtett ûrlap mezõ" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "szöveg bejegyzés terület" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "tartomány bejegyzés mezõ" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "fájl bejegyzés mezõ" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "szöveg-küldõ mezõ" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "kép-küldõ mezõ" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "kulcsgeneráló mezõ" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "ismeretlen ûrlap mezõ" -#: src/GridText.c:10077 +#: src/GridText.c:10074 msgid "Can't open file for uploading" msgstr "Nem lehet megnyitni a fájlt a feltöltéshez" -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "%s továbbítása" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "Akadásjelzés: A TextAnchor szerkezete sérült - javaslom a megszakítást!" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "Tördeljem a sorokat, hogy kiférjenek?" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "A hosszú sorokat új sorba tördeltem!" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "A hosszú sorok végét levágtam!" @@ -3542,31 +3542,31 @@ msgstr "nem" msgid "Y/N/A/V" msgstr "I/N/M/S" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "Leírás:" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "(nincs)" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "Útvonal:" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(ismeretlen)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "(A dokumentum csak rejtett hivatkozásokat tartalmaz. Használja az 'L' parancsot." -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "Forrás gyorstárazási hiba - a lemez megtelt?" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "Forrás gyorstárazási hiba - nincs elég memória!" @@ -3673,27 +3673,27 @@ msgstr "cookie_domain_flag_set hiba, program megszakítva" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "Terminál megnyitás sikertelen - ismeretlen terminál típus?" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "Terminál =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "Önnek vt100, 200 stb.-t kell használnia ehhez a programhoz." -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "A terminál típus ismeretlen!" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "Kérem a terminál típusát:" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "A TERMINÁL TÍPUS BEÁLLÍTVA:" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3702,7 +3702,7 @@ msgstr "" "\n" "Végzetes hiba lépett fel a %s %s verzióban\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3732,39 +3732,39 @@ msgstr "A szerkesztõprogram a következõ hibaállapottal tért vissza: %s" msgid "reason unknown." msgstr "ok ismeretlen." -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "Letöltött link:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "Javasolt fájlnév:" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "Alapvetõ letöltési beállítások:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "Letöltési beállítások:" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "Mentés lemezre" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 msgid "View temporary file" msgstr "Átmeneti fájl nézése" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "Mentés lemezre le van tiltva." -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "Helyi adalékok:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "Nincs név megadva" @@ -4180,19 +4180,19 @@ msgstr "Ez az üzenet önmûködõen jött létre" msgid "No system mailer configured" msgstr "Nincsen rendszerszintû levelezõ beállítva" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "Nem találtam Winsock-ot, sajnálom." -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "Önnek meg kell adnia egy érvényes TMP vagy TEMP területet" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "Nincs ilyen könyvtár" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4203,7 +4203,7 @@ msgstr "" "A(z) %s konfigurációs fájl nem áll rendelkezésre.\n" "\n" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4214,7 +4214,7 @@ msgstr "" "Nincs deklarált karakterkészlet a Lynx-ben.\n" "\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4225,7 +4225,7 @@ msgstr "" "Nincs deklarált szerkesztõkép a Lynx-ben.\n" "\n" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4236,7 +4236,7 @@ msgstr "" "A(z) %s Lynx-fájl nem áll rendelkezésre.\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "Figyelem:" @@ -4281,113 +4281,113 @@ msgstr "HASZNÁLAT: %s [opciók] [fájl]\n" msgid "Options are:\n" msgstr "Opciók:\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s: Érvénytelen opció: %s \n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "Belsõ hiba: Hibás egér hivatkozás %d!" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "Felhasználó által megadott URL" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "Enctype multipart/form-data még nincs támogatva! Nem tudjuk elküldeni." #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "Súgó képernyõ" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "Rendszer index" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "Belépés a fõképernyõbe" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "Nincs további dokumentum" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "a dokumentum karakterkészlete már be van állítva..." -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "könyvtárváltás:" -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "Az útvonal egy összetevõje nem könyvtár" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "nem sikerült a könyvtárváltás" -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "A dokumentumot átalakítom az aktuális beállításoknak megfelelõen..." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "Végzetes hiba: nem lehet megnyitni a(z) '%s' kimeneti fájlt\n" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "'Táblázat középre' engedélyezve." -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "'Táblázat középre' tiltva." -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 msgid "Current URL is empty." msgstr "Üres a pillanatnyi URL." -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "Sikertelen a vágólapra másolás." -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "A dokumentum URL-jét a vágólapra tesszük." -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "A link URL-jét a vágólapra tesszük." -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "Nincsen URL a vágólapon." -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "-index-" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx: Nincs kezdõfájl!" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "lynx: A kezdõfájlt nem találom (sem HTML szöveget, sem sima szöveget)" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr " Kilépés..." -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "-tovább-" @@ -5323,11 +5323,11 @@ msgstr "Mûvelet:" msgid "(Form field)" msgstr "(Ûrlap mezõ)" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "Nincs hivatkozás ezen a lapon" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 msgid "Server Headers:" msgstr "Kiszolgáló fejléc:" @@ -5380,33 +5380,33 @@ msgstr "Feltöltés:" msgid "Upload options:" msgstr "Feltöltési beállítások:" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "A letöltendõ dokumentum URL-jét a vágólapra tesszük." -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "Nem támogatott elérési protokoll ezen az URL sémán." -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "Túl sok átmeneti fájl" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 msgid "unknown restriction" msgstr "ismeretlen szigorítás" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "Nincs szigorítás beállítva.\n" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "Szigorítási beállítás:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "Nem találom a HOME könyvtárat" diff --git a/po/it.po b/po/it.po index e1685e75..9b1bfb31 100644 --- a/po/it.po +++ b/po/it.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx 2.8.4.pre2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 2002-06-23 23:30 +02:00\n" "Last-Translator: Giuliano Artico <artico@math.unipd.it>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -2852,7 +2852,7 @@ msgstr "Documento con contenuto POST non trovato in memoria. Ritentare?" msgid "Loading failed, use a previous copy." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "Caricamento incompleto." @@ -2875,7 +2875,7 @@ msgstr "**** HTAccess: stato di ritorno: %d\n" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "Accesso impossibile" @@ -2883,20 +2883,20 @@ msgstr "Accesso impossibile" msgid "Unable to access document." msgstr "Impossibile accedere al documento." -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "Password per l'utente %s@%s:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "Connessione impossibile con l'host FTP" -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "chiudere socket principale" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "socket per socket principale" @@ -2904,24 +2904,24 @@ msgstr "socket per socket principale" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "Link simbolico" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "Ricezione della directory FTP." -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "Trasferiti %d byte (%5d)" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "connessione per dati" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "Ricezione del file FTP" @@ -3130,49 +3130,49 @@ msgstr "Falliti 180000 tentativi di lettura socket." msgid "Address contains a username: %s" msgstr "" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "Questo client non è predisposto per gestire gli URL HTTPS." -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "Impossibile stabilire la connessione con l'host remoto." # First %s will be FTP, HTTP or other protocol and second %s will be hostname -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 #, fuzzy msgid "Retrying connection without TLS." msgstr "Connessione %s a %s " -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "Invio della richiesta HTTP" -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "Errore inatteso di scrittura in rete; connessione annullata." -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "Richiesta HTTP inviata; in attesa di risposta." # END of Permit FORM # More progress strings follow -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "Errore inatteso di lettura in rete; connessione annullata." @@ -3185,7 +3185,7 @@ msgstr "Errore inatteso di lettura in rete; connessione annullata." #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "Ricevuta informazione di stato inattesa." @@ -3195,7 +3195,7 @@ msgstr "Ricevuta informazione di stato inattesa." #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "Richiesta soddisfatta. Ripristino del contenuto." @@ -3205,27 +3205,27 @@ msgstr "Richiesta soddisfatta. Ripristino del contenuto." #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "Ricezione inattesa di stato non modificato 304" -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "Il reindirizzamento del contenuto POST richiede il consenso dell'utente." -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "Contenuto POST. Il reindirizzamento permanente è trattato come temporaneo.\n" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "Nuovo tentativo con info di autorizzazione d'accesso." -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "Visualizzare il corpo del messaggio 401?" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "Visualizzare il corpo del messaggio 407?" @@ -3233,7 +3233,7 @@ msgstr "Visualizzare il corpo del messaggio 407?" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "Risposta di stato sconosciuto ricevuta dal server!" @@ -3423,108 +3423,108 @@ msgid "Host" msgstr "Host" # src/GridText.c -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "Memoria insufficiente, visualizzazione interrotta!" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "Memoria insufficiente, il trasferimento sarà interrotto!" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr " *** MEMORIA INSUFFICIENTE ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "campo o link sconosciuto" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "campo di immissione testo" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "campo di immissione password" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "casella di scelta" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "bottone radio" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "bottone Invio" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "bottone Annulla" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "menù a comparsa" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "campo nascosto di modulo" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "area di immissione testo" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "campo di immissione (range)" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "campo di immissione file" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "campo di invio testo" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "bottone di invio immagine" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "campo «keygen»" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "campo di modulo sconosciuto" # WWW/Libary/Implementation/HTFile.c # #, fuzzy -#: src/GridText.c:10077 +#: src/GridText.c:10074 msgid "Can't open file for uploading" msgstr "Impossibile aprire il file per il caricamento" -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "Invio di %s" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "Interruzione: struttura TextAnchorrovinata - si suggerisce di abbandonare!" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "Accorciare le righe per adattarle all'area di visualizzazione?" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "Le righe molto lunghe sono state spezzate!" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "Le righe molto lunghe sono state troncate!" @@ -3617,31 +3617,31 @@ msgstr "no" msgid "Y/N/A/V" msgstr "" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "Descrizione:" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "(nessuno/a)" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "Percorso del file:" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(sconosciuto)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "Il documento rinvia solo a link nascosti. Usare il comando 'l'ista." -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "Errore di registrazione - disco pieno?" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "Errore di registrazione - memoria insufficiente!" @@ -3748,27 +3748,27 @@ msgstr "errore cookie_domain_flag_set: programma interrotto" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "Inizializzazione del terminale fallita - tipo di terminale sconosciuto?" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "Terminale =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "Con questo programma si deve usare un terminale vt100, 200, ecc." -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "Il tipo di terminale è sconosciuto." -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "Indicare un tipo di terminale:" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "TIPO DI TERMINALE IMPOSTATO A" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3777,7 +3777,7 @@ msgstr "" "\n" "Un errore irreversibile si è verificato in %s Ver. %s\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3808,40 +3808,40 @@ msgstr "L'editor ha restituito un codice di errore %s" msgid "reason unknown." msgstr "motivo sconosciuto." -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "Link scaricato:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "Nome di file proposto:" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "Opzioni standard di scaricamento:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "Opzioni di scaricamento file:" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "Registrare su disco" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 #, fuzzy msgid "View temporary file" msgstr "Spedire il file tramite mail" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "Registrazione su disco disattivata." -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "Aggiunte locali:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "Nessun nome dato" @@ -4259,19 +4259,19 @@ msgstr "Questo messaggio è stato generato automaticamente da" msgid "No system mailer configured" msgstr "" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "Nessun Winsock trovato, spiacente." -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "SI DEVE definire un'area TMP o TEMP valida! " -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "Non esiste la directory indicata" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4283,7 +4283,7 @@ msgstr "" "\n" # src/LYMain.c -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4294,7 +4294,7 @@ msgstr "" "Insiemi di caratteri di Lynx non precisati.\n" "\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4305,7 +4305,7 @@ msgstr "" "Edit map di Lynx non precisata.\n" "\n" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4316,7 +4316,7 @@ msgstr "" "Il file Lynx %s non è disponibile.\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "Attenzione:" @@ -4361,114 +4361,114 @@ msgstr "USO: %s [opzioni] [file]\n" msgid "Options are:\n" msgstr "Le opzioni sono:\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s: opzione non valida: %s\n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "Errore interno: link per il mouse %d non valido" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "Un URL precisato dall'utente" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "«Enctype multipart/form-data» non ancora funzionante! Invio impossibile." #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "Schermata di aiuto" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "Indice sistema" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "Ingresso nella pagina di avvio" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "Non è presente un documento successivo" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "charset per questo documento precisato in modo esplicito, spiacente..." -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "cambio directory su:" -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "Un elemento del percorso non è una directory." -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "cambiamento directory fallito" -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "Reanalisi del documento con le impostazioni attuali..." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "Errore grave: impossibile aprire il file di uscita %s\n" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "" -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "" -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 #, fuzzy msgid "Current URL is empty." msgstr "Directory attuale:" -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "" -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "" -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "-indice-" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx: impossibile accedere al file di avvio" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "lynx: file di avvio non trovato o non avente formato text/html o text/plain" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr " Uscita..." -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "-segue-" @@ -5431,11 +5431,11 @@ msgstr "Posizione: " msgid "(Form field)" msgstr "(campo del modulo)" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "Nessun link nella pagina attuale" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 #, fuzzy msgid "Server Headers:" msgstr "Server:" @@ -5489,34 +5489,34 @@ msgstr "Caricare su:" msgid "Upload options:" msgstr "Opzioni di caricamento file:" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "" -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "Protocollo di accesso inatteso per questo schema di URL." -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "Troppi file temporanei" # #, fuzzy -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 msgid "unknown restriction" msgstr "Restrizione ignota" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "Nessuna restrizione impostata.\n" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "Descrizione delle restrizioni:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "" diff --git a/po/ja.po b/po/ja.po index c4988689..7f8b22bf 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx 2.8.5pre9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 2003-04-19 20:40+0900\n" "Last-Translator: Masayuki Hatta <mhatta@po.airs.net>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" @@ -2790,7 +2790,7 @@ msgstr "POST ¥³¥ó¥Æ¥ó¥Ä¤ò´Þ¤à¥É¥¥å¥á¥ó¥È¤Ï¥¥ã¥Ã¥·¥å¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£ºÆÁ msgid "Loading failed, use a previous copy." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "Æɤ߹þ¤ß¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿¡£" @@ -2813,7 +2813,7 @@ msgstr "**** HTAccess: Ê֤äƤ¤¿¥¹¥Æ¡¼¥¿¥¹¤Ï: %d\n" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "¥¢¥¯¥»¥¹¤Ç¤¤Þ¤»¤ó¡£" @@ -2821,20 +2821,20 @@ msgstr "¥¢¥¯¥»¥¹¤Ç¤¤Þ¤»¤ó¡£" msgid "Unable to access document." msgstr "ʸ½ñ¤Ë¥¢¥¯¥»¥¹¤Ç¤¤Þ¤»¤ó¡£" -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "¥æ¡¼¥¶ %s@%s ¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆþÎÏ:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "FTP ¥Û¥¹¥È¤ËÀܳ¤Ç¤¤Þ¤»¤ó¡£" -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "¥Þ¥¹¥¿¡¼¥½¥±¥Ã¥È¤¬ÊĤ¸¤Þ¤¹" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "¥Þ¥¹¥¿¡¼¥½¥±¥Ã¥ÈÍÑ¥½¥±¥Ã¥È" @@ -2842,24 +2842,24 @@ msgstr "¥Þ¥¹¥¿¡¼¥½¥±¥Ã¥ÈÍÑ¥½¥±¥Ã¥È" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "FTP ¥Ç¥£¥ì¥¯¥È¥ê¤ò¼õ¿®Ãæ" -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "%d ¥Ð¥¤¥ÈžÁ÷ºÑ (%5d)" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "¥Ç¡¼¥¿¤ËÀܳ" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "FTP ¥Õ¥¡¥¤¥ë¤ò¼õ¿®Ãæ" @@ -3067,45 +3067,45 @@ msgstr "180,000 ²ó»î¹Ô¤·¤Þ¤·¤¿¤¬¥½¥±¥Ã¥È¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£" msgid "Address contains a username: %s" msgstr "¥¢¥É¥ì¥¹¤Ï¥æ¡¼¥¶Ì¾ %s ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "¤³¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ï HTTPS URL ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£" -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "¥ê¥â¡¼¥È¥Û¥¹¥È¤ËÀܳ¤Ç¤¤Þ¤»¤ó¡£" -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 msgid "Retrying connection without TLS." msgstr "TLS¤ò»È¤ï¤º¤ËÀܳ¤òºÆ»î¹Ô¤·¤Æ¤¤¤Þ¤¹¡£" -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "SSL¥¨¥é¡¼: ¥Û¥¹¥È(%s) ¤¬ cert(%s) ¤È°ìÃפ·¤Þ¤»¤ó ³¤±¤Þ¤¹¤«?" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "¥»¥¥å¥¢¤Ê %d ¥Ó¥Ã¥È %s (%s) HTTP Àܳ" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "HTTP ¥ê¥¯¥¨¥¹¥È¤òÁ÷¿®Ãæ" -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "ÆÍÁ³¤Î¥Í¥Ã¥È¥ï¡¼¥¯½ñ¤¹þ¤ß¥¨¥é¡¼: Àܳ¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿¡£" -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "HTTP ¥ê¥¯¥¨¥¹¥È¤òÁ÷¿®¤·¤Þ¤·¤¿: ±þÅú¤òÂԤäƤ¤¤Þ¤¹" -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "ÆÍÁ³¤Î¥Í¥Ã¥È¥ï¡¼¥¯Æɤ߹þ¤ß¥¨¥é¡¼: Àܳ¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿¡£" @@ -3118,7 +3118,7 @@ msgstr "ÆÍÁ³¤Î¥Í¥Ã¥È¥ï¡¼¥¯Æɤ߹þ¤ß¥¨¥é¡¼: Àܳ¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿¡£" #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "ͽ´ü¤·¤Ê¤¤ Informational Status ¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿¡£" @@ -3128,7 +3128,7 @@ msgstr "ͽ´ü¤·¤Ê¤¤ Informational Status ¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿¡£" #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "¥ê¥¯¥¨¥¹¥È¤¬¼Â¹Ô¤µ¤ì¤Þ¤·¤¿¡£¥³¥ó¥Æ¥ó¥È¤ò¥ê¥»¥Ã¥È¤·¤Æ¤¯¤À¤µ¤¤¡£" @@ -3138,27 +3138,27 @@ msgstr "¥ê¥¯¥¨¥¹¥È¤¬¼Â¹Ô¤µ¤ì¤Þ¤·¤¿¡£¥³¥ó¥Æ¥ó¥È¤ò¥ê¥»¥Ã¥È¤·¤Æ¤¯¤À¤µ¤¤¡£" #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "ͽ´ü¤»¤Ì 304 Not Modified ¥¹¥Æ¡¼¥¿¥¹¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿¡£" -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "POST ¥³¥ó¥Æ¥ó¥È¤Î¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó¤Ë¤Ï¥æ¡¼¥¶¤Î¾µÇ§¤¬É¬ÍפǤ¹¡£" -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "POST ¥³¥ó¥Æ¥ó¥È¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£±Ê³Ū¤Ê¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó¤ò°ì»þŪ¤Ê¤â¤Î¤È¤·¤Æ°·¤¤¤Þ¤¹¡£\n" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "¥¢¥¯¥»¥¹Ç§¾Ú¾ðÊóÉÕ¤¤ÇºÆ»î¹Ô¤·¤Æ¤¤¤Þ¤¹¡£" -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "401 ¥á¥Ã¥»¡¼¥¸ËÜÂΤò¸«¤Þ¤¹¤«?" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "407 ¥á¥Ã¥»¡¼¥¸ËÜÂΤò¸«¤Þ¤¹¤«?" @@ -3166,7 +3166,7 @@ msgstr "407 ¥á¥Ã¥»¡¼¥¸ËÜÂΤò¸«¤Þ¤¹¤«?" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "¥µ¡¼¥Ð¤«¤é¤ÎÉÔÌÀ¤Ê¥¹¥Æ¡¼¥¿¥¹¥ê¥×¥é¥¤¤Ç¤¹!" @@ -3354,106 +3354,106 @@ msgstr "¥á¥ó¥Æ¥Ê" msgid "Host" msgstr "¥Û¥¹¥È" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "¥á¥â¥ê¤ò»È¤¤¤¤ê¤Þ¤·¤¿¡£É½¼¨¤òÃæÃǤ·¤Þ¤¹!" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "¥á¥â¥ê¤ò»È¤¤¤¤ê¤Þ¤·¤¿¡£Å¾Á÷¤òÃæÃǤ·¤Þ¤¹!" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr "*** ¥á¥â¥ê¤ò»È¤¤¤¤ê¤Þ¤·¤¿ ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "̤ÃΤΥե£¡¼¥ë¥É¤Þ¤¿¤Ï¥ê¥ó¥¯¤Ç¤¹" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "¥Æ¥¥¹¥ÈÆþÎÏ¥Õ¥£¡¼¥ë¥É" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "¥Ñ¥¹¥ï¡¼¥ÉÆþÎÏ¥Õ¥£¡¼¥ë¥É" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "¥Á¥§¥Ã¥¯¥Ü¥Ã¥¯¥¹" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "¥é¥¸¥ª¥Ü¥¿¥ó" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "Á÷¿®¥Ü¥¿¥ó" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "¥ê¥»¥Ã¥È¥Ü¥¿¥ó" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "¥Ý¥Ã¥×¥¢¥Ã¥×¥á¥Ë¥å¡¼" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "±£¤µ¤ì¤¿¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "¥Æ¥¥¹¥ÈÆþÎÏ¥¨¥ê¥¢" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "ÈÏ°ÏÆþÎÏ¥Õ¥£¡¼¥ë¥É" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "¥Õ¥¡¥¤¥ëÆþÎÏ¥Õ¥£¡¼¥ë¥É" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "¥Æ¥¥¹¥ÈÁ÷¿®¥Õ¥£¡¼¥ë¥É" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "²èÁüÁ÷¿®¥Ü¥¿¥ó" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "keygen ¥Õ¥£¡¼¥ë¥É" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "̤ÃΤΥե©¡¼¥à¥Õ¥£¡¼¥ë¥É" -#: src/GridText.c:10077 +#: src/GridText.c:10074 msgid "Can't open file for uploading" msgstr "¥¢¥Ã¥×¥í¡¼¥É¤¹¤ë¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£" -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "%s ¤òÁ÷¿®Ãæ" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "¥Ï¥ó¥°¸¡½Ð: TextAnchor ¹½Â¤ÂΤ¬²õ¤ì¤Þ¤·¤¿ - ½ªÎ»¤ò¤ª´«¤á¤·¤Þ¤¹!" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "ɽ¼¨Îΰè¤Ë¼ý¤Þ¤ë¤è¤¦¹Ô¤òÀÞ¤êÊÖ¤·¤Þ¤¹¤«?" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "Ť¹¤®¤ë¹Ô¤ÏÀÞ¤êÊÖ¤µ¤ì¤Þ¤¹!" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "Ť¹¤®¤ë¹Ô¤ÏÀÚ¤êµÍ¤á¤é¤ì¤Þ¤¹!" @@ -3543,31 +3543,31 @@ msgstr "no" msgid "Y/N/A/V" msgstr "" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "ÀâÌÀ:" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "(¤Ê¤·)" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹:" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(ÉÔÌÀ)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "ʸ½ñ¤Ë¤Ï±£¤·¥ê¥ó¥¯¤·¤«¤¢¤ê¤Þ¤»¤ó¡£[l]¤«¤éé¤Ã¤Æ¤¯¤À¤µ¤¤¡£" -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "¥½¡¼¥¹¥¥ã¥Ã¥·¥å¥¨¥é¡¼¤Ç¤¹ - ¥Ç¥£¥¹¥¯¤¬°ìÇÕ¤«¤â?" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "¥½¡¼¥¹¥¥ã¥Ã¥·¥å¥¨¥é¡¼¤Ç¤¹ - ¥á¥â¥ê¤¬Â¤ê¤Þ¤»¤ó!" @@ -3675,27 +3675,27 @@ msgstr "cookie_domain_flag_set ¥¨¥é¡¼¡¢¥×¥í¥°¥é¥à¤ò½ªÎ»¤·¤Þ¤¹" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "üËö¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ - üËö¤Î¥¿¥¤¥×¤¬ÉÔÌÀ?" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "üËö =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "¤³¤Î¥×¥í¥°¥é¥à¤Ï vt100¡¢200 ¤Ê¤É¤ÎüËö¾å¤Ç¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£" -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "¤ª»È¤¤¤ÎüËö¥¿¥¤¥×¤¬Ê¬¤«¤ê¤Þ¤»¤ó!" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "üËö¥¿¥¤¥×¤òÆþÎÏ:" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "ÀßÄꤵ¤ì¤ëüËö¥¿¥¤¥×¤Ï" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3704,7 +3704,7 @@ msgstr "" "\n" "Ã×̿Ū¤Ê¥¨¥é¡¼¤¬ %s ¥Ð¡¼¥¸¥ç¥ó %s ¤ÇȯÀ¸¤·¤Þ¤·¤¿\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3733,40 +3733,40 @@ msgstr "¥¨¥Ç¥£¥¿¤Ï¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹ %s ¤òÊÖ¤·¤Þ¤·¤¿" msgid "reason unknown." msgstr "(ÉÔÌÀ)" -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥ê¥ó¥¯:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "¿ä¾©¤¹¤ë¥Õ¥¡¥¤¥ë̾:" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "ɸ½à¤Î¥À¥¦¥ó¥í¡¼¥ÉÀè:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "¥À¥¦¥ó¥í¡¼¥ÉÀè" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "¥Ç¥£¥¹¥¯¤ËÊݸ" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 #, fuzzy msgid "View temporary file" msgstr "¥Õ¥¡¥¤¥ë¤ò±ÜÍ÷" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "¥Ç¥£¥¹¥¯¤ËÊݸ¤Ç¤¤Þ¤»¤ó¡£" -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "¥í¡¼¥«¥ë¤Ç¤ÎÄɲÃ:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "̾Á°¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" @@ -4184,19 +4184,19 @@ msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï°Ê²¼¤Ë¤è¤Ã¤Æ¼«Æ°Åª¤ËÀ¸À®¤µ¤ì¤Þ¤·¤¿: " msgid "No system mailer configured" msgstr "" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "Winsock ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£" -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "TMP ¤Ê¤¤¤· TEMP Îΰè¤òÀµ¤·¤¯ÄêµÁ¤·¤Ê¤±¤ì¤Ð*¤Ê¤ê¤Þ¤»¤ó*!" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "¤½¤ó¤Ê¥Ç¥£¥ì¥¯¥È¥ê¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4207,7 +4207,7 @@ msgstr "" "ÄêµÁ¥Õ¥¡¥¤¥ë %s ¤¬ÍøÍѤǤ¤Þ¤»¤ó¡£\n" "\n" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4218,7 +4218,7 @@ msgstr "" "Lynx ¥¥ã¥é¥¯¥¿¥»¥Ã¥È¤¬Àë¸À¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" "\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4229,7 +4229,7 @@ msgstr "" "Lynx ÊÔ½¸¥Þ¥Ã¥×¤¬Àë¸À¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" "\n" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4240,7 +4240,7 @@ msgstr "" "Lynx ¥Õ¥¡¥¤¥ë %s ¤ÏÍøÍѤǤ¤Þ¤»¤ó¡£\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "Ãí°Õ: " @@ -4285,114 +4285,114 @@ msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë]\n" msgid "Options are:\n" msgstr "¥ª¥×¥·¥ç¥ó:\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹: %s\n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "ÆâÉô¥¨¥é¡¼: %d ¤ÏÉÔÀµ¤Ê¥Þ¥¦¥¹¥ê¥ó¥¯¤Ç¤¹!" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "¥æ¡¼¥¶¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤¿ URL" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "Enctype multipart/form-data ¤Ï¤Þ¤À¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó! Á÷¿®¤Ç¤¤Þ¤»¤ó¡£" #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "¥Ø¥ë¥×²èÌÌ" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "¥·¥¹¥Æ¥à¥¤¥ó¥Ç¥Ã¥¯¥¹" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "¥á¥¤¥ó²èÌ̤ؤÎÆþÎÏ" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "¼¡¤Î¥É¥¥å¥á¥ó¥È¤¬Â¸ºß¤·¤Þ¤»¤ó" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "¤³¤Îʸ½ñ¤Î¥¥ã¥é¥¯¥¿¥»¥Ã¥È¤ÏÌÀ¼¨Åª¤Ë»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹..." -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "°Ê²¼¤Ø°ÜÆ°:" -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "¥Ñ¥¹¤Î°ìÉô¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òÊѹ¹¤Ç¤¤Þ¤»¤ó" -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "¸½ºß¤ÎÀßÄê¤Î²¼¤Çʸ½ñ¤òºÆ²ò¼áÃæ..." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "Ã×̿Ū¥¨¥é¡¼ - ½ÐÎÏ¥Õ¥¡¥¤¥ë %s ¤¬³«¤±¤Þ¤»¤ó\n" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "" -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "" -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 #, fuzzy msgid "Current URL is empty." msgstr "¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê:" -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "" -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "" -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "-¥¤¥ó¥Ç¥Ã¥¯¥¹-" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx: ¥¹¥¿¡¼¥È¥Õ¥¡¥¤¥ë¤Ë¥¢¥¯¥»¥¹¤Ç¤¤Þ¤»¤ó" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "lynx: ¥¹¥¿¡¼¥È¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤é¤Ê¤¤¤«¡¢text/html ¤Ê¤¤¤· text/plain ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr " ½ªÎ»¤·¤Þ¤¹..." -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "-³¤¤¢¤ê-" @@ -5348,11 +5348,11 @@ msgstr "¾ì½ê: " msgid "(Form field)" msgstr "(¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É)" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "¸½ºß¤Î¥Ú¡¼¥¸¤Ë¤Ï¥ê¥ó¥¯¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 #, fuzzy msgid "Server Headers:" msgstr "¥µ¡¼¥Ð:" @@ -5406,33 +5406,33 @@ msgstr "°Ê²¼¤Ë¥¢¥Ã¥×¥í¡¼¥É:" msgid "Upload options:" msgstr "¥¢¥Ã¥×¥í¡¼¥É¥ª¥×¥·¥ç¥ó:" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "" -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "¤³¤Î URL ¥¹¥¡¼¥à¤Ç¤ÏÁÛÄꤵ¤ì¤Æ¤¤¤Ê¤¤¥¢¥¯¥»¥¹¥×¥í¥È¥³¥ë¤Ç¤¹¡£" -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤¬Â¿¤¹¤®¤Þ¤¹" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 msgid "unknown restriction" msgstr "ÉÔÌÀ¤ÊÀ©¸Â" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "À©¸Â¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "À©¸Â¤ò°Ê²¼¤ËÀßÄê:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "HOME ¥Ç¥£¥ì¥¯¥È¥ê¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" diff --git a/po/lynx.pot b/po/lynx.pot index be30d29b..fb52cc7f 100644 --- a/po/lynx.pot +++ b/po/lynx.pot @@ -1,9 +1,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lynx 2.8.6dev.8\n" +"Project-Id-Version: lynx 2.8.6dev.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-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" @@ -2780,7 +2780,7 @@ msgstr "" msgid "Loading failed, use a previous copy." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "" @@ -2805,7 +2805,7 @@ msgstr "" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "" @@ -2813,20 +2813,20 @@ msgstr "" msgid "Unable to access document." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "" @@ -2834,25 +2834,25 @@ msgstr "" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 -#: WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 +#: WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "" @@ -3055,45 +3055,45 @@ msgstr "" msgid "Address contains a username: %s" msgstr "" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "" -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "" -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 msgid "Retrying connection without TLS." msgstr "" -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "" @@ -3106,7 +3106,7 @@ msgstr "" #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "" @@ -3116,7 +3116,7 @@ msgstr "" #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "" @@ -3126,27 +3126,27 @@ msgstr "" #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "" @@ -3154,7 +3154,7 @@ msgstr "" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "" @@ -3332,106 +3332,106 @@ msgstr "" msgid "Host" msgstr "" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr "" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "" -#: src/GridText.c:10077 +#: src/GridText.c:10074 msgid "Can't open file for uploading" msgstr "" -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "" @@ -3521,31 +3521,31 @@ msgstr "" msgid "Y/N/A/V" msgstr "" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "" -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "" @@ -3638,34 +3638,34 @@ msgstr "" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "" -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" "A Fatal error has occurred in %s Ver. %s\n" msgstr "" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3689,39 +3689,39 @@ msgstr "" msgid "reason unknown." msgstr "" -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 msgid "View temporary file" msgstr "" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "" -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "" @@ -4137,19 +4137,19 @@ msgstr "" msgid "No system mailer configured" msgstr "" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "" -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4157,7 +4157,7 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4165,7 +4165,7 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4173,7 +4173,7 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4181,7 +4181,7 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "" @@ -4227,113 +4227,113 @@ msgstr "" msgid "Options are:\n" msgstr "" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "" #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "" -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "" -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "" -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "" -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "" -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "" -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 msgid "Current URL is empty." msgstr "" -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "" -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "" -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr "" -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "" @@ -5251,11 +5251,11 @@ msgstr "" msgid "(Form field)" msgstr "" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 msgid "Server Headers:" msgstr "" @@ -5302,33 +5302,33 @@ msgstr "" msgid "Upload options:" msgstr "" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "" -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "" -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 msgid "unknown restriction" msgstr "" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "" diff --git a/po/nl.po b/po/nl.po index 2a18ad49..58f791ff 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx 2.8.6-dev8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 2004-11-15 08:49+0100\n" "Last-Translator: Luk Claes <luk.claes@ugent.be>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" @@ -2790,7 +2790,7 @@ msgstr "Document met POST inhoud niet gevonden in cache. Nog eens verzenden?" msgid "Loading failed, use a previous copy." msgstr "Het laden is mislukt, gebruik een vroegere kopie." -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "Laden niet voltooid." @@ -2813,7 +2813,7 @@ msgstr "**** HTAccess: Geretourneerde status was: %d\n" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "Kan geen toegang krijgen" @@ -2821,20 +2821,20 @@ msgstr "Kan geen toegang krijgen" msgid "Unable to access document." msgstr "Kan geen toegang krijgen tot document." -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "Voer wachtwoord in voor gebruiker %s@%s:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "Kan niet verbinden met FTP host." -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "sluit hoofdsocket af" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "socket voor hoofdsocket" @@ -2842,24 +2842,24 @@ msgstr "socket voor hoofdsocket" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "Symbolische Koppeling" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "Bezig met ophalen van FTP bestandenoverzicht." -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "%d bytes overgezet (%5d)" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "verbinden voor datastroom" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "Bezig met ophalen van FTP bestand." @@ -3066,45 +3066,45 @@ msgstr "Lezen uit socket mislukt na 180,000 (!) pogingen." msgid "Address contains a username: %s" msgstr "Adres bevat een gebruikersnaam: %s" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "Dit programma ondersteunt geen HTTPS URL's." -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "Niet in staat om met de andere computer te verbinden." -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 msgid "Retrying connection without TLS." msgstr "Verbinding wordt opnieuw geprobeerd zonder TLS." -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "SSL-fout: kan gemeenschappelijke naam niet vinden in certificaat. Verdergaan?" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "SSL-fout: computer (%s) != certificaat (%s). Verdergaan?" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "Veilige %d-bit %s (%s) HTTP-verbinding" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "Bezig met zenden van HTTP verzoek." -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "Onverwachte fout bij schrijven naar netwerk: verbinding verbroken." -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "HTTP verzoek verzonden; wacht op antwoord." -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "Onverwachte fout bij lezen uit netwerk; verbinding verbroken." @@ -3117,7 +3117,7 @@ msgstr "Onverwachte fout bij lezen uit netwerk; verbinding verbroken." #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "Onverwachte informatieve status ontvangen." @@ -3127,7 +3127,7 @@ msgstr "Onverwachte informatieve status ontvangen." #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "Verzoek volbracht. Herstel inhoud." @@ -3137,27 +3137,27 @@ msgstr "Verzoek volbracht. Herstel inhoud." #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "Kreeg een onverwachte 304 Niet Gewijzigd statusmelding." -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "Doorverwijzing van POST inhoud vereist toestemming van de gebruiker." -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "Heb POST inhoud. Permanente doorverwijzing wordt behandeld als een tijdelijke.\n" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "Bezig opnieuw te proberen met informatie over toegangs-authorisatie." -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "Inhoud van het 401 bericht laten zien?" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "Inhoud van het 407 bericht laten zien?" @@ -3165,7 +3165,7 @@ msgstr "Inhoud van het 407 bericht laten zien?" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "Onbekend status-antwoord van server!" @@ -3353,106 +3353,106 @@ msgstr "Beheerder" msgid "Host" msgstr "Host" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "Geen geheugen meer beschikbar, beeldweergave onderbroken!" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "Geen geheugen meer beschikbaar, overdracht zal worden afgebroken!" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr " *** GEHEUGEN VERMOEID ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "onbekend veld of link" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "tekst invoerveld" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "wachtwoord invoerveld" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "aanvinkvakje" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "drukknop" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "verzendknop" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "herstelknop" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "popup menu" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "verborgen formulierveld" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "tekst invoergebied" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "bereik invoerveld" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "bestandsnaam invoerveld" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "tekst-verzendveld" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "afbeelding-verzendknop" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "sleutelaanmaak veld" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "onbekend formulier veld" -#: src/GridText.c:10077 +#: src/GridText.c:10074 msgid "Can't open file for uploading" msgstr "Kan bestand niet openen voor upload" -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "Bezig met verzenden van %s" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "Ophanging Gedetecteerd: TextAnchor-struct is corrupt - stel voor te onderbreken!" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "Regels omvouwen zodat alles zichtbaar is?" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "Erg lange regels zijn omgevouwen!" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "Erg lange regels zijn afgekapt!" @@ -3542,32 +3542,32 @@ msgstr "nee" msgid "Y/N/A/V" msgstr "Y/N/A/V" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "Omschrijving:" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "(geen)" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "Bestandspad:" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(onbekend)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "Document heeft slechts verborgen links. Gebruik het 'l'ijst commando." # Source? -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "Cache fout - schijf vol?" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "Cache fout - niet genoeg geheugen!" @@ -3675,27 +3675,27 @@ msgstr "cookie_domain_flag_set fout, programma wordt afgebroken" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "Terminal initialisatie mislukt - onbekend terminal type?" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "Terminal =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "U mout een vt100, 200, enz. terminal gebruiken met dit programma." -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "Uw terminal type is onbekend!" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "Voer een terminal type in:" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "TERMINAL TYPE IS GEZET OP" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3704,7 +3704,7 @@ msgstr "" "\n" "Een fatale fout is opgetreden in %s Ver. %s\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3736,39 +3736,39 @@ msgstr "Editor gaf een foutstatus terug, %s" msgid "reason unknown." msgstr "reden onbekend." -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "Gedownloade link:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "Voorgestelde bestandsnaam:" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "Standaard download mogelijkheden:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "Download mogelijkheden:" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "Opslaan op schijf" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 msgid "View temporary file" msgstr "Bekijk tijdelijk bestand" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "Opslaan op schijf uitgezet." -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "Lokale toevoegingen:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "Geen naam opgegeven" @@ -4184,19 +4184,19 @@ msgstr "Dit bericht is automatisch gegenereerd door" msgid "No system mailer configured" msgstr "Geen systeemmailer geconfigureerd" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "Geen Winsock gevonden, sorry." -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "U MOET een geldig TMP of TEMP gebied opgeven!" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "Geen dergelijke map" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4207,7 +4207,7 @@ msgstr "" "Configuratiebestand %s is niet beschikbaar.\n" "\n" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4218,7 +4218,7 @@ msgstr "" "Lynx karaktersets zijn niet opgegeven.\n" "\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4229,7 +4229,7 @@ msgstr "" "Lynx edit-kaart niet opgegeven.\n" "\n" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4240,7 +4240,7 @@ msgstr "" "Lynx bestand %s is niet beschikbaar.\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "Let op:" @@ -4285,113 +4285,113 @@ msgstr "GEBRUIK: %s [opties] [bestand]\n" msgid "Options are:\n" msgstr "Opties zijn:\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s: Ongeldige Optie: %s\n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "Interne fout: Ongeldige muis link %d!" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "Een door de gebruiker opgegeven URL" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "Enctype meerdelig/form-data nog niet ondersteund! Kan niet verzenden." #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "Help Scherm" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "Systeem Index" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "Ingang naar begin scherm" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "Geen volgend document aanwezig" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "de tekenverzameling voor dit document is expliciet opgegeven, sorry..." -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "cd naar:" -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "Een component van het pad is geen map" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "Map wijzigen is mislukt" -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "Document wordt opnieuw ontleed met huidige instellingen..." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "Fatale fout - kan uitvoerbestand %s niet openen\n" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "TABLE centreren ingeschakeld." -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "TABLE centreren uitgeschakeld." -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 msgid "Current URL is empty." msgstr "Huidige URL is leeg." -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "Kopiëren naar klembord is mislukt." -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "Document URL op klembord geplaatst." -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "Link URL op klembord geplaatst." -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "Geen URL op het klembord." -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "-index-" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx: Geen toegang tot startbestand" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "lynx: Beginbestand kan niet gevonden worden of is geen tekst/html of tekst/plain" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr " Bezig met stoppen..." -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "-meer-" @@ -5327,11 +5327,11 @@ msgstr "Actie:" msgid "(Form field)" msgstr "(Formulier veld)" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "Er zijn geen verwijzingen op de huidige pagina" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 msgid "Server Headers:" msgstr "Server Headers:" @@ -5384,33 +5384,33 @@ msgstr "Zenden naar:" msgid "Upload options:" msgstr "Zend opties:" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "Document afhalings-URL op klembord geplaatst." -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "Onverwacht toegangsprotocol voor dit URL methode" -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "Teveel tijdelijke bestanden" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 msgid "unknown restriction" msgstr "Onbekende beperking" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "Er zijn geen beperkingen gesteld.\n" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "Gestelde beperkingen:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "Kan HOME-map niet vinden" diff --git a/po/pt_BR.po b/po/pt_BR.po index 4894557b..e3f5a287 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx 2.8.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 1999-07-30 09:47-03:00\n" "Last-Translator: Ricardo Soares Guimarães <ricardo@conectiva.com.br>\n" "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n" @@ -2794,7 +2794,7 @@ msgstr "Documento com ação de postagem não encontrado no cache. Reenviar?" msgid "Loading failed, use a previous copy." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "Leitura incompleta" @@ -2817,7 +2817,7 @@ msgstr "HTAccess: Retorno de estado foi: %d\n" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "Não foi possível acessar" @@ -2825,20 +2825,20 @@ msgstr "Não foi possível acessar" msgid "Unable to access document." msgstr "Impossível acessar documento." -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "Entre senha para usuário %s@%s:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "Impossível contactar servidor de FTP." -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "fechado o socket principal." -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "socket para socket principal" @@ -2846,24 +2846,24 @@ msgstr "socket para socket principal" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "Ligação simbólica" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "Recebendo lista de diretórios do FTP." -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "Transferidos %d bytes (%5d)." -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "conectado para dados" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "Recebendo arquivo de FTP." @@ -3071,46 +3071,46 @@ msgstr "Leitura do socket falhou após 180,000 tentativas." msgid "Address contains a username: %s" msgstr "" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "Este programa não suporta URLs com HTTPS" -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "Impossível conectar ao servidor remoto." -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 #, fuzzy msgid "Retrying connection without TLS." msgstr "Conectando com %s em %s." -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "Enviando requisição HTTP." -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "Erro inesperado de gravação na rede; conecção abortada." -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "Enviada requisição HTTP; aguardando resposta." -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "Erro inesperado de leitura na rede; conecção abortada." @@ -3123,7 +3123,7 @@ msgstr "Erro inesperado de leitura na rede; conecção abortada." #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "Recebido informação de estado não solicitada." @@ -3133,7 +3133,7 @@ msgstr "Recebido informação de estado não solicitada." #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "Estouro de requisição. Limpando pedido." @@ -3143,27 +3143,27 @@ msgstr "Estouro de requisição. Limpando pedido." #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "Recebida resposta de valor 304." -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "Redirecionamento de postagem requer autorização do usuário." -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "Há uma ação de postagem.Tratando redirecionamento permanente como temporário.\n" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "Repetindo com informações de autorização de acesso." -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "Mostra o corpo da mensagem 401?" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "Mostra o corpo da mensagem 407?" @@ -3171,7 +3171,7 @@ msgstr "Mostra o corpo da mensagem 407?" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "Resposta desconhecida de estado do servidor!" @@ -3359,107 +3359,107 @@ msgstr "Mantenedor" msgid "Host" msgstr "Servidor" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "Memória exaurida, apresentação interrompida!" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "Memória exaurida, srá interrompida a transferência!" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr "*** MEMÓRIA EXAURIDA ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "Campo ou ligacão desconhecidos." -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "Campo de entrada de texto" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "Campo de entrada de senha" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "Caixa de checagem" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "Botão de rádio" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "Botão de envio" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "Botão de limpar" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "Menu de pop-up" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "Campo de formulário escondido" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "Área de entrada de texto" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "Faixa de entrada de texto" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "Campo de entrada de arquivo" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "Campo de envio de texto" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "Botão de imagem de envio de formulário" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "Campo de 'chave'" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "Campo desconhecido" -#: src/GridText.c:10077 +#: src/GridText.c:10074 #, fuzzy msgid "Can't open file for uploading" msgstr "Impossóvel abrir arquivo para descompressão!" -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "Enviando %s" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "" @@ -3549,31 +3549,31 @@ msgstr "não" msgid "Y/N/A/V" msgstr "" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "Descrição:" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr " (vazio)" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "Caminho:" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(desconhecido)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "Documento contém somente ligações ocultas. Use 'l' para listar." -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "" @@ -3678,27 +3678,27 @@ msgstr "" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "Inicialização do terminal falhou - Terminal de tipo desconhecido?" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "Terminal =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "Você deve usar um terminal vt100, 200, etc... com este programa." -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "O tipo do seu terminal é desconhecido!" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "Entre com o tipo do terminal:" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "TERMINAL ESTÁ CONFIGURADO PARA" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3707,7 +3707,7 @@ msgstr "" "\n" "Um erro fatal ocorreu em %s Ver. %s\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3737,40 +3737,40 @@ msgstr "" msgid "reason unknown." msgstr "" -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "Ligaçao copiada:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "Sugestão de nome do arquivo:" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "Opções padrão de cópia:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "Opções de cópia" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "Salva no disco" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 #, fuzzy msgid "View temporary file" msgstr "Enviar arquivo por email" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "Salvar para o disco está desabilitado." -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "Adições locais:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "Não foi informado nome" @@ -4188,19 +4188,19 @@ msgstr "Esta mensagem foi gerada automaticamente por" msgid "No system mailer configured" msgstr "" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "Não foi encontrado o Winsock, desculpe." -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "Você deve definir uma área TMP ou TEMP válida!" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr " diretório" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4211,7 +4211,7 @@ msgstr "" "Arquivo %s de configuração não está disponível.\n" "\n" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4222,7 +4222,7 @@ msgstr "" "Não foi declarada uma coleção de caracteres Lynx.\n" "\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4233,7 +4233,7 @@ msgstr "" "Editor de mapas Lynx não foi declarado.\n" "\n" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4244,7 +4244,7 @@ msgstr "" "Arquivo Lynx %s não está disponível.\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "" @@ -4289,114 +4289,114 @@ msgstr "USO: %s [opções] [arquivo]\n" msgid "Options are:\n" msgstr "Opções são:\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s: Opção inválida: %s\n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "Uma URL especificada pelo usuário" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "multipart/form-data não é suportado ainda! Impossível enviar." #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "Tela de Ajuda" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "Indexador de sistema" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "Entrada na tela principal" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "O mapa de caracteres deve ser explicito no documento, desculpe..." -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr " para " -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "Impossível acessar diretório." -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "Reinterpretando documento pelas opções atuais..." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "Erro fatal - não foi possível abrir arquivo %s\n" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "" -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "" -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 #, fuzzy msgid "Current URL is empty." msgstr "Diretório corrente:" -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "" -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "" -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr " index" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx: Não foi possível acessar o arquivo principal" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "lynx: Arquivo inicial não pode ser encontrado ou não é texto/HTML" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr " Saindo..." -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "" @@ -5354,11 +5354,11 @@ msgstr "Localização:" msgid "(Form field)" msgstr "(Campo de formulário)" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "Sem ligações na página atual" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 #, fuzzy msgid "Server Headers:" msgstr "Servidor:" @@ -5412,34 +5412,34 @@ msgstr "Enviar para:" msgid "Upload options:" msgstr "Opções de envio de arquivos:" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "" -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "" -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 #, fuzzy msgid "unknown restriction" msgstr "Campo ou ligacão desconhecidos." -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "Descrição:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "" diff --git a/po/ru.po b/po/ru.po index 72c5ee04..01815572 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx 2.8.5pre15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 2003-06-03 17:40+0400\n" "Last-Translator: Dmitry S. Sivachenko <mitya@cavia.pp.ru>\n" "Language-Team: Russian <ru@li.org>\n" @@ -2791,7 +2791,7 @@ msgstr "äÏËÕÍÅÎÔ Ó ÓÏÄÅÒÖÉÍÙÍ POST ÎÅ ÎÁÊÄÅÎ × ËÜÛÅ. ðÏÓÌÁÔØ ÓÎÏ×Á?" msgid "Loading failed, use a previous copy." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "úÁÇÒÕÚËÁ ÚÁ×ÅÒÛÅÎÁ ÎÅ ÐÏÌÎÏÓÔØÀ." @@ -2814,7 +2814,7 @@ msgstr "**** HTAccess: ÷ÏÚ×ÒÁÝÅÎÎÙÊ ÓÔÁÔÕÓ: %d\n" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "îÅÔ ÄÏÓÔÕÐÁ" @@ -2822,20 +2822,20 @@ msgstr "îÅÔ ÄÏÓÔÕÐÁ" msgid "Unable to access document." msgstr "ïÛÉÂËÁ ÄÏÓÔÕÐÁ Ë ÄÏËÕÍÅÎÔÕ." -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "÷×ÅÄÉÔÅ ÐÁÒÏÌØ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÑ %s@%s:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "îÅ ÕÄÁÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ Ó FTP-ÕÚÌÏÍ." -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "ÚÁËÒÙÔØ ×ÅÄÕÝÉÊ ÓÏËÅÔ" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "ÓÏËÅÔ ÄÌÑ ×ÅÄÕÝÅÇÏ ÓÏËÅÔÁ" @@ -2843,24 +2843,24 @@ msgstr "ÓÏËÅÔ ÄÌÑ ×ÅÄÕÝÅÇÏ ÓÏËÅÔÁ" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "óÉÍ×ÏÌØÎÁÑ ÓÓÙÌËÁ" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "ðÏÌÕÞÅÎÉÅ FTP-ËÁÔÁÌÏÇÁ." -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "ðÅÒÅÄÁÎÏ %d ÂÁÊÔ (%5d)" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "ÓÏÅÄÉÎÅÎÉÅ ÄÌÑ ÄÁÎÎÙÈ" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "ðÏÌÕÞÅÎÉÅ FTP-ÆÁÊÌÁ." @@ -3068,45 +3068,45 @@ msgstr "ïÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÓÏËÅÔÁ × ÔÅÞÅÎÉÅ 180,000 ÐÏÐÙÔÏË." msgid "Address contains a username: %s" msgstr "áÄÒÅÓ ÓÏÄÅÒÖÉÔ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ: %s" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "üÔÏÔ ËÌÉÅÎÔ ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÄÄÅÒÖËÉ ÄÌÑ URL HTTPS." -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "îÅ ÕÄÁÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ Ó ÕÄÁÌÅÎÎÏÊ ÍÁÛÉÎÏÊ." -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 msgid "Retrying connection without TLS." msgstr "ðÏÐÙÔËÁ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ ÂÅÚ TLS." -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "ïÛÉÂËÁ SSL:host(%s)!=cert(%s)-ðÒÏÄÏÌÖÉÔØ?" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "âÅÚÏÐÁÓÎÏÅ HTTP-ÓÏÅÄÉÎÅÎÉÅ: %d ÂÉÔ %s (%s)" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "ðÏÓÙÌËÁ HTTP-ÚÁÐÒÏÓÁ." -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "îÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ ÚÁÐÉÓÉ ÐÏ ÓÅÔÉ; ÓÏÅÄÉÎÅÎÉÅ ÐÒÅÒ×ÁÎÏ." -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "HTTP-ÚÁÐÒÏÓ ÐÏÓÌÁÎ; ÏÖÉÄÁÅÔÓÑ ÏÔ×ÅÔ." -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "îÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ ÞÔÅÎÉÑ ÐÏ ÓÅÔÉ; ÓÏÅÄÉÎÅÎÉÅ ÐÒÅÒ×ÁÎÏ." @@ -3119,7 +3119,7 @@ msgstr "îÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ ÞÔÅÎÉÑ ÐÏ ÓÅÔÉ; ÓÏÅÄÉÎÅÎÉÅ ÐÒÅÒ×ÁÎÏ." #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "ðÏÌÕÞÅÎ ÎÅÏÖÉÄÁÎÎÙÊ éÎÆÏÒÍÁÃÉÏÎÎÙÊ óÔÁÔÕÓ." @@ -3129,7 +3129,7 @@ msgstr "ðÏÌÕÞÅÎ ÎÅÏÖÉÄÁÎÎÙÊ éÎÆÏÒÍÁÃÉÏÎÎÙÊ óÔÁÔÕÓ." #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "úÁÐÒÏÓ ×ÙÐÏÌÎÅÎ. ïÂÎÏ×ÌÅÎÉÅ óÏÄÅÒÖÉÍÏÇÏ." @@ -3139,27 +3139,27 @@ msgstr "úÁÐÒÏÓ ×ÙÐÏÌÎÅÎ. ïÂÎÏ×ÌÅÎÉÅ óÏÄÅÒÖÉÍÏÇÏ." #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "ðÏÌÕÞÅÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÔÁÔÕÓ 304 (îÅ íÏÄÉÆÉÃÉÒÏ×ÁÎÏ)." -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "ðÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ ÓÏÄÅÒÖÉÍÏÇÏ POST ÔÒÅÂÕÅÔ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ ÐÏÌØÚÏ×ÁÔÅÌÑ." -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "éÍÅÅÔÓÑ ÓÏÄÅÒÖÉÍÏÅ POST. ôÒÁËÔÏ×ËÁ ðÏÓÔÏÑÎÎÏÇÏ ðÅÒÅÎÁÐÒÁ×ÌÅÎÉÑ ËÁË ÷ÒÅÍÅÎÎÏÇÏ.\n" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "ðÏ×ÔÏÒÅÎÉÅ Ó ÉÎÆÏÒÍÁÃÉÅÊ Ï ÐÒÁ×ÁÈ ÄÏÓÔÕÐÁ." -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "ðÏËÁÚÙ×ÁÔØ ÔÅÌÏ ÓÏÏÂÝÅÎÉÑ 401?" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "ðÏËÁÚÙ×ÁÔØ ÔÅÌÏ ÓÏÏÂÝÅÎÉÑ 407?" @@ -3167,7 +3167,7 @@ msgstr "ðÏËÁÚÙ×ÁÔØ ÔÅÌÏ ÓÏÏÂÝÅÎÉÑ 407?" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÓÔÁÔÕÓ ÏÔ×ÅÔÁ ÏÔ ÓÅÒ×ÅÒÁ!" @@ -3355,106 +3355,106 @@ msgstr "ïÔ×ÅÔÓÔ×ÅÎÎÙÊ" msgid "Host" msgstr "íÁÛÉÎÁ" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ, ÏÔÏÂÒÁÖÅÎÉÅ ÐÒÅÒ×ÁÎÏ!" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ, ÐÅÒÅÄÁÞÁ ÄÁÎÎÙÈ ÂÕÄÅÔ ÐÒÅÒ×ÁÎÁ!" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr " *** ðáíñôø éóþåòðáîá ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "ÎÅÉÚ×ÅÓÔÎÏÅ ÐÏÌÅ ÉÌÉ ÓÓÙÌËÁ" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "ÐÏÌÅ ××ÏÄÁ ÔÅËÓÔÁ" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "ÐÏÌÅ ××ÏÄÁ ÐÁÒÏÌÑ" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "ÎÅÚÁ×ÉÓÉÍÁÑ ËÎÏÐËÁ" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "ÚÁ×ÉÓÉÍÁÑ ËÎÏÐËÁ" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "ËÎÏÐËÁ ÐÏÓÙÌËÉ" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "ËÎÏÐËÁ ÏÞÉÓÔËÉ" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "×ÓÐÌÙ×ÁÀÝÅÅ ÍÅÎÀ" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "ÓËÒÙÔÏÅ ÐÏÌÅ ÆÏÒÍÙ" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "ÏÂÌÁÓÔØ ××ÏÄÁ ÔÅËÓÔÁ" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "ÐÏÌÅ ××ÏÄÁ ÄÉÁÐÁÚÏÎÁ" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "ÐÏÌÅ ××ÏÄÁ ÆÁÊÌÁ" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "ÔÅËÓÔÏ×ÏÅ ÐÏÌÅ ÐÏÓÙÌËÉ" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "ÇÒÁÆÉÞÅÓËÁÑ ËÎÏÐËÁ ÐÏÓÙÌËÉ" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "ÐÏÌÅ keygen" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "ÎÅÉÚ×ÅÓÔÎÏÅ ÐÏÌÅ ÆÏÒÍÙ" -#: src/GridText.c:10077 +#: src/GridText.c:10074 msgid "Can't open file for uploading" msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ ÄÌÑ ÚÁÇÒÕÚËÉ!" -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "ðÏÓÙÌËÁ %s" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "ðÅÒÅÎÅÓÔÉ ÓÔÒÏËÉ, ÞÔÏÂÙ ÐÏÐÁÓÔØ × ÏÂÌÁÓÔØ ÏÔÏÂÒÁÖÅÎÉÑ?" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "ïÞÅÎØ ÄÌÉÎÎÙÅ ÓÔÒÏËÉ ÂÙÌÉ ÐÅÒÅÎÅÓÅÎÙ!" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "ïÞÅÎØ ÄÌÉÎÎÙÅ ÓÔÒÏËÉ ÂÙÌÉ ÕÓÅÞÅÎÙ!" @@ -3544,31 +3544,31 @@ msgstr "no" msgid "Y/N/A/V" msgstr "" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "ïÐÉÓÁÎÉÅ:" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "(ÎÅÔ)" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "ðÕÔØ Ë ÆÁÊÌÕ:" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(ÎÅÉÚ×ÅÓÔÎÙÊ)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "äÏËÕÍÅÎÔ ÉÍÅÅÔ ÔÏÌØËÏ ÓËÒÙÔÙÅ ÓÓÙÌËÉ. éÓÐÏÌØÚÕÊÔÅ ËÏÍÁÎÄÕ 'l'ist." -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "ïÛÉÂËÁ ËÜÛÉÒÏ×ÁÎÉÑ ÉÓÈÏÄÎÙÈ ÆÁÊÌÏ× - ÐÅÒÅÐÏÌÎÅÎÉÅ ÄÉÓËÁ?" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "ïÛÉÂËÁ ËÜÛÉÒÏ×ÁÎÉÑ ÉÓÈÏÄÎÙÈ ÆÁÊÌÏ× - ÎÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ!" @@ -3677,27 +3677,27 @@ msgstr "ÏÛÉÂËÁ cookie_domain_flag_set error, ÐÒÅÇÒÁÍÍÁ ÐÒÅÒÙ×ÁÅÔÓÑ" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "ïÛÉÂËÁ ÐÒÉ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÔÅÒÍÉÎÁÌÁ - ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÔÅÒÍÉÎÁÌÁ?" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "ôÅÒÍÉÎÁÌ =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "ó ÜÔÏÊ ÐÒÏÇÒÁÍÍÏÊ ×Ù ÄÏÌÖÎÙ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÅÒÍÉÎÁÌ vt100, 200, É Ô.Ä." -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "ôÉÐ ×ÁÛÅÇÏ ôÅÒÍÉÎÁÌÁ ÎÅÉÚ×ÅÓÔÅÎ!" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "÷×ÅÄÉÔÅ ÔÉÐ ÔÅÒÍÉÎÁÌÁ:" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "ôéð ôåòíéîáìá õóôáîï÷ìåî ÷" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3706,7 +3706,7 @@ msgstr "" "\n" " ÷ %s ÷ÅÒ. %s ÐÒÏÉÚÏÛÌÁ ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ.\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3737,40 +3737,40 @@ msgstr "òÅÄÁËÔÏÒ ÚÁ×ÅÒÛÉÌÓÑ ÓÏ ÓÔÁÔÕÓÏÍ ÏÛÉÂËÉ, %s" msgid "reason unknown." msgstr "ÐÒÉÞÉÎÁ ÎÅÉÚ×ÅÓÔÎÁ." -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "óËÁÞÁÎÎÁÑ ÓÓÙÌËÁ:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "ðÒÅÄÌÁÇÁÅÍÏÅ ÉÍÑ ÆÁÊÌÁ:" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "óÔÁÎÄÁÒÔÎÙÅ ÏÐÃÉÉ ÄÌÑ ÓËÁÞÉ×ÁÎÉÑ:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "ïÐÃÉÉ ÓËÁÞÉ×ÁÎÉÑ:" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "óÏÈÒÁÎÉÔØ ÎÁ ÄÉÓË" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 #, fuzzy msgid "View temporary file" msgstr "ðÒÏÓÍÏÔÒÅÔØ ÆÁÊÌ" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "óÏÈÒÁÎÅÎÉÅ ÎÁ ÄÉÓË ÏÔËÌÀÞÅÎÏ." -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "ìÏËÁÌØÎÙÅ ÄÏÐÏÌÎÅÎÉÑ:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "éÍÑ ÎÅ ÚÁÄÁÎÏ" @@ -4187,19 +4187,19 @@ msgstr "üÔÏ ÓÏÏÂÝÅÎÉÅ ÂÙÌÏ Á×ÔÏÍÁÔÉÞÅÓËÉ ÓÇÅÎÅÒÉÒÏ×ÁÎÏ" msgid "No system mailer configured" msgstr "" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "ë ÓÏÖÁÌÅÎÉÀ Winsock ÎÅ ÎÁÊÄÅÎ." -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "÷Ù äïìöîù ÏÐÒÅÄÅÌÉÔØ ÐÒÁ×ÉÌØÎÕÀ ÏÂÌÁÓÔØ TMP ÉÌÉ TEMP!" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "îÅÔ ËÁÔÁÌÏÇÁ" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4210,7 +4210,7 @@ msgstr "" "ëÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ %s ÎÅ ÄÏÓÔÕÐÅÎ.\n" "\n" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4221,7 +4221,7 @@ msgstr "" "ëÏÄÉÒÏ×ËÉ Lynx ÎÅ ÏÐÒÅÄÅÌÅÎÙ.\n" "\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4229,7 +4229,7 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4240,7 +4240,7 @@ msgstr "" "æÁÊÌ Lynx %s ÎÅ ÄÏÓÔÕÐÅÎ.\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ:" @@ -4285,113 +4285,113 @@ msgstr "éóðïìøúï÷áîéå: %s [ËÌÀÞÉ] [ÆÁÊÌ]\n" msgid "Options are:\n" msgstr "ëÌÀÞÉ:\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s: îÅ×ÅÒÎÁÑ ÏÐÃÉÑ: %s\n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: îÅ×ÅÒÎÁÑ ÓÓÙÌËÁ ÍÙÛÉ %d!" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "URL, ÕËÁÚÁÎÎÙÊ ÐÏÌØÚÏ×ÁÔÅÌÅÍ" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "Enctype multipart/form-data ÅÝÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ! îÅ ÕÄÁÅÔÓÑ ÐÏÓÌÁÔØ." #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "üËÒÁÎ ðÏÍÏÝÉ" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "óÉÓÔÅÍÎÙÊ éÎÄÅËÓ" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "÷ÈÏÄ ÎÁ ÇÌÁ×ÎÙÊ ÜËÒÁÎ" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "óÌÅÄÕÀÝÉÊ ÄÏËÕÍÅÎÔ ÏÔÓÕÔÓÔ×ÕÅÔ" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "ÉÚ×ÉÎÉÔÅ, ËÏÄÉÒÏ×ËÁ ÄÌÑ ÜÔÏÇÏ ÄÏËÕÍÅÎÔÁ ÕËÁÚÁÎÁ Ñ×ÎÏ..." -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "ÐÅÒÅÊÔÉ ×:" -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "ëÏÍÐÏÎÅÎÔÁ ÐÕÔÉ ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "ÎÅ ÕÄÁÌÏÓØ ÉÚÍÅÎÉÔØ ËÁÔÁÌÏÇ" -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "äÏËÕÍÅÎÔ ÒÁÚÂÉÒÁÅÔÓÑ ÚÁÎÏ×Ï Ó ÕÞÅÔÏÍ ÔÅËÕÝÉÈ ÕÓÔÁÎÏ×ÏË..." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "æÁÔÁÌØÎÁÑ ÏÛÉÂËÁ - ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ %s\n" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "" -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "" -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 msgid "Current URL is empty." msgstr "ôÅËÕÝÉÊ URL ÐÕÓÔ." -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "ïÝÉÂËÁ ÐÒÉ ËÏÐÉÒÏ×ÁÎÉÉ × ÂÕÆÅÒ ÏÂÍÅÎÁ." -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "URL ÄÏËÕÍÅÎÔÁ ÐÏÍÅÝÅÎ × ÂÕÆÅÒ ÏÂÍÅÎÁ." -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "URL ÓÓÙÌËÉ ÐÏÍÅÝÅÎ × ÂÕÆÅÒ ÏÂÍÅÎÁ." -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "URL × ÂÕÆÅÒÅ ÏÂÍÅÎÁ ÏÔÓÕÔÓÔ×ÕÅÔ." -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "-ÉÎÄÅËÓ-" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx: îÅÔ ÄÏÓÔÕÐÁ Ë ÎÁÞÁÌØÎÏÍÕ ÆÁÊÌÕ" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "lynx: îÁÞÁÌØÎÙÊ ÆÁÊÌ ÌÉÂÏ ÎÅ ÕÄÁÅÔÓÑ ÎÁÊÔÉ, ÌÉÂÏ ÏÎ ÎÅ text/html ÉÌÉ text/plain" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr " ÷ÙÈÏÄ..." -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "-ÄÁÌÅÅ-" @@ -5347,11 +5347,11 @@ msgstr "áÄÒÅÓ: " msgid "(Form field)" msgstr "(ðÏÌÅ ÆÏÒÍÙ)" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "îÁ ÜÔÏÊ ÓÔÒÁÎÉÃÅ ÎÅÔ ÓÓÙÌÏË" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 #, fuzzy msgid "Server Headers:" msgstr "óÅÒ×ÅÒ:" @@ -5405,33 +5405,33 @@ msgstr "úÁÇÒÕÚÉÔØ ×:" msgid "Upload options:" msgstr "ïÐÃÉÉ ÚÁÇÒÕÚËÉ:" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "" -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "îÅÏÖÉÄÁÎÎÙÊ ÐÒÏÔÏËÏÌ ÄÏÓÔÕÐÁ ÄÌÑ ÜÔÏÊ ÓÈÅÍÙ URL." -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ×ÒÅÍÅÎÎÙÈ ÆÁÊÌÏ×" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 msgid "unknown restriction" msgstr "ÎÅÉÚ×ÅÓÔÎÏÅ ÏÇÒÁÎÉÞÅÎÉÅ" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "ïÇÒÁÎÉÞÅÎÉÊ ÎÅ ÕÓÔÁÎÏ×ÌÅÎÙ.\n" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "õÓÔÁÎÏ×ÌÅÎÎÙÅ ÏÇÒÁÎÉÞÅÎÉÑ:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "äÏÍÁÛÎÉÊ ËÁÔÁÌÏÇ ÎÅ ÎÁÊÄÅÎ" diff --git a/po/sl.po b/po/sl.po index 7747426e..133f13ac 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,14 +1,14 @@ # Slovenian translation of Lynx WWW browser. # Copyright (C) 1999 Free Software Foundation, Inc. # Roman Maurer <roman.maurer@hermes.si>, 1999. -# @Id: sl.po 1.19 Thu, 30 Dec 2004 04:11:59 -0800 dickey @ +# @Id: sl.po 1.20 Sun, 02 Jan 2005 15:35:21 -0800 dickey @ # @Source: po/sl.po @ # msgid "" msgstr "" "Project-Id-Version: lynx 2.8.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 1999-12-29 12:30 +0200\n" "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -2788,7 +2788,7 @@ msgstr "" msgid "Loading failed, use a previous copy." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "Nalaganje nepopolno." @@ -2811,7 +2811,7 @@ msgstr "" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "Ne moremo dostopati" @@ -2819,20 +2819,20 @@ msgstr "Ne moremo dostopati" msgid "Unable to access document." msgstr "Ne moremo dostopati do sestavka" -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "Vnesite geslo za uporabnika %s@%s:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "Ne moremo se povezati z gostiteljem FTP." -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "" @@ -2840,24 +2840,24 @@ msgstr "" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "Simbolna povezava" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "Sprejemamo imenik za FTP." -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "Preneseno %d zlogov (%5d)" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "povezava za podatke" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "Jemljemo datoteko s FTP." @@ -3060,45 +3060,45 @@ msgstr "" msgid "Address contains a username: %s" msgstr "" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "" -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "" -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 msgid "Retrying connection without TLS." msgstr "" -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "Po¹iljamo zahtevek HTTP." -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "" @@ -3111,7 +3111,7 @@ msgstr "" #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "" @@ -3121,7 +3121,7 @@ msgstr "" #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "" @@ -3131,27 +3131,27 @@ msgstr "" #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "" @@ -3159,7 +3159,7 @@ msgstr "" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "" @@ -3343,107 +3343,107 @@ msgstr "Vzdr¾evalec" msgid "Host" msgstr "Gostitelj" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "Pomnilnik izèrpan, prikaz prekinjen!" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "Pomnilnik izèrpan, prekinili bomo prenos!" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr "*** POMNILNIK IZÈRPAN ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "neznano polje ali povezava" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "tekstovno vnosno polje" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "vnosno polje za geslo" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "radijski gumb" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "gumb za po¹iljanje slike" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "polje za generiranje kljuèa" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "" -#: src/GridText.c:10077 +#: src/GridText.c:10074 #, fuzzy msgid "Can't open file for uploading" msgstr "Ne moremo odpreti izhodne datoteke! Prekinitev!" -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "" @@ -3533,31 +3533,31 @@ msgstr "ne" msgid "Y/N/A/V" msgstr "" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "Opis:" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "(brez)" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "Pot do datoteke:" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(neznana)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "Dokument ima le skrite povezave. Uporabite ukaz ,l` za izpis." -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "" @@ -3650,27 +3650,27 @@ msgstr "" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "Terminal =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "V tem programu morate uporabljati terminal vt100, 200, ipd." -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "Vrsta va¹ega terminala je neznana!" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "Vnesite vrsto terminala:" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "VRSTA TERMINALA JE NASTAVLJENA NA" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3679,7 +3679,7 @@ msgstr "" "\n" "Usodna napaka se je pojavila v %s Ver. %s\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3710,40 +3710,40 @@ msgstr "" msgid "reason unknown." msgstr "" -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "Prene¹ena povezava:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "Predlagano ime datoteke:" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "Standardne izbire za jemanje:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "Izbire za jemanje:" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "Shranimo v disk" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 #, fuzzy msgid "View temporary file" msgstr "Ne moremo odpreti zaèasne datoteke!" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "Shranjevanje v disk onemogoèeno." -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "Lokalni dodatki:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "Ni podanega imena" @@ -4160,19 +4160,19 @@ msgstr "" msgid "No system mailer configured" msgstr "" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "Vtiènica Winsock ¾al ni bila najdena." -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "MORATE nastaviti veljavno podroèje TMP ali TEMP!" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr " imenik" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4183,7 +4183,7 @@ msgstr "" "Nastavitvena datoteka %s ni dostopna.\n" "\n" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4194,7 +4194,7 @@ msgstr "" "Nabor znakov za Lynx ni bil doloèen.\n" "\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4205,7 +4205,7 @@ msgstr "" "Urejevalna preslikava za Lynx ni bila doloèena.\n" "\n" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4216,7 +4216,7 @@ msgstr "" "Datoteka %s za Lynx< ni dostopna.\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "" @@ -4261,114 +4261,114 @@ msgstr "" msgid "Options are:\n" msgstr "" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "" #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "" -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr " v " -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "Ne moremo dostopati do imenika." -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "" -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "" -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "" -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 #, fuzzy msgid "Current URL is empty." msgstr "Trenutni imenik:" -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "" -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "" -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr " stvarno kazalo" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr "" -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "" @@ -5301,11 +5301,11 @@ msgstr "Lokacija: " msgid "(Form field)" msgstr "" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 msgid "Server Headers:" msgstr "" @@ -5352,34 +5352,34 @@ msgstr "" msgid "Upload options:" msgstr "" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "" -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "" -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 #, fuzzy msgid "unknown restriction" msgstr "neznano polje ali povezava" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "Opis:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "" diff --git a/po/sv.po b/po/sv.po index c6c1fafc..733a6e11 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx 2.8.6-dev8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 2004-11-27 12:30+0100\n" "Last-Translator: Peter Karlsson <peter@softwolves.pp.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -2788,7 +2788,7 @@ msgstr "Dokument med POST-data hittades ej i cache. Skicka in igen?" msgid "Loading failed, use a previous copy." msgstr "Hämtningen misslyckades, använder tidigare exemplar." -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "Hämtning ej komplett." @@ -2811,7 +2811,7 @@ msgstr "**** HTAccess: Returnerad status var: %d\n" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "Kan inte komma åt" @@ -2819,20 +2819,20 @@ msgstr "Kan inte komma åt" msgid "Unable to access document." msgstr "Kan inte komma åt dokument." -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "Ange lösenord för användar-id %s@%s:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "Kan inte ansluta till ftp-värd." -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "stängd huvuduttag (master socket)" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "uttag (socket) för huvuduttag" @@ -2840,24 +2840,24 @@ msgstr "uttag (socket) för huvuduttag" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "Symbolisk länk" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "Hämtar ftp-katalog." -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "Överförde %d byte (%5d)" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "ansluter för data" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "Hämtar ftp-fil." @@ -3065,23 +3065,23 @@ msgstr "Läsning från uttag misslyckades 180.000 gånger." msgid "Address contains a username: %s" msgstr "Adress innehåller användar-id: %s" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "Denna klient innehåller inte stöd för HTTPS-adresser." -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "Kan inte ansluta till värd." -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 msgid "Retrying connection without TLS." msgstr "Gör nytt försök; ansluter utan TLS." -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "SSL-fel:Hittar inte vanligt namn i certifikat-Fortsätta?" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "SSL-fel:värd(%s)!=cert(%s)-Fortsätta?" @@ -3089,24 +3089,24 @@ msgstr "SSL-fel:värd(%s)!=cert(%s)-Fortsätta?" # %d = SSL_get_cipher_bits(handle,NULL) # %s = SSL_get_cipher_version(handle) # %s = SSL_get_cipher(handle) -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "Säker %d-bitars HTTP-anslutning med %s (%s)" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "Sänder HTTP-fråga." -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "Oväntat skrivfel på nätverket; uppkopplingen avbröts." -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "HTTP-fråga sänd; väntar på svar." -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "Oväntat läsfel på nätverket; uppkopplingen avbröts." @@ -3119,7 +3119,7 @@ msgstr "Oväntat läsfel på nätverket; uppkopplingen avbröts." #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "Fick oväntad informationsstatus." @@ -3129,7 +3129,7 @@ msgstr "Fick oväntad informationsstatus." #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "Frågan slutförd. Nollställ innehåll." @@ -3139,27 +3139,27 @@ msgstr "Frågan slutförd. Nollställ innehåll." #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "Fick oväntad \"ej modifierad\"-(304)-status." -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "Omdirigering av POST-innehåll kräver användarens samtycke." -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "Har POST-innehåll. Behandlar permanent omdirigering som temporär.\n" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "Försöker igen med auktoriseringsinformation." -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "Visa kroppen för 401-meddelandet?" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "Via kroppen för 407-meddelandet?" @@ -3167,7 +3167,7 @@ msgstr "Via kroppen för 407-meddelandet?" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "Okänt statussvar från server!" @@ -3355,106 +3355,106 @@ msgstr "Ansvarig" msgid "Host" msgstr "Värd" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "Minnet slut, visning avbruten!" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "Minnet slut, avbryter överföring!" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr " *** MINNET SLUT ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "okänt fält eller länk" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "textinmatningsfält" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "lösenordsinmatningsfält" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "kryssruta" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "radioknapp" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "sändknapp" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "nollställningsknapp" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "popup-meny" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "dolt formulärfält" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "textinmatningsområde" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "områdesinmatningsfält" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "filinmatningsfält" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "textsändfält" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "bildsändfält" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "nyckelgenerering misslyckades" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "okänt formulärfält" -#: src/GridText.c:10077 +#: src/GridText.c:10074 msgid "Can't open file for uploading" msgstr "Kan inte öppna fil för sändning" -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "Skickar %s" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "Hängning upptäckt: TextAnchor-struktur förstörd - föreslår avbrott!" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "Ombryt rader så att de passar i visat fält?" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "Mycket långa rader har ombrutits!" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "mycket långa rader har trunkerats!" @@ -3544,31 +3544,31 @@ msgstr "nej" msgid "Y/N/A/V" msgstr "J/N/A/L" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "Beskrivning:" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "(ingen)" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "Sökväg:" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(okänd)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "Dokumentet innehåller endast dolda länkar. Använd \"l\"istkommandot." -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "Källkodscachefel - disk full?" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "Källkodscachefel - minnet slut!" @@ -3677,27 +3677,27 @@ msgstr "\"cookie_domain_flag_set\"-fel, avbryter programmet" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "Terminalinitiering misslyckades - okänd terminaltyp?" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "Terminal =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "Du måste använda en vt100-, -200-, etc. -terminal med detta program." -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "Din terminaltyp är okänd!" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "Ange en terminaltyp:" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "TERMINALTYP SATT TILL" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3706,7 +3706,7 @@ msgstr "" "\n" "Ett fatalt fel har uppstått i %s ver. %s\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3736,39 +3736,39 @@ msgstr "Redigeringsprogrammet gav felstatus %s" msgid "reason unknown." msgstr "okänd anledning." -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "Hämtad länk:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "Föreslaget filnamn:" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "Fördefinierade hämtalternativ:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "Hämtalternativ:" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "Spara på disk" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 msgid "View temporary file" msgstr "Visa temporär fil" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "\"Spara på disk\" deaktiverad." -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "Lokala tillägg:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "Inget namn har angetts" @@ -4184,19 +4184,19 @@ msgstr "Detta meddelande automatgenererades av" msgid "No system mailer configured" msgstr "E-postprogram inte konfigurerat i systemet" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "Ingen Winsock hittades, ursäkta." -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "Du MÅSTE ange ett giltigt TMP- eller TEMP-område!" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "Katalogen finns ej" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4207,7 +4207,7 @@ msgstr "" "Konfigurationsfil %s ej tillgänglig.\n" "\n" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4218,7 +4218,7 @@ msgstr "" "Lynxteckenuppsättningar ej deklarerade.\n" "\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4229,7 +4229,7 @@ msgstr "" "Lynxredigeringskarta ej deklarerad.\n" "\n" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4240,7 +4240,7 @@ msgstr "" "Lynxfil %s ej tillgänglig.\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "Varning:" @@ -4285,115 +4285,115 @@ msgstr "ANVÄNDNING: %s [flaggor] [fil]\n" msgid "Options are:\n" msgstr "Flaggorna är:\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s: Okänd flagga: %s\n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "Internt fel: Ogiltig muslänk %d!" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "En adress angiven av användaren" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "Kodningen multiport/form-data stöds inte ännu! Kan inte skicka." #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "Hjälpskärm" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "Systemindex" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "Ingång till huvudskärm" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "Det finns inget nästa dokument" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "teckenuppsättning för detta dokumentet explicit deklarerat, ursäkta..." -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "byt katalog till:" -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "En del av sökvägen är inte en katalog" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "lyckades inte byta katalog" -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "Tolkar om dokumentet med aktuella inställningar..." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "Fatalt fel - kunde inte öppna utdatafil %s\n" # Kollas! -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "Tabellcentrering aktiverad." # Kollas! -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "Tabellcentrering inaktiverad." -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 msgid "Current URL is empty." msgstr "Nuvarande adress är tom." -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "Misslyckades kopiera till urklipp." -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "Dokumentadress lagd i urklipp." -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "Länkadress lagd i urklipp." -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "Ingen adress i urklipp." -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "-index-" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx: Kan inte komma åt startfil" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "lynx: Startfilen hittades inte eller är varken text/html eller text/plain" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr " Avslutar..." -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "-mer-" @@ -5330,11 +5330,11 @@ msgstr "Åtgärd:" msgid "(Form field)" msgstr "(Formulärfält)" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "Ingen länk på aktuell sida" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 msgid "Server Headers:" msgstr "Serverhuvuden:" @@ -5387,33 +5387,33 @@ msgstr "Skicka till:" msgid "Upload options:" msgstr "Insändningsalternativ:" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "Adress till hämtat dokument lagt i urklipp." -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "Oväntat åtkomstprotokoll för denna adresstyp." -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "För många temporärfiler" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 msgid "unknown restriction" msgstr "okänd begränsning" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "Inga begränsningar satta.\n" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "Satta begränsningar:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "Hittar inte hemkatalogen (HOME)" diff --git a/po/tr.po b/po/tr.po index 6bb795e1..74506b74 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx-2.8.6-dev8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 2004-11-19 22:25+0200\n" "Last-Translator: Eyüp Hakan Duran <hakan_duran@hotmail.com>\n" "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n" @@ -2790,7 +2790,7 @@ msgstr "Önbellekte POST içerikli belge bulunmadý. Yeniden gönderilsin mi?" msgid "Loading failed, use a previous copy." msgstr "Yükleme baþarýsýz, önceki bir kopyayý kullanýn." -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "Yükleme tamamlanmadý." @@ -2813,7 +2813,7 @@ msgstr "**** HTAccess: Dönen durum: %d\n" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "Eriþilemiyor" @@ -2821,20 +2821,20 @@ msgstr "Eriþilemiyor" msgid "Unable to access document." msgstr "Belgeye eriþilemiyor." -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "%s@%s kullanýcýsý için parola giriniz:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "FTP makinasýna baðlanýlamadý." -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "ana soketi kapatýnýz" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "ana soket için soket" @@ -2842,24 +2842,24 @@ msgstr "ana soket için soket" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "Simgesel Link" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "FTP dizini alýnýyor." -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "%d bayt aktarýldý (%5d)" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "veri için baðlan" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "FTP dosyasý alýnýyor" @@ -3067,45 +3067,45 @@ msgstr "Soket okunmasý 180,000 kez baþarýsýz." msgid "Address contains a username: %s" msgstr "Adres bir kullanýcý adý içeriyor: %s" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "Bu istemci HTTPS URL'ler için destek içermiyor." -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "Karþý makinaya baðlanýlamadý." -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 msgid "Retrying connection without TLS." msgstr "Baðlantý, TLS'siz tekrar deneniyor." -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "SSL hatasý:sertifikada ortak ad bulunamadý-Devam?" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "SSL hatasý:makina(%s)!=sert(%s)-Devam edilsin mi?" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "Güvenli %d-bit %s (%s) HTTP baðlantýsý" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "HTTP istemi gönderiliyor." -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "Umulmadýk aða yazma hatasý; baðlantý yarýda kesildi." -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "HTTP istemi gönderildi; yanýt bekleniyor." -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "Umulmadýk aða yazma hatasý; baðlantý yarýda kesildi." @@ -3118,7 +3118,7 @@ msgstr "Umulmadýk aða yazma hatasý; baðlantý yarýda kesildi." #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "Umulmadýk Bilgisel Durum alýndý." @@ -3128,7 +3128,7 @@ msgstr "Umulmadýk Bilgisel Durum alýndý." #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "Ýstem karþýlandý. Ýçeriði temizle." @@ -3138,27 +3138,27 @@ msgstr "Ýstem karþýlandý. Ýçeriði temizle." #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "Umulmadýk 304 Deðiþtirilmedi durumu alýndý." -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "POST içeriðinin yeniden yönlendirilmesi kullanýcý onayý gerektirir." -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "POST içeriði mevcut. Kalýcý Yeniden Yönlendirmeye Geçici muamelesi yapýlýyor.\n" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "Eriþim yetkilendirme bilgisiyle yeniden deneniyor." -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "401 mesaj gövdesi gösterilsin mi?" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "407 mesaj gövdesi gösterilsin mi?" @@ -3166,7 +3166,7 @@ msgstr "407 mesaj gövdesi gösterilsin mi?" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "Sunucudan bilinmeyen durum yanýtý!" @@ -3354,106 +3354,106 @@ msgstr "Yönetici" msgid "Host" msgstr "Bilgisayar" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "Bellek tükendi, görüntü kesildi!" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "Bellek tükendi, aktarým kesilecek!" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr " *** BELLEK TÜKENDÝ ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "bilinmeyen alan ya da link" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "metin giriþ alaný" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "parola giriþ alaný" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "onay kutusu" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "radyo düðmesi" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "gönderme düðmesi" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "temizleme düðmesi" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "açýlýr menü" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "gizli form alaný" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "metin giriþ alaný" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "erim giriþ alaný" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "dosya giriþ alaný" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "metin-gönderme alaný" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "resim-gönderme alaný" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "keygen alaný" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "bilinmeyen form alaný" -#: src/GridText.c:10077 +#: src/GridText.c:10074 msgid "Can't open file for uploading" msgstr "Yüklemek için dosya açýlamýyor." -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "%s gönderiliyor" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "Takýlma Saptandý: TextAnchor struct bozuk - sonlandýrmanýz önerilir!" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "Görüntülenen alana sýðmak üzere satýrlar sarmalansýn mý?" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "Çok uzun satýrlar sarmalandý!" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "Çok uzun satýrlarýn sonundan kýrpýldý!" @@ -3543,31 +3543,31 @@ msgstr "hayýr" msgid "Y/N/A/V" msgstr "(E/H/Daima/Asla)" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "Açýklama:" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "(hiçbiri)" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "Dosya yolu:" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(bilinmiyor)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "Belgede yalnýzca gizli linkler var. Listele(l) komutunu kullanýnýz." -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "Kaynak önbellek hatasý - disk tamamen dolu mu?" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "Kaynak önbellek hatasý - bellek yetersiz!" @@ -3675,27 +3675,27 @@ msgstr "cookie_domain_flag_set hatasý, program yarýda kesiliyor" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "Uçbirim ön deðer atamasý baþarýsýz - bilinmeyen uçbirim türü?" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "Uçbirim =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "Bu programla bir vt100, 200 vb. uçbirim kullanmalýsýnýz." -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "Uçbirim türünüz bilinmiyor!" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "Bir uçbirim türü giriniz:" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "UÇBÝRÝM TÜRÜ AYARI" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3704,7 +3704,7 @@ msgstr "" "\n" "%2$s Sür. %1$s'de ölümcül bir hata oluþtu\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3734,39 +3734,39 @@ msgstr "Düzenleyici %s hata durumuyla döndü." msgid "reason unknown." msgstr "neden bilinmiyor." -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "Ýndirilmiþ link:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "Önerilen dosya adý:" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "Standart indirme seçenekleri:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "Ýndirme seçenekleri:" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "Diske kaydet" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 msgid "View temporary file" msgstr "Geçici dosyayý görüntüle" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "Diske kaydetme devre dýþý..." -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "Yerel eklentiler:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "Ýsim Verilmemiþ" @@ -4182,19 +4182,19 @@ msgstr "Bu mesajý otomatik olarak oluþturan" msgid "No system mailer configured" msgstr "Ayarlanmýþ sistem postacýsý yok" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "Winsock bulunamadý, üzgünüm." -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "Geçerli bir TMP ya da TEMP alaný tanýmlamalýsýnýz!" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "Böyle bir dizin yok" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4205,7 +4205,7 @@ msgstr "" "Ayarlama dosyasý %s temin edilemiyor.\n" "\n" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4216,7 +4216,7 @@ msgstr "" "Lynx karakter kümeleri bildirilmemiþ.\n" "\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4227,7 +4227,7 @@ msgstr "" "Lynx düzenleme eþlemi bildirilmemiþ.\n" "\n" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4238,7 +4238,7 @@ msgstr "" "Lynx dosyasý %s temin edilemiyor.\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "Uyarý:" @@ -4283,113 +4283,113 @@ msgstr "KULLANIM: %s [seçenekler] [dosya]\n" msgid "Options are:\n" msgstr "Seçenekler:\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s: Geçersiz Seçenek: %s\n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "Dahili hata: Geçersiz fare linki %d!" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "Kullanýcý tarafýndan belirtilmiþ bir URL" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "Enctip çok parçalý/form verisi henüz desteklenmiyor! Gönderilemez." #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "Yardým Ekraný" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "Sistem Ýndeksi" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "Ana ekrana giriþ" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "Sonrasýnda baþka belge yok" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "bu belge için karakterkümesi özgün þekilde belirtilmiþtir, üzgünüm..." -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "hangi dizine cd:" -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "Yolun bileþenlerinden biri dizin deðildir" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "dizin deðiþtirme baþarýsýz" -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "Mevcut ayarlarla belge yeniden ayrýþtýrýlýyor..." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "Ölümcül hata - çýktý dosyasý %s açýlamýyor\n" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "TABLO ortala(mayý) etkinleþtir." -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "TABLO ortala(mayý) devre dýþý býrak." -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 msgid "Current URL is empty." msgstr "Mevcut URL boþ." -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "Panoya kopyalama baþarýsýz." -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "Belge URL'sini panoya koy." -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "Link URL'sini panoya koy." -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "Panoda URL yok." -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "-indeks-" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx: baþlat dosyasýna (startfile) eriþilemiyor" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "lynx: Baþlat dosyasý bulunamýyor ya da html-metin ya da salt-metin deðil" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr " Kapanýyor..." -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "-devam-" @@ -5325,11 +5325,11 @@ msgstr "Eylem:" msgid "(Form field)" msgstr "(Form alaný)" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "Mevcut sayfada link yok" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 msgid "Server Headers:" msgstr "Sunucu Baþlýklarý:" @@ -5382,33 +5382,33 @@ msgstr "Yüklenecek yer:" msgid "Upload options:" msgstr "Yükleme seçenekleri:" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "Belge indirme URL'sini panoya koy." -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "Bu URL þemasý için umulmadýk eriþim protokolü." -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "Çok sayýda geçici dosya" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 msgid "unknown restriction" msgstr "bilinmeyen kýsýtlama" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "Hiçbir kýsýtlama kurulmamýþ.\n" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "Kurulmuþ kýsýtlamalar:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "EV dizini bulunamýyor" diff --git a/po/uk.po b/po/uk.po index a83a71ba..b13b0fed 100644 --- a/po/uk.po +++ b/po/uk.po @@ -3,13 +3,13 @@ # Volodymyr M. Lisivka <lvm@mystery.lviv.net>, 2003 # Dmytro O. Redchuk <dor@kiev-online.net>, 2001-2002 # Olexander Kunytsa <kunia@snark.ukma.kiev.ua>, 2000-2001 -# @Id: uk.po 1.12 Thu, 30 Dec 2004 04:11:59 -0800 dickey @ +# @Id: uk.po 1.13 Sun, 02 Jan 2005 15:35:21 -0800 dickey @ # msgid "" msgstr "" "Project-Id-Version: lynx 2.8.5pre9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 2003-01-22 18:21EEST\n" "Last-Translator: Volodymyr M. Lisivka <lvm@mystery.lviv.net>\n" "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" @@ -2865,7 +2865,7 @@ msgstr "" msgid "Loading failed, use a previous copy." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ ÎÅ ÚÁ×ÅÒÛÅÎÏ." @@ -2888,7 +2888,7 @@ msgstr "" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "îÅ ÍÏÖÕ Ä¦ÓÔÁÔÉÓÑ" @@ -2896,20 +2896,20 @@ msgstr "îÅ ÍÏÖÕ Ä¦ÓÔÁÔÉÓÑ" msgid "Unable to access document." msgstr "îÅ ÍÏÖÕ Ä¦ÓÔÁÔÉÓÑ ÄÏ ÄÏËÕÍÅÎÔÁ." -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "÷×ÅĦÔØ ÐÁÒÏÌØ ËÏÒÉÓÔÕ×ÁÞÁ %s@%s:" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "îÅ ÍÏÖÕ Ð¦Ä'¤ÄÎÁÔÉÓÑ ÄÏ FTP ÓÅÒ×ÅÒÕ." -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "" @@ -2919,26 +2919,26 @@ msgstr "" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "óÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "ïÔÒÉÍÕ¤ÍÏ ËÁÔÁÌÏÇ FTP." # ÐÅÒÅËÁÞÁÎÏ! - ÂÏ ÎÅ ÚÎÁÀ, Õ ÑËÉÊ Â¦Ë # ÐÅÒÅËÁÞÁÎÏ! - ÂÏ ÎÅ ÚÎÁÀ, Õ ÑËÉÊ Â¦Ë -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "ðÅÒÅËÁÞÁÎÏ %d ÂÁÊÔ¦× (%5d)" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "ïÔÒÉÍÕ¤ÍÏ ÆÁÊÌ FTP." @@ -3146,45 +3146,45 @@ msgstr "" msgid "Address contains a username: %s" msgstr "" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "ãÅÊ Ë̦¤ÎÔ ÎÅ ÍÁ¤ ЦÄÔÒÉÍËÉ ÄÌÑ HTTPS URL'¦×." -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "îÅÍÏÖÌÉ×Ï Ð¦Ä'¤ÄÎÁÔÉÓÑ ÄÏ ×¦ÄÄÁÌÅÎÏÇÏ ÓÅÒ×ÅÒÁ." -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 msgid "Retrying connection without TLS." msgstr "÷ÓÔÁÎÏ×ÌÀ¤ÍÏ %s Ú'¤ÄÎÁÎÎÑ ÄÏ %s" -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "îÁÄÓÉÌÁ¤ÍÏ ÚÁÐÉÔ HTTP." -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "îÅÓÐÏĦ×ÁÎÁ ÐÏÍÉÌËÁ ÚÁÐÉÓÕ ÄÏ ÍÅÒÅÖ¦; Ú'¤ÄÎÁÎÎÑ Ï¦Ò×ÁÎÅ." -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "HTTP ÚÁÐÉÔÁ ÎÁĦÓÌÁÎÏ; ÞÅËÁ¤ÍÏ ÎÁ צÄÐÏצÄØ." -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "îÅÓÐÏĦ×ÁÎÁ ÐÏÍÉÌËÁ ÞÉÔÁÎÎÑ ¦Ú ÍÅÒÅÖ¦; Ú'¤ÄÎÁÎÎÑ Ï¦Ò×ÁÎÅ." @@ -3197,7 +3197,7 @@ msgstr "îÅÓÐÏĦ×ÁÎÁ ÐÏÍÉÌËÁ ÞÉÔÁÎÎÑ ¦Ú ÍÅÒÅÖ¦; Ú'¤ÄÎÁÎÎÑ Ï¦Ò×ÁÎÅ." #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "" @@ -3207,7 +3207,7 @@ msgstr "" #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "" @@ -3217,27 +3217,27 @@ msgstr "" #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "ïÔÒÉÍÁÎÏ ÎÅÓÐÏĦ×ÁÎÏÇÏ ÓÔÁÔÕÓÁ 304 Not Modified." -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "ðÅÒÅÎÁÐÒÁ×ÌÅÎÎÑ ×ͦÓÔÕ POST ×ÉÍÁÇÁ¤ ÄÏÚ×ÏÌÕ ËÏÒÉÓÔÕ×ÁÞÁ." -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "ðÏËÁÚÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ËÏÄÕ 401?" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "ðÏËÁÚÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ËÏÄÕ 407?" @@ -3245,7 +3245,7 @@ msgstr "ðÏËÁÚÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ËÏÄÕ 407?" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "îÅצÄÏÍÉÊ ×¦ÄÇÕË ÓÔÁÔÕÓÕ ×¦Ä ÓÅÒ×ÅÒÁ!" @@ -3435,106 +3435,106 @@ msgstr "óÕÐÒÏצÄ" msgid "Host" msgstr "èÏÓÔ" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr " *** ðáí'ñôø ÷éþåòðáîï ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "ÎÅצÄÏÍÅ ÐÏÌÅ ÞÉ ÐÏÓÉÌÁÎÎÑ" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "ÔÅËÓÔÏ×Å ÐÏÌÅ" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "ÐÏÌÅ ××ÏÄÕ ÐÁÒÏÌÑ" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "ÐÅÒÅÍÉËÁÞ" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "ÒÁĦÏËÎÏÐËÁ" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "ËÎÏÐËÁ ÚÁÔ×ÅÒÄÖÅÎÎÑ" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "ËÌÁצÛÁ צÄͦÎÉ ÚͦÎ" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "×ÓÐÌÉ×ÁÀÞÅ ÍÅÎÀ" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "ÐÒÉÈÏ×ÁÎÅ ÐÏÌÅ ÆÏÒÍÉ" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "ÔÅËÓÔÏ×Á ÏÂÌÁÓÔØ" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "ÐÏÌÅ ××ÏÄÕ ÆÁÊÌÕ" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "ÚÏÂÒÁÖÅÎÎÑ-ËÎÏÐËÁ ÄÌÑ ×¦ÄÓÉÌËÉ" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "ÎÅצÄÏÍÅ ÐÏÌÅ ÆÏÒÍÉ" -#: src/GridText.c:10077 +#: src/GridText.c:10074 msgid "Can't open file for uploading" msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÞÉÔÁÎÎÑ." -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "úÁÔ×ÅÒÄÖÕ¤ÍÏ %s" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "äÕÖÅ ÄÏ×Ǧ ÒÑÄËÉ ÂÕÌÉ ÚÁ×ÅÒÎÕÔ¦!" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "" @@ -3628,33 +3628,33 @@ msgstr "Φ" msgid "Y/N/A/V" msgstr "" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "ïÐÉÓ:" # @ GIMP evolution gimp-perl guppi kcminfo kfind kfindpart kpm kppp lynx nautilus rpmdrake xmms # * Andriy Rysin <arysin@yahoo.com> -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "(ΦÞÏÇÏ)" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(ÎÅצÄÏÍÉÊ)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "äÏËÕÍÅÎÔ Í¦ÓÔÉÔØ ÌÉÛÅ ÐÒÉÈÏ×ÁΦ ÐÏÓÉÌÁÎÎÑ. ÷ÉËÏÒÉÓÔÁÊÔÅ ËÏÍÁÎÄÕ 'l'ist." -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "ðÏÍÉÌËÁ ËÅÛÕ×ÁÎÎÑ ÄÖÅÒÅÌÁ - ÚÁÐÏ×ÎÅÎÉÊ ÄÉÓË?" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "ðÏÍÉÌËÁ ËÅÛÕ×ÁÎÎÑ ÄÖÅÒÅÌÁ - ÎÅÄÏÓÔÁÔÎØÏ ÐÁÍ'ÑÔ¦!" @@ -3760,27 +3760,27 @@ msgstr "ÐÏÍÉÌËÁ Õ cookie_domain_flag_set, ÕÒÉ×Á¤ÍÏ ÐÒÏÇÒÁÍÕ" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "îÅ ×ÄÁÌÏÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ ÔÅÒͦÎÁÌ - ÎÅצÄÏÍÉÊ ÔÉÐ ÔÅÒͦÎÁÌÕ?" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "ôÅÒͦÎÁÌ =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "÷É ÍÁ¤ÔÅ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ Ú Ã¦¤À ÐÒÏÇÒÁÍÏÀ ÔÅÒͦÎÁÌÉ vt100, 200 ÔÏÝÏ." -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "ôÉÐ ×ÁÛÏÇÏ ÔÅÒͦÎÁÌÕ ÎÅצÄÏÍÉÊ!" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "÷×ÅĦÔØ ÔÉÐ ÔÅÒͦÎÁÌÕ:" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "ôéð ôåòí¶îáìõ ÷óôáîï÷ìåîï õ" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3789,7 +3789,7 @@ msgstr "" "\n" "æÁÔÁÌØÎÁ ÐÏÍÉÌËÁ × %s, ×ÅÒÓ¦Ñ %s\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3815,46 +3815,46 @@ msgstr "ÐÒÉÞÉÎÁ ÎÅצÄÏÍÁ." # ôåòí¶îïìïç¶ñ # ôåòí¶îïìïç¶ñ -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "úÁ×ÁÎÔÁÖÅÎÏ ÐÏÓÉÌÁÎÎÑ:" # msgstr "ðÒÏÐÏÎÕ¤ÔØÓÑ ¦Í'Ñ ÆÁÊÌÕ:" # msgstr "ðÒÏÐÏÎÕ¤ÔØÓÑ ¦Í'Ñ ÆÁÊÌÕ:" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "úÁÐÒÏÐÏÎÏ×ÁÎÅ ¦Í'Ñ ÆÁÊÌÕ:" # ôåòí¶îïìïç¶ñ # ôåòí¶îïìïç¶ñ -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "óÔÁÎÄÁÒÔΦ ÐÁÒÁÍÅÔÒÉ ÚÁ×ÁÎÔÁÖÕ×ÁÎÎÑ:" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "ðÁÒÁÍÅÔÒÉ ÚÁ×ÁÎÔÁÖÕ×ÁÎÎÑ:" # @ Galeon- drkonqi kdelibs kmail konqueror lynx # * Andriy Rysin <arysin@yahoo.com> -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "úÂÅÒÅÇÔÉ ÎÁ ÄÉÓË" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 #, fuzzy msgid "View temporary file" msgstr "ðÅÒÅÇÌÑÎÕÔÉ ÆÁÊÌ " -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "úÁÐÉÓÕ×ÁÔÉ ÎÁ ÄÉÓË ÚÁÂÏÒÏÎÅÎÏ." -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "ìÏËÁÌØΦ ÄÏÄÁÔËÉ:" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "¶Í'Ñ ÎÅ ÚÁÄÁÎÅ" @@ -4292,21 +4292,21 @@ msgstr "ãÅ ÐÏצÄÏÍÌÅÎÎÑ ÚÇÅÎÅÒÏ×ÁÎÏ Á×ÔÏÍÁÔÉÞÎÏ ÍÎÏÀ," msgid "No system mailer configured" msgstr "" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "äÁÒÕÊÔÅ, Winsock ÎÅ ÚÎÁÊÄÅÎÏ." -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "÷É íõóéôå ×ËÁÚÁÔÉ TMP ÞÉ TEMP!" # ôåòí¶îïìïç¶ñ # msgstr "îÅÍÁ¤ ÔÁËÏÇÏ ËÁÔÁÌÏÇÕ" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "ôÁËÏÇÏ ËÁÔÁÌÏÇÕ ÎÅÍÁ¤" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4317,7 +4317,7 @@ msgstr "" "æÁÊÌ ËÏÎƦÇÕÒÁÃ¦Ê %s ÎÅÄÏÓÔÕÐÎÉÊ.\n" "\n" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4325,7 +4325,7 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4333,7 +4333,7 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4344,7 +4344,7 @@ msgstr "" "æÁÊÌ Lynx %s ÎÅÄÏÓÔÕÐÎÉÊ.\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "õ×ÁÇÁ:" @@ -4389,116 +4389,116 @@ msgstr "÷éëïòéóôáîîñ: %s [ÐÁÒÁÍÅÔÒÉ] [ÆÁÊÌ]\n" msgid "Options are:\n" msgstr "ðÁÒÁÍÅÔÒÉ:\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s: îÅצÒÎÉÊ ÐÁÒÁÍÅÔÒ: %s\n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "URL ×ËÁÚÁÎÉÊ ËÏÒÉÓÔÕ×ÁÞÅÍ" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "" #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "åËÒÁÎ äÏÐÏÍÏÇÉ" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "" -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "ÐÅÒÅÊÔÉ ÄÏ:" -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "îÅ ÍÏÖÕ Ä¦ÓÔÁÔÉÓÑ ÄÏ ËÁÔÁÌÏÇÕ." -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "ïÐÒÁÃØÏ×Õ¤ÍÏ ÄÏËÕÍÅÎÔ ÚǦÄÎÏ Ú ÐÏÔÏÞÎÉÍÉ ÕÓÔÁÎÏ×ËÁÍÉ..." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "æÁÔÁÌØÎÁ ÐÏÍÉÌËÁ - ÎÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ×ÉȦÄÎÉÊ ÆÁÊÌ %s\n" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "" -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "" # ôåòí¶îïìïç¶ñ # ôåòí¶îïìïç¶ñ -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 #, fuzzy msgid "Current URL is empty." msgstr "ðÏÔÏÞÎÉÊ ËÁÔÁÌÏÇ:" -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "" -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "" -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "-¦ÎÄÅËÓ-" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx: îÅÍÏÖÌÉ×Ï ÚÁ×ÁÎÔÁÖÉÔÉ ÓÔÁÒÔÏ×ÉÊ ÆÁÊÌ" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "lynx: óÔÁÒÔÏ×ÏÇÏ ÆÁÊÌÕ ÎÅÍÁ, ÞÉ ×¦Î ÎÅ Õ ÆÏÒÍÁÔ¦ text/html (text/plain)" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr " ÷ÉÈÏÄÉÍÏ..." -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "-ÄÁ̦-" @@ -5494,11 +5494,11 @@ msgstr "òÏÚͦÝÅÎÎÑ: " msgid "(Form field)" msgstr "(ðÏÌÅ ÆÏÒÍÉ)" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "îÁ Ã¦Ê ÓÔÏÒ¦Îæ ÎÅÍÁ¤ ÐÏÓÉÌÁÎØ" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 #, fuzzy msgid "Server Headers:" msgstr "óÅÒ×ÅÒ:" @@ -5546,33 +5546,33 @@ msgstr "÷¦Ä×ÁÎÔÁÖÉÔÉ ÄÏ:" msgid "Upload options:" msgstr "ðÁÒÁÍÅÔÒÉ ×¦Ä×ÁÎÔÁÖÅÎÎÑ:" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "" -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "" -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 msgid "unknown restriction" msgstr "ÎÅצÄÏÍÅ ÏÂÍÅÖÅÎÎÑ" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "ïÂÍÅÖÅÎÎÑ ×¦ÄÓÕÔΦ.\n" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "îÁÂ¦Ò ÏÂÍÅÖÅÎØ:\n" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "îÅ ÍÏÖÕ ÚÎÁÊÔÉ ÄÏÍÁÛÎ¦Ê ËÁÔÁÌÏÇ" diff --git a/po/zh_CN.po b/po/zh_CN.po index e32e1b7d..873eb4dd 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx-2.8.5pre9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 2002-10-15 15:13+0800\n" "Last-Translator: Wang Jian <lark@linux.net.cn>\n" "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n" @@ -2740,7 +2740,7 @@ msgstr "" msgid "Loading failed, use a previous copy." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "" @@ -2763,7 +2763,7 @@ msgstr "" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "" @@ -2771,20 +2771,20 @@ msgstr "" msgid "Unable to access document." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "" @@ -2792,24 +2792,24 @@ msgstr "" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "" @@ -3010,45 +3010,45 @@ msgstr "" msgid "Address contains a username: %s" msgstr "" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "" -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "" -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 msgid "Retrying connection without TLS." msgstr "" -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "" @@ -3061,7 +3061,7 @@ msgstr "" #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "" @@ -3071,7 +3071,7 @@ msgstr "" #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "" @@ -3081,27 +3081,27 @@ msgstr "" #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "" @@ -3109,7 +3109,7 @@ msgstr "" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "" @@ -3287,106 +3287,106 @@ msgstr "" msgid "Host" msgstr "" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr "" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "" -#: src/GridText.c:10077 +#: src/GridText.c:10074 msgid "Can't open file for uploading" msgstr "" -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "" @@ -3476,31 +3476,31 @@ msgstr "" msgid "Y/N/A/V" msgstr "" -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr "" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "" -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "" @@ -3593,34 +3593,34 @@ msgstr "" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "" -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" "A Fatal error has occurred in %s Ver. %s\n" msgstr "" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3644,40 +3644,40 @@ msgstr "" msgid "reason unknown." msgstr "" -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 #, fuzzy msgid "View temporary file" msgstr "æ— æ³•æ‰“å¼€ä¸´æ—¶æ–‡ä»¶ï¼" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "" -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "" @@ -4094,19 +4094,19 @@ msgstr "" msgid "No system mailer configured" msgstr "" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "" -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4114,7 +4114,7 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4122,7 +4122,7 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4130,7 +4130,7 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4138,7 +4138,7 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "" @@ -4183,113 +4183,113 @@ msgstr "" msgid "Options are:\n" msgstr "" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "" #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "" -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "" -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "" -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "" -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "" -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "" -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 msgid "Current URL is empty." msgstr "" -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "" -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "" -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr "" -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "" @@ -5205,11 +5205,11 @@ msgstr "" msgid "(Form field)" msgstr "" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 msgid "Server Headers:" msgstr "" @@ -5256,33 +5256,33 @@ msgstr "" msgid "Upload options:" msgstr "" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "" -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "" -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 msgid "unknown restriction" msgstr "" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 0e4c8b87..64931f9c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lynx 2.8.5pre9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 06:03-0500\n" +"POT-Creation-Date: 2005-01-02 09:33-0500\n" "PO-Revision-Date: 2003-02-11 19:44+0800\n" "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -2766,7 +2766,7 @@ msgstr "" msgid "Loading failed, use a previous copy." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8358 +#: WWW/Library/Implementation/HTAccess.c:1045 src/GridText.c:8351 msgid "Loading incomplete." msgstr "¥¼§¹¦¨¸ü¤J¤º®e¡C" @@ -2789,7 +2789,7 @@ msgstr "**** HTAccess¡G¦^¶Çªºª¬ºA¬°¡G%d\n" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7673 +#: WWW/Library/Implementation/HTAccess.c:1085 src/LYMainLoop.c:7669 msgid "Can't Access" msgstr "µLªk¦s¨ú" @@ -2797,20 +2797,20 @@ msgstr "µLªk¦s¨ú" msgid "Unable to access document." msgstr "µLªk¦s¨ú¤å¥ó¡C" -#: WWW/Library/Implementation/HTFTP.c:780 +#: WWW/Library/Implementation/HTFTP.c:823 #, c-format msgid "Enter password for user %s@%s:" msgstr "½Ð¿é¤J¨Ï¥ÎªÌ %s@%s ªº±K½X¡G" -#: WWW/Library/Implementation/HTFTP.c:808 +#: WWW/Library/Implementation/HTFTP.c:851 msgid "Unable to connect to FTP host." msgstr "µLªkÁpµ¸ FTP ¥D¾÷¡C" -#: WWW/Library/Implementation/HTFTP.c:1074 +#: WWW/Library/Implementation/HTFTP.c:1117 msgid "close master socket" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:1135 +#: WWW/Library/Implementation/HTFTP.c:1178 msgid "socket for master socket" msgstr "" @@ -2818,24 +2818,24 @@ msgstr "" #. * It's a symbolic link, does the user care about knowing if it is #. * symbolic? I think so since it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1658 WWW/Library/Implementation/HTFTP.c:2275 +#: WWW/Library/Implementation/HTFTP.c:1701 WWW/Library/Implementation/HTFTP.c:2318 msgid "Symbolic Link" msgstr "²Å¸¹³sµ²" -#: WWW/Library/Implementation/HTFTP.c:2632 +#: WWW/Library/Implementation/HTFTP.c:2675 msgid "Receiving FTP directory." msgstr "¥¿¦b±µ¦¬ FTP ¥Ø¿ý¤º®e¡C" -#: WWW/Library/Implementation/HTFTP.c:2768 +#: WWW/Library/Implementation/HTFTP.c:2811 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "¤w¶Ç°e %d ¦ì¤¸²Õ (%5d)" -#: WWW/Library/Implementation/HTFTP.c:3115 +#: WWW/Library/Implementation/HTFTP.c:3158 msgid "connect for data" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:3779 +#: WWW/Library/Implementation/HTFTP.c:3822 msgid "Receiving FTP file." msgstr "¥¿¦b±µ¦¬ FTP ¥Ø¿ý¡C" @@ -3038,45 +3038,45 @@ msgstr "" msgid "Address contains a username: %s" msgstr "¦a¤î¤¤§t¦³±b¤á¦WºÙ¡G%s" -#: WWW/Library/Implementation/HTTP.c:533 +#: WWW/Library/Implementation/HTTP.c:534 msgid "This client does not contain support for HTTPS URLs." msgstr "¦¹ÂsÄý¾¹¤£¤ä´© HTTPS URL¡C" -#: WWW/Library/Implementation/HTTP.c:558 +#: WWW/Library/Implementation/HTTP.c:559 msgid "Unable to connect to remote host." msgstr "µLªkÁpµ¸»·ºÝ¥D¾÷¡C" -#: WWW/Library/Implementation/HTTP.c:580 +#: WWW/Library/Implementation/HTTP.c:581 msgid "Retrying connection without TLS." msgstr "¹Á¸Õ¥H¤£¥Î TLS ªº¤è¦¡³s½u¡C" -#: WWW/Library/Implementation/HTTP.c:623 +#: WWW/Library/Implementation/HTTP.c:624 msgid "SSL error:Can't find common name in certificate-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:640 +#: WWW/Library/Implementation/HTTP.c:641 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "SSL ¿ù»~¡G¥D¾÷(%s)¤£²Å¦XÃÒ®Ñ(%s)¡C¬O§_Ä~Äò¡H" -#: WWW/Library/Implementation/HTTP.c:652 +#: WWW/Library/Implementation/HTTP.c:653 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "%d ¦ì¤¸ %s (%s) ¦w¥þ HTTP ³s½u" -#: WWW/Library/Implementation/HTTP.c:1122 +#: WWW/Library/Implementation/HTTP.c:1123 msgid "Sending HTTP request." msgstr "¥¿¦b°e¥X HTTP n¨D¡C" -#: WWW/Library/Implementation/HTTP.c:1161 +#: WWW/Library/Implementation/HTTP.c:1162 msgid "Unexpected network write error; connection aborted." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1167 +#: WWW/Library/Implementation/HTTP.c:1168 msgid "HTTP request sent; waiting for response." msgstr "¤w¶i¥X HTTP n¨D¡F¥¿¦bµ¥«Ý¦^À³¡C" -#: WWW/Library/Implementation/HTTP.c:1235 +#: WWW/Library/Implementation/HTTP.c:1236 msgid "Unexpected network read error; connection aborted." msgstr "" @@ -3089,7 +3089,7 @@ msgstr "" #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1429 +#: WWW/Library/Implementation/HTTP.c:1430 msgid "Got unexpected Informational Status." msgstr "" @@ -3099,7 +3099,7 @@ msgstr "" #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:1463 +#: WWW/Library/Implementation/HTTP.c:1464 msgid "Request fulfilled. Reset Content." msgstr "" @@ -3109,27 +3109,27 @@ msgstr "" #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:1580 +#: WWW/Library/Implementation/HTTP.c:1581 msgid "Got unexpected 304 Not Modified status." msgstr "¥X²{¹w®Æ¤§¥~ªº 304 Not Modified ª¬ºA¡C" -#: WWW/Library/Implementation/HTTP.c:1643 +#: WWW/Library/Implementation/HTTP.c:1644 msgid "Redirection of POST content requires user approval." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1658 +#: WWW/Library/Implementation/HTTP.c:1659 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1700 +#: WWW/Library/Implementation/HTTP.c:1701 msgid "Retrying with access authorization information." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1712 +#: WWW/Library/Implementation/HTTP.c:1713 msgid "Show the 401 message body?" msgstr "¬O§_Åã¥Ü 401 ¿ù»~°T®§ªººô¶¤º®e¡H" -#: WWW/Library/Implementation/HTTP.c:1755 +#: WWW/Library/Implementation/HTTP.c:1756 msgid "Show the 407 message body?" msgstr "¬O§_Åã¥Ü 407 ¿ù»~°T®§ªººô¶¤º®e¡H" @@ -3137,7 +3137,7 @@ msgstr "¬O§_Åã¥Ü 407 ¿ù»~°T®§ªººô¶¤º®e¡H" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:1855 +#: WWW/Library/Implementation/HTTP.c:1856 msgid "Unknown status reply from server!" msgstr "¦øªA¾¹µo¥X¤£©úªºª¬ºA¦^À³°T®§¡I" @@ -3315,106 +3315,106 @@ msgstr "ºûÅ@ªÌ" msgid "Host" msgstr "¥D¾÷" -#: src/GridText.c:700 +#: src/GridText.c:710 msgid "Memory exhausted, display interrupted!" msgstr "°O¾ÐÅé¯ÓºÉ¡A¥²¶·¤¤Â_Åã¥Ü¡I" -#: src/GridText.c:705 +#: src/GridText.c:715 msgid "Memory exhausted, will interrupt transfer!" msgstr "°O¾ÐÅé¯ÓºÉ¡A¥²¶·¤¤Â_¶Ç¿é¡I" -#: src/GridText.c:3588 +#: src/GridText.c:3590 msgid " *** MEMORY EXHAUSTED ***" msgstr "*** °O¾ÐÅé¯ÓºÉ ***" -#: src/GridText.c:6002 src/GridText.c:6009 src/LYList.c:248 +#: src/GridText.c:6004 src/GridText.c:6011 src/LYList.c:248 msgid "unknown field or link" msgstr "¤£©úªºÄæ¦ì©ÎÃìµ²" -#: src/GridText.c:6018 +#: src/GridText.c:6020 msgid "text entry field" msgstr "¤å¦r¿é¤JÄæ¦ì" -#: src/GridText.c:6021 +#: src/GridText.c:6023 msgid "password entry field" msgstr "±K½X¿é¤JÄæ¦ì" -#: src/GridText.c:6024 +#: src/GridText.c:6026 msgid "checkbox" msgstr "" -#: src/GridText.c:6027 +#: src/GridText.c:6029 msgid "radio button" msgstr "" -#: src/GridText.c:6030 +#: src/GridText.c:6032 msgid "submit button" msgstr "" -#: src/GridText.c:6033 +#: src/GridText.c:6035 msgid "reset button" msgstr "" -#: src/GridText.c:6036 +#: src/GridText.c:6038 msgid "popup menu" msgstr "" -#: src/GridText.c:6039 +#: src/GridText.c:6041 msgid "hidden form field" msgstr "" -#: src/GridText.c:6042 +#: src/GridText.c:6044 msgid "text entry area" msgstr "¤å¦r¿é¤J°Ï°ì" -#: src/GridText.c:6045 +#: src/GridText.c:6047 msgid "range entry field" msgstr "" -#: src/GridText.c:6048 +#: src/GridText.c:6050 msgid "file entry field" msgstr "ÀɮצWºÙ¿é¤JÄæ¦ì" -#: src/GridText.c:6051 +#: src/GridText.c:6053 msgid "text-submit field" msgstr "" -#: src/GridText.c:6054 +#: src/GridText.c:6056 msgid "image-submit button" msgstr "" -#: src/GridText.c:6057 +#: src/GridText.c:6059 msgid "keygen field" msgstr "" -#: src/GridText.c:6060 +#: src/GridText.c:6062 msgid "unknown form field" msgstr "" -#: src/GridText.c:10077 +#: src/GridText.c:10074 msgid "Can't open file for uploading" msgstr "µLªk¶}±Ò·Ç³Æ¤W¶ÇªºÀÉ®×" -#: src/GridText.c:11229 +#: src/GridText.c:11227 #, c-format msgid "Submitting %s" msgstr "" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12377 +#: src/GridText.c:12375 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "" #. don't show previous state -#: src/GridText.c:12582 +#: src/GridText.c:12580 msgid "Wrap lines to fit displayed area?" msgstr "¬O§_¶i¦æ¦Û°Ê´«¦æ¨Ó²Å¦Xµe±¤Ø¤o¡H" -#: src/GridText.c:12634 +#: src/GridText.c:12632 msgid "Very long lines have been wrapped!" msgstr "" -#: src/GridText.c:13075 +#: src/GridText.c:13073 msgid "Very long lines have been truncated!" msgstr "" @@ -3505,31 +3505,31 @@ msgid "Y/N/A/V" msgstr "" # Lynx is very bad, have to use space for indentation..... -- Abel -#: src/HTML.c:5915 +#: src/HTML.c:5914 msgid "Description:" msgstr " ´yz¡G" -#: src/HTML.c:5920 +#: src/HTML.c:5919 msgid "(none)" msgstr "(µL)" -#: src/HTML.c:5924 +#: src/HTML.c:5923 msgid "Filepath:" msgstr "Àɮ׸ô®|¡G" -#: src/HTML.c:5930 +#: src/HTML.c:5929 msgid "(unknown)" msgstr "(¤£©ú)" -#: src/HTML.c:7374 +#: src/HTML.c:7373 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "" -#: src/HTML.c:7867 +#: src/HTML.c:7870 msgid "Source cache error - disk full?" msgstr "" -#: src/HTML.c:7880 +#: src/HTML.c:7883 msgid "Source cache error - not enough memory!" msgstr "" @@ -3628,27 +3628,27 @@ msgstr "cookie_domain_flag_set ¿ù»~¡A¤¤¤îµ{¦¡" msgid "Terminal initialisation failed - unknown terminal type?" msgstr "µLªkªì©l¤Æ²×ºÝ¾÷ ¢w ²×ºÝ¾÷Ãþ«¬¤£¸Ô¡H" -#: src/LYCurses.c:1442 +#: src/LYCurses.c:1443 msgid "Terminal =" msgstr "²×ºÝ¾÷Ãþ«¬ =" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1447 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "¨Ï¥Î¥»µ{¦¡®É²×ºÝ¾÷ªºÃþ«¬¥²¶·¬O vt100¡B200 µ¥µ¥¡C" -#: src/LYCurses.c:1495 +#: src/LYCurses.c:1496 msgid "Your Terminal type is unknown!" msgstr "²×ºÝ¾÷Ãþ«¬¤£©ú¡I" -#: src/LYCurses.c:1496 +#: src/LYCurses.c:1497 msgid "Enter a terminal type:" msgstr "½Ð¿é¤J²×ºÝ¾÷Ãþ«¬¡G" -#: src/LYCurses.c:1510 +#: src/LYCurses.c:1511 msgid "TERMINAL TYPE IS SET TO" msgstr "²×ºÝ¾÷Ãþ«¬¤w³]©w¬°" -#: src/LYCurses.c:2087 +#: src/LYCurses.c:2088 #, c-format msgid "" "\n" @@ -3657,7 +3657,7 @@ msgstr "" "\n" "¦b %s ª©¥» %s ¥X²{ÄY«¿ù»~\n" -#: src/LYCurses.c:2090 +#: src/LYCurses.c:2091 #, c-format msgid "" "\n" @@ -3686,40 +3686,40 @@ msgstr "½s¿è¾¹ªº¦^¶Ç¿ù»~ª¬ºA¡A%s" msgid "reason unknown." msgstr "ì¦]¤£¸Ô¡C" -#: src/LYDownload.c:502 +#: src/LYDownload.c:503 msgid "Downloaded link:" msgstr "¤w¤U¸üªºÃìµ²¡G" -#: src/LYDownload.c:507 +#: src/LYDownload.c:508 msgid "Suggested file name:" msgstr "«ØijªºÀɮצWºÙ¡G" -#: src/LYDownload.c:512 +#: src/LYDownload.c:513 msgid "Standard download options:" msgstr "¼Ð·Çªº¤U¸ü³B²z¤è¦¡¡G" -#: src/LYDownload.c:513 +#: src/LYDownload.c:514 msgid "Download options:" msgstr "¤U¸ü¿ï¶µ¡G" -#: src/LYDownload.c:529 +#: src/LYDownload.c:530 msgid "Save to disk" msgstr "Àx¦s¦ÜºÏºÐ" -#: src/LYDownload.c:543 +#: src/LYDownload.c:544 #, fuzzy msgid "View temporary file" msgstr "µLªk¶}±Ò¼È¦sÀÉ¡I" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "Save to disk disabled." msgstr "¸T¤î±N¤º®eÀx¦s¦ÜºÏºÐ¡C" -#: src/LYDownload.c:554 src/LYPrint.c:1319 +#: src/LYDownload.c:555 src/LYPrint.c:1319 msgid "Local additions:" msgstr "ÃB¥~ªº³B²z¤è¦¡¡G" -#: src/LYDownload.c:565 src/LYUpload.c:211 +#: src/LYDownload.c:566 src/LYUpload.c:211 #, c-format msgid "No Name Given" msgstr "¥¼«ü©w¦WºÙ" @@ -4136,19 +4136,19 @@ msgstr "" msgid "No system mailer configured" msgstr "" -#: src/LYMain.c:999 +#: src/LYMain.c:998 msgid "No Winsock found, sorry." msgstr "§ä¤£¨ì Winsock¡A©êºp¡C" -#: src/LYMain.c:1194 +#: src/LYMain.c:1193 msgid "You MUST define a valid TMP or TEMP area!" msgstr "»Õ¤U *¥²¶·* «ü©w¦³®Äªº TMP ©Î TEMP ¦ì¸m¡I" -#: src/LYMain.c:1247 src/LYMainLoop.c:4979 +#: src/LYMain.c:1246 src/LYMainLoop.c:4977 msgid "No such directory" msgstr "¸Ó¥Ø¿ý¤£¦s¦b" -#: src/LYMain.c:1452 +#: src/LYMain.c:1453 #, c-format msgid "" "\n" @@ -4159,7 +4159,7 @@ msgstr "" "³]©wÀÉ %s ¤£¦s¦b¡C\n" "\n" -#: src/LYMain.c:1462 +#: src/LYMain.c:1463 #, c-format msgid "" "\n" @@ -4170,7 +4170,7 @@ msgstr "" "¥¼«Å§i Lynx ©Ò¥Îªº¦r¤¸¶°¡C\n" "\n" -#: src/LYMain.c:1491 +#: src/LYMain.c:1492 #, c-format msgid "" "\n" @@ -4178,7 +4178,7 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1517 +#: src/LYMain.c:1518 #, c-format msgid "" "\n" @@ -4189,7 +4189,7 @@ msgstr "" "Lynx ÀÉ®× %s ¤£¦s¦b¡C\n" "\n" -#: src/LYMain.c:1758 +#: src/LYMain.c:1761 msgid "Warning:" msgstr "ĵ§i¡G" @@ -4234,114 +4234,114 @@ msgstr "¥Îªk¡G%s [¿ï¶µ] [ÀÉ®×]\n" msgid "Options are:\n" msgstr "¿ï¶µ¥]¬A¡G\n" -#: src/LYMain.c:4243 +#: src/LYMain.c:4242 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "%s¡GµL®Äªº¿ï¶µ¡G%s\n" -#: src/LYMainLoop.c:567 +#: src/LYMainLoop.c:572 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "" -#: src/LYMainLoop.c:684 src/LYMainLoop.c:5001 +#: src/LYMainLoop.c:689 src/LYMainLoop.c:4999 msgid "A URL specified by the user" msgstr "¥Ñ¨Ï¥ÎªÌ«ü©wªº URL" -#: src/LYMainLoop.c:1140 +#: src/LYMainLoop.c:1145 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "" #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3042 +#: src/LYMainLoop.c:3047 msgid "Help Screen" msgstr "¨D§U»¡©úµe±" -#: src/LYMainLoop.c:3163 +#: src/LYMainLoop.c:3168 msgid "System Index" msgstr "" -#: src/LYMainLoop.c:3523 src/LYMainLoop.c:5221 +#: src/LYMainLoop.c:3528 src/LYMainLoop.c:5223 msgid "Entry into main screen" msgstr "" -#: src/LYMainLoop.c:3793 +#: src/LYMainLoop.c:3791 msgid "No next document present" msgstr "" -#: src/LYMainLoop.c:4091 +#: src/LYMainLoop.c:4089 msgid "charset for this document specified explicitly, sorry..." msgstr "©êºp¡A¸Ó¤å¥ó¤w¸g¯S¦a«ü©w¤F¦r¤¸¶°..." -#: src/LYMainLoop.c:4955 +#: src/LYMainLoop.c:4953 msgid "cd to:" msgstr "·Ç³Æ¶i¤Jªº¥Ø¿ý¡G" -#: src/LYMainLoop.c:4982 +#: src/LYMainLoop.c:4980 msgid "A component of path is not a directory" msgstr "¸ô®|¤¤ªº¤@³¡¥÷¤£¬O¥Ø¿ý" -#: src/LYMainLoop.c:4985 +#: src/LYMainLoop.c:4983 msgid "failed to change directory" msgstr "µLªk¶i¤J¥Ø¿ý" -#: src/LYMainLoop.c:6143 +#: src/LYMainLoop.c:6144 msgid "Reparsing document under current settings..." msgstr "®Ú¾Ú¥Ø«eªº³]©w«·s¤ÀªR¤å¥ó..." -#: src/LYMainLoop.c:6429 +#: src/LYMainLoop.c:6433 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "ÄY«¿ù»~ ¢w µLªk¶}±Ò¿é¥XÀÉ %s\n" -#: src/LYMainLoop.c:6773 +#: src/LYMainLoop.c:6777 msgid "TABLE center enable." msgstr "" -#: src/LYMainLoop.c:6776 +#: src/LYMainLoop.c:6780 msgid "TABLE center disable." msgstr "" -#: src/LYMainLoop.c:6853 +#: src/LYMainLoop.c:6857 #, fuzzy msgid "Current URL is empty." msgstr "¥Ø«eªº¥Ø¿ý¡G" -#: src/LYMainLoop.c:6855 src/LYUtils.c:1693 +#: src/LYMainLoop.c:6859 src/LYUtils.c:1702 msgid "Copy to clipboard failed." msgstr "" -#: src/LYMainLoop.c:6857 +#: src/LYMainLoop.c:6861 msgid "Document URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6859 +#: src/LYMainLoop.c:6863 msgid "Link URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:6886 +#: src/LYMainLoop.c:6890 msgid "No URL in the clipboard." msgstr "" -#: src/LYMainLoop.c:7558 src/LYMainLoop.c:7728 +#: src/LYMainLoop.c:7554 src/LYMainLoop.c:7724 msgid "-index-" msgstr "¢w¯Á¤Þ¢w" -#: src/LYMainLoop.c:7668 +#: src/LYMainLoop.c:7664 msgid "lynx: Can't access startfile" msgstr "lynx¡GµLªk¦s¨ú¶}©lªººô¶" -#: src/LYMainLoop.c:7680 +#: src/LYMainLoop.c:7676 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "" -#: src/LYMainLoop.c:7681 +#: src/LYMainLoop.c:7677 msgid " Exiting..." msgstr " ·Ç³ÆÂ÷¶}..." -#: src/LYMainLoop.c:7722 +#: src/LYMainLoop.c:7718 msgid "-more-" msgstr "¢wÁÙ¦³¤º®e¢w" @@ -5287,11 +5287,11 @@ msgstr "¦ì¸m¡G" msgid "(Form field)" msgstr "" -#: src/LYShowInfo.c:450 +#: src/LYShowInfo.c:448 msgid "No Links on the current page" msgstr "¸Ó¶±¨S¦³¥ô¦óÃìµ²" -#: src/LYShowInfo.c:455 +#: src/LYShowInfo.c:453 #, fuzzy msgid "Server Headers:" msgstr "¦øªA¾¹¡G" @@ -5339,33 +5339,33 @@ msgstr "¤W¶Ç¦Ü¡G" msgid "Upload options:" msgstr "¤W¶Ç¿ï¶µ¡G" -#: src/LYUtils.c:1695 +#: src/LYUtils.c:1704 msgid "Download document URL put to clipboard." msgstr "" -#: src/LYUtils.c:2465 +#: src/LYUtils.c:2481 msgid "Unexpected access protocol for this URL scheme." msgstr "" -#: src/LYUtils.c:3283 +#: src/LYUtils.c:3289 msgid "Too many tempfiles" msgstr "¤Ó¦h¼È¦sÀÉ" -#: src/LYUtils.c:3587 +#: src/LYUtils.c:3593 msgid "unknown restriction" msgstr "" -#: src/LYUtils.c:3617 +#: src/LYUtils.c:3623 #, c-format msgid "No restrictions set.\n" msgstr "" -#: src/LYUtils.c:3620 +#: src/LYUtils.c:3626 #, c-format msgid "Restrictions set:\n" msgstr "" -#: src/LYUtils.c:5002 +#: src/LYUtils.c:5010 msgid "Cannot find HOME directory" msgstr "§ä¤£¨ìÓ¤H¥Ø¿ý" diff --git a/src/AttrList.h b/src/AttrList.h index c466714d..b73babc7 100644 --- a/src/AttrList.h +++ b/src/AttrList.h @@ -4,33 +4,36 @@ #include <HText.h> #include <HTMLDTD.h> -enum { - ABS_OFF = 0, - STACK_OFF = 0, - STACK_ON, - ABS_ON -}; +#ifdef __cplusplus +extern "C" { +#endif + enum { + ABS_OFF = 0, + STACK_OFF = 0, + STACK_ON, + ABS_ON + }; #define STARTAT 8 -enum { - DSTYLE_LINK = HTML_A + STARTAT, - DSTYLE_STATUS = HTML_ELEMENTS + STARTAT, - DSTYLE_ALINK, /* active link */ - DSTYLE_NORMAL, /* default attributes */ - DSTYLE_OPTION, /* option on the option screen */ - DSTYLE_VALUE, /* value on the option screen */ - DSTYLE_HIGH, - DSTYLE_CANDY, /* possibly going to vanish */ - DSTYLE_WHEREIS, /* whereis search target */ - DSTYLE_ELEMENTS -}; - -typedef struct { - int color; /* color highlighting to be done */ - int mono; /* mono highlighting to be done */ - int cattr; /* attributes to go with the color */ -} HTCharStyle; + enum { + DSTYLE_LINK = HTML_A + STARTAT, + DSTYLE_STATUS = HTML_ELEMENTS + STARTAT, + DSTYLE_ALINK, /* active link */ + DSTYLE_NORMAL, /* default attributes */ + DSTYLE_OPTION, /* option on the option screen */ + DSTYLE_VALUE, /* value on the option screen */ + DSTYLE_HIGH, + DSTYLE_CANDY, /* possibly going to vanish */ + DSTYLE_WHEREIS, /* whereis search target */ + DSTYLE_ELEMENTS + }; + + typedef struct { + int color; /* color highlighting to be done */ + int mono; /* mono highlighting to be done */ + int cattr; /* attributes to go with the color */ + } HTCharStyle; #define HText_characterStyle CTRACE((tfp,"HTC called from %s/%d\n",__FILE__,__LINE__));_internal_HTC @@ -38,16 +41,19 @@ typedef struct { #define HText_characterStyle _internal_HTC #if defined(USE_COLOR_STYLE) -extern void _internal_HTC(HText *text, int style, int dir); + extern void _internal_HTC(HText *text, int style, int dir); #define TEMPSTRINGSIZE 256 -extern char class_string[TEMPSTRINGSIZE]; + extern char class_string[TEMPSTRINGSIZE]; /* stack of attributes during page rendering */ #define MAX_LAST_STYLES 128 -extern int last_styles[MAX_LAST_STYLES]; -extern int last_colorattr_ptr; + extern int last_styles[MAX_LAST_STYLES]; + extern int last_colorattr_ptr; #endif +#ifdef __cplusplus +} +#endif #endif diff --git a/src/GridText.c b/src/GridText.c index 6f2819a3..acf4503e 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -388,6 +388,38 @@ typedef struct { int column; /* Zero-based column value */ } HTTabID; +typedef enum { + S_text, + S_esc, + S_dollar, + S_paren, + S_nonascii_text, + S_dollar_paren, + S_jisx0201_text +} eGridState; /* Escape sequence? */ + +#ifdef USE_TH_JP_AUTO_DETECT +typedef enum { /* Detected Kanji code */ + DET_SJIS, + DET_EUC, + DET_NOTYET, + DET_MIXED +} eDetectedKCode; + +typedef enum { + SJIS_state_neutral, + SJIS_state_in_kanji, + SJIS_state_has_bad_code +} eSJIS_status; + +typedef enum { + EUC_state_neutral, + EUC_state_in_kanji, + EUC_state_in_kana, + EUC_state_has_bad_code +} eEUC_status; +#endif + /* Notes on struct _Htext: * next_line is valid if stale is false. * top_of_screen line means the line at the top of the screen @@ -436,33 +468,11 @@ struct _HText { HTkcode kcode; /* Kanji code? */ HTkcode specified_kcode; /* Specified Kanji code */ #ifdef USE_TH_JP_AUTO_DETECT - enum _detected_kcode { - DET_SJIS, - DET_EUC, - DET_NOTYET, - DET_MIXED - } detected_kcode; /* Detected Kanji code */ - enum _SJIS_status { - SJIS_state_neutral, - SJIS_state_in_kanji, - SJIS_state_has_bad_code - } SJIS_status; - enum _EUC_status { - EUC_state_neutral, - EUC_state_in_kanji, - EUC_state_in_kana, - EUC_state_has_bad_code - } EUC_status; -#endif - enum grid_state { - S_text, - S_esc, - S_dollar, - S_paren, - S_nonascii_text, - S_dollar_paren, - S_jisx0201_text - } state; /* Escape sequence? */ + eDetectedKCode detected_kcode; + eSJIS_status SJIS_status; + eEUC_status EUC_status; +#endif + eGridState state; /* Escape sequence? */ int kanji_buf; /* Lead multibyte */ int in_sjis; /* SJIS flag */ int halted; /* emergency halt */ @@ -1173,13 +1183,13 @@ HText *HText_new(HTParentAnchor *anchor) HText *HText_new2(HTParentAnchor *anchor, HTStream *stream) { - HText *this = HText_new(anchor); + HText *result = HText_new(anchor); if (stream) { - this->target = stream; - this->targetClass = *stream->isa; /* copy action procedures */ + result->target = stream; + result->targetClass = *stream->isa; /* copy action procedures */ } - return this; + return result; } /* Free Entire Text @@ -1236,12 +1246,7 @@ void HText_free(HText *self) * Free the hidden links list. -FM */ if (self->hidden_links) { - char *href = NULL; - HTList *cur = self->hidden_links; - - while (NULL != (href = (char *) HTList_nextObject(cur))) - FREE(href); - HTList_delete(self->hidden_links); + LYFreeStringList(self->hidden_links); self->hidden_links = NULL; } @@ -2382,10 +2387,7 @@ static void display_page(HText *text, int line_number, * Free any un-reallocated links[] entries * from the previous page draw. -FM */ - for (i = nlinks; i < last_nlinks; i++) { - LYSetHilite(i, NULL); - FREE(links[i].lname); - } + LYFreeHilites(nlinks, last_nlinks); last_nlinks = nlinks; /* @@ -3594,7 +3596,7 @@ void HText_appendCharacter(HText *text, int ch) if ((HTCJK == JAPANESE) && (text->detected_kcode != DET_MIXED) && (text->specified_kcode != SJIS) && (text->specified_kcode != EUC)) { unsigned char c; - enum _detected_kcode save_d_kcode; + eDetectedKCode save_d_kcode; c = UCH(ch); save_d_kcode = text->detected_kcode; @@ -4171,7 +4173,7 @@ void HText_appendCharacter(HText *text, int ch) (text->T.output_utf8 && target_cu + UTF_XLEN(ch) >= LYcols_cu(text))) { int saved_kanji_buf; - int saved_state; + eGridState saved_state; new_line(text); line = text->last_line; @@ -5967,7 +5969,7 @@ HTParentAnchor *HText_nodeAnchor(HText *text) HTChildAnchor *HText_childNextNumber(int number, void **prev) { /* Sorry, TextAnchor is not declared outside this file, use a cast. */ - TextAnchor *a = *prev; + TextAnchor *a = (TextAnchor *) *prev; if (!HTMainText || number <= 0) return (HTChildAnchor *) 0; /* Fail */ @@ -7337,18 +7339,8 @@ HTAnchor *HText_linkSelTo(HText *me GCC_UNUSED, */ void HTSearchQueries_free(void) { - char *query; - HTList *cur = search_queries; - - if (!cur) - return; - - while (NULL != (query = (char *) HTList_nextObject(cur))) { - FREE(query); - } - HTList_delete(search_queries); + LYFreeStringList(search_queries); search_queries = NULL; - return; } /* @@ -7391,7 +7383,8 @@ void HTAddSearchQuery(char *query) int do_www_search(DocInfo *doc) { char searchstring[256], temp[256], *cp, *tmpaddress = NULL; - int ch, recall; + int ch; + RecallType recall; int QueryTotal; int QueryNum; BOOLEAN PreviousSearch = FALSE; @@ -8866,8 +8859,12 @@ static void HText_AddHiddenLink(HText *text, TextAnchor *textanchor) */ if ((dest = HTAnchor_followLink(textanchor->anchor)) && (text->hiddenlinkflag != HIDDENLINKS_IGNORE || - HTList_isEmpty(text->hidden_links))) - HTList_appendObject(text->hidden_links, HTAnchor_address(dest)); + HTList_isEmpty(text->hidden_links))) { + char *cp_freeme = NULL; + + HTList_appendObject(text->hidden_links, cp_freeme = HTAnchor_address(dest)); + FREE(cp_freeme); + } return; } @@ -9281,7 +9278,7 @@ char *HText_setLastOptionValue(HText *text, char *value, /* * Deal with newlines or tabs. */ - convert_to_spaces(value, FALSE); + LYReduceBlanks(value); if (!op_ptr) { /* @@ -10380,7 +10377,8 @@ int HText_SubmitForm(FormInfo * submit_item, DocInfo *doc, char *link_name, if (!HTMainText) return 0; - thisform = HTList_objectAt(HTMainText->forms, form_number - 1); + thisform = (PerFormInfo *) HTList_objectAt(HTMainText->forms, form_number + - 1); /* Sanity check */ if (!thisform) { CTRACE((tfp, "SubmitForm: form %d not in HTMainText's list!\n", @@ -11526,7 +11524,7 @@ BOOL HText_hasUTF8OutputSet(HText *text) void HText_setKcode(HText *text, const char *charset, LYUCcharset *p_in) { - BOOL explicit; + BOOL charset_explicit; if (!text) return; @@ -11537,7 +11535,7 @@ void HText_setKcode(HText *text, const char *charset, if (!charset && !p_in) { return; } - explicit = charset ? TRUE : FALSE; + charset_explicit = charset ? TRUE : FALSE; /* * If no explicit charset string, use the implied one. - kw */ @@ -11563,11 +11561,11 @@ void HText_setKcode(HText *text, const char *charset, * is specified explicitely, otherwise text->kcode would cause * mishandling Japanese strings. -- TH */ - if (explicit && (!strcmp(charset, "shift_jis") || - !strcmp(charset, "x-sjis") || /* 1997/11/28 (Fri) 18:11:33 */ - !strcmp(charset, "x-shift-jis"))) { + if (charset_explicit && (!strcmp(charset, "shift_jis") || + !strcmp(charset, "x-sjis") || /* 1997/11/28 (Fri) 18:11:33 */ + !strcmp(charset, "x-shift-jis"))) { text->kcode = SJIS; - } else if (explicit + } else if (charset_explicit #ifdef EXP_JAPANESEUTF8_SUPPORT && strcmp(charset, "utf-8") #endif @@ -11601,7 +11599,7 @@ void HText_setKcode(HText *text, const char *charset, } } - if (explicit + if (charset_explicit #ifdef EXP_JAPANESEUTF8_SUPPORT && strcmp(charset, "utf-8") #endif diff --git a/src/GridText.h b/src/GridText.h index 40cc7591..e5e2d44f 100644 --- a/src/GridText.h +++ b/src/GridText.h @@ -1,4 +1,3 @@ - /* Specialities of GridText as subclass of HText */ #ifndef LYGRIDTEXT_H @@ -12,13 +11,16 @@ #include <HTFont.h> +#include <HTCJK.h> + +#ifdef __cplusplus +extern "C" { +#endif #define TABSTOP 8 #define SPACES " " /* must be at least TABSTOP spaces long */ #define SPLAT '.' - #define NOCHOP 0 #define CHOP 1 - /* just for information: US-ASCII control characters <32 which are not defined in Unicode standard =00 U+0000 NULL @@ -54,230 +56,229 @@ US-ASCII control characters <32 which are not defined in Unicode standard =1E U+001E RECORD SEPARATOR =1F U+001F UNIT SEPARATOR =7F U+007F DELETE -*/ - -extern int HTCurSelectGroupType; -extern char *HTCurSelectGroupSize; +*/ extern int HTCurSelectGroupType; + extern char *HTCurSelectGroupSize; #if defined(VMS) && defined(VAXC) && !defined(__DECC) -extern int HTVirtualMemorySize; -#endif /* VMS && VAXC && !__DECC */ + extern int HTVirtualMemorySize; +#endif /* VMS && VAXC && !__DECC */ -extern HTChildAnchor *HText_childNextNumber(int n, void **prev); -extern void HText_FormDescNumber(int n, const char **desc); + extern HTChildAnchor *HText_childNextNumber(int n, void **prev); + extern void HText_FormDescNumber(int n, const char **desc); /* Is there any file left? */ -extern BOOL HText_canScrollUp(HText *text); -extern BOOL HText_canScrollDown(void); + extern BOOL HText_canScrollUp(HText *text); + extern BOOL HText_canScrollDown(void); /* Move display within window */ -extern void HText_scrollUp(HText *text); /* One page */ -extern void HText_scrollDown(HText *text); /* One page */ -extern void HText_scrollTop(HText *text); -extern void HText_scrollBottom(HText *text); -extern void HText_pageDisplay(int line_num, char *target); -extern BOOL HText_pageHasPrevTarget(void); - -extern int HText_LinksInLines(HText *text, int line_num, int Lines); - -extern void HText_setLastChar(HText *text, char ch); -extern char HText_getLastChar(HText *text); -extern void HText_setIgnoreExcess(HText *text, BOOL ignore); - -extern int HText_sourceAnchors(HText *text); -extern void HText_setStale(HText *text); -extern void HText_refresh(HText *text); -extern const char *HText_getTitle(void); -extern const char *HText_getSugFname(void); -extern void HTCheckFnameForCompression(char **fname, - HTParentAnchor *anchor, - BOOLEAN strip_ok); -extern const char *HText_getLastModified(void); -extern const char *HText_getDate(void); -extern const char *HText_getHttpHeaders(void); -extern const char *HText_getServer(void); -extern const char *HText_getOwner(void); -extern const char *HText_getContentBase(void); -extern const char *HText_getContentLocation(void); -extern const char *HText_getMessageID(void); -extern const char *HText_getRevTitle(void); + extern void HText_scrollUp(HText *text); /* One page */ + extern void HText_scrollDown(HText *text); /* One page */ + extern void HText_scrollTop(HText *text); + extern void HText_scrollBottom(HText *text); + extern void HText_pageDisplay(int line_num, char *target); + extern BOOL HText_pageHasPrevTarget(void); + + extern int HText_LinksInLines(HText *text, int line_num, int Lines); + + extern void HText_setLastChar(HText *text, char ch); + extern char HText_getLastChar(HText *text); + extern void HText_setIgnoreExcess(HText *text, BOOL ignore); + + extern int HText_sourceAnchors(HText *text); + extern void HText_setStale(HText *text); + extern void HText_refresh(HText *text); + extern const char *HText_getTitle(void); + extern const char *HText_getSugFname(void); + extern void HTCheckFnameForCompression(char **fname, + HTParentAnchor *anchor, + BOOLEAN strip_ok); + extern const char *HText_getLastModified(void); + extern const char *HText_getDate(void); + extern const char *HText_getHttpHeaders(void); + extern const char *HText_getServer(void); + extern const char *HText_getOwner(void); + extern const char *HText_getContentBase(void); + extern const char *HText_getContentLocation(void); + extern const char *HText_getMessageID(void); + extern const char *HText_getRevTitle(void); #ifdef USE_COLOR_STYLE -extern const char *HText_getStyle(void); + extern const char *HText_getStyle(void); #endif -extern void HText_setMainTextOwner(const char *owner); -extern void print_wwwfile_to_fd(FILE *fp, BOOLEAN is_email, BOOLEAN is_reply); -extern BOOL HText_select(HText *text); -extern BOOL HText_POSTReplyLoaded(DocInfo *doc); -extern BOOL HTFindPoundSelector(const char *selector); -extern int HTGetRelLinkNum(int num, int rel, int cur); -extern int HTGetLinkInfo(int number, - int want_go, - int *go_line, - int *linknum, - char **hightext, - char **lname); -extern BOOL HText_TAHasMoreLines(int curlink, - int direction); -extern int HTGetLinkOrFieldStart(int curlink, - int *go_line, - int *linknum, - int direction, - BOOLEAN ta_skip); -extern BOOL HText_getFirstTargetInLine(HText *text, - int line_num, - BOOL utf_flag, - int *offset, - int *tLen, - char **data, - const char *target); -extern int HTisDocumentSource(void); -extern void HTuncache_current_document(void); + extern void HText_setMainTextOwner(const char *owner); + extern void print_wwwfile_to_fd(FILE *fp, BOOLEAN is_email, BOOLEAN is_reply); + extern BOOL HText_select(HText *text); + extern BOOL HText_POSTReplyLoaded(DocInfo *doc); + extern BOOL HTFindPoundSelector(const char *selector); + extern int HTGetRelLinkNum(int num, int rel, int cur); + extern int HTGetLinkInfo(int number, + int want_go, + int *go_line, + int *linknum, + char **hightext, + char **lname); + extern BOOL HText_TAHasMoreLines(int curlink, + int direction); + extern int HTGetLinkOrFieldStart(int curlink, + int *go_line, + int *linknum, + int direction, + BOOLEAN ta_skip); + extern BOOL HText_getFirstTargetInLine(HText *text, + int line_num, + BOOL utf_flag, + int *offset, + int *tLen, + char **data, + const char *target); + extern int HTisDocumentSource(void); + extern void HTuncache_current_document(void); #ifdef USE_SOURCE_CACHE -extern BOOLEAN HTreparse_document(void); -extern BOOLEAN HTcan_reparse_document(void); -extern BOOLEAN HTdocument_settings_changed(void); + extern BOOLEAN HTreparse_document(void); + extern BOOLEAN HTcan_reparse_document(void); + extern BOOLEAN HTdocument_settings_changed(void); #endif -extern BOOL HTLoadedDocumentEightbit(void); -extern BOOL HText_LastLineEmpty(HText *me, BOOL IgnoreSpaces); -extern BOOL HText_PreviousLineEmpty(HText *me, BOOL IgnoreSpaces); -extern BOOL HText_inLineOne(HText *text); -extern BOOLEAN HTLoadedDocumentIsHEAD(void); -extern BOOLEAN HTLoadedDocumentIsSafe(void); -extern bstring *HTLoadedDocumentPost_data(void); -extern const char *HTLoadedDocumentBookmark(void); -extern const char *HTLoadedDocumentCharset(void); -extern const char *HTLoadedDocumentTitle(void); -extern const char *HTLoadedDocumentURL(void); -extern const char *HText_HiddenLinkAt(HText *text, int number); -extern int HText_HiddenLinkCount(HText *text); -extern int HText_LastLineOffset(HText *me); -extern int HText_LastLineSize(HText *me, BOOL IgnoreSpaces); -extern int HText_PreviousLineSize(HText *me, BOOL IgnoreSpaces); -extern int HText_getCurrentColumn(HText *text); -extern int HText_getLines(HText *text); -extern int HText_getMaximumColumn(HText *text); -extern int HText_getNumOfBytes(void); -extern int HText_getNumOfLines(void); -extern int HText_getTabIDColumn(HText *text, const char *name); -extern int HText_getTopOfScreen(void); -extern int do_www_search(DocInfo *doc); -extern void HText_NegateLineOne(HText *text); -extern void HText_RemovePreviousLine(HText *text); -extern void HText_setNodeAnchorBookmark(const char *bookmark); -extern void HText_setTabID(HText *text, const char *name); -extern void *HText_pool_calloc(HText *text, unsigned size); + extern BOOL HTLoadedDocumentEightbit(void); + extern BOOL HText_LastLineEmpty(HText *me, BOOL IgnoreSpaces); + extern BOOL HText_PreviousLineEmpty(HText *me, BOOL IgnoreSpaces); + extern BOOL HText_inLineOne(HText *text); + extern BOOLEAN HTLoadedDocumentIsHEAD(void); + extern BOOLEAN HTLoadedDocumentIsSafe(void); + extern bstring *HTLoadedDocumentPost_data(void); + extern const char *HTLoadedDocumentBookmark(void); + extern const char *HTLoadedDocumentCharset(void); + extern const char *HTLoadedDocumentTitle(void); + extern const char *HTLoadedDocumentURL(void); + extern const char *HText_HiddenLinkAt(HText *text, int number); + extern int HText_HiddenLinkCount(HText *text); + extern int HText_LastLineOffset(HText *me); + extern int HText_LastLineSize(HText *me, BOOL IgnoreSpaces); + extern int HText_PreviousLineSize(HText *me, BOOL IgnoreSpaces); + extern int HText_getCurrentColumn(HText *text); + extern int HText_getLines(HText *text); + extern int HText_getMaximumColumn(HText *text); + extern int HText_getNumOfBytes(void); + extern int HText_getNumOfLines(void); + extern int HText_getTabIDColumn(HText *text, const char *name); + extern int HText_getTopOfScreen(void); + extern int do_www_search(DocInfo *doc); + extern void HText_NegateLineOne(HText *text); + extern void HText_RemovePreviousLine(HText *text); + extern void HText_setNodeAnchorBookmark(const char *bookmark); + extern void HText_setTabID(HText *text, const char *name); + extern void *HText_pool_calloc(HText *text, unsigned size); /* "simple table" stuff */ -extern int HText_endStblTABLE(HText *); -extern int HText_trimCellLines(HText *text); -extern void HText_cancelStbl(HText *); -extern void HText_endStblCOLGROUP(HText *); -extern void HText_endStblTD(HText *); -extern void HText_endStblTR(HText *); -extern void HText_startStblCOL(HText *, int, short, BOOL); -extern void HText_startStblRowGroup(HText *, short); -extern void HText_startStblTABLE(HText *, short); -extern void HText_startStblTD(HText *, int, int, short, BOOL); -extern void HText_startStblTR(HText *, short); + extern int HText_endStblTABLE(HText *); + extern int HText_trimCellLines(HText *text); + extern void HText_cancelStbl(HText *); + extern void HText_endStblCOLGROUP(HText *); + extern void HText_endStblTD(HText *); + extern void HText_endStblTR(HText *); + extern void HText_startStblCOL(HText *, int, short, BOOL); + extern void HText_startStblRowGroup(HText *, short); + extern void HText_startStblTABLE(HText *, short); + extern void HText_startStblTD(HText *, int, int, short, BOOL); + extern void HText_startStblTR(HText *, short); /* forms stuff */ -extern void HText_beginForm(char *action, - char *method, - char *enctype, - char *title, - const char *accept_cs); -extern void HText_endForm(HText *text); -extern void HText_beginSelect(char *name, - int name_cs, - BOOLEAN multiple, - char *len); -extern int HText_getOptionNum(HText *text); -extern char *HText_setLastOptionValue(HText *text, - char *value, - char *submit_value, - int order, - BOOLEAN checked, - int val_cs, - int submit_val_cs); -extern int HText_beginInput(HText *text, - BOOL underline, - InputFieldData * I); -extern void HText_endInput(HText *text); -extern int HText_SubmitForm(FormInfo * submit_item, DocInfo *doc, - char *link_name, - char *link_value); -extern void HText_DisableCurrentForm(void); -extern void HText_ResetForm(FormInfo * form); -extern void HText_activateRadioButton(FormInfo * form); -extern BOOLEAN HText_HaveUserChangedForms(HText *text); - -extern HTList *search_queries; /* Previous isindex and whereis queries */ -extern void HTSearchQueries_free(void); -extern void HTAddSearchQuery(char *query); - -extern void user_message(const char *message, - const char *argument); + extern void HText_beginForm(char *action, + char *method, + char *enctype, + char *title, + const char *accept_cs); + extern void HText_endForm(HText *text); + extern void HText_beginSelect(char *name, + int name_cs, + BOOLEAN multiple, + char *len); + extern int HText_getOptionNum(HText *text); + extern char *HText_setLastOptionValue(HText *text, + char *value, + char *submit_value, + int order, + BOOLEAN checked, + int val_cs, + int submit_val_cs); + extern int HText_beginInput(HText *text, + BOOL underline, + InputFieldData * I); + extern void HText_endInput(HText *text); + extern int HText_SubmitForm(FormInfo * submit_item, DocInfo *doc, + char *link_name, + char *link_value); + extern void HText_DisableCurrentForm(void); + extern void HText_ResetForm(FormInfo * form); + extern void HText_activateRadioButton(FormInfo * form); + extern BOOLEAN HText_HaveUserChangedForms(HText *text); + + extern HTList *search_queries; /* Previous isindex and whereis queries */ + extern void HTSearchQueries_free(void); + extern void HTAddSearchQuery(char *query); + + extern void user_message(const char *message, + const char *argument); #define _user_message(msg, arg) mustshow = TRUE, user_message(msg, arg) -extern void www_user_search(int start_line, - DocInfo *doc, - char *target, - int direction); + extern void www_user_search(int start_line, + DocInfo *doc, + char *target, + int direction); -extern void print_crawl_to_fd(FILE *fp, - char *thelink, - char *thetitle); -extern char *stub_HTAnchor_address(HTAnchor * me); + extern void print_crawl_to_fd(FILE *fp, + char *thelink, + char *thetitle); + extern char *stub_HTAnchor_address(HTAnchor * me); -extern void HText_setToolbar(HText *text); -extern BOOL HText_hasToolbar(HText *text); + extern void HText_setToolbar(HText *text); + extern BOOL HText_hasToolbar(HText *text); -extern void HText_setNoCache(HText *text); -extern BOOL HText_hasNoCacheSet(HText *text); + extern void HText_setNoCache(HText *text); + extern BOOL HText_hasNoCacheSet(HText *text); -extern BOOL HText_hasUTF8OutputSet(HText *text); -extern void HText_setKcode(HText *text, - const char *charset, - LYUCcharset *p_in); + extern BOOL HText_hasUTF8OutputSet(HText *text); + extern void HText_setKcode(HText *text, + const char *charset, + LYUCcharset *p_in); -extern void HText_setBreakPoint(HText *text); + extern void HText_setBreakPoint(HText *text); -extern BOOL HText_AreDifferent(HTParentAnchor *anchor, - const char *full_address); + extern BOOL HText_AreDifferent(HTParentAnchor *anchor, + const char *full_address); -extern int HText_ExtEditForm(LinkInfo * form_link); -extern void HText_ExpandTextarea(LinkInfo * form_link, int newlines); -extern int HText_InsertFile(LinkInfo * form_link); + extern int HText_ExtEditForm(LinkInfo * form_link); + extern void HText_ExpandTextarea(LinkInfo * form_link, int newlines); + extern int HText_InsertFile(LinkInfo * form_link); -extern void redraw_lines_of_link(int cur); -extern void LYMoveToLink(int cur, - const char *target, - const char *hightext, - int flag, - BOOL inU, - BOOL utf_flag); + extern void redraw_lines_of_link(int cur); + extern void LYMoveToLink(int cur, + const char *target, + const char *hightext, + int flag, + BOOL inU, + BOOL utf_flag); #ifdef USE_PRETTYSRC -extern void HTMark_asSource(void); + extern void HTMark_asSource(void); #endif -extern int HTMainText_Get_UCLYhndl(void); - -#include <HTCJK.h> + extern int HTMainText_Get_UCLYhndl(void); #ifdef KANJI_CODE_OVERRIDE -extern HTkcode last_kcode; + extern HTkcode last_kcode; #endif -extern HTkcode HText_getKcode(HText *text); -extern void HText_updateKcode(HText *text, HTkcode kcode); -extern HTkcode HText_getSpecifiedKcode(HText *text); -extern void HText_updateSpecifiedKcode(HText *text, HTkcode kcode); + extern HTkcode HText_getKcode(HText *text); + extern void HText_updateKcode(HText *text, HTkcode kcode); + extern HTkcode HText_getSpecifiedKcode(HText *text); + extern void HText_updateSpecifiedKcode(HText *text, HTkcode kcode); -#endif /* LYGRIDTEXT_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYGRIDTEXT_H */ diff --git a/src/HTAlert.h b/src/HTAlert.h index e9a48468..89f60e26 100644 --- a/src/HTAlert.h +++ b/src/HTAlert.h @@ -10,8 +10,10 @@ #include <LYCookie.h> +#ifdef __cplusplus +extern "C" { +#endif #define ALERT_PREFIX_LEN 5 - /* Display a message and get the input * * On entry, @@ -19,28 +21,27 @@ * * On exit, * Return value is malloc'd string which must be freed. - */ -extern char *HTPrompt(const char *Msg, const char *deflt); + */ extern char *HTPrompt(const char *Msg, const char *deflt); /* Display a message, don't wait for input * * On entry, * The input is a list of parameters for printf. */ -extern void HTAlert(const char *Msg); -extern void HTAlwaysAlert(const char *extra_prefix, const char *Msg); -extern void HTInfoMsg(const char *Msg); -extern void HTUserMsg(const char *Msg); -extern void HTUserMsg2(const char *Msg, const char *Arg); + extern void HTAlert(const char *Msg); + extern void HTAlwaysAlert(const char *extra_prefix, const char *Msg); + extern void HTInfoMsg(const char *Msg); + extern void HTUserMsg(const char *Msg); + extern void HTUserMsg2(const char *Msg, const char *Arg); /* Display a progress message for information (and diagnostics) only * * On entry, * The input is a list of parameters for printf. */ -extern const char *HTProgressUnits(int kilobytes); -extern void HTProgress(const char *Msg); -extern void HTReadProgress(long bytes, long total); + extern const char *HTProgressUnits(int kilobytes); + extern void HTProgress(const char *Msg); + extern void HTReadProgress(long bytes, long total); #define _HTProgress(msg) mustshow = TRUE, HTProgress(msg) @@ -48,12 +49,12 @@ extern void HTReadProgress(long bytes, long total); * Indicates whether last HTConfirm was cancelled (^G or ^C) and * resets flag. (so only call once!) - kw */ -extern BOOL HTLastConfirmCancelled(void); + extern BOOL HTLastConfirmCancelled(void); /* * Supports logic for forced yes/no prompt results. */ -extern int HTForcedPrompt(int Opt, const char *Msg, int Dft); + extern int HTForcedPrompt(int Opt, const char *Msg, int Dft); /* Display a message, then wait for 'yes' or 'no', allowing default * response if a return or left-arrow is used. @@ -65,7 +66,7 @@ extern int HTForcedPrompt(int Opt, const char *Msg, int Dft); * If the user enters 'YES', returns TRUE, returns FALSE * otherwise. */ -extern int HTConfirmDefault(const char *Msg, int Dft); + extern int HTConfirmDefault(const char *Msg, int Dft); /* Display a message, then wait for 'yes' or 'no'. * @@ -76,16 +77,16 @@ extern int HTConfirmDefault(const char *Msg, int Dft); * If the user enters 'YES', returns TRUE, returns FALSE * otherwise. */ -extern BOOL HTConfirm(const char *Msg); + extern BOOL HTConfirm(const char *Msg); -extern BOOL confirm_post_resub(const char *address, - const char *title, - int if_imgmap, - int if_file); + extern BOOL confirm_post_resub(const char *address, + const char *title, + int if_imgmap, + int if_file); /* Prompt for password without echoing the reply */ -extern char *HTPromptPassword(const char *Msg); + extern char *HTPromptPassword(const char *Msg); /* Prompt both username and password HTPromptUsernameAndPassword() * --------------------------------- @@ -108,10 +109,10 @@ extern char *HTPromptPassword(const char *Msg); * are NOT freed. * */ -extern void HTPromptUsernameAndPassword(const char *Msg, - char **username, - char **password, - BOOL IsProxy); + extern void HTPromptUsernameAndPassword(const char *Msg, + char **username, + char **password, + BOOL IsProxy); /* Confirm a cookie operation. HTConfirmCookie() * --------------------------- @@ -127,9 +128,9 @@ extern void HTPromptUsernameAndPassword(const char *Msg, * Returns FALSE on cancel, * TRUE if the cookie should be set. */ -extern BOOL HTConfirmCookie(domain_entry * dp, const char *server, - const char *name, - const char *value); + extern BOOL HTConfirmCookie(domain_entry * dp, const char *server, + const char *name, + const char *value); /* Confirm redirection of POST. HTConfirmPostRedirect() * ---------------------------- @@ -142,19 +143,22 @@ extern BOOL HTConfirmCookie(domain_entry * dp, const char *server, * 1 for redirect of POST with content, * 303 for redirect as GET without content */ -extern int HTConfirmPostRedirect(const char *Redirecting_url, - int server_status); + extern int HTConfirmPostRedirect(const char *Redirecting_url, + int server_status); -extern void LYSleepAlert(void); -extern void LYSleepDebug(void); -extern void LYSleepInfo(void); -extern void LYSleepMsg(void); -extern void LYSleepReplay(void); + extern void LYSleepAlert(void); + extern void LYSleepDebug(void); + extern void LYSleepInfo(void); + extern void LYSleepMsg(void); + extern void LYSleepReplay(void); #ifdef HAVE_STRERROR #define LYStrerror strerror #else -extern char *LYStrerror(int code); -#endif /* HAVE_STRERROR */ + extern char *LYStrerror(int code); +#endif /* HAVE_STRERROR */ -#endif /* HTALERT_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTALERT_H */ diff --git a/src/HTForms.h b/src/HTForms.h index 71ef376d..8cf01eaa 100644 --- a/src/HTForms.h +++ b/src/HTForms.h @@ -5,93 +5,93 @@ #include <LYStructs.h> #endif /* LYSTRUCTS_H */ -/* in LYForms.c */ - +#ifdef __cplusplus +extern "C" { +#endif /* change_form_link() calls change_form_link_ex() with all its args and FALSE * as last arg - */ -extern int change_form_link(int cur, - DocInfo *newdoc, - BOOLEAN *refresh_screen, - BOOLEAN use_last_tfpos, - BOOLEAN immediate_submit); - -extern int change_form_link_ex(int cur, - DocInfo *newdoc, - BOOLEAN *refresh_screen, - BOOLEAN use_last_tfpos, - BOOLEAN immediate_submit, - BOOLEAN draw_only); + */ extern int change_form_link(int cur, + DocInfo *newdoc, + BOOLEAN *refresh_screen, + BOOLEAN use_last_tfpos, + BOOLEAN immediate_submit); + + extern int change_form_link_ex(int cur, + DocInfo *newdoc, + BOOLEAN *refresh_screen, + BOOLEAN use_last_tfpos, + BOOLEAN immediate_submit, + BOOLEAN draw_only); /* InputFieldData is used to pass the info between HTML.c and Gridtext.c in * HText_beginInput() */ -typedef struct _InputFieldData { - const char *accept; - const char *align; - int checked; - const char *class; - int disabled; - const char *error; - const char *height; - const char *id; - const char *lang; - const char *max; - const char *maxlength; - const char *md; - const char *min; - const char *name; - int size; - const char *src; - const char *type; - char *value; - const char *width; - int name_cs; /* charset handle for name */ - int value_cs; /* charset handle for value */ - const char *accept_cs; -} InputFieldData; + typedef struct _InputFieldData { + const char *accept; + const char *align; + int checked; + const char *iclass; + int disabled; + const char *error; + const char *height; + const char *id; + const char *lang; + const char *max; + const char *maxlength; + const char *md; + const char *min; + const char *name; + int size; + const char *src; + const char *type; + char *value; + const char *width; + int name_cs; /* charset handle for name */ + int value_cs; /* charset handle for value */ + const char *accept_cs; + } InputFieldData; /* The OptionType structure is for a linked list of option entries */ -typedef struct _OptionType { - char *name; /* the name of the entry */ - char *cp_submit_value; /* the value to submit */ - int value_cs; /* charset value is in */ - struct _OptionType *next; /* the next entry */ -} OptionType; + typedef struct _OptionType { + char *name; /* the name of the entry */ + char *cp_submit_value; /* the value to submit */ + int value_cs; /* charset value is in */ + struct _OptionType *next; /* the next entry */ + } OptionType; /* * The FormInfo structure is used to contain the form field data within each * anchor. A pointer to this structure is in the TextAnchor struct. */ -typedef struct _FormInfo { - char *name; /* the name of the link */ - int number; /* which form is the link within */ - int type; /* string, int, etc. */ - char *value; /* user entered string data */ - char *orig_value; /* the original value */ - int size; /* width on the screen */ - unsigned maxlength; /* max width of data */ - int group; /* a group associated with the link + typedef struct _FormInfo { + char *name; /* the name of the link */ + int number; /* which form is the link within */ + int type; /* string, int, etc. */ + char *value; /* user entered string data */ + char *orig_value; /* the original value */ + int size; /* width on the screen */ + unsigned maxlength; /* max width of data */ + int group; /* a group associated with the link * this is used for select's */ - int num_value; /* value of the numerical fields */ - int hrange; /* high numerical range */ - int lrange; /* low numerical range */ - OptionType *select_list; /* array of option choices */ - char *submit_action; /* form's action */ - int submit_method; /* form's method */ - char *submit_enctype; /* form's entype */ - char *submit_title; /* form's title */ - BOOL no_cache; /* Always resubmit? */ - char *cp_submit_value; /* option value to submit */ - char *orig_submit_value; /* original submit value */ - int size_l; /* The length of the option list */ - int disabled; /* If YES, can't change values */ - int name_cs; - int value_cs; - char *accept_cs; -} FormInfo; + int num_value; /* value of the numerical fields */ + int hrange; /* high numerical range */ + int lrange; /* low numerical range */ + OptionType *select_list; /* array of option choices */ + char *submit_action; /* form's action */ + int submit_method; /* form's method */ + char *submit_enctype; /* form's entype */ + char *submit_title; /* form's title */ + BOOL no_cache; /* Always resubmit? */ + char *cp_submit_value; /* option value to submit */ + char *orig_submit_value; /* original submit value */ + int size_l; /* The length of the option list */ + int disabled; /* If YES, can't change values */ + int name_cs; + int value_cs; + char *accept_cs; + } FormInfo; /* * As structure for info associated with a form. There is some redundancy @@ -99,17 +99,17 @@ typedef struct _FormInfo { * (as opposed to form fields) per doc is expected to be rather small. More * things which are per form rather than per field could be moved here. - kw */ -typedef struct _PerFormInfo { - int number; /* form number, see GridText.c */ - /* except for the last two, the following fields aren't actually used.. */ - int disabled; /* If YES, can't change values */ - struct _PerFormInfo *next; /* pointer to next form in doc */ - int nfields; /* number of fields */ - FormInfo *first_field; - FormInfo *last_field; /* pointer to last field in form */ - char *accept_cs; - char *thisacceptcs; /* used during submit */ -} PerFormInfo; + typedef struct _PerFormInfo { + int number; /* form number, see GridText.c */ + /* except for the last two, the following fields aren't actually used.. */ + int disabled; /* If YES, can't change values */ + struct _PerFormInfo *next; /* pointer to next form in doc */ + int nfields; /* number of fields */ + FormInfo *first_field; + FormInfo *last_field; /* pointer to last field in form */ + char *accept_cs; + char *thisacceptcs; /* used during submit */ + } PerFormInfo; #define HYPERTEXT_ANCHOR 1 #define INPUT_ANCHOR 2 /* forms mode input fields */ @@ -151,7 +151,9 @@ typedef struct _PerFormInfo { #define LAST_ORDER 3 /* in LYForms.c */ -extern void show_formlink_statusline(const FormInfo * form, - int for_what); - -#endif /* HTFORMS_H */ + extern void show_formlink_statusline(const FormInfo * form, + int for_what); +#ifdef __cplusplus +} +#endif +#endif /* HTFORMS_H */ diff --git a/src/HTInit.c b/src/HTInit.c index 24f62f61..db684ad1 100644 --- a/src/HTInit.c +++ b/src/HTInit.c @@ -236,7 +236,8 @@ static char *GetCommand(char *s, char **t) s = LYSkipBlanks(s); /* marca -- added + 1 for error case -- oct 24, 1993. */ - s2 = malloc(strlen(s) * 2 + 1); /* absolute max, if all % signs */ + s2 = typeMallocn(char, strlen(s) * 2 + 1); /* absolute max, if all % signs */ + if (!s2) ExitWithError(MEMORY_EXHAUSTED_ABORT); @@ -345,7 +346,8 @@ static int ProcessMailcapEntry(FILE *fp, struct MailcapEntry *mc, AcceptMedia me need = len + strlen(rawentry) + 1; if (need > rawentryalloc) { rawentryalloc += (2000 + need); - rawentry = realloc(rawentry, rawentryalloc); + rawentry = typeRealloc(char, rawentry, rawentryalloc); + if (!rawentry) ExitWithError(MEMORY_EXHAUSTED_ABORT); } diff --git a/src/HTML.c b/src/HTML.c index 218842ae..821fd3e6 100644 --- a/src/HTML.c +++ b/src/HTML.c @@ -698,9 +698,9 @@ static void addClassName(const char *prefix, if ((have + need) >= Style_className_len) { Style_className_len += 1024 + 2 * (have + need); if (Style_className == 0) { - Style_className = malloc(Style_className_len); + Style_className = typeMallocn(char, Style_className_len); } else { - Style_className = realloc(Style_className, Style_className_len); + Style_className = typeRealloc(char, Style_className, Style_className_len); } if (Style_className == NULL) outofmem(__FILE__, "addClassName"); @@ -920,7 +920,7 @@ static int HTML_start_element(HTStructured * me, int element_number, HTChildAnchor *ID_A = NULL; /* HTML_foo_ID anchor */ int url_type = 0, i = 0; char *cp = NULL; - HTMLElement ElementNumber = element_number; + HTMLElement ElementNumber = (HTMLElement) element_number; BOOL intern_flag = FALSE; short stbl_align = HT_ALIGN_NONE; int status = HT_OK; @@ -1842,7 +1842,7 @@ static int HTML_start_element(HTStructured * me, int element_number, ElementNumber = HTML_LH; } else { me->new_style = me->sp[0].style; - ElementNumber = me->sp[0].tag_number; + ElementNumber = (HTMLElement) me->sp[0].tag_number; UPDATE_STYLE; } /* @@ -3149,8 +3149,7 @@ static int HTML_start_element(HTStructured * me, int element_number, VERBOSE_IMG(value, HTML_IMG_SRC, "[INLINE]")))); else - StrAllocCopy(alt_string, (title ? - title : "")); + StrAllocCopy(alt_string, NonNull(title)); } if (*alt_string == '\0' && map_href) { StrAllocCopy(alt_string, (temp = MakeNewMapValue(value, "USEMAP"))); @@ -3750,7 +3749,7 @@ static int HTML_start_element(HTStructured * me, int element_number, status = HT_PARSER_OTHER_CONTENT; if (me->sp[0].tag_number == HTML_FIG && me->objects_figged_open > 0) { - ElementNumber = HTML_OBJECT_M; + ElementNumber = (HTMLElement) HTML_OBJECT_M; } else { me->objects_mixed_open++; SET_SKIP_STACK(HTML_OBJECT); @@ -4287,7 +4286,7 @@ static int HTML_start_element(HTStructured * me, int element_number, I.align = NULL; I.accept = NULL; I.checked = NO; - I.class = NULL; + I.iclass = NULL; I.disabled = NO; I.error = NULL; I.height = NULL; @@ -4390,7 +4389,7 @@ static int HTML_start_element(HTStructured * me, int element_number, if (present && present[HTML_BUTTON_CLASS] && /* Not yet used. */ non_empty(value[HTML_BUTTON_CLASS])) - I.class = value[HTML_BUTTON_CLASS]; + I.iclass = value[HTML_BUTTON_CLASS]; if (present && present[HTML_BUTTON_ID] && non_empty(value[HTML_BUTTON_ID])) { @@ -4468,14 +4467,14 @@ static int HTML_start_element(HTStructured * me, int element_number, BOOL HaveSRClink = FALSE; char *ImageSrc = NULL; BOOL IsSubmitOrReset = FALSE; - HTkcode kcode = 0; - HTkcode specified_kcode = 0; + HTkcode kcode = NOKANJI; + HTkcode specified_kcode = NOKANJI; /* init */ I.align = NULL; I.accept = NULL; I.checked = NO; - I.class = NULL; + I.iclass = NULL; I.disabled = NO; I.error = NULL; I.height = NULL; @@ -4792,7 +4791,7 @@ static int HTML_start_element(HTStructured * me, int element_number, I.align = value[HTML_INPUT_ALIGN]; if (present && present[HTML_INPUT_CLASS] && /* Not yet used. */ non_empty(value[HTML_INPUT_CLASS])) - I.class = value[HTML_INPUT_CLASS]; + I.iclass = value[HTML_INPUT_CLASS]; if (present && present[HTML_INPUT_ERROR] && /* Not yet used. */ non_empty(value[HTML_INPUT_ERROR])) I.error = value[HTML_INPUT_ERROR]; @@ -5150,7 +5149,7 @@ static int HTML_start_element(HTStructured * me, int element_number, I.align = NULL; I.accept = NULL; I.checked = NO; - I.class = NULL; + I.iclass = NULL; I.disabled = NO; I.error = NULL; I.height = NULL; @@ -6796,7 +6795,7 @@ static int HTML_end_element(HTStructured * me, int element_number, I.align = NULL; I.accept = NULL; I.checked = NO; - I.class = NULL; + I.iclass = NULL; I.disabled = NO; I.error = NULL; I.height = NULL; @@ -7072,8 +7071,8 @@ static int HTML_end_element(HTStructured * me, int element_number, if (*ptr == ' ') HText_appendCharacter(me->text, HT_NON_BREAK_SPACE); else { - HTkcode kcode = 0; - HTkcode specified_kcode = 0; + HTkcode kcode = NOKANJI; + HTkcode specified_kcode = NOKANJI; if (HTCJK == JAPANESE) { kcode = HText_getKcode(me->text); @@ -7858,10 +7857,14 @@ static void CacheThru_do_free(HTStream *me) me->status = HT_ERROR; LYCloseTempFP(me->fp); if (me->status == HT_OK) { + char *cp_freeme = 0; + me->anchor->source_cache_file = me->filename; CTRACE((tfp, "SourceCacheWriter: Committing file %s for URL %s to anchor\n", - me->filename, HTAnchor_address((HTAnchor *) me->anchor))); + me->filename, + cp_freeme = HTAnchor_address((HTAnchor *) me->anchor))); + FREE(cp_freeme); } else { if (source_cache_file_error == FALSE) { HTAlert(gettext("Source cache error - disk full?")); @@ -7880,10 +7883,14 @@ static void CacheThru_do_free(HTStream *me) HTAlert(gettext("Source cache error - not enough memory!")); } if (me->chunk) { + char *cp_freeme = NULL; + me->anchor->source_cache_chunk = me->chunk; CTRACE((tfp, "SourceCacheWriter: Committing memory chunk %p for URL %s to anchor\n", - (void *) me->chunk, HTAnchor_address((HTAnchor *) me->anchor))); + (void *) me->chunk, + cp_freeme = HTAnchor_address((HTAnchor *) me->anchor))); + FREE(cp_freeme); } } @@ -7977,6 +7984,7 @@ static const HTStreamClass PassThruCache = static HTStream *CacheThru_new(HTParentAnchor *anchor, HTStream *target) { + char *cp_freeme = NULL; char filename[LY_MAXPATH]; HTStream *stream = NULL; HTProtocol *p = (HTProtocol *) anchor->protocol; @@ -8013,6 +8021,7 @@ static HTStream *CacheThru_new(HTParentAnchor *anchor, stream->status = HT_OK; if (LYCacheSource == SOURCE_CACHE_FILE) { + if (anchor->source_cache_file) { CTRACE((tfp, "SourceCacheWriter: If successful, will replace source cache file %s\n", @@ -8028,8 +8037,9 @@ static HTStream *CacheThru_new(HTParentAnchor *anchor, if (!(stream->fp = LYOpenTemp(filename, HTML_SUFFIX, BIN_W))) { CTRACE((tfp, "SourceCacheWriter: Cannot open source cache file for URL %s\n", - HTAnchor_address((HTAnchor *) anchor))); + cp_freeme = HTAnchor_address((HTAnchor *) anchor))); FREE(stream); + FREE(cp_freeme); return target; } @@ -8037,7 +8047,9 @@ static HTStream *CacheThru_new(HTParentAnchor *anchor, CTRACE((tfp, "SourceCacheWriter: Caching source for URL %s in file %s\n", - HTAnchor_address((HTAnchor *) anchor), filename)); + cp_freeme = HTAnchor_address((HTAnchor *) anchor), + filename)); + FREE(cp_freeme); } if (LYCacheSource == SOURCE_CACHE_MEMORY) { @@ -8056,8 +8068,9 @@ static HTStream *CacheThru_new(HTParentAnchor *anchor, CTRACE((tfp, "SourceCacheWriter: Caching source for URL %s in memory chunk %p\n", - HTAnchor_address((HTAnchor *) anchor), (void *) stream->chunk)); - + cp_freeme = HTAnchor_address((HTAnchor *) anchor), + (void *) stream->chunk)); + FREE(cp_freeme); } return stream; diff --git a/src/HTML.h b/src/HTML.h index a8626270..76376ebd 100644 --- a/src/HTML.h +++ b/src/HTML.h @@ -16,27 +16,23 @@ #include <HTAnchor.h> #include <HTMLDTD.h> +#ifdef __cplusplus +extern "C" { +#endif /* #define ATTR_CS_IN (me->T.output_utf8 ? me->UCLYhndl : 0) */ #define ATTR_CS_IN me->tag_charset - #define TRANSLATE_AND_UNESCAPE_ENTITIES(s, p, h) \ LYUCTranslateHTMLString(s, ATTR_CS_IN, current_char_set, YES, p, h, st_HTML) - #define TRANSLATE_AND_UNESCAPE_ENTITIES5(s,cs_from,cs_to,p,h) \ LYUCTranslateHTMLString(s, cs_from, cs_to, YES, p, h, st_HTML) - #define TRANSLATE_AND_UNESCAPE_ENTITIES6(s,cs_from,cs_to,spcls,p,h) \ LYUCTranslateHTMLString(s, cs_from, cs_to, spcls, p, h, st_HTML) - #define TRANSLATE_HTML(s,p,h) \ LYUCFullyTranslateString(s, me->UCLYhndl, current_char_set, NO, YES, p, h, NO, st_HTML) - #define TRANSLATE_HTML5(s,cs_from,cs_to,p,h) \ LYUCFullyTranslateString(s, cs_from, cs_to, NO, YES, p, h, NO, st_HTML) - #define TRANSLATE_HTML7(s,cs_from,cs_to,spcls,p,h,Back) \ LYUCFullyTranslateString(s, cs_from, cs_to, NO, spcls, p, h, Back, st_HTML) - /* * Strings from attributes which should be converted to some kind of "standard" * representation (character encoding), was Latin-1, esp. URLs (incl. @@ -46,8 +42,7 @@ LYUCTranslateHTMLString(s, ATTR_CS_IN, ATTR_CS_IN, NO, NO, YES, st_URL) #define UNESCAPE_FIELDNAME_TO_STD(s) \ LYUCTranslateHTMLString(s, ATTR_CS_IN, ATTR_CS_IN, NO, NO, YES, st_HTML) - -extern const HTStructuredClass HTMLPresentation; + extern const HTStructuredClass HTMLPresentation; #ifdef Lynx_HTML_Handler /* @@ -55,180 +50,180 @@ extern const HTStructuredClass HTMLPresentation; * -------------------------------------------------------------------- */ -typedef struct _stack_element { - HTStyle *style; - int tag_number; -} stack_element; + typedef struct _stack_element { + HTStyle *style; + int tag_number; + } stack_element; /* HTML Object * ----------- */ #define MAX_NESTING 800 /* Should be checked by parser */ -struct _HTStructured { - const HTStructuredClass *isa; - HTParentAnchor *node_anchor; - HText *text; - - HTStream *target; /* Output stream */ - HTStreamClass targetClass; /* Output routines */ - - HTChildAnchor *CurrentA; /* current HTML_A anchor */ - int CurrentANum; /* current HTML_A number */ - char *base_href; /* current HTML_BASE href */ - char *map_address; /* current HTML_MAP address */ - - HTChunk title; /* Grow by 128 */ - HTChunk object; /* Grow by 128 */ - BOOL object_started; - BOOL object_declare; - BOOL object_shapes; - BOOL object_ismap; - char *object_usemap; - char *object_id; - char *object_title; - char *object_data; - char *object_type; - char *object_classid; - char *object_codebase; - char *object_codetype; - char *object_name; - int objects_mixed_open, objects_figged_open; - HTChunk option; /* Grow by 128 */ - BOOL first_option; /* First OPTION in SELECT? */ - char *LastOptionValue; - BOOL LastOptionChecked; - BOOL select_disabled; - HTChunk textarea; /* Grow by 128 */ - char *textarea_name; - int textarea_name_cs; - char *textarea_accept_cs; - int textarea_cols; - int textarea_rows; - int textarea_disabled; - char *textarea_id; - HTChunk math; /* Grow by 128 */ - HTChunk style_block; /* Grow by 128 */ - HTChunk script; /* Grow by 128 */ - - /* - * Used for nested lists. - FM - */ - int List_Nesting_Level; /* counter for list nesting level */ - int OL_Counter[12]; /* counter for ordered lists */ - char OL_Type[12]; /* types for ordered lists */ - int Last_OL_Count; /* last count in ordered lists */ - char Last_OL_Type; /* last type in ordered lists */ - - int Division_Level; - short DivisionAlignments[MAX_NESTING]; - int Underline_Level; - int Quote_Level; - - BOOL UsePlainSpace; - BOOL HiddenValue; - int lastraw; - - char *comment_start; /* for literate programming */ - char *comment_end; - - HTTag *current_tag; - BOOL style_change; - HTStyle *new_style; - HTStyle *old_style; - int current_default_alignment; - BOOL in_word; /* Have just had a non-white char */ - stack_element stack[MAX_NESTING]; - stack_element *sp; /* Style stack pointer */ - BOOL stack_overrun; /* Was MAX_NESTING exceeded? */ - int skip_stack; /* flag to skip next style stack operation */ - - /* - * Track if we are in an anchor, paragraph, address, base, etc. - */ - BOOL inA; - BOOL inAPPLET; - BOOL inAPPLETwithP; - BOOL inBadBASE; - BOOL inBadHREF; - BOOL inBadHTML; - BOOL inBASE; - BOOL inBoldA; - BOOL inBoldH; - BOOL inCAPTION; - BOOL inCREDIT; - BOOL inFIG; - BOOL inFIGwithP; - BOOL inFONT; - BOOL inFORM; - BOOL inLABEL; - BOOL inP; - BOOL inPRE; - BOOL inSELECT; - BOOL inTABLE; - BOOL inTEXTAREA; - BOOL inUnderline; - - BOOL needBoldH; - - char *xinclude; /* if no include strin address passed */ - /* - * UCI and UCLYhndl give the UCInfo and charset registered for the HTML - * parser in the node_anchor's UCStages structure. It indicates what is - * fed to the HTML parser as the stream of character data (not necessarily - * tags and attributes). It should currently always be set to be the same - * as UCI and UCLhndl for the HTEXT stage in the node_anchor's UCStages - * structure, since the HTML parser sends its input character data to the - * output without further charset translation. - */ - LYUCcharset *UCI; - int UCLYhndl; - /* - * inUCI and inUCLYhndl indicate the UCInfo and charset which the HTML - * parser treats at the input charset. It is normally set to the UCI and - * UCLhndl for the SGML parser in the node_anchor's UCStages structure - * (which may be a dummy, based on the MIME parser's UCI and UCLhndl in - * that structure, when we are handling a local file or non-http(s) - * gateway). It could be changed temporarily by the HTML parser, for - * conversions of attribute strings, but should be reset once done. - FM - */ - LYUCcharset *inUCI; - int inUCLYhndl; - /* - * outUCI and outUCLYhndl indicate the UCInfo and charset which the HTML - * parser treats as the output charset. It is normally set to its own UCI - * and UCLhndl. It could be changed for conversions of attribute strings, - * but should be reset once done. - FM - */ - LYUCcharset *outUCI; - int outUCLYhndl; - /* - * T holds the transformation rules for conversions of strings between the - * input and output charsets by the HTML parser. - FM - */ - UCTransParams T; - - int tag_charset; /* charset for attribute values etc. */ -}; - -extern HTStyle *LYstyles(int style_number); -extern BOOL LYBadHTML(HTStructured * me); + struct _HTStructured { + const HTStructuredClass *isa; + HTParentAnchor *node_anchor; + HText *text; + + HTStream *target; /* Output stream */ + HTStreamClass targetClass; /* Output routines */ + + HTChildAnchor *CurrentA; /* current HTML_A anchor */ + int CurrentANum; /* current HTML_A number */ + char *base_href; /* current HTML_BASE href */ + char *map_address; /* current HTML_MAP address */ + + HTChunk title; /* Grow by 128 */ + HTChunk object; /* Grow by 128 */ + BOOL object_started; + BOOL object_declare; + BOOL object_shapes; + BOOL object_ismap; + char *object_usemap; + char *object_id; + char *object_title; + char *object_data; + char *object_type; + char *object_classid; + char *object_codebase; + char *object_codetype; + char *object_name; + int objects_mixed_open, objects_figged_open; + HTChunk option; /* Grow by 128 */ + BOOL first_option; /* First OPTION in SELECT? */ + char *LastOptionValue; + BOOL LastOptionChecked; + BOOL select_disabled; + HTChunk textarea; /* Grow by 128 */ + char *textarea_name; + int textarea_name_cs; + char *textarea_accept_cs; + int textarea_cols; + int textarea_rows; + int textarea_disabled; + char *textarea_id; + HTChunk math; /* Grow by 128 */ + HTChunk style_block; /* Grow by 128 */ + HTChunk script; /* Grow by 128 */ + + /* + * Used for nested lists. - FM + */ + int List_Nesting_Level; /* counter for list nesting level */ + int OL_Counter[12]; /* counter for ordered lists */ + char OL_Type[12]; /* types for ordered lists */ + int Last_OL_Count; /* last count in ordered lists */ + char Last_OL_Type; /* last type in ordered lists */ + + int Division_Level; + short DivisionAlignments[MAX_NESTING]; + int Underline_Level; + int Quote_Level; + + BOOL UsePlainSpace; + BOOL HiddenValue; + int lastraw; + + char *comment_start; /* for literate programming */ + char *comment_end; + + HTTag *current_tag; + BOOL style_change; + HTStyle *new_style; + HTStyle *old_style; + int current_default_alignment; + BOOL in_word; /* Have just had a non-white char */ + stack_element stack[MAX_NESTING]; + stack_element *sp; /* Style stack pointer */ + BOOL stack_overrun; /* Was MAX_NESTING exceeded? */ + int skip_stack; /* flag to skip next style stack operation */ + + /* + * Track if we are in an anchor, paragraph, address, base, etc. + */ + BOOL inA; + BOOL inAPPLET; + BOOL inAPPLETwithP; + BOOL inBadBASE; + BOOL inBadHREF; + BOOL inBadHTML; + BOOL inBASE; + BOOL inBoldA; + BOOL inBoldH; + BOOL inCAPTION; + BOOL inCREDIT; + BOOL inFIG; + BOOL inFIGwithP; + BOOL inFONT; + BOOL inFORM; + BOOL inLABEL; + BOOL inP; + BOOL inPRE; + BOOL inSELECT; + BOOL inTABLE; + BOOL inTEXTAREA; + BOOL inUnderline; + + BOOL needBoldH; + + char *xinclude; /* if no include strin address passed */ + /* + * UCI and UCLYhndl give the UCInfo and charset registered for the HTML + * parser in the node_anchor's UCStages structure. It indicates what is + * fed to the HTML parser as the stream of character data (not necessarily + * tags and attributes). It should currently always be set to be the same + * as UCI and UCLhndl for the HTEXT stage in the node_anchor's UCStages + * structure, since the HTML parser sends its input character data to the + * output without further charset translation. + */ + LYUCcharset *UCI; + int UCLYhndl; + /* + * inUCI and inUCLYhndl indicate the UCInfo and charset which the HTML + * parser treats at the input charset. It is normally set to the UCI and + * UCLhndl for the SGML parser in the node_anchor's UCStages structure + * (which may be a dummy, based on the MIME parser's UCI and UCLhndl in + * that structure, when we are handling a local file or non-http(s) + * gateway). It could be changed temporarily by the HTML parser, for + * conversions of attribute strings, but should be reset once done. - FM + */ + LYUCcharset *inUCI; + int inUCLYhndl; + /* + * outUCI and outUCLYhndl indicate the UCInfo and charset which the HTML + * parser treats as the output charset. It is normally set to its own UCI + * and UCLhndl. It could be changed for conversions of attribute strings, + * but should be reset once done. - FM + */ + LYUCcharset *outUCI; + int outUCLYhndl; + /* + * T holds the transformation rules for conversions of strings between the + * input and output charsets by the HTML parser. - FM + */ + UCTransParams T; + + int tag_charset; /* charset for attribute values etc. */ + }; + + extern HTStyle *LYstyles(int style_number); + extern BOOL LYBadHTML(HTStructured * me); /* * Semi-Private functions. - FM */ -extern void HTML_put_character(HTStructured * me, char c); -extern void HTML_put_string(HTStructured * me, const char *s); -extern void HTML_write(HTStructured * me, const char *s, int l); -extern int HTML_put_entity(HTStructured * me, int entity_number); -extern void actually_set_style(HTStructured * me); + extern void HTML_put_character(HTStructured * me, char c); + extern void HTML_put_string(HTStructured * me, const char *s); + extern void HTML_write(HTStructured * me, const char *s, int l); + extern int HTML_put_entity(HTStructured * me, int entity_number); + extern void actually_set_style(HTStructured * me); /* Style buffering avoids dummy paragraph begin/ends. */ #define UPDATE_STYLE if (me->style_change) { actually_set_style(me); } -#endif /* Lynx_HTML_Handler */ +#endif /* Lynx_HTML_Handler */ -extern void strtolower(char *i); + extern void strtolower(char *i); /* P U B L I C */ @@ -236,25 +231,25 @@ extern void strtolower(char *i); /* * HTConverter to present HTML */ -extern HTStream *HTMLToPlain(HTPresentation *pres, - HTParentAnchor *anchor, - HTStream *sink); + extern HTStream *HTMLToPlain(HTPresentation *pres, + HTParentAnchor *anchor, + HTStream *sink); -extern HTStream *HTMLParsedPresent(HTPresentation *pres, - HTParentAnchor *anchor, - HTStream *sink); + extern HTStream *HTMLParsedPresent(HTPresentation *pres, + HTParentAnchor *anchor, + HTStream *sink); -extern HTStream *HTMLToC(HTPresentation *pres, - HTParentAnchor *anchor, - HTStream *sink); - -extern HTStream *HTMLPresent(HTPresentation *pres, + extern HTStream *HTMLToC(HTPresentation *pres, HTParentAnchor *anchor, HTStream *sink); -extern HTStructured *HTML_new(HTParentAnchor *anchor, - HTFormat format_out, - HTStream *target); + extern HTStream *HTMLPresent(HTPresentation *pres, + HTParentAnchor *anchor, + HTStream *sink); + + extern HTStructured *HTML_new(HTParentAnchor *anchor, + HTFormat format_out, + HTStream *target); /* * Record error message as a hypertext object. @@ -270,8 +265,11 @@ extern HTStructured *HTML_new(HTParentAnchor *anchor, * On exit, * a return code like HT_LOADED if object exists else 60; 0 */ -extern int HTLoadError(HTStream *sink, - int number, - const char *message); - -#endif /* HTML_H */ + extern int HTLoadError(HTStream *sink, + int number, + const char *message); + +#ifdef __cplusplus +} +#endif +#endif /* HTML_H */ diff --git a/src/HTNestedList.h b/src/HTNestedList.h index d641b471..5a5f1039 100644 --- a/src/HTNestedList.h +++ b/src/HTNestedList.h @@ -1,43 +1,43 @@ #ifndef HTNESTEDLIST_H #define HTNESTEDLIST_H -#define HTML_OL1 HTML_ELEMENTS+1 -#define HTML_OL2 HTML_ELEMENTS+2 -#define HTML_OL3 HTML_ELEMENTS+3 -#define HTML_OL4 HTML_ELEMENTS+4 -#define HTML_OL5 HTML_ELEMENTS+5 -#define HTML_OL6 HTML_ELEMENTS+6 - -#define HTML_MENU1 HTML_ELEMENTS+7 -#define HTML_MENU2 HTML_ELEMENTS+8 -#define HTML_MENU3 HTML_ELEMENTS+9 -#define HTML_MENU4 HTML_ELEMENTS+10 -#define HTML_MENU5 HTML_ELEMENTS+11 -#define HTML_MENU6 HTML_ELEMENTS+12 - -#define HTML_DL1 HTML_ELEMENTS+13 -#define HTML_DL2 HTML_ELEMENTS+14 -#define HTML_DL3 HTML_ELEMENTS+15 -#define HTML_DL4 HTML_ELEMENTS+16 -#define HTML_DL5 HTML_ELEMENTS+17 -#define HTML_DL6 HTML_ELEMENTS+18 - -#define HTML_DLC1 HTML_ELEMENTS+19 -#define HTML_DLC2 HTML_ELEMENTS+20 -#define HTML_DLC3 HTML_ELEMENTS+21 -#define HTML_DLC4 HTML_ELEMENTS+22 -#define HTML_DLC5 HTML_ELEMENTS+23 -#define HTML_DLC6 HTML_ELEMENTS+24 - -#define HTML_HCENTER HTML_ELEMENTS+25 -#define HTML_HLEFT HTML_ELEMENTS+26 -#define HTML_HRIGHT HTML_ELEMENTS+27 - -#define HTML_DCENTER HTML_ELEMENTS+28 -#define HTML_DLEFT HTML_ELEMENTS+29 -#define HTML_DRIGHT HTML_ELEMENTS+30 - -#define HTML_OBJECT_M HTML_ELEMENTS+31 +#define HTML_OL1 (HTML_ELEMENTS+1) +#define HTML_OL2 (HTML_ELEMENTS+2) +#define HTML_OL3 (HTML_ELEMENTS+3) +#define HTML_OL4 (HTML_ELEMENTS+4) +#define HTML_OL5 (HTML_ELEMENTS+5) +#define HTML_OL6 (HTML_ELEMENTS+6) + +#define HTML_MENU1 (HTML_ELEMENTS+7) +#define HTML_MENU2 (HTML_ELEMENTS+8) +#define HTML_MENU3 (HTML_ELEMENTS+9) +#define HTML_MENU4 (HTML_ELEMENTS+10) +#define HTML_MENU5 (HTML_ELEMENTS+11) +#define HTML_MENU6 (HTML_ELEMENTS+12) + +#define HTML_DL1 (HTML_ELEMENTS+13) +#define HTML_DL2 (HTML_ELEMENTS+14) +#define HTML_DL3 (HTML_ELEMENTS+15) +#define HTML_DL4 (HTML_ELEMENTS+16) +#define HTML_DL5 (HTML_ELEMENTS+17) +#define HTML_DL6 (HTML_ELEMENTS+18) + +#define HTML_DLC1 (HTML_ELEMENTS+19) +#define HTML_DLC2 (HTML_ELEMENTS+20) +#define HTML_DLC3 (HTML_ELEMENTS+21) +#define HTML_DLC4 (HTML_ELEMENTS+22) +#define HTML_DLC5 (HTML_ELEMENTS+23) +#define HTML_DLC6 (HTML_ELEMENTS+24) + +#define HTML_HCENTER (HTML_ELEMENTS+25) +#define HTML_HLEFT (HTML_ELEMENTS+26) +#define HTML_HRIGHT (HTML_ELEMENTS+27) + +#define HTML_DCENTER (HTML_ELEMENTS+28) +#define HTML_DLEFT (HTML_ELEMENTS+29) +#define HTML_DRIGHT (HTML_ELEMENTS+30) + +#define HTML_OBJECT_M (HTML_ELEMENTS+31) #define LYNX_HTML_EXTRA_ELEMENTS 31 diff --git a/src/HTSaveToFile.h b/src/HTSaveToFile.h index 8ede8d51..35ce3904 100644 --- a/src/HTSaveToFile.h +++ b/src/HTSaveToFile.h @@ -8,16 +8,22 @@ #include <HTStream.h> #include <HTFormat.h> -extern HTStream *HTSaveToFile(HTPresentation *pres, - HTParentAnchor *anchor, - HTStream *sink); +#ifdef __cplusplus +extern "C" { +#endif + extern HTStream *HTSaveToFile(HTPresentation *pres, + HTParentAnchor *anchor, + HTStream *sink); -extern HTStream *HTDumpToStdout(HTPresentation *pres, - HTParentAnchor *anchor, - HTStream *sink); + extern HTStream *HTDumpToStdout(HTPresentation *pres, + HTParentAnchor *anchor, + HTStream *sink); -extern HTStream *HTCompressed(HTPresentation *pres, - HTParentAnchor *anchor, - HTStream *sink); + extern HTStream *HTCompressed(HTPresentation *pres, + HTParentAnchor *anchor, + HTStream *sink); -#endif /* HTSAVETOFILE_H */ +#ifdef __cplusplus +} +#endif +#endif /* HTSAVETOFILE_H */ diff --git a/src/LYBookmark.c b/src/LYBookmark.c index 0c238fec..2a00a1bc 100644 --- a/src/LYBookmark.c +++ b/src/LYBookmark.c @@ -291,7 +291,7 @@ void save_bookmark_link(const char *address, } else { LYstrncpy(string_buffer, title, sizeof(string_buffer) - 1); } - convert_to_spaces(string_buffer, FALSE); + LYReduceBlanks(string_buffer); LYMBM_statusline(TITLE_PROMPT); LYgetstr(string_buffer, VISIBLE, sizeof(string_buffer), NORECALL); if (*string_buffer == '\0') { diff --git a/src/LYBookmark.h b/src/LYBookmark.h index a0a2816f..ae8257bd 100644 --- a/src/LYBookmark.h +++ b/src/LYBookmark.h @@ -1,4 +1,3 @@ - #ifndef LYBOOKMARK_H #define LYBOOKMARK_H @@ -6,15 +5,21 @@ #include <LYStructs.h> #endif /* LYSTRUCTS_H */ -extern BOOLEAN LYHaveSubBookmarks(void); -extern const char *get_bookmark_filename(char **name); -extern int LYMBM2index(int ch); -extern int LYindex2MBM(int n); -extern int select_menu_multi_bookmarks(void); -extern int select_multi_bookmarks(void); -extern void LYMBM_statusline(const char *text); -extern void remove_bookmark_link(int cur, char *cur_bookmark_page); -extern void save_bookmark_link(const char *address, const char *title); -extern void set_default_bookmark_page(char *value); +#ifdef __cplusplus +extern "C" { +#endif + extern BOOLEAN LYHaveSubBookmarks(void); + extern const char *get_bookmark_filename(char **name); + extern int LYMBM2index(int ch); + extern int LYindex2MBM(int n); + extern int select_menu_multi_bookmarks(void); + extern int select_multi_bookmarks(void); + extern void LYMBM_statusline(const char *text); + extern void remove_bookmark_link(int cur, char *cur_bookmark_page); + extern void save_bookmark_link(const char *address, const char *title); + extern void set_default_bookmark_page(char *value); -#endif /* LYBOOKMARK_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYBOOKMARK_H */ diff --git a/src/LYCgi.h b/src/LYCgi.h index bd29a780..6b90f2de 100644 --- a/src/LYCgi.h +++ b/src/LYCgi.h @@ -5,6 +5,12 @@ #include <HTUtils.h> #endif -extern void add_lynxcgi_environment(const char *variable_name); +#ifdef __cplusplus +extern "C" { +#endif + extern void add_lynxcgi_environment(const char *variable_name); -#endif /* LYGETFILE_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYGETFILE_H */ diff --git a/src/LYCharSets.h b/src/LYCharSets.h index 26a852a1..a0f0c26a 100644 --- a/src/LYCharSets.h +++ b/src/LYCharSets.h @@ -11,42 +11,46 @@ #include <UCMap.h> #endif /* !UCMAP_H */ -extern BOOL HTPassEightBitRaw; -extern BOOL HTPassEightBitNum; -extern BOOL HTPassHighCtrlRaw; -extern BOOL HTPassHighCtrlNum; -extern BOOLEAN LYHaveCJKCharacterSet; -extern BOOLEAN DisplayCharsetMatchLocale; - #include <HTCJK.h> -extern HTkcode kanji_code; + +#ifdef __cplusplus +extern "C" { +#endif + extern BOOL HTPassEightBitRaw; + extern BOOL HTPassEightBitNum; + extern BOOL HTPassHighCtrlRaw; + extern BOOL HTPassHighCtrlNum; + extern BOOLEAN LYHaveCJKCharacterSet; + extern BOOLEAN DisplayCharsetMatchLocale; + + extern HTkcode kanji_code; /* * currently active character set (internal handler) */ -extern int current_char_set; + extern int current_char_set; /* * Initializer, calls initialization function for the * CHARTRANS handling. - KW */ -extern int LYCharSetsDeclared(void); - -extern const char **LYCharSets[]; -extern const char *SevenBitApproximations[]; -extern const char **p_entity_values; -extern const char *LYchar_set_names[]; /* Full name, not MIME */ -extern int LYlowest_eightbit[]; -extern int LYNumCharsets; -extern LYUCcharset LYCharSet_UC[]; -extern int UCGetLYhndl_byAnyName(char *value); -extern void HTMLSetCharacterHandling(int i); -extern void HTMLSetUseDefaultRawMode(int i, BOOLEAN modeflag); -extern void HTMLUseCharacterSet(int i); -extern UCode_t HTMLGetEntityUCValue(const char *name); -extern void Set_HTCJK(const char *inMIMEname, const char *outMIMEname); - -extern const char *HTMLGetEntityName(UCode_t code); + extern int LYCharSetsDeclared(void); + + extern const char **LYCharSets[]; + extern const char *SevenBitApproximations[]; + extern const char **p_entity_values; + extern const char *LYchar_set_names[]; /* Full name, not MIME */ + extern int LYlowest_eightbit[]; + extern int LYNumCharsets; + extern LYUCcharset LYCharSet_UC[]; + extern int UCGetLYhndl_byAnyName(char *value); + extern void HTMLSetCharacterHandling(int i); + extern void HTMLSetUseDefaultRawMode(int i, BOOLEAN modeflag); + extern void HTMLUseCharacterSet(int i); + extern UCode_t HTMLGetEntityUCValue(const char *name); + extern void Set_HTCJK(const char *inMIMEname, const char *outMIMEname); + + extern const char *HTMLGetEntityName(UCode_t code); /* * HTMLGetEntityName calls LYEntityNames for iso-8859-1 entity names only. @@ -54,24 +58,24 @@ extern const char *HTMLGetEntityName(UCode_t code); * unicode number in general may have several equivalent entity names because * of synonyms. */ -extern BOOL force_old_UCLYhndl_on_reload; -extern int forced_UCLYhdnl; + extern BOOL force_old_UCLYhndl_on_reload; + extern int forced_UCLYhdnl; #ifndef EXP_CHARSET_CHOICE # define ALL_CHARSETS_IN_O_MENU_SCREEN 1 #endif #ifdef EXP_CHARSET_CHOICE -typedef struct { - BOOL hide_display; /* if FALSE, show in "display-charset" menu */ - BOOL hide_assumed; /* if FALSE, show in "assumed-charset" menu */ + typedef struct { + BOOL hide_display; /* if FALSE, show in "display-charset" menu */ + BOOL hide_assumed; /* if FALSE, show in "assumed-charset" menu */ #ifndef ALL_CHARSETS_IN_O_MENU_SCREEN - int assumed_idx; /* only this field is needed */ + int assumed_idx; /* only this field is needed */ #endif -} charset_subset_t; + } charset_subset_t; /* each element corresponds to charset in LYCharSets */ -extern charset_subset_t charset_subsets[]; + extern charset_subset_t charset_subsets[]; /* all zeros by default - i.e., all charsets allowed */ @@ -80,10 +84,10 @@ extern charset_subset_t charset_subsets[]; * lynx.cfg. It will remain FALSE if no "display_charset_choice" settings were * encountered in lynx.cfg */ -extern BOOL custom_display_charset; + extern BOOL custom_display_charset; /* similar to custom_display_charset */ -extern BOOL custom_assumed_doc_charset; + extern BOOL custom_assumed_doc_charset; #ifndef ALL_CHARSETS_IN_O_MENU_SCREEN @@ -92,19 +96,19 @@ extern BOOL custom_assumed_doc_charset; /* * These arrays map index of charset shown in menu to the index in LYCharsets[] */ -extern int display_charset_map[]; -extern int assumed_doc_charset_map[]; + extern int display_charset_map[]; + extern int assumed_doc_charset_map[]; /* these arrays are NULL terminated */ -extern const char *display_charset_choices[]; -extern const char *assumed_charset_choices[]; + extern const char *display_charset_choices[]; + extern const char *assumed_charset_choices[]; -extern int displayed_display_charset_idx; + extern int displayed_display_charset_idx; #endif /* this will be called after lynx.cfg and .lynxrc are read */ -extern void init_charset_subsets(void); -#endif /* EXP_CHARSET_CHOICE */ + extern void init_charset_subsets(void); +#endif /* EXP_CHARSET_CHOICE */ #if !defined(NO_AUTODETECT_DISPLAY_CHARSET) # ifdef __EMX__ @@ -116,23 +120,26 @@ extern void init_charset_subsets(void); #endif #ifdef CAN_AUTODETECT_DISPLAY_CHARSET -extern int auto_display_charset; + extern int auto_display_charset; #endif #ifdef CAN_SWITCH_DISPLAY_CHARSET -enum switch_display_charset_t { - SWITCH_DISPLAY_CHARSET_MAYBE, - SWITCH_DISPLAY_CHARSET_REALLY, - SWITCH_DISPLAY_CHARSET_RESIZE -}; -extern int Switch_Display_Charset(int ord, enum switch_display_charset_t really); -extern int Find_Best_Display_Charset(int ord); -extern char *charsets_directory; -extern char *charset_switch_rules; -extern int switch_display_charsets; -extern int auto_other_display_charset; -extern int codepages[2]; -extern int real_charsets[2]; /* Non "auto-" charsets for the codepages */ + enum switch_display_charset_t { + SWITCH_DISPLAY_CHARSET_MAYBE, + SWITCH_DISPLAY_CHARSET_REALLY, + SWITCH_DISPLAY_CHARSET_RESIZE + }; + extern int Switch_Display_Charset(int ord, enum switch_display_charset_t really); + extern int Find_Best_Display_Charset(int ord); + extern char *charsets_directory; + extern char *charset_switch_rules; + extern int switch_display_charsets; + extern int auto_other_display_charset; + extern int codepages[2]; + extern int real_charsets[2]; /* Non "auto-" charsets for the codepages */ #endif -#endif /* LYCHARSETS_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYCHARSETS_H */ diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c index 30581988..e3c42602 100644 --- a/src/LYCharUtils.c +++ b/src/LYCharUtils.c @@ -2550,11 +2550,12 @@ void LYHandleMETA(HTStructured * me, const BOOL *present, me->inA = FALSE; me->CurrentANum = 0; } - me->CurrentA = HTAnchor_findChildAndLink( - me->node_anchor, /* Parent */ - id_string, /* Tag */ - href, /* Addresss */ - (void *) 0); /* Type */ + me->CurrentA = HTAnchor_findChildAndLink + ( + me->node_anchor, /* Parent */ + id_string, /* Tag */ + href, /* Addresss */ + (HTLinkType *) 0); /* Type */ if (id_string) *cp = '#'; FREE(id_string); @@ -3203,11 +3204,12 @@ void LYCheckForID(HTStructured * me, const BOOL *present, * Create the link if we still have a non-zero-length string. - FM */ if ((temp[0] != '\0') && - (ID_A = HTAnchor_findChildAndLink( - me->node_anchor, /* Parent */ - temp, /* Tag */ - NULL, /* Addresss */ - (void *) 0))) { /* Type */ + (ID_A = HTAnchor_findChildAndLink + ( + me->node_anchor, /* Parent */ + temp, /* Tag */ + NULL, /* Addresss */ + (HTLinkType *) 0))) { /* Type */ HText_beginAnchor(me->text, me->inUnderline, ID_A); HText_endAnchor(me->text, 0); } @@ -3231,11 +3233,12 @@ void LYHandleID(HTStructured * me, const char *id) /* * Create the link if we still have a non-zero-length string. - FM */ - if ((ID_A = HTAnchor_findChildAndLink( - me->node_anchor, /* Parent */ - id, /* Tag */ - NULL, /* Addresss */ - (void *) 0)) != NULL) { /* Type */ + if ((ID_A = HTAnchor_findChildAndLink + ( + me->node_anchor, /* Parent */ + id, /* Tag */ + NULL, /* Addresss */ + (HTLinkType *) 0)) != NULL) { /* Type */ HText_beginAnchor(me->text, me->inUnderline, ID_A); HText_endAnchor(me->text, 0); } diff --git a/src/LYCharUtils.h b/src/LYCharUtils.h index 45c2b384..83e63c06 100644 --- a/src/LYCharUtils.h +++ b/src/LYCharUtils.h @@ -5,89 +5,94 @@ #include <HTUtils.h> #endif /* HTUTILS_H */ +#ifdef __cplusplus +extern "C" { +#endif #define CHECK_ID(code) LYCheckForID(me, present, value, (int)code) + typedef enum { + st_HTML = 0, /* attributes and content found in HTML, probably meant for display */ + st_URL, /* URLs, fragments, NAME and ID */ + st_other + } CharUtil_st; -typedef enum { - st_HTML = 0, /* attributes and content found in HTML, probably meant for display */ - st_URL, /* URLs, fragments, NAME and ID */ - st_other -} CharUtil_st; - -extern char **LYUCFullyTranslateString(char **str, - int cs_from, - int cs_to, - BOOLEAN do_ent, - BOOL use_lynx_specials, - BOOLEAN plain_space, - BOOLEAN hidden, - BOOL Back, - CharUtil_st stype); -extern BOOL LYUCTranslateHTMLString(char **str, - int cs_from, - int cs_to, - BOOL use_lynx_specials, - BOOLEAN plain_space, - BOOLEAN hidden, - CharUtil_st stype); -extern BOOL LYUCTranslateBackFormData(char **str, - int cs_from, - int cs_to, - BOOLEAN plain_space); -extern void LYEntify(char **str, - BOOLEAN isTITLE); -extern void LYTrimHead(char *str); -extern void LYTrimTail(char *str); -extern char *LYFindEndOfComment(char *str); -extern void LYFillLocalFileURL(char **href, - const char *base); -extern void LYAddMETAcharsetToFD(FILE *fd, - int disp_chndl); -extern void LYformTitle(char **dst, - const char *src); -extern char *LYParseTagParam(char *from, - const char *name); -extern void LYParseRefreshURL(char *content, - char **p_seconds, - char **p_address); + extern char **LYUCFullyTranslateString(char **str, + int cs_from, + int cs_to, + BOOLEAN do_ent, + BOOL use_lynx_specials, + BOOLEAN plain_space, + BOOLEAN hidden, + BOOL Back, + CharUtil_st stype); + extern BOOL LYUCTranslateHTMLString(char **str, + int cs_from, + int cs_to, + BOOL use_lynx_specials, + BOOLEAN plain_space, + BOOLEAN hidden, + CharUtil_st stype); + extern BOOL LYUCTranslateBackFormData(char **str, + int cs_from, + int cs_to, + BOOLEAN plain_space); + extern void LYEntify(char **str, + BOOLEAN isTITLE); + extern void LYTrimHead(char *str); + extern void LYTrimTail(char *str); + extern char *LYFindEndOfComment(char *str); + extern void LYFillLocalFileURL(char **href, + const char *base); + extern void LYAddMETAcharsetToFD(FILE *fd, + int disp_chndl); + extern void LYformTitle(char **dst, + const char *src); + extern char *LYParseTagParam(char *from, + const char *name); + extern void LYParseRefreshURL(char *content, + char **p_seconds, + char **p_address); #ifdef Lynx_HTML_Handler -extern int OL_CONTINUE; /* flag for whether CONTINUE is set */ -extern int OL_VOID; /* flag for whether a count is set */ -extern void LYZero_OL_Counter(HTStructured * me); -extern char *LYUppercaseA_OL_String(int seqnum); -extern char *LYLowercaseA_OL_String(int seqnum); -extern char *LYUppercaseI_OL_String(int seqnum); -extern char *LYLowercaseI_OL_String(int seqnum); -extern void LYGetChartransInfo(HTStructured * me); -extern void LYHandleMETA(HTStructured * me, const BOOL *present, - const char **value, - char **include); -extern void LYHandlePlike(HTStructured * me, const BOOL *present, - const char **value, - char **include, - int align_idx, - BOOL start); -extern void LYHandleSELECT(HTStructured * me, const BOOL *present, - const char **value, - char **include, - BOOL start); -extern int LYLegitimizeHREF(HTStructured * me, char **href, - BOOL force_slash, - BOOL strip_dots); -extern void LYCheckForContentBase(HTStructured * me); -extern void LYCheckForID(HTStructured * me, const BOOL *present, - const char **value, - int attribute); -extern void LYHandleID(HTStructured * me, const char *id); -extern BOOLEAN LYoverride_default_alignment(HTStructured * me); -extern void LYEnsureDoubleSpace(HTStructured * me); -extern void LYEnsureSingleSpace(HTStructured * me); -extern void LYResetParagraphAlignment(HTStructured * me); -extern BOOLEAN LYCheckForCSI(HTParentAnchor *anchor, - char **url); + extern int OL_CONTINUE; /* flag for whether CONTINUE is set */ + extern int OL_VOID; /* flag for whether a count is set */ + extern void LYZero_OL_Counter(HTStructured * me); + extern char *LYUppercaseA_OL_String(int seqnum); + extern char *LYLowercaseA_OL_String(int seqnum); + extern char *LYUppercaseI_OL_String(int seqnum); + extern char *LYLowercaseI_OL_String(int seqnum); + extern void LYGetChartransInfo(HTStructured * me); + extern void LYHandleMETA(HTStructured * me, const BOOL *present, + const char **value, + char **include); + extern void LYHandlePlike(HTStructured * me, const BOOL *present, + const char **value, + char **include, + int align_idx, + BOOL start); + extern void LYHandleSELECT(HTStructured * me, const BOOL *present, + const char **value, + char **include, + BOOL start); + extern int LYLegitimizeHREF(HTStructured * me, char **href, + BOOL force_slash, + BOOL strip_dots); + extern void LYCheckForContentBase(HTStructured * me); + extern void LYCheckForID(HTStructured * me, const BOOL *present, + const char **value, + int attribute); + extern void LYHandleID(HTStructured * me, const char *id); + extern BOOLEAN LYoverride_default_alignment(HTStructured * me); + extern void LYEnsureDoubleSpace(HTStructured * me); + extern void LYEnsureSingleSpace(HTStructured * me); + extern void LYResetParagraphAlignment(HTStructured * me); + extern BOOLEAN LYCheckForCSI(HTParentAnchor *anchor, + char **url); -#endif /* Lynx_HTML_Handler */ +#endif /* Lynx_HTML_Handler */ #define LYUCTranslateBackHeaderText LYUCTranslateBackFormData -#endif /* LYCHARUTILS_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYCHARUTILS_H */ diff --git a/src/LYClean.h b/src/LYClean.h index c9e13ca0..6126c2c6 100644 --- a/src/LYClean.h +++ b/src/LYClean.h @@ -5,14 +5,20 @@ #include <HTUtils.h> #endif +#ifdef __cplusplus +extern "C" { +#endif #ifdef VMS -extern BOOLEAN HadVMSInterrupt; + extern BOOLEAN HadVMSInterrupt; #endif -extern void cleanup_sig(int sig); -extern void cleanup(void); -extern void cleanup_files(void); -extern void set_alarm(int sig); -extern void reset_alarm(void); + extern void cleanup_sig(int sig); + extern void cleanup(void); + extern void cleanup_files(void); + extern void set_alarm(int sig); + extern void reset_alarm(void); -#endif /* LYCLEAN_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYCLEAN_H */ diff --git a/src/LYCookie.c b/src/LYCookie.c index dbe91ef3..f54f7db0 100644 --- a/src/LYCookie.c +++ b/src/LYCookie.c @@ -2048,7 +2048,7 @@ void LYStoreCookies(char *cookie_file) if (cookie_handle == NULL) return; for (dl = domain_list; dl != NULL; dl = dl->next) { - de = dl->object; + de = (domain_entry *) (dl->object); if (de == NULL) /* * Fote says the first object is NULL. Go with that. @@ -2280,7 +2280,7 @@ static int LYHandleCookies(const char *arg, cl = de->cookie_list; while (cl) { next = cl->next; - co = cl->object; + co = (cookie *) (cl->object); if (co) { HTList_removeObject(de->cookie_list, co); freeCookie(co); @@ -2394,7 +2394,7 @@ static int LYHandleCookies(const char *arg, HTSprintf0(&buf, "<dl compact>\n"); PUTS(buf); for (dl = domain_list; dl != NULL; dl = dl->next) { - de = dl->object; + de = (domain_entry *) (dl->object); if (de == NULL) /* * First object always is NULL. - FM diff --git a/src/LYCookie.h b/src/LYCookie.h index ffa96453..3b0e109b 100644 --- a/src/LYCookie.h +++ b/src/LYCookie.h @@ -7,45 +7,51 @@ #include <HTList.h> -typedef enum { - ACCEPT_ALWAYS = 0 - ,REJECT_ALWAYS - ,QUERY_USER -} behaviour_t; - -typedef enum { - INVCHECK_QUERY = 0 - ,INVCHECK_STRICT - ,INVCHECK_LOOSE -} invcheck_behaviour_t; - -typedef enum { - FLAG_ACCEPT_ALWAYS = 0 - ,FLAG_REJECT_ALWAYS - ,FLAG_QUERY_USER - ,FLAG_FROM_FILE - ,FLAG_INVCHECK_QUERY - ,FLAG_INVCHECK_STRICT - ,FLAG_INVCHECK_LOOSE -} cookie_domain_flags; - -struct _domain_entry { - char *domain; /* Domain for which these cookies are valid */ - behaviour_t bv; - invcheck_behaviour_t invcheck_bv; - HTList *cookie_list; -}; -typedef struct _domain_entry domain_entry; - -extern void LYSetCookie(const char *SetCookie, - const char *SetCookie2, - const char *address); -extern char *LYAddCookieHeader(char *hostname, - char *partialpath, - int port, - BOOL secure); -extern void LYStoreCookies(char *cookie_file); -extern void LYLoadCookies(char *cookie_file); -extern void LYConfigCookies(void); - -#endif /* LYCOOKIES_H */ +#ifdef __cplusplus +extern "C" { +#endif + typedef enum { + ACCEPT_ALWAYS = 0 + ,REJECT_ALWAYS + ,QUERY_USER + } behaviour_t; + + typedef enum { + INVCHECK_QUERY = 0 + ,INVCHECK_STRICT + ,INVCHECK_LOOSE + } invcheck_behaviour_t; + + typedef enum { + FLAG_ACCEPT_ALWAYS = 0 + ,FLAG_REJECT_ALWAYS + ,FLAG_QUERY_USER + ,FLAG_FROM_FILE + ,FLAG_INVCHECK_QUERY + ,FLAG_INVCHECK_STRICT + ,FLAG_INVCHECK_LOOSE + } cookie_domain_flags; + + struct _domain_entry { + char *domain; /* Domain for which these cookies are valid */ + behaviour_t bv; + invcheck_behaviour_t invcheck_bv; + HTList *cookie_list; + }; + typedef struct _domain_entry domain_entry; + + extern void LYSetCookie(const char *SetCookie, + const char *SetCookie2, + const char *address); + extern char *LYAddCookieHeader(char *hostname, + char *partialpath, + int port, + BOOL secure); + extern void LYStoreCookies(char *cookie_file); + extern void LYLoadCookies(char *cookie_file); + extern void LYConfigCookies(void); + +#ifdef __cplusplus +} +#endif +#endif /* LYCOOKIES_H */ diff --git a/src/LYCurses.c b/src/LYCurses.c index 5095c1ee..9221ff82 100644 --- a/src/LYCurses.c +++ b/src/LYCurses.c @@ -525,11 +525,11 @@ void wcurses_css(WINDOW * win, char *name, CTRACE2(TRACE_STYLE, (tfp, "CSSTRIM:trying to set [%s] style - ", name)); if (tmpHash == NOSTYLE) { - char *class = strrchr(name, '.'); + char *pclass = strrchr(name, '.'); - CTRACE2(TRACE_STYLE, (tfp, "undefined, trimming at %p\n", class)); - if (class) - *class = '\0'; + CTRACE2(TRACE_STYLE, (tfp, "undefined, trimming at %p\n", pclass)); + if (pclass) + *pclass = '\0'; else try_again = 0; } else { @@ -1397,6 +1397,11 @@ void stop_curses(void) } #ifdef VMS + +#ifdef USE_SLANG +extern void longname(char *, char *); +#endif /* USE_SLANG */ + /* * Check terminal type, start curses & setup terminal. */ @@ -1406,10 +1411,6 @@ BOOLEAN setup(char *terminal) int status; char *dummy = 0, *cp, term[81]; -#ifdef USE_SLANG - extern void longname(); -#endif /* USE_SLANG */ - /* * If the display was not set by a command line option then see if it is * available from the environment. diff --git a/src/LYCurses.h b/src/LYCurses.h index 1bb773be..f9c52fe3 100644 --- a/src/LYCurses.h +++ b/src/LYCurses.h @@ -284,18 +284,21 @@ typedef struct { #endif /* USE_SLANG */ +#ifdef __cplusplus +extern "C" { +#endif #ifdef USE_SLANG #define LYstopPopup() /* nothing */ #define LYtopwindow() LYwin #else -extern void LYsubwindow(WINDOW * param); -extern WINDOW *LYtopwindow(void); + extern void LYsubwindow(WINDOW * param); + extern WINDOW *LYtopwindow(void); #define LYstopPopup() LYsubwindow(0) -#endif /* NCURSES */ +#endif /* NCURSES */ -extern void LYbox(WINDOW * win, BOOLEAN formfield); -extern WINDOW *LYstartPopup(int *top_y, int *left_x, int *height, int *width); + extern void LYbox(WINDOW * win, BOOLEAN formfield); + extern WINDOW *LYstartPopup(int *top_y, int *left_x, int *height, int *width); /* * Useful macros not in PDCurses or very old ncurses headers. @@ -311,7 +314,7 @@ extern WINDOW *LYstartPopup(int *top_y, int *left_x, int *height, int *width); #endif #if defined(HAVE_WATTR_GET) -extern long LYgetattrs(WINDOW * win); + extern long LYgetattrs(WINDOW * win); #else #if defined(HAVE_GETATTRS) || defined(getattrs) @@ -319,11 +322,15 @@ extern long LYgetattrs(WINDOW * win); #else #define LYgetattrs(win) ((win)->_attrs) #endif -#endif /* HAVE_WATTR_GET */ +#endif /* HAVE_WATTR_GET */ #if defined(PDCURSES) #define HAVE_GETBKGD 1 /* can use fallback definition */ #define HAVE_NAPMS 1 /* can use millisecond-delays */ +# if defined(PDC_BUILD) && PDC_BUILD >= 2401 + extern int saved_scrsize_x; + extern int saved_scrsize_y; +# endif #endif #ifdef HAVE_NAPMS @@ -339,14 +346,14 @@ extern long LYgetattrs(WINDOW * win); /* Both slang and curses: */ #ifndef TRUE #define TRUE 1 -#endif /* !TRUE */ +#endif /* !TRUE */ #ifndef FALSE #define FALSE 0 -#endif /* !FALSE */ +#endif /* !FALSE */ #ifdef REDEFINE_CR #define CR FROMASCII('\015') -#endif /* REDEFINE_CR */ +#endif /* REDEFINE_CR */ #ifdef ALT_CHAR_SET #define BOXVERT 0 /* use alt char set for popup window vertical borders */ @@ -364,8 +371,8 @@ extern long LYgetattrs(WINDOW * win); #undef HAVE_KEYPAD /* avoid confusion with bogus 'keypad()' */ #endif -extern int LYlines; /* replaces LINES */ -extern int LYcols; /* replaces COLS */ + extern int LYlines; /* replaces LINES */ + extern int LYcols; /* replaces COLS */ /* * The scrollbar, if used, occupies the rightmost column. @@ -386,11 +393,11 @@ extern int LYcols; /* replaces COLS */ #endif #ifdef USE_CURSES_PADS -extern WINDOW *LYwin; -extern int LYshiftWin; -extern int LYwideLines; -extern int LYtableCols; -extern BOOL LYuseCursesPads; + extern WINDOW *LYwin; + extern int LYshiftWin; + extern int LYwideLines; + extern int LYtableCols; + extern BOOL LYuseCursesPads; #else #define LYwin stdscr @@ -400,62 +407,62 @@ extern BOOL LYuseCursesPads; #endif #if defined(USE_COLOR_TABLE) || defined(USE_SLANG) -extern int Current_Attr; -extern int Masked_Attr; -#endif - -extern BOOLEAN setup(char *terminal); -extern int LYscreenHeight(void); -extern int LYscreenWidth(void); -extern int LYstrExtent(const char *string, int len, int maxCells); -extern int LYstrExtent2(const char *string, int len); -extern int LYstrCells(const char *string); -extern void LYclear(void); -extern void LYclrtoeol(void); -extern void LYerase(void); -extern void LYmove(int y, int x); -extern void LYnoVideo(int mask); -extern void LYpaddstr(WINDOW * w, int width, const char *s); -extern void LYrefresh(void); -extern void LYstartTargetEmphasis(void); -extern void LYstopTargetEmphasis(void); -extern void LYtouchline(int row); -extern void LYwaddnstr(WINDOW * w, const char *s, size_t len); -extern void start_curses(void); -extern void stop_curses(void); + extern int Current_Attr; + extern int Masked_Attr; +#endif + + extern BOOLEAN setup(char *terminal); + extern int LYscreenHeight(void); + extern int LYscreenWidth(void); + extern int LYstrExtent(const char *string, int len, int maxCells); + extern int LYstrExtent2(const char *string, int len); + extern int LYstrCells(const char *string); + extern void LYclear(void); + extern void LYclrtoeol(void); + extern void LYerase(void); + extern void LYmove(int y, int x); + extern void LYnoVideo(int mask); + extern void LYpaddstr(WINDOW * w, int width, const char *s); + extern void LYrefresh(void); + extern void LYstartTargetEmphasis(void); + extern void LYstopTargetEmphasis(void); + extern void LYtouchline(int row); + extern void LYwaddnstr(WINDOW * w, const char *s, size_t len); + extern void start_curses(void); + extern void stop_curses(void); #define LYaddstr(s) LYwaddnstr(LYwin, s, strlen(s)) #define LYaddnstr(s,len) LYwaddnstr(LYwin, s, len) #define LYwaddstr(w,s) LYwaddnstr(w, s, strlen(s)) #ifdef VMS -extern int DCLsystem(char *command); -extern void VMSexit(); -extern int ttopen(); -extern int ttclose(); -extern int ttgetc(); -extern void VMSsignal(int sig, void (*func) ()); -#endif /* VMS */ + extern int DCLsystem(char *command); + extern void VMSexit(); + extern int ttopen(); + extern int ttclose(); + extern int ttgetc(); + extern void VMSsignal(int sig, void (*func) ()); +#endif /* VMS */ #if defined(USE_COLOR_STYLE) -extern void curses_css(char *name, int dir); -extern void curses_style(int style, int dir); -extern void setHashStyle(int style, int color, int cattr, int mono, char *element); -extern void setStyle(int style, int color, int cattr, int mono); -extern void wcurses_css(WINDOW * win, char *name, int dir); -extern void curses_w_style(WINDOW * win, int style, int dir); + extern void curses_css(char *name, int dir); + extern void curses_style(int style, int dir); + extern void setHashStyle(int style, int color, int cattr, int mono, char *element); + extern void setStyle(int style, int color, int cattr, int mono); + extern void wcurses_css(WINDOW * win, char *name, int dir); + extern void curses_w_style(WINDOW * win, int style, int dir); # define LynxChangeStyle(style,dir) curses_style(style,dir) # define LynxWChangeStyle(win,style,dir) curses_w_style(win,style,dir) #else # define LynxWChangeStyle(win,style,dir) (void)1 -#endif /* USE_COLOR_STYLE */ +#endif /* USE_COLOR_STYLE */ #ifdef USE_COLOR_TABLE -extern void LYaddAttr(int a); -extern void LYsubAttr(int a); -extern void lynx_setup_colors(void); -extern unsigned int Lynx_Color_Flags; + extern void LYaddAttr(int a); + extern void LYsubAttr(int a); + extern void lynx_setup_colors(void); + extern unsigned int Lynx_Color_Flags; #endif #ifdef USE_SLANG @@ -481,23 +488,23 @@ extern unsigned int Lynx_Color_Flags; #ifdef FANCY_CURSES #undef FANCY_CURSES -#endif /* FANCY_CURSES */ +#endif /* FANCY_CURSES */ /* * Map some curses functions to slang functions. */ #define stdscr ((WINDOW *)0) #ifdef SLANG_MBCS_HACK -extern int PHYSICAL_SLtt_Screen_Cols; + extern int PHYSICAL_SLtt_Screen_Cols; #define COLS PHYSICAL_SLtt_Screen_Cols #else #define COLS SLtt_Screen_Cols -#endif /* SLANG_MBCS_HACK */ +#endif /* SLANG_MBCS_HACK */ #define LINES SLtt_Screen_Rows #define move SLsmg_gotorc #define addstr SLsmg_write_string -extern void LY_SLerase(void); + extern void LY_SLerase(void); #define erase LY_SLerase #define clear LY_SLerase @@ -521,29 +528,29 @@ extern void LY_SLerase(void); #define echo() #define printw SLsmg_printf -extern int curscr; -extern BOOLEAN FullRefresh; + extern int curscr; + extern BOOLEAN FullRefresh; #ifdef clearok #undef clearok -#endif /* clearok */ +#endif /* clearok */ #define clearok(a,b) { FullRefresh = (BOOLEAN)b; } -extern void LY_SLrefresh(void); + extern void LY_SLrefresh(void); #ifdef refresh #undef refresh -#endif /* refresh */ +#endif /* refresh */ #define refresh LY_SLrefresh #ifdef VMS -extern void VTHome(void); + extern void VTHome(void); #define endwin() LYclear(),refresh(),SLsmg_reset_smg(),VTHome() #else #define endwin SLsmg_reset_smg(),SLang_reset_tty -#endif /* VMS */ +#endif /* VMS */ -#else /* Define curses functions: */ +#else /* Define curses functions: */ #ifdef FANCY_CURSES #define SHOW_WHEREIS_TARGETS 1 @@ -563,9 +570,9 @@ extern void VTHome(void); #define stop_reverse() clrattr(_REVERSE) #define wstop_reverse(w) wclrattr(w, _REVERSE) -#else /* Not VMS: */ +#else /* Not VMS: */ -extern int string_to_attr(char *name); + extern int string_to_attr(char *name); /* * For Unix FANCY_FANCY curses we interpose @@ -573,13 +580,13 @@ extern int string_to_attr(char *name); * A_foo attributes. - FM */ #ifdef USE_COLOR_TABLE -extern void LYaddWAttr(WINDOW * win, int a); -extern void LYsubWAttr(WINDOW * win, int a); -extern void LYaddWAttr(WINDOW * win, int a); -extern void LYsubWAttr(WINDOW * win, int a); -extern void lynx_set_color(int a); -extern void lynx_standout(int a); -extern int lynx_chg_color(int, int, int); + extern void LYaddWAttr(WINDOW * win, int a); + extern void LYsubWAttr(WINDOW * win, int a); + extern void LYaddWAttr(WINDOW * win, int a); + extern void LYsubWAttr(WINDOW * win, int a); + extern void lynx_set_color(int a); + extern void lynx_standout(int a); + extern int lynx_chg_color(int, int, int); #undef standout #define standout() lynx_standout(TRUE) @@ -607,11 +614,11 @@ extern int lynx_chg_color(int, int, int); #define wstart_reverse(w) LYaddWAttr(w, A_REVERSE) #define stop_reverse() LYsubAttr(A_REVERSE) #define wstop_reverse(w) LYsubWAttr(w, A_REVERSE) -#endif /* SNAKE && HP_TERMINAL */ +#endif /* SNAKE && HP_TERMINAL */ -#endif /* VMS */ +#endif /* VMS */ -#else /* Not FANCY_CURSES: */ +#else /* Not FANCY_CURSES: */ /* *INDENT-OFF* */ #ifdef COLOR_CURSES #undef COLOR_CURSES @@ -636,7 +643,7 @@ FANCY_CURSES. Check your config.log to see why the FANCY_CURSES test failed. #define stop_reverse() standend() #define wstop_reverse(a) wstandend(a) -#endif /* FANCY_CURSES */ +#endif /* FANCY_CURSES */ #ifdef __hpux /* FIXME: configure check */ #undef ACS_UARROW @@ -675,7 +682,7 @@ FANCY_CURSES. Check your config.log to see why the FANCY_CURSES test failed. #define addch_raw(ch) LYaddch(ch) -#endif /* USE_SLANG */ +#endif /* USE_SLANG */ #ifdef USE_SLANG #define LYGetYX(y, x) y = SLsmg_get_row(), x = SLsmg_get_column() @@ -684,8 +691,8 @@ FANCY_CURSES. Check your config.log to see why the FANCY_CURSES test failed. #define LYGetYX(y, x) getyx(LYwin, y, x) #else #define LYGetYX(y, x) y = LYwin->_cury, x = LYwin->_curx -#endif /* getyx */ -#endif /* USE_SLANG */ +#endif /* getyx */ +#endif /* USE_SLANG */ /* * If the screen library allows us to specify "default" color, allow user to @@ -697,31 +704,31 @@ FANCY_CURSES. Check your config.log to see why the FANCY_CURSES test failed. #endif #endif -extern void lynx_enable_mouse(int); -extern void lynx_force_repaint(void); -extern void lynx_nl2crlf(int normal); -extern void lynx_start_title_color(void); -extern void lynx_stop_title_color(void); -extern void lynx_start_link_color(int flag, int pending); -extern void lynx_stop_link_color(int flag, int pending); -extern void lynx_stop_target_color(void); -extern void lynx_start_target_color(void); -extern void lynx_start_status_color(void); -extern void lynx_stop_status_color(void); -extern void lynx_start_h1_color(void); -extern void lynx_stop_h1_color(void); -extern void lynx_start_prompt_color(void); -extern void lynx_stop_prompt_color(void); -extern void lynx_start_radio_color(void); -extern void lynx_stop_radio_color(void); -extern void lynx_stop_all_colors(void); - -extern void lynx_start_bold(void); -extern void lynx_start_reverse(void); -extern void lynx_start_underline(void); -extern void lynx_stop_bold(void); -extern void lynx_stop_reverse(void); -extern void lynx_stop_underline(void); + extern void lynx_enable_mouse(int); + extern void lynx_force_repaint(void); + extern void lynx_nl2crlf(int normal); + extern void lynx_start_title_color(void); + extern void lynx_stop_title_color(void); + extern void lynx_start_link_color(int flag, int pending); + extern void lynx_stop_link_color(int flag, int pending); + extern void lynx_stop_target_color(void); + extern void lynx_start_target_color(void); + extern void lynx_start_status_color(void); + extern void lynx_stop_status_color(void); + extern void lynx_start_h1_color(void); + extern void lynx_stop_h1_color(void); + extern void lynx_start_prompt_color(void); + extern void lynx_stop_prompt_color(void); + extern void lynx_start_radio_color(void); + extern void lynx_stop_radio_color(void); + extern void lynx_stop_all_colors(void); + + extern void lynx_start_bold(void); + extern void lynx_start_reverse(void); + extern void lynx_start_underline(void); + extern void lynx_stop_bold(void); + extern void lynx_stop_reverse(void); + extern void lynx_stop_underline(void); /* * To prevent corrupting binary data on DOS, MS-WINDOWS or OS/2 we open files @@ -753,6 +760,9 @@ extern void lynx_stop_underline(void); #define LYHideCursor() LYmove((LYlines - 1), (LYcolLimit - 1)) #endif -extern void LYstowCursor(WINDOW * win, int row, int col); + extern void LYstowCursor(WINDOW * win, int row, int col); -#endif /* LYCURSES_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYCURSES_H */ diff --git a/src/LYDownload.c b/src/LYDownload.c index 721c75ed..3025f586 100644 --- a/src/LYDownload.c +++ b/src/LYDownload.c @@ -34,7 +34,8 @@ void LYDownload(char *line) char command[LY_MAXPATH]; char *cp; lynx_list_item_type *download_command = 0; - int ch, recall; + int ch; + RecallType recall; int FnameTotal; int FnameNum; BOOLEAN FirstRecall = TRUE; diff --git a/src/LYDownload.h b/src/LYDownload.h index f80177db..5926df8b 100644 --- a/src/LYDownload.h +++ b/src/LYDownload.h @@ -5,11 +5,17 @@ #include <LYStructs.h> #endif /* LYSTRUCTS_H */ -extern void LYDownload(char *line); -extern int LYdownload_options(char **newfile, char *data_file); +#ifdef __cplusplus +extern "C" { +#endif + extern void LYDownload(char *line); + extern int LYdownload_options(char **newfile, char *data_file); #ifdef VMS -extern BOOLEAN LYDidRename; + extern BOOLEAN LYDidRename; #endif -#endif /* LYDOWNLOAD_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYDOWNLOAD_H */ diff --git a/src/LYEdit.h b/src/LYEdit.h index 8b417e19..3c070628 100644 --- a/src/LYEdit.h +++ b/src/LYEdit.h @@ -5,8 +5,14 @@ #include <HTUtils.h> #endif -extern BOOLEAN editor_can_position(void); -extern int edit_current_file(char *newfile, int cur, int lineno); -extern void edit_temporary_file(char *filename, const char *position, const char *message); +#ifdef __cplusplus +extern "C" { +#endif + extern BOOLEAN editor_can_position(void); + extern int edit_current_file(char *newfile, int cur, int lineno); + extern void edit_temporary_file(char *filename, const char *position, const char *message); -#endif /* LYEDIT_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYEDIT_H */ diff --git a/src/LYEditmap.c b/src/LYEditmap.c index 2b30e1c7..cf8c3ec8 100644 --- a/src/LYEditmap.c +++ b/src/LYEditmap.c @@ -19,9 +19,9 @@ /* Get (lynxkeycode+modifier -> lynxeditactioncode) mapping, intermediate. */ -#define LKC_TO_LEC_M1(c) ((c)>LAST_MOD1_LKC? LYE_UNMOD: Mod1Binding[c]) -#define LKC_TO_LEC_M2(c) ((c)>LAST_MOD2_LKC? LYE_UNMOD: Mod2Binding[c]) -#define LKC_TO_LEC_M3(c) ((c)>LAST_MOD3_LKC? LYE_UNMOD: Mod3Binding[c]) +#define LKC_TO_LEC_M1(c) ((c)>LAST_MOD1_LKC? (int)LYE_UNMOD: Mod1Binding[c]) +#define LKC_TO_LEC_M2(c) ((c)>LAST_MOD2_LKC? (int)LYE_UNMOD: Mod2Binding[c]) +#define LKC_TO_LEC_M3(c) ((c)>LAST_MOD3_LKC? (int)LYE_UNMOD: Mod3Binding[c]) #endif /* EXP_ALT_BINDINGS */ diff --git a/src/LYExtern.h b/src/LYExtern.h index 6cb9ba8b..4d77b1db 100644 --- a/src/LYExtern.h +++ b/src/LYExtern.h @@ -5,11 +5,17 @@ #include <LYStructs.h> #endif /* LYSTRUCTS_H */ -/* returns TRUE if something matching was executed */ -BOOL run_external(char *c, BOOL only_overriders); +#ifdef __cplusplus +extern "C" { +#endif +/* returns TRUE if something matching was executed */ BOOL run_external(char + *c, BOOL only_overriders); #ifdef WIN_EX -extern char *quote_pathname(char *pathname); + extern char *quote_pathname(char *pathname); #endif -#endif /* EXTERNALS_H */ +#ifdef __cplusplus +} +#endif +#endif /* EXTERNALS_H */ diff --git a/src/LYGCurses.h b/src/LYGCurses.h index 6cdf9e91..bdb1e5ef 100644 --- a/src/LYGCurses.h +++ b/src/LYGCurses.h @@ -5,74 +5,72 @@ #include <stdio.h> #include <smgdef.h> +#ifdef __cplusplus +extern "C" { +#endif #define reg register - #ifndef TRUE #define TRUE (1) #define FALSE (0) #endif #define ERR (0) #define OK (1) - #define _SUBWIN 0001 #define _ENDLINE 0002 #define _FULLWIN 0004 #define _SCROLLWIN 0010 #define _FLUSH 0020 #define _STANDOUT 0200 - #define _NOECHO 001 #define _NONL 002 #define _NOCRMODE 004 #define _NORAW 010 - #define _BLINK SMG$M_BLINK #define _BOLD SMG$M_BOLD #define _REVERSE SMG$M_REVERSE #define _UNDERLINE SMG$M_UNDERLINE - -struct _win_st { - int _cur_y, _cur_x; - int _max_y, _max_x; - int _beg_y, _beg_x; - short _flags; - char _clear, _leave, _scroll, _wrap; - char **_y; - short *_firstch, *_lastch; - struct _win_st *_next, *_parent, *_child; - int _id; -}; - -struct _kb_st { - int _id; - unsigned char _flags; - struct { - unsigned short length; - unsigned char type; - unsigned char class; - char *address; - } _buffer_desc; - int _count; - char *_ptr; -}; - -struct _pb_st { - int _id; - int _rows, _cols; - union SMGDEF *_attr; - int _attr_size; -}; + struct _win_st { + int _cur_y, _cur_x; + int _max_y, _max_x; + int _beg_y, _beg_x; + short _flags; + char _clear, _leave, _scroll, _wrap; + char **_y; + short *_firstch, *_lastch; + struct _win_st *_next, *_parent, *_child; + int _id; + }; + + struct _kb_st { + int _id; + unsigned char _flags; + struct { + unsigned short length; + unsigned char type; + unsigned char pclass; + char *address; + } _buffer_desc; + int _count; + char *_ptr; + }; + + struct _pb_st { + int _id; + int _rows, _cols; + union SMGDEF *_attr; + int _attr_size; + }; #define _KEYBOARD struct _kb_st #define WINDOW struct _win_st #define _PASTEBOARD struct _pb_st -extern int LINES __asm("_$$PsectAttributes_NOSHR$$LINES"); -extern int COLS __asm("_$$PsectAttributes_NOSHR$$COLS"); -extern WINDOW *stdscr __asm("_$$PsectAttributes_NOSHR$$stdscr"); -extern WINDOW *curscr __asm("_$$PsectAttributes_NOSHR$$curscr"); -extern _KEYBOARD *stdkb __asm("_$$PsectAttributes_NOSHR$$stdkb"); -extern _PASTEBOARD *stdpb __asm("_$$PsectAttributes_NOSHR$$stdpb"); + extern int LINES __asm("_$$PsectAttributes_NOSHR$$LINES"); + extern int COLS __asm("_$$PsectAttributes_NOSHR$$COLS"); + extern WINDOW *stdscr __asm("_$$PsectAttributes_NOSHR$$stdscr"); + extern WINDOW *curscr __asm("_$$PsectAttributes_NOSHR$$curscr"); + extern _KEYBOARD *stdkb __asm("_$$PsectAttributes_NOSHR$$stdkb"); + extern _PASTEBOARD *stdpb __asm("_$$PsectAttributes_NOSHR$$stdpb"); #define getch() wgetch (stdscr) #define addch(ch) waddch (stdscr, ch) @@ -139,55 +137,55 @@ extern _PASTEBOARD *stdpb __asm("_$$PsectAttributes_NOSHR$$stdpb"); #define bool int -int waddch(WINDOW * win, char ch); + int waddch(WINDOW * win, char ch); -int waddstr(WINDOW * win, char *str); + int waddstr(WINDOW * win, char *str); -int box(WINDOW * win, char vert, char hor); + int box(WINDOW * win, char vert, char hor); -int wclear(WINDOW * win); + int wclear(WINDOW * win); -int wclrattr(WINDOW * win, int attr); + int wclrattr(WINDOW * win, int attr); -int wclrtobot(WINDOW * win); + int wclrtobot(WINDOW * win); -int wclrtoeol(WINDOW * win); + int wclrtoeol(WINDOW * win); -int wdelch(WINDOW * win); + int wdelch(WINDOW * win); -int wdeleteln(WINDOW * win); + int wdeleteln(WINDOW * win); -int delwin(WINDOW * win); + int delwin(WINDOW * win); -int endwin(void); + int endwin(void); -int werase(WINDOW * win); + int werase(WINDOW * win); -int wgetch(WINDOW * win); + int wgetch(WINDOW * win); -int wgetstr(WINDOW * win, char *str); + int wgetstr(WINDOW * win, char *str); -char winch(WINDOW * win); + char winch(WINDOW * win); -WINDOW *initscr(void); + WINDOW *initscr(void); -int winsch(WINDOW * win, char ch); + int winsch(WINDOW * win, char ch); -int winsertln(WINDOW * win); + int winsertln(WINDOW * win); -int winsstr(WINDOW * win, char *str); + int winsstr(WINDOW * win, char *str); -int longname(char *termbuf, char *name); + int longname(char *termbuf, char *name); -int mvwin(WINDOW * win, int st_row, int st_col); + int mvwin(WINDOW * win, int st_row, int st_col); -int wmove(WINDOW * win, int y, int x); + int wmove(WINDOW * win, int y, int x); -WINDOW *newwin(int numlines, int numcols, int begin_y, int begin_x); + WINDOW *newwin(int numlines, int numcols, int begin_y, int begin_x); -int overlay(WINDOW * win1, WINDOW * win2); + int overlay(WINDOW * win1, WINDOW * win2); -int overwrite(WINDOW * win1, WINDOW * win2); + int overwrite(WINDOW * win1, WINDOW * win2); #pragma NOSTANDARD #undef printw @@ -196,28 +194,28 @@ int overwrite(WINDOW * win1, WINDOW * win2); #undef scanw #pragma STANDARD -int printw(char *format_spec,...); + int printw(char *format_spec,...); -int wprintw(WINDOW * win, char *format_spec,...); + int wprintw(WINDOW * win, char *format_spec,...); -int wrefresh(WINDOW * win); + int wrefresh(WINDOW * win); -int wscanw(WINDOW * win, char *format_spec,...); + int wscanw(WINDOW * win, char *format_spec,...); -int scanw(char *fmt, int arg1); + int scanw(char *fmt, int arg1); -int scroll(WINDOW * win); + int scroll(WINDOW * win); -int wsetattr(WINDOW * win, int attr); + int wsetattr(WINDOW * win, int attr); -WINDOW *subwin(WINDOW * win, int numlines, int numcols, - int begin_y, int begin_x); + WINDOW *subwin(WINDOW * win, int numlines, int numcols, + int begin_y, int begin_x); -int wstandend(WINDOW * win); + int wstandend(WINDOW * win); -int wstandout(WINDOW * win); + int wstandout(WINDOW * win); -int touchwin(WINDOW * win); + int touchwin(WINDOW * win); #if defined(CC$mixed_float) || defined(CC$VAXCSHR) @@ -242,4 +240,7 @@ int touchwin(WINDOW * win); #endif #endif -#endif /* __CURSES_LOADED */ +#ifdef __cplusplus +} +#endif +#endif /* __CURSES_LOADED */ diff --git a/src/LYGetFile.c b/src/LYGetFile.c index 42ac71b3..10e80f04 100644 --- a/src/LYGetFile.c +++ b/src/LYGetFile.c @@ -68,7 +68,7 @@ int HTNoDataOK = 0; */ int getfile(DocInfo *doc, int *target) { - int url_type = 0; + UrlTypes url_type = NOT_A_URL_TYPE; char *pound; char *cp = NULL; char *temp = NULL; @@ -945,6 +945,7 @@ int getfile(DocInfo *doc, int *target) "getfile: Adding fragment '%s' to redirection URL.\n", pound)); StrAllocCat(use_this_url_instead, pound); + doc->link = -1; } CTRACE_SLEEP(MessageSecs); HTUserMsg2(WWW_USING_MESSAGE, use_this_url_instead); @@ -1064,8 +1065,10 @@ int getfile(DocInfo *doc, int *target) /* * May set www_search_result. */ - if (HTFindPoundSelector(pound + 1)) + if (HTFindPoundSelector(pound + 1)) { *target = www_search_result; + doc->link = -1; + } } return (NORMAL); } diff --git a/src/LYGetFile.h b/src/LYGetFile.h index 28b379e0..f204d07c 100644 --- a/src/LYGetFile.h +++ b/src/LYGetFile.h @@ -3,20 +3,22 @@ #include <LYStructs.h> +#ifdef __cplusplus +extern "C" { +#endif #define NOT_FOUND 0 #define NORMAL 1 #define NULLFILE 3 + extern int getfile(DocInfo *doc, int *target); + extern void srcmode_for_next_retrieval(int); + extern int follow_link_number(int c, + int cur, + DocInfo *doc, + int *num); + extern void add_trusted(char *str, int type); + extern BOOLEAN exec_ok(const char *source, const char *linkpath, int type); -extern int getfile(DocInfo *doc, int *target); -extern void srcmode_for_next_retrieval(int); -extern int follow_link_number(int c, - int cur, - DocInfo *doc, - int *num); -extern void add_trusted(char *str, int type); -extern BOOLEAN exec_ok(const char *source, const char *linkpath, int type); - -extern char *WWW_Download_File; + extern char *WWW_Download_File; /* values for follow_link_number() */ #define DO_LINK_STUFF 1 @@ -30,4 +32,7 @@ extern char *WWW_Download_File; #define ALWAYS_EXEC_PATH 1 #define CGI_PATH 2 -#endif /* LYGETFILE_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYGETFILE_H */ diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h index 1963331d..5b4e43d5 100644 --- a/src/LYGlobalDefs.h +++ b/src/LYGlobalDefs.h @@ -40,75 +40,78 @@ #include <LYMail.h> /* to get ifdef's for mail-variables */ +#ifdef __cplusplus +extern "C" { +#endif #ifdef SOCKS -extern BOOLEAN socks_flag; -extern unsigned long socks_bind_remoteAddr; -#endif /* SOCKS */ + extern BOOLEAN socks_flag; + extern unsigned long socks_bind_remoteAddr; +#endif /* SOCKS */ #ifdef IGNORE_CTRL_C -extern BOOLEAN sigint; -#endif /* IGNORE_CTRL_C */ + extern BOOLEAN sigint; +#endif /* IGNORE_CTRL_C */ #if USE_VMS_MAILER -extern char *mail_adrs; -extern BOOLEAN UseFixedRecords; /* convert binary files to FIXED 512 records */ -#endif /* VMS */ + extern char *mail_adrs; + extern BOOLEAN UseFixedRecords; /* convert binary files to FIXED 512 records */ +#endif /* VMS */ #ifndef VMS -extern char *list_format; -#endif /* !VMS */ + extern char *list_format; +#endif /* !VMS */ #ifdef DIRED_SUPPORT -typedef enum { - DIRS_FIRST = 0 - ,FILES_FIRST - ,MIXED_STYLE -} enumDirListStyle; - -typedef enum { - ORDER_BY_NAME - ,ORDER_BY_SIZE - ,ORDER_BY_DATE - ,ORDER_BY_MODE - ,ORDER_BY_TYPE - ,ORDER_BY_USER - ,ORDER_BY_GROUP -} enumDirListOrder; - -extern BOOLEAN lynx_edit_mode; -extern BOOLEAN no_dired_support; -extern HTList *tagged; -extern int LYAutoUncacheDirLists; -extern int dir_list_style; /* enumDirListStyle */ -extern int dir_list_order; /* enumDirListOrder */ + typedef enum { + DIRS_FIRST = 0 + ,FILES_FIRST + ,MIXED_STYLE + } enumDirListStyle; + + typedef enum { + ORDER_BY_NAME + ,ORDER_BY_SIZE + ,ORDER_BY_DATE + ,ORDER_BY_MODE + ,ORDER_BY_TYPE + ,ORDER_BY_USER + ,ORDER_BY_GROUP + } enumDirListOrder; + + extern BOOLEAN lynx_edit_mode; + extern BOOLEAN no_dired_support; + extern HTList *tagged; + extern int LYAutoUncacheDirLists; + extern int dir_list_style; /* enumDirListStyle */ + extern int dir_list_order; /* enumDirListOrder */ #ifdef OK_OVERRIDE -extern BOOLEAN prev_lynx_edit_mode; -#endif /* OK_OVERRIDE */ + extern BOOLEAN prev_lynx_edit_mode; +#endif /* OK_OVERRIDE */ #ifdef OK_PERMIT -extern BOOLEAN no_change_exec_perms; -#endif /* OK_PERMIT */ + extern BOOLEAN no_change_exec_perms; +#endif /* OK_PERMIT */ -#endif /* DIRED_SUPPORT */ +#endif /* DIRED_SUPPORT */ -extern int HTCacheSize; /* the number of documents cached in memory */ + extern int HTCacheSize; /* the number of documents cached in memory */ #if defined(VMS) && defined(VAXC) && !defined(__DECC) -extern int HTVirtualMemorySize; /* bytes allocated and not yet freed */ -#endif /* VMS && VAXC && !__DECC */ + extern int HTVirtualMemorySize; /* bytes allocated and not yet freed */ +#endif /* VMS && VAXC && !__DECC */ #if defined(EXEC_LINKS) || defined(EXEC_SCRIPTS) -extern BOOLEAN local_exec; /* TRUE to enable local program execution */ -extern BOOLEAN local_exec_on_local_files; /* TRUE to enable local program * + extern BOOLEAN local_exec; /* TRUE to enable local program execution */ + extern BOOLEAN local_exec_on_local_files; /* TRUE to enable local program * * execution in local files only */ -#endif /* defined(EXEC_LINKS) || defined(EXEC_SCRIPTS) */ +#endif /* defined(EXEC_LINKS) || defined(EXEC_SCRIPTS) */ #if defined(LYNXCGI_LINKS) && !defined(VMS) /* WebSter Mods -jkt */ -extern char *LYCgiDocumentRoot; /* DOCUMENT_ROOT in the lynxcgi env */ -#endif /* LYNXCGI_LINKS */ + extern char *LYCgiDocumentRoot; /* DOCUMENT_ROOT in the lynxcgi env */ +#endif /* LYNXCGI_LINKS */ /* Values to which keypad_mode can be set */ #define NUMBERS_AS_ARROWS 0 @@ -131,51 +134,51 @@ extern char *LYCgiDocumentRoot; /* DOCUMENT_ROOT in the lynxcgi env */ #define NOVICE_MODE 0 #define INTERMEDIATE_MODE 1 #define ADVANCED_MODE 2 -extern BOOLEAN LYUseNoviceLineTwo; /* True if TOGGLE_HELP is not mapped */ + extern BOOLEAN LYUseNoviceLineTwo; /* True if TOGGLE_HELP is not mapped */ #define MAX_LINE 1024 /* Hope that no window is larger than this */ #define MAX_COLS 999 /* we don't expect wider than this */ #define DFT_COLS 80 /* ...and normally only this */ #define DFT_ROWS 24 /* ...corresponding nominal height */ -extern char star_string[MAX_LINE + 1]; /* from GridText.c */ + extern char star_string[MAX_LINE + 1]; /* from GridText.c */ #define STARS(n) \ ((n) >= MAX_LINE ? star_string : &star_string[(MAX_LINE-1)] - (n)) -typedef enum { - SHOW_COLOR_UNKNOWN = -1 - ,SHOW_COLOR_NEVER = 0 /* positive numbers are index in LYOptions.c */ - ,SHOW_COLOR_OFF - ,SHOW_COLOR_ON - ,SHOW_COLOR_ALWAYS -} enumShowColor; + typedef enum { + SHOW_COLOR_UNKNOWN = -1 + ,SHOW_COLOR_NEVER = 0 /* positive numbers are index in LYOptions.c */ + ,SHOW_COLOR_OFF + ,SHOW_COLOR_ON + ,SHOW_COLOR_ALWAYS + } enumShowColor; -extern int LYShowColor; /* Show color or monochrome? */ -extern int LYrcShowColor; /* ... as read or last written */ + extern int LYShowColor; /* Show color or monochrome? */ + extern int LYrcShowColor; /* ... as read or last written */ -typedef enum { - MBM_OFF = 0 - ,MBM_STANDARD - ,MBM_ADVANCED -} enumMultiBookmarks; + typedef enum { + MBM_OFF = 0 + ,MBM_STANDARD + ,MBM_ADVANCED + } enumMultiBookmarks; #if !defined(NO_OPTION_FORMS) && !defined(NO_OPTION_MENU) -extern BOOLEAN LYUseFormsOptions; /* use Forms-based options menu */ + extern BOOLEAN LYUseFormsOptions; /* use Forms-based options menu */ #else #define LYUseFormsOptions FALSE /* simplify ifdef'ing in LYMainLoop.c */ #endif -typedef enum { - rateOFF = 0 - ,rateBYTES = 1 - ,rateKB + typedef enum { + rateOFF = 0 + ,rateBYTES = 1 + ,rateKB #ifdef USE_READPROGRESS - ,rateEtaBYTES - ,rateEtaKB + ,rateEtaBYTES + ,rateEtaKB #endif -} TransferRate; + } TransferRate; #ifdef USE_READPROGRESS # define rateEtaKB_maybe rateEtaKB @@ -183,303 +186,303 @@ typedef enum { # define rateEtaKB_maybe rateKB #endif -extern BOOLEAN LYCursesON; /* start_curses()->TRUE, stop_curses()->FALSE */ -extern BOOLEAN LYJumpFileURL; /* URL from the jump file shortcuts? */ -extern BOOLEAN LYNewsPosting; /* News posting supported if TRUE */ -extern BOOLEAN LYShowCursor; /* Show the cursor or hide it? */ -extern BOOLEAN LYShowTransferRate; -extern BOOLEAN LYUnderlineLinks; /* Show the links underlined vs bold */ -extern BOOLEAN LYUseDefShoCur; /* Command line -show_cursor toggle */ -extern BOOLEAN LYUserSpecifiedURL; /* URL from a goto or document? */ -extern BOOLEAN LYfind_leaks; -extern BOOLEAN LYforce_HTML_mode; -extern BOOLEAN LYforce_no_cache; -extern BOOLEAN LYinternal_flag; /* don't need fresh copy, was internal link */ -extern BOOLEAN LYoverride_no_cache; /* don't need fresh copy, from history */ -extern BOOLEAN LYresubmit_posts; -extern BOOLEAN LYtrimInputFields; -extern BOOLEAN bold_H1; -extern BOOLEAN bold_headers; -extern BOOLEAN bold_name_anchors; -extern BOOLEAN case_sensitive; /* TRUE to turn on case sensitive search */ -extern BOOLEAN check_mail; /* TRUE to report unread/new mail messages */ -extern BOOLEAN child_lynx; /* TRUE to exit with an arrow */ -extern BOOLEAN dump_links_only; -extern BOOLEAN dump_output_immediately; -extern BOOLEAN emacs_keys; /* TRUE to turn on emacs-like key movement */ -extern BOOLEAN error_logging; /* TRUE to mail error messages */ -extern BOOLEAN ftp_local_passive; -extern BOOLEAN ftp_ok; -extern BOOLEAN ftp_passive; /* TRUE if we want to use passive mode ftp */ -extern BOOLEAN goto_buffer; /* TRUE if offering default goto URL */ -extern BOOLEAN is_www_index; -extern BOOLEAN jump_buffer; /* TRUE if offering default shortcut */ -extern BOOLEAN long_url_ok; -extern BOOLEAN lynx_mode; -extern BOOLEAN more; /* is there more document to display? */ -extern BOOLEAN news_ok; -extern BOOLEAN number_fields_on_left; -extern BOOLEAN number_links_on_left; -extern BOOLEAN recent_sizechange; -extern BOOLEAN rlogin_ok; -extern BOOLEAN syslog_requested_urls; -extern BOOLEAN system_editor; /* True if locked-down editor */ -extern BOOLEAN telnet_ok; -extern BOOLEAN verbose_img; /* display filenames of images? */ -extern BOOLEAN vi_keys; /* TRUE to turn on vi-like key movement */ - -extern HTList *Goto_URLs; - -extern char *LYRequestReferer; /* Referer, may be set in getfile() */ -extern char *LYRequestTitle; /* newdoc.title in calls to getfile() */ -extern char *LYTransferName; /* abbreviation for Kilobytes */ -extern char *LynxHome; -extern char *LynxSigFile; /* Signature file, in or off home */ -extern char *ftp_lasthost; -extern char *helpfile; -extern char *helpfilepath; -extern char *jumpprompt; /* The default jump statusline prompt */ -extern char *language; -extern char *lynx_cfg_file; /* location of active lynx.cfg file */ -extern char *lynx_cmd_logfile; /* file to write keystroke commands, if any */ -extern char *lynx_cmd_script; /* file to read keystroke commands, if any */ -extern char *lynx_save_space; -extern char *lynx_temp_space; -extern char *lynxjumpfile; -extern char *lynxlinksfile; -extern char *lynxlistfile; -extern char *original_dir; -extern char *pref_charset; /* Lynx's preferred character set - MM */ -extern char *startfile; -extern char *syslog_txt; /* syslog arb text for session */ -extern char *system_mail; -extern char *system_mail_flags; -extern char *x_display; -extern char empty_string[]; - -extern const char *checked_box; /* form boxes */ -extern const char *checked_radio; /* form radio buttons */ -extern const char *unchecked_box; /* form boxes */ -extern const char *unchecked_radio; /* form radio buttons */ - -extern int LYAcceptEncoding; -extern int LYAcceptMedia; -extern int LYTransferRate; /* see enum TransferRate */ -extern int display_lines; /* number of lines in the display */ -extern int dump_output_width; -extern int keypad_mode; /* NUMBERS_AS_ARROWS or LINKS_ARE_NUMBERED */ -extern int lynx_temp_subspace; -extern int max_cookies_buffer; -extern int max_cookies_domain; -extern int max_cookies_global; -extern int user_mode; /* novice or advanced */ -extern int www_search_result; - -extern BOOLEAN exec_frozen; -extern BOOLEAN had_restrictions_all; /* parsed these restriction options */ -extern BOOLEAN had_restrictions_default; /* flags to note whether we have... */ -extern BOOLEAN no_bookmark; -extern BOOLEAN no_bookmark_exec; -extern BOOLEAN no_chdir; -extern BOOLEAN no_compileopts_info; -extern BOOLEAN no_disk_save; -extern BOOLEAN no_dotfiles; -extern BOOLEAN no_download; -extern BOOLEAN no_editor; -extern BOOLEAN no_exec; -extern BOOLEAN no_file_url; -extern BOOLEAN no_goto; -extern BOOLEAN no_goto_configinfo; -extern BOOLEAN no_goto_cso; -extern BOOLEAN no_goto_file; -extern BOOLEAN no_goto_finger; -extern BOOLEAN no_goto_ftp; -extern BOOLEAN no_goto_gopher; -extern BOOLEAN no_goto_http; -extern BOOLEAN no_goto_https; -extern BOOLEAN no_goto_lynxcgi; -extern BOOLEAN no_goto_lynxexec; -extern BOOLEAN no_goto_lynxprog; -extern BOOLEAN no_goto_mailto; -extern BOOLEAN no_goto_news; -extern BOOLEAN no_goto_nntp; -extern BOOLEAN no_goto_rlogin; -extern BOOLEAN no_goto_snews; -extern BOOLEAN no_goto_telnet; -extern BOOLEAN no_goto_tn3270; -extern BOOLEAN no_goto_wais; -extern BOOLEAN no_inside_ftp; -extern BOOLEAN no_inside_news; -extern BOOLEAN no_inside_rlogin; -extern BOOLEAN no_inside_telnet; /* this and following are restrictions */ -extern BOOLEAN no_jump; -extern BOOLEAN no_lynxcfg_info; -extern BOOLEAN no_lynxcfg_xinfo; -extern BOOLEAN no_lynxcgi; -extern BOOLEAN no_mail; -extern BOOLEAN no_multibook; -extern BOOLEAN no_newspost; -extern BOOLEAN no_option_save; -extern BOOLEAN no_outside_ftp; -extern BOOLEAN no_outside_news; -extern BOOLEAN no_outside_rlogin; -extern BOOLEAN no_outside_telnet; -extern BOOLEAN no_print; /* TRUE to disable printing */ -extern BOOLEAN no_shell; -extern BOOLEAN no_suspend; -extern BOOLEAN no_telnet_port; -extern BOOLEAN no_useragent; - -extern BOOLEAN no_statusline; -extern BOOLEAN no_filereferer; -extern char LYRefererWithQuery; /* 'S', 'P', or 'D' */ -extern BOOLEAN local_host_only; -extern BOOLEAN override_no_download; -extern BOOLEAN show_dotfiles; /* From rcfile if no_dotfiles is false */ -extern char *indexfile; -extern char *anonftp_password; -extern char *personal_mail_address; -extern char *homepage; /* startfile or command line argument */ -extern char *editor; /* if non empty it enables edit mode with + extern BOOLEAN LYCursesON; /* start_curses()->TRUE, stop_curses()->FALSE */ + extern BOOLEAN LYJumpFileURL; /* URL from the jump file shortcuts? */ + extern BOOLEAN LYNewsPosting; /* News posting supported if TRUE */ + extern BOOLEAN LYShowCursor; /* Show the cursor or hide it? */ + extern BOOLEAN LYShowTransferRate; + extern BOOLEAN LYUnderlineLinks; /* Show the links underlined vs bold */ + extern BOOLEAN LYUseDefShoCur; /* Command line -show_cursor toggle */ + extern BOOLEAN LYUserSpecifiedURL; /* URL from a goto or document? */ + extern BOOLEAN LYfind_leaks; + extern BOOLEAN LYforce_HTML_mode; + extern BOOLEAN LYforce_no_cache; + extern BOOLEAN LYinternal_flag; /* don't need fresh copy, was internal link */ + extern BOOLEAN LYoverride_no_cache; /* don't need fresh copy, from history */ + extern BOOLEAN LYresubmit_posts; + extern BOOLEAN LYtrimInputFields; + extern BOOLEAN bold_H1; + extern BOOLEAN bold_headers; + extern BOOLEAN bold_name_anchors; + extern BOOLEAN case_sensitive; /* TRUE to turn on case sensitive search */ + extern BOOLEAN check_mail; /* TRUE to report unread/new mail messages */ + extern BOOLEAN child_lynx; /* TRUE to exit with an arrow */ + extern BOOLEAN dump_links_only; + extern BOOLEAN dump_output_immediately; + extern BOOLEAN emacs_keys; /* TRUE to turn on emacs-like key movement */ + extern BOOLEAN error_logging; /* TRUE to mail error messages */ + extern BOOLEAN ftp_local_passive; + extern BOOLEAN ftp_ok; + extern BOOLEAN ftp_passive; /* TRUE if we want to use passive mode ftp */ + extern BOOLEAN goto_buffer; /* TRUE if offering default goto URL */ + extern BOOLEAN is_www_index; + extern BOOLEAN jump_buffer; /* TRUE if offering default shortcut */ + extern BOOLEAN long_url_ok; + extern BOOLEAN lynx_mode; + extern BOOLEAN more; /* is there more document to display? */ + extern BOOLEAN news_ok; + extern BOOLEAN number_fields_on_left; + extern BOOLEAN number_links_on_left; + extern BOOLEAN recent_sizechange; + extern BOOLEAN rlogin_ok; + extern BOOLEAN syslog_requested_urls; + extern BOOLEAN system_editor; /* True if locked-down editor */ + extern BOOLEAN telnet_ok; + extern BOOLEAN verbose_img; /* display filenames of images? */ + extern BOOLEAN vi_keys; /* TRUE to turn on vi-like key movement */ + + extern HTList *Goto_URLs; + + extern char *LYRequestReferer; /* Referer, may be set in getfile() */ + extern char *LYRequestTitle; /* newdoc.title in calls to getfile() */ + extern char *LYTransferName; /* abbreviation for Kilobytes */ + extern char *LynxHome; + extern char *LynxSigFile; /* Signature file, in or off home */ + extern char *ftp_lasthost; + extern char *helpfile; + extern char *helpfilepath; + extern char *jumpprompt; /* The default jump statusline prompt */ + extern char *language; + extern char *lynx_cfg_file; /* location of active lynx.cfg file */ + extern char *lynx_cmd_logfile; /* file to write keystroke commands, if any */ + extern char *lynx_cmd_script; /* file to read keystroke commands, if any */ + extern char *lynx_save_space; + extern char *lynx_temp_space; + extern char *lynxjumpfile; + extern char *lynxlinksfile; + extern char *lynxlistfile; + extern char *original_dir; + extern char *pref_charset; /* Lynx's preferred character set - MM */ + extern char *startfile; + extern char *syslog_txt; /* syslog arb text for session */ + extern char *system_mail; + extern char *system_mail_flags; + extern char *x_display; + extern char empty_string[]; + + extern const char *checked_box; /* form boxes */ + extern const char *checked_radio; /* form radio buttons */ + extern const char *unchecked_box; /* form boxes */ + extern const char *unchecked_radio; /* form radio buttons */ + + extern int LYAcceptEncoding; + extern int LYAcceptMedia; + extern int LYTransferRate; /* see enum TransferRate */ + extern int display_lines; /* number of lines in the display */ + extern int dump_output_width; + extern int keypad_mode; /* NUMBERS_AS_ARROWS or LINKS_ARE_NUMBERED */ + extern int lynx_temp_subspace; + extern int max_cookies_buffer; + extern int max_cookies_domain; + extern int max_cookies_global; + extern int user_mode; /* novice or advanced */ + extern int www_search_result; + + extern BOOLEAN exec_frozen; + extern BOOLEAN had_restrictions_all; /* parsed these restriction options */ + extern BOOLEAN had_restrictions_default; /* flags to note whether we have... */ + extern BOOLEAN no_bookmark; + extern BOOLEAN no_bookmark_exec; + extern BOOLEAN no_chdir; + extern BOOLEAN no_compileopts_info; + extern BOOLEAN no_disk_save; + extern BOOLEAN no_dotfiles; + extern BOOLEAN no_download; + extern BOOLEAN no_editor; + extern BOOLEAN no_exec; + extern BOOLEAN no_file_url; + extern BOOLEAN no_goto; + extern BOOLEAN no_goto_configinfo; + extern BOOLEAN no_goto_cso; + extern BOOLEAN no_goto_file; + extern BOOLEAN no_goto_finger; + extern BOOLEAN no_goto_ftp; + extern BOOLEAN no_goto_gopher; + extern BOOLEAN no_goto_http; + extern BOOLEAN no_goto_https; + extern BOOLEAN no_goto_lynxcgi; + extern BOOLEAN no_goto_lynxexec; + extern BOOLEAN no_goto_lynxprog; + extern BOOLEAN no_goto_mailto; + extern BOOLEAN no_goto_news; + extern BOOLEAN no_goto_nntp; + extern BOOLEAN no_goto_rlogin; + extern BOOLEAN no_goto_snews; + extern BOOLEAN no_goto_telnet; + extern BOOLEAN no_goto_tn3270; + extern BOOLEAN no_goto_wais; + extern BOOLEAN no_inside_ftp; + extern BOOLEAN no_inside_news; + extern BOOLEAN no_inside_rlogin; + extern BOOLEAN no_inside_telnet; /* this and following are restrictions */ + extern BOOLEAN no_jump; + extern BOOLEAN no_lynxcfg_info; + extern BOOLEAN no_lynxcfg_xinfo; + extern BOOLEAN no_lynxcgi; + extern BOOLEAN no_mail; + extern BOOLEAN no_multibook; + extern BOOLEAN no_newspost; + extern BOOLEAN no_option_save; + extern BOOLEAN no_outside_ftp; + extern BOOLEAN no_outside_news; + extern BOOLEAN no_outside_rlogin; + extern BOOLEAN no_outside_telnet; + extern BOOLEAN no_print; /* TRUE to disable printing */ + extern BOOLEAN no_shell; + extern BOOLEAN no_suspend; + extern BOOLEAN no_telnet_port; + extern BOOLEAN no_useragent; + + extern BOOLEAN no_statusline; + extern BOOLEAN no_filereferer; + extern char LYRefererWithQuery; /* 'S', 'P', or 'D' */ + extern BOOLEAN local_host_only; + extern BOOLEAN override_no_download; + extern BOOLEAN show_dotfiles; /* From rcfile if no_dotfiles is false */ + extern char *indexfile; + extern char *anonftp_password; + extern char *personal_mail_address; + extern char *homepage; /* startfile or command line argument */ + extern char *editor; /* if non empty it enables edit mode with * the editor that is named */ -extern char *jumpfile; -extern char *bookmark_page; -extern char *BookmarkPage; -extern char *personal_type_map; -extern char *global_type_map; -extern char *global_extension_map; -extern char *personal_extension_map; -extern char *LYHostName; -extern char *LYLocalDomain; -extern BOOLEAN use_underscore; -extern BOOLEAN no_list; -extern BOOLEAN historical_comments; -extern BOOLEAN minimal_comments; -extern BOOLEAN soft_dquotes; + extern char *jumpfile; + extern char *bookmark_page; + extern char *BookmarkPage; + extern char *personal_type_map; + extern char *global_type_map; + extern char *global_extension_map; + extern char *personal_extension_map; + extern char *LYHostName; + extern char *LYLocalDomain; + extern BOOLEAN use_underscore; + extern BOOLEAN no_list; + extern BOOLEAN historical_comments; + extern BOOLEAN minimal_comments; + extern BOOLEAN soft_dquotes; #ifdef USE_SOURCE_CACHE -extern BOOLEAN source_cache_file_error; -extern int LYCacheSource; + extern BOOLEAN source_cache_file_error; + extern int LYCacheSource; #define SOURCE_CACHE_NONE 0 #define SOURCE_CACHE_FILE 1 #define SOURCE_CACHE_MEMORY 2 -extern int LYCacheSourceForAborted; + extern int LYCacheSourceForAborted; #define SOURCE_CACHE_FOR_ABORTED_KEEP 1 #define SOURCE_CACHE_FOR_ABORTED_DROP 0 #endif -extern BOOLEAN LYCancelDownload; -extern BOOLEAN LYRestricted; /* whether we had -anonymous option */ -extern BOOLEAN LYValidate; -extern BOOLEAN LYPermitURL; -extern BOOLEAN enable_scrollback; /* Clear screen before displaying new page */ -extern BOOLEAN keep_mime_headers; /* Include mime headers and * + extern BOOLEAN LYCancelDownload; + extern BOOLEAN LYRestricted; /* whether we had -anonymous option */ + extern BOOLEAN LYValidate; + extern BOOLEAN LYPermitURL; + extern BOOLEAN enable_scrollback; /* Clear screen before displaying new page */ + extern BOOLEAN keep_mime_headers; /* Include mime headers and * * force source dump */ -extern BOOLEAN no_url_redirection; /* Don't follow URL redirections */ + extern BOOLEAN no_url_redirection; /* Don't follow URL redirections */ #ifdef DISP_PARTIAL -extern BOOLEAN display_partial; /* Display document while loading */ -extern int NumOfLines_partial; /* -//- "current" number of lines */ -extern int partial_threshold; -extern BOOLEAN debug_display_partial; /* show with MessageSecs delay */ -extern BOOLEAN display_partial_flag; /* permanent flag, not mutable */ + extern BOOLEAN display_partial; /* Display document while loading */ + extern int NumOfLines_partial; /* -//- "current" number of lines */ + extern int partial_threshold; + extern BOOLEAN debug_display_partial; /* show with MessageSecs delay */ + extern BOOLEAN display_partial_flag; /* permanent flag, not mutable */ #endif -extern char *form_post_data; /* User data for post form */ -extern char *form_get_data; /* User data for get form */ -extern char *http_error_file; /* Place HTTP status code in this file */ -extern char *authentication_info[2]; /* Id:Password for protected documents */ -extern char *proxyauth_info[2]; /* Id:Password for protected proxy server */ -extern BOOLEAN HEAD_request; /* Do a HEAD request */ -extern BOOLEAN scan_for_buried_news_references; -extern BOOLEAN bookmark_start; /* Use bookmarks as startfile */ -extern BOOLEAN clickable_images; -extern BOOLEAN nested_tables; -extern BOOLEAN pseudo_inline_alts; -extern BOOLEAN crawl; -extern BOOLEAN traversal; -extern BOOLEAN check_realm; -extern char *startrealm; -extern BOOLEAN more_links; -extern int crawl_count; -extern BOOLEAN LYCancelledFetch; -extern const char *LYToolbarName; - -extern int AlertSecs; -extern int InfoSecs; -extern int MessageSecs; -extern int DebugSecs; -extern int ReplaySecs; - -extern char *LYUserAgent; /* Lynx User-Agent header */ -extern char *LYUserAgentDefault; /* Lynx default User-Agent header */ -extern BOOLEAN LYNoRefererHeader; /* Never send Referer header? */ -extern BOOLEAN LYNoRefererForThis; /* No Referer header for this URL? */ -extern BOOLEAN LYNoFromHeader; /* Never send From header? */ -extern BOOLEAN LYListNewsNumbers; -extern BOOLEAN LYUseMouse; -extern BOOLEAN LYListNewsDates; - -extern BOOLEAN LYRawMode; -extern BOOLEAN LYDefaultRawMode; -extern BOOLEAN LYUseDefaultRawMode; -extern char *UCAssume_MIMEcharset; -extern BOOLEAN UCSaveBookmarksInUnicode; /* in titles, chars >127 save as &#xUUUU */ -extern BOOLEAN UCForce8bitTOUPPER; /* disable locale case-conversion for >127 */ -extern int outgoing_mail_charset; /* translate outgoing mail to this charset */ - -extern BOOLEAN LYisConfiguredForX; -extern char *URLDomainPrefixes; -extern char *URLDomainSuffixes; -extern BOOLEAN startfile_ok; -extern BOOLEAN LYSelectPopups; /* Cast popups to radio buttons? */ -extern BOOLEAN LYUseDefSelPop; /* Command line -popup toggle */ -extern int LYMultiBookmarks; /* Multi bookmark support on? */ -extern BOOLEAN LYMBMBlocked; /* Force MBM support off? */ -extern int LYStatusLine; /* Line for statusline() or -1 */ -extern BOOLEAN LYCollapseBRs; /* Collapse serial BRs? */ -extern BOOLEAN LYSetCookies; /* Process Set-Cookie headers? */ -extern BOOLEAN LYAcceptAllCookies; /* accept ALL cookies? */ - -extern char *LYCookieAcceptDomains; /* domains to accept all cookies */ -extern char *LYCookieRejectDomains; /* domains to reject all cookies */ -extern char *LYCookieStrictCheckDomains; /* domains to check strictly */ -extern char *LYCookieLooseCheckDomains; /* domains to check loosely */ -extern char *LYCookieQueryCheckDomains; /* domains to check w/a query */ -extern char *LYCookieSAcceptDomains; /* domains to accept all cookies */ -extern char *LYCookieSRejectDomains; /* domains to reject all cookies */ -extern char *LYCookieSStrictCheckDomains; /* domains to check strictly */ -extern char *LYCookieSLooseCheckDomains; /* domains to check loosely */ -extern char *LYCookieSQueryCheckDomains; /* domains to check w/a query */ + extern char *form_post_data; /* User data for post form */ + extern char *form_get_data; /* User data for get form */ + extern char *http_error_file; /* Place HTTP status code in this file */ + extern char *authentication_info[2]; /* Id:Password for protected documents */ + extern char *proxyauth_info[2]; /* Id:Password for protected proxy server */ + extern BOOLEAN HEAD_request; /* Do a HEAD request */ + extern BOOLEAN scan_for_buried_news_references; + extern BOOLEAN bookmark_start; /* Use bookmarks as startfile */ + extern BOOLEAN clickable_images; + extern BOOLEAN nested_tables; + extern BOOLEAN pseudo_inline_alts; + extern BOOLEAN crawl; + extern BOOLEAN traversal; + extern BOOLEAN check_realm; + extern char *startrealm; + extern BOOLEAN more_links; + extern int crawl_count; + extern BOOLEAN LYCancelledFetch; + extern const char *LYToolbarName; + + extern int AlertSecs; + extern int InfoSecs; + extern int MessageSecs; + extern int DebugSecs; + extern int ReplaySecs; + + extern char *LYUserAgent; /* Lynx User-Agent header */ + extern char *LYUserAgentDefault; /* Lynx default User-Agent header */ + extern BOOLEAN LYNoRefererHeader; /* Never send Referer header? */ + extern BOOLEAN LYNoRefererForThis; /* No Referer header for this URL? */ + extern BOOLEAN LYNoFromHeader; /* Never send From header? */ + extern BOOLEAN LYListNewsNumbers; + extern BOOLEAN LYUseMouse; + extern BOOLEAN LYListNewsDates; + + extern BOOLEAN LYRawMode; + extern BOOLEAN LYDefaultRawMode; + extern BOOLEAN LYUseDefaultRawMode; + extern char *UCAssume_MIMEcharset; + extern BOOLEAN UCSaveBookmarksInUnicode; /* in titles, chars >127 save as &#xUUUU */ + extern BOOLEAN UCForce8bitTOUPPER; /* disable locale case-conversion for >127 */ + extern int outgoing_mail_charset; /* translate outgoing mail to this charset */ + + extern BOOLEAN LYisConfiguredForX; + extern char *URLDomainPrefixes; + extern char *URLDomainSuffixes; + extern BOOLEAN startfile_ok; + extern BOOLEAN LYSelectPopups; /* Cast popups to radio buttons? */ + extern BOOLEAN LYUseDefSelPop; /* Command line -popup toggle */ + extern int LYMultiBookmarks; /* Multi bookmark support on? */ + extern BOOLEAN LYMBMBlocked; /* Force MBM support off? */ + extern int LYStatusLine; /* Line for statusline() or -1 */ + extern BOOLEAN LYCollapseBRs; /* Collapse serial BRs? */ + extern BOOLEAN LYSetCookies; /* Process Set-Cookie headers? */ + extern BOOLEAN LYAcceptAllCookies; /* accept ALL cookies? */ + + extern char *LYCookieAcceptDomains; /* domains to accept all cookies */ + extern char *LYCookieRejectDomains; /* domains to reject all cookies */ + extern char *LYCookieStrictCheckDomains; /* domains to check strictly */ + extern char *LYCookieLooseCheckDomains; /* domains to check loosely */ + extern char *LYCookieQueryCheckDomains; /* domains to check w/a query */ + extern char *LYCookieSAcceptDomains; /* domains to accept all cookies */ + extern char *LYCookieSRejectDomains; /* domains to reject all cookies */ + extern char *LYCookieSStrictCheckDomains; /* domains to check strictly */ + extern char *LYCookieSLooseCheckDomains; /* domains to check loosely */ + extern char *LYCookieSQueryCheckDomains; /* domains to check w/a query */ #ifndef DISABLE_BIBP -extern BOOLEAN no_goto_bibp; -extern char *BibP_globalserver; /* global server for bibp: links */ -extern char *BibP_bibhost; /* local server for bibp: links */ -extern BOOLEAN BibP_bibhost_checked; /* bibhost has been checked */ -extern BOOLEAN BibP_bibhost_available; /* bibhost is responding */ + extern BOOLEAN no_goto_bibp; + extern char *BibP_globalserver; /* global server for bibp: links */ + extern char *BibP_bibhost; /* local server for bibp: links */ + extern BOOLEAN BibP_bibhost_checked; /* bibhost has been checked */ + extern BOOLEAN BibP_bibhost_available; /* bibhost is responding */ #endif #ifdef USE_PERSISTENT_COOKIES -extern BOOLEAN persistent_cookies; -extern char *LYCookieFile; /* cookie read file */ -extern char *LYCookieSaveFile; /* cookie save file */ -#endif /* USE_PERSISTENT_COOKIES */ + extern BOOLEAN persistent_cookies; + extern char *LYCookieFile; /* cookie read file */ + extern char *LYCookieSaveFile; /* cookie save file */ +#endif /* USE_PERSISTENT_COOKIES */ -extern char *XLoadImageCommand; /* Default image viewer for X */ + extern char *XLoadImageCommand; /* Default image viewer for X */ #ifdef USE_EXTERNALS -extern BOOLEAN no_externals; /* don't allow the use of externals */ + extern BOOLEAN no_externals; /* don't allow the use of externals */ #endif -extern BOOLEAN LYNoISMAPifUSEMAP; /* Omit ISMAP link if MAP present? */ -extern int LYHiddenLinks; + extern BOOLEAN LYNoISMAPifUSEMAP; /* Omit ISMAP link if MAP present? */ + extern int LYHiddenLinks; -extern int Old_DTD; + extern int Old_DTD; #define MBM_V_MAXFILES 25 /* Max number of sub-bookmark files */ @@ -487,118 +490,118 @@ extern int Old_DTD; * Arrays that holds the names of sub-bookmark files * and their descriptions. */ -extern char *MBM_A_subbookmark[MBM_V_MAXFILES + 1]; -extern char *MBM_A_subdescript[MBM_V_MAXFILES + 1]; - -extern BOOLEAN LYForceSSLCookiesSecure; -extern BOOLEAN LYNoCc; -extern BOOLEAN LYNonRestartingSIGWINCH; -extern BOOLEAN LYPreparsedSource; /* Show source as preparsed? */ -extern BOOLEAN LYPrependBaseToSource; -extern BOOLEAN LYPrependCharsetToSource; -extern BOOLEAN LYQuitDefaultYes; -extern BOOLEAN LYReuseTempfiles; -extern BOOLEAN LYSeekFragAREAinCur; -extern BOOLEAN LYSeekFragMAPinCur; -extern BOOLEAN LYStripDotDotURLs; /* Try to fix ../ in some URLs? */ -extern BOOLEAN LYUseBuiltinSuffixes; -extern BOOLEAN dont_wrap_pre; - -extern int cookie_noprompt; - -typedef enum { - FORCE_PROMPT_DFT /* force a prompt, use the result */ - ,FORCE_PROMPT_YES /* assume "yes" where a prompt would be used */ - ,FORCE_PROMPT_NO /* assume "no" where a prompt would be used */ -} FORCE_PROMPT; + extern char *MBM_A_subbookmark[MBM_V_MAXFILES + 1]; + extern char *MBM_A_subdescript[MBM_V_MAXFILES + 1]; + + extern BOOLEAN LYForceSSLCookiesSecure; + extern BOOLEAN LYNoCc; + extern BOOLEAN LYNonRestartingSIGWINCH; + extern BOOLEAN LYPreparsedSource; /* Show source as preparsed? */ + extern BOOLEAN LYPrependBaseToSource; + extern BOOLEAN LYPrependCharsetToSource; + extern BOOLEAN LYQuitDefaultYes; + extern BOOLEAN LYReuseTempfiles; + extern BOOLEAN LYSeekFragAREAinCur; + extern BOOLEAN LYSeekFragMAPinCur; + extern BOOLEAN LYStripDotDotURLs; /* Try to fix ../ in some URLs? */ + extern BOOLEAN LYUseBuiltinSuffixes; + extern BOOLEAN dont_wrap_pre; + + extern int cookie_noprompt; + + typedef enum { + FORCE_PROMPT_DFT /* force a prompt, use the result */ + ,FORCE_PROMPT_YES /* assume "yes" where a prompt would be used */ + ,FORCE_PROMPT_NO /* assume "no" where a prompt would be used */ + } FORCE_PROMPT; #ifdef USE_SSL -extern int ssl_noprompt; + extern int ssl_noprompt; #endif #ifdef MISC_EXP -extern int LYNoZapKey; /* 0: off (do 'z' checking), 1: full, 2: initially */ + extern int LYNoZapKey; /* 0: off (do 'z' checking), 1: full, 2: initially */ #endif #ifdef EXP_JUSTIFY_ELTS -extern BOOL ok_justify; -extern int justify_max_void_percent; + extern BOOL ok_justify; + extern int justify_max_void_percent; #endif #ifdef EXP_LOCALE_CHARSET -extern BOOLEAN LYLocaleCharset; + extern BOOLEAN LYLocaleCharset; #endif #ifndef NO_DUMP_WITH_BACKSPACES -extern BOOLEAN with_backspaces; + extern BOOLEAN with_backspaces; #endif #if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401 -extern int scrsize_x; -extern int scrsize_y; + extern int scrsize_x; + extern int scrsize_y; #endif #ifndef NO_LYNX_TRACE -extern FILE *LYTraceLogFP; /* Pointer for TRACE log */ -extern char *LYTraceLogPath; /* Path for TRACE log */ + extern FILE *LYTraceLogFP; /* Pointer for TRACE log */ + extern char *LYTraceLogPath; /* Path for TRACE log */ #endif -extern BOOLEAN LYUseTraceLog; /* Use a TRACE log? */ + extern BOOLEAN LYUseTraceLog; /* Use a TRACE log? */ -extern BOOL force_empty_hrefless_a; -extern int connect_timeout; + extern BOOL force_empty_hrefless_a; + extern int connect_timeout; #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION -extern BOOL textfields_need_activation; -extern BOOL textfields_activation_option; + extern BOOL textfields_need_activation; + extern BOOL textfields_activation_option; #ifdef INACTIVE_INPUT_STYLE_VH -extern BOOL textinput_redrawn; + extern BOOL textinput_redrawn; #endif #else #define textfields_need_activation FALSE -#endif /* TEXTFIELDS_MAY_NEED_ACTIVATION */ +#endif /* TEXTFIELDS_MAY_NEED_ACTIVATION */ -extern BOOLEAN textfield_prompt_at_left_edge; + extern BOOLEAN textfield_prompt_at_left_edge; #ifndef VMS -extern BOOLEAN LYNoCore; -extern BOOLEAN restore_sigpipe_for_children; -#endif /* !VMS */ + extern BOOLEAN LYNoCore; + extern BOOLEAN restore_sigpipe_for_children; +#endif /* !VMS */ #if defined(USE_COLOR_STYLE) -extern char *lynx_lss_file; + extern char *lynx_lss_file; #endif -extern int HTNoDataOK; /* HT_NO_DATA-is-ok hack */ -extern BOOLEAN FileInitAlreadyDone; + extern int HTNoDataOK; /* HT_NO_DATA-is-ok hack */ + extern BOOLEAN FileInitAlreadyDone; #ifdef __DJGPP__ -extern BOOLEAN watt_debug; -extern BOOLEAN dj_is_bash; -#endif /* __DJGPP__ */ + extern BOOLEAN watt_debug; + extern BOOLEAN dj_is_bash; +#endif /* __DJGPP__ */ #ifdef WIN_EX /* LYMain.c */ -extern BOOLEAN focus_window; -extern BOOLEAN system_is_NT; -extern char windows_drive[4]; -extern int lynx_timeout; -#endif /* _WINDOWS */ + extern BOOLEAN focus_window; + extern BOOLEAN system_is_NT; + extern char windows_drive[4]; + extern int lynx_timeout; +#endif /* _WINDOWS */ #ifdef SH_EX -extern BOOLEAN show_cfg; + extern BOOLEAN show_cfg; #endif -extern BOOLEAN no_table_center; + extern BOOLEAN no_table_center; #if USE_BLAT_MAILER -extern BOOLEAN mail_is_blat; + extern BOOLEAN mail_is_blat; #endif #if defined(__CYGWIN__) -extern void cygwin_conv_to_full_win32_path(char *posix, char *dos); -extern void cygwin_conv_to_full_posix_path(char *dos, char *posix); -extern int setmode(int handle, int amode); + extern void cygwin_conv_to_full_win32_path(char *posix, char *dos); + extern void cygwin_conv_to_full_posix_path(char *dos, char *posix); + extern int setmode(int handle, int amode); #endif #if !defined(__CYGWIN__) && defined(__CYGWIN32__) @@ -613,18 +616,21 @@ extern int setmode(int handle, int amode); #ifdef USE_SCROLLBAR /* GridText.c */ -extern BOOLEAN LYShowScrollbar; -extern BOOLEAN LYsb_arrow; -extern int LYsb_begin; -extern int LYsb_end; + extern BOOLEAN LYShowScrollbar; + extern BOOLEAN LYsb_arrow; + extern int LYsb_begin; + extern int LYsb_end; #endif #ifdef MARK_HIDDEN_LINKS -extern char *hidden_link_marker; + extern char *hidden_link_marker; #endif #ifdef USE_BLINK -extern BOOLEAN term_blink_is_boldbg; + extern BOOLEAN term_blink_is_boldbg; #endif -#endif /* LYGLOBALDEFS_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYGLOBALDEFS_H */ diff --git a/src/LYHash.h b/src/LYHash.h index b0d2674d..f8aaf4a2 100644 --- a/src/LYHash.h +++ b/src/LYHash.h @@ -1,81 +1,87 @@ -#if !defined(_LYHASH_H_) +#ifndef _LYHASH_H_ #define _LYHASH_H_ 1 #ifndef HTUTILS_H #include <HTUtils.h> #endif -#define OMIT_SCN_KEEPING 0 /* whether to omit keeping of Style_className - in HTML.c when lss support is on. 1 to increase performance. */ - -struct _hashbucket { - char *name; /* name of this item */ - int code; /* code of this item */ - int color; /* color highlighting to be done */ - int mono; /* mono highlighting to be done */ - int cattr; /* attributes to go with the color */ - struct _hashbucket *next; /* next item */ -}; +#ifdef __cplusplus +extern "C" { +#endif + /* define OMIT_SCN_KEEPING to 1 to omit keeping of Style_className + * in HTML.c when lss support is on. 1 to increase performance. + */ +#define OMIT_SCN_KEEPING 0 + struct _hashbucket { + char *name; /* name of this item */ + int code; /* code of this item */ + int color; /* color highlighting to be done */ + int mono; /* mono highlighting to be done */ + int cattr; /* attributes to go with the color */ + struct _hashbucket *next; /* next item */ + }; -typedef struct _hashbucket bucket; + typedef struct _hashbucket bucket; -#if !defined(CSHASHSIZE) +#ifndef CSHASHSIZE #define CSHASHSIZE 8193 #endif #define NOSTYLE -1 -extern bucket hashStyles[CSHASHSIZE]; -extern int hash_code(const char *string); -extern bucket nostyle_bucket; /* initialized properly - to be used in CTRACE + /* hashStyles[] is used in CTRACE when NOSTYLE is passed as 'style' to + * curses_w_style + */ + extern bucket hashStyles[CSHASHSIZE]; + extern int hash_code(const char *string); + extern bucket nostyle_bucket; - * when NOSTYLE is passed as 'style' to - * curses_w_style - */ + extern int hash_code_lowercase_on_fly(const char *string); + extern int hash_code_aggregate_char(char c, int hash); + extern int hash_code_aggregate_lower_str(const char *c, int hash_was); -extern int hash_code_lowercase_on_fly(const char *string); -extern int hash_code_aggregate_char(char c, int hash); -extern int hash_code_aggregate_lower_str(const char *c, int hash_was); - -extern int s_a; -extern int s_aedit; -extern int s_aedit_arr; -extern int s_aedit_pad; -extern int s_aedit_sel; -extern int s_alert; -extern int s_alink; -extern int s_curedit; -extern int s_forw_backw; -extern int s_hot_paste; -extern int s_menu_active; -extern int s_menu_bg; -extern int s_menu_entry; -extern int s_menu_frame; -extern int s_menu_number; -extern int s_menu_sb; -extern int s_normal; -extern int s_prompt_edit; -extern int s_prompt_edit_arr; -extern int s_prompt_edit_pad; -extern int s_prompt_sel; -extern int s_status; -extern int s_title; -extern int s_whereis; + extern int s_a; + extern int s_aedit; + extern int s_aedit_arr; + extern int s_aedit_pad; + extern int s_aedit_sel; + extern int s_alert; + extern int s_alink; + extern int s_curedit; + extern int s_forw_backw; + extern int s_hot_paste; + extern int s_menu_active; + extern int s_menu_bg; + extern int s_menu_entry; + extern int s_menu_frame; + extern int s_menu_number; + extern int s_menu_sb; + extern int s_normal; + extern int s_prompt_edit; + extern int s_prompt_edit_arr; + extern int s_prompt_edit_pad; + extern int s_prompt_sel; + extern int s_status; + extern int s_title; + extern int s_whereis; #ifdef USE_SCROLLBAR -extern int s_sb_aa; -extern int s_sb_bar; -extern int s_sb_bg; -extern int s_sb_naa; + extern int s_sb_aa; + extern int s_sb_bar; + extern int s_sb_bg; + extern int s_sb_naa; #endif #if OMIT_SCN_KEEPING -extern bucket special_bucket; + extern bucket special_bucket; #endif #define CACHEW 128 #define CACHEH 64 -extern unsigned cached_styles[CACHEH][CACHEW]; + extern unsigned cached_styles[CACHEH][CACHEW]; -#endif /* _LYHASH_H_ */ +#ifdef __cplusplus +} +#endif +#endif /* _LYHASH_H_ */ diff --git a/src/LYHistory.c b/src/LYHistory.c index 7f90bc87..0e3da111 100644 --- a/src/LYHistory.c +++ b/src/LYHistory.c @@ -93,7 +93,7 @@ static void trace_history(const char *tag) */ void LYAddVisitedLink(DocInfo *doc) { - VisitedLink *new; + VisitedLink *tmp; HTList *cur; const char *title = (doc->title ? doc->title : NO_TITLE); @@ -152,36 +152,36 @@ void LYAddVisitedLink(DocInfo *doc) } cur = Visited_Links; - while (NULL != (new = (VisitedLink *) HTList_nextObject(cur))) { - if (!strcmp(NonNull(new->address), + while (NULL != (tmp = (VisitedLink *) HTList_nextObject(cur))) { + if (!strcmp(NonNull(tmp->address), NonNull(doc->address))) { - PrevVisitedLink = PrevActiveVisitedLink = new; + PrevVisitedLink = PrevActiveVisitedLink = tmp; /* Already visited. Update the last-visited info. */ - if (new->next_latest == &Latest_last) /* optimization */ + if (tmp->next_latest == &Latest_last) /* optimization */ return; /* Remove from "latest" chain */ - new->prev_latest->next_latest = new->next_latest; - new->next_latest->prev_latest = new->prev_latest; + tmp->prev_latest->next_latest = tmp->next_latest; + tmp->next_latest->prev_latest = tmp->prev_latest; /* Insert at the end of the "latest" chain */ - Latest_last.prev_latest->next_latest = new; - new->prev_latest = Latest_last.prev_latest; - new->next_latest = &Latest_last; - Latest_last.prev_latest = new; + Latest_last.prev_latest->next_latest = tmp; + tmp->prev_latest = Latest_last.prev_latest; + tmp->next_latest = &Latest_last; + Latest_last.prev_latest = tmp; return; } } - if ((new = typecalloc(VisitedLink)) == NULL) + if ((tmp = typecalloc(VisitedLink)) == NULL) outofmem(__FILE__, "LYAddVisitedLink"); - StrAllocCopy(new->address, doc->address); - LYformTitle(&(new->title), title); + StrAllocCopy(tmp->address, doc->address); + LYformTitle(&(tmp->title), title); /* First-visited chain */ - HTList_appendObject(Visited_Links, new); /* At end */ - new->prev_first = Last_by_first; - Last_by_first = new; + HTList_appendObject(Visited_Links, tmp); /* At end */ + tmp->prev_first = Last_by_first; + Last_by_first = tmp; /* Tree structure */ if (PrevVisitedLink) { @@ -194,27 +194,27 @@ void LYAddVisitedLink(DocInfo *doc) a = b, b = b->next_tree; if (!b) /* a == Latest_tree */ - Latest_tree = new; - new->next_tree = a->next_tree; - a->next_tree = new; + Latest_tree = tmp; + tmp->next_tree = a->next_tree; + a->next_tree = tmp; - new->level = PrevVisitedLink->level + 1; + tmp->level = PrevVisitedLink->level + 1; } else { if (Latest_tree) - Latest_tree->next_tree = new; - new->level = 0; - new->next_tree = NULL; - Latest_tree = new; + Latest_tree->next_tree = tmp; + tmp->level = 0; + tmp->next_tree = NULL; + Latest_tree = tmp; } - PrevVisitedLink = PrevActiveVisitedLink = new; + PrevVisitedLink = PrevActiveVisitedLink = tmp; if (!First_tree) - First_tree = new; + First_tree = tmp; /* "latest" chain */ - Latest_last.prev_latest->next_latest = new; - new->prev_latest = Latest_last.prev_latest; - new->next_latest = &Latest_last; - Latest_last.prev_latest = new; + Latest_last.prev_latest->next_latest = tmp; + tmp->prev_latest = Latest_last.prev_latest; + tmp->next_latest = &Latest_last; + Latest_last.prev_latest = tmp; return; } @@ -334,7 +334,7 @@ static int are_identical(HistInfo * doc, DocInfo *doc1) void LYAllocHistory(int entries) { - CTRACE((tfp, "FIXME LYAllocHistory %d vs %d\n", entries, size_history)); + CTRACE((tfp, "LYAllocHistory %d vs %d\n", entries, size_history)); if (entries + 1 >= size_history) { unsigned want; int save = size_history; @@ -349,11 +349,11 @@ void LYAllocHistory(int entries) if (history == 0) outofmem(__FILE__, "LYAllocHistory"); while (save < size_history) { - CTRACE((tfp, "FIXME ...LYAllocHistory clearing %d\n", save)); + CTRACE((tfp, "...LYAllocHistory clearing %d\n", save)); memset(&history[save++], 0, sizeof(history[0])); } } - CTRACE((tfp, "FIXME ...LYAllocHistory %d vs %d\n", entries, size_history)); + CTRACE((tfp, "...LYAllocHistory %d vs %d\n", entries, size_history)); } /* diff --git a/src/LYHistory.h b/src/LYHistory.h index c5cc8a94..249304f5 100644 --- a/src/LYHistory.h +++ b/src/LYHistory.h @@ -5,24 +5,30 @@ #include <LYStructs.h> #endif /* LYSTRUCTS_H */ -extern BOOLEAN LYwouldPush(const char *title, const char *docurl); -extern BOOLEAN historytarget(DocInfo *newdoc); -extern int LYShowVisitedLinks(char **newfile); -extern int LYhist_next(DocInfo *doc, DocInfo *newdoc); -extern int LYpush(DocInfo *doc, BOOLEAN force_push); -extern int showhistory(char **newfile); -extern void LYAddVisitedLink(DocInfo *doc); -extern void LYAllocHistory(int entries); -extern void LYFreePostData(DocInfo *data); -extern void LYFreeDocInfo(DocInfo *data); -extern void LYhist_prev(DocInfo *doc); -extern void LYhist_prev_register(DocInfo *doc); -extern void LYpop(DocInfo *doc); -extern void LYpop_num(int number, DocInfo *doc); -extern void LYstatusline_messages_on_exit(char **buf); -extern void LYstore_message(const char *message); -extern void LYstore_message2(const char *message, const char *argument); +#ifdef __cplusplus +extern "C" { +#endif + extern BOOLEAN LYwouldPush(const char *title, const char *docurl); + extern BOOLEAN historytarget(DocInfo *newdoc); + extern int LYShowVisitedLinks(char **newfile); + extern int LYhist_next(DocInfo *doc, DocInfo *newdoc); + extern int LYpush(DocInfo *doc, BOOLEAN force_push); + extern int showhistory(char **newfile); + extern void LYAddVisitedLink(DocInfo *doc); + extern void LYAllocHistory(int entries); + extern void LYFreePostData(DocInfo *data); + extern void LYFreeDocInfo(DocInfo *data); + extern void LYhist_prev(DocInfo *doc); + extern void LYhist_prev_register(DocInfo *doc); + extern void LYpop(DocInfo *doc); + extern void LYpop_num(int number, DocInfo *doc); + extern void LYstatusline_messages_on_exit(char **buf); + extern void LYstore_message(const char *message); + extern void LYstore_message2(const char *message, const char *argument); -extern int nhist_extra; + extern int nhist_extra; -#endif /* LYHISTORY_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYHISTORY_H */ diff --git a/src/LYJump.c b/src/LYJump.c index 419963ea..903c2ee2 100644 --- a/src/LYJump.c +++ b/src/LYJump.c @@ -33,14 +33,7 @@ void LYJumpTable_free(void) FREE(cur->file); FREE(cur->shortcut); if (cur->history) { - char *shortcut; - HTList *current = cur->history; - - while (NULL != (shortcut = (char *) HTList_nextObject(current))) { - FREE(shortcut); - }; - - HTList_delete(cur->history); + LYFreeStringList(cur->history); cur->history = NULL; } FREE(cur->table); @@ -58,23 +51,23 @@ void LYJumpTable_free(void) */ void LYAddJumpShortcut(HTList *historyp, char *shortcut) { - char *new = NULL; + char *tmp = NULL; char *old; HTList *cur = historyp; if (!historyp || isEmpty(shortcut)) return; - StrAllocCopy(new, shortcut); + StrAllocCopy(tmp, shortcut); while (NULL != (old = (char *) HTList_nextObject(cur))) { - if (!strcmp(old, new)) { + if (!strcmp(old, tmp)) { HTList_removeObject(historyp, old); FREE(old); break; } } - HTList_addObject(historyp, new); + HTList_addObject(historyp, tmp); return; } @@ -185,7 +178,8 @@ char *LYJump(int key) static char buf[124]; char *bp, *cp; struct JumpTable *jtp; - int ch, recall; + int ch; + RecallType recall; int ShortcutTotal; int ShortcutNum; BOOLEAN FirstShortcutRecall = TRUE; diff --git a/src/LYJump.h b/src/LYJump.h index fad6608e..24b5222e 100644 --- a/src/LYJump.h +++ b/src/LYJump.h @@ -3,27 +3,33 @@ #include <HTList.h> -typedef struct _JumpDatum { - char *key; - char *url; -} JumpDatum; +#ifdef __cplusplus +extern "C" { +#endif + typedef struct _JumpDatum { + char *key; + char *url; + } JumpDatum; -struct JumpTable { - int key; - int nel; - char *msg; - char *file; - char *shortcut; - HTList *history; - JumpDatum *table; - struct JumpTable *next; - char *mp; -}; + struct JumpTable { + int key; + int nel; + char *msg; + char *file; + char *shortcut; + HTList *history; + JumpDatum *table; + struct JumpTable *next; + char *mp; + }; -extern struct JumpTable *JThead; -extern void LYJumpTable_free(void); -extern void LYAddJumpShortcut(HTList *the_history, char *shortcut); -extern BOOL LYJumpInit(char *config); -extern char *LYJump(int key); + extern struct JumpTable *JThead; + extern void LYJumpTable_free(void); + extern void LYAddJumpShortcut(HTList *the_history, char *shortcut); + extern BOOL LYJumpInit(char *config); + extern char *LYJump(int key); -#endif /* LYJUMP_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYJUMP_H */ diff --git a/src/LYJustify.h b/src/LYJustify.h index 3bebdc56..43e22bd0 100644 --- a/src/LYJustify.h +++ b/src/LYJustify.h @@ -7,25 +7,27 @@ #include <HTUtils.h> +#ifdef __cplusplus +extern "C" { +#endif #ifdef EXP_JUSTIFY_ELTS + extern BOOL ok_justify; + extern BOOL can_justify_here; + extern BOOL can_justify_here_saved; -extern BOOL ok_justify; -extern BOOL can_justify_here; -extern BOOL can_justify_here_saved; - -extern BOOL can_justify_this_line; -extern int wait_for_this_stacked_elt; -extern BOOL form_in_htext; + extern BOOL can_justify_this_line; + extern int wait_for_this_stacked_elt; + extern BOOL form_in_htext; /* this is the element with SGML_EMPTY content, so it won't get on the stack, * so we can't trap it with wait_for_this_stacked_elt */ -extern BOOL in_DT; + extern BOOL in_DT; /*disabled by default*/ /*#define DEBUG_JUSTIFY*/ #ifdef DEBUG_JUSTIFY -extern BOOL can_justify_stack_depth; /* can be 0 or 1 if all code is correct */ + extern BOOL can_justify_stack_depth; /* can be 0 or 1 if all code is correct */ # define CAN_JUSTIFY_STACK_INC ++can_justify_stack_depth;\ assert(can_justify_stack_depth < 2 && can_justify_stack_depth >=0 ); @@ -57,25 +59,23 @@ extern BOOL can_justify_stack_depth; /* can be 0 or 1 if all code is correct */ #define EMIT_IFDEF_EXP_JUSTIFY_ELTS(x) x /*defined in order not to wrap single line of code into #ifdef/#endif */ -extern void ht_justify_cleanup(void); -extern void mark_justify_start_position(void *text); - -#else /* ! EXP_JUSTIFY_ELTS */ + extern void ht_justify_cleanup(void); + extern void mark_justify_start_position(void *text); +#else /* ! EXP_JUSTIFY_ELTS */ /* * define empty macros so that they can be used without wrapping them in * #ifdef EXP_JUSTIFY_ELTS/#endif */ - #define CAN_JUSTIFY_PUSH(x) #define CAN_JUSTIFY_POP #define CAN_JUSTIFY_SET(x) #define CAN_JUSTIFY_START #define CANT_JUSTIFY_THIS_LINE #define EMIT_IFDEF_EXP_JUSTIFY_ELTS(x) - -#endif /* EXP_JUSTIFY_ELTS */ - +#endif /* EXP_JUSTIFY_ELTS */ #define CAN_JUSTIFY_PUSH_F CAN_JUSTIFY_PUSH(FALSE) - -#endif /* LYJUSTIFY_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYJUSTIFY_H */ diff --git a/src/LYKeymap.c b/src/LYKeymap.c index 3e81e27d..f794a828 100644 --- a/src/LYKeymap.c +++ b/src/LYKeymap.c @@ -1264,7 +1264,7 @@ static char *pretty_html(int c) static char *format_binding(LYKeymap_t * table, int i) { - LYKeymap_t the_key = table[i]; + LYKeymapCode the_key = (LYKeymapCode) table[i]; char *buf = 0; char *formatted; Kcmd *rmap = LYKeycodeToKcmd(the_key); @@ -1292,7 +1292,7 @@ static void print_binding(HTStream *target, int i, #if defined(DIRED_SUPPORT) && defined(OK_OVERRIDE) if (prev_lynx_edit_mode && !no_dired_support && - (lac1 = key_override[i]) != LYK_UNKNOWN) { + (lac1 = (LYKeymapCode) key_override[i]) != LYK_UNKNOWN) { if ((buf = format_binding(key_override, i)) != 0) { PUTS(buf); FREE(buf); @@ -1300,7 +1300,7 @@ static void print_binding(HTStream *target, int i, } else #endif /* DIRED_SUPPORT && OK_OVERRIDE */ if ((buf = format_binding(keymap, i)) != 0) { - lac1 = keymap[i]; + lac1 = (LYKeymapCode) keymap[i]; PUTS(buf); FREE(buf); } diff --git a/src/LYKeymap.h b/src/LYKeymap.h index 2df5de6e..a6549615 100644 --- a/src/LYKeymap.h +++ b/src/LYKeymap.h @@ -5,46 +5,49 @@ #include <HTList.h> #include <LYCurses.h> -extern BOOLEAN LYisNonAlnumKeyname(int ch, int KeyName); -extern HTList *LYcommandList(void); -extern char *LYKeycodeToString(int c, BOOLEAN upper8); -extern char *fmt_keys(int lkc_first, int lkc_second); -extern char *key_for_func(int func); -extern char *key_for_func_ext(int lac, int context_code); -extern int LYReverseKeymap(int KeyName); -extern int LYStringToKeycode(char *src); -extern int lacname_to_lac(const char *func); -extern int lecname_to_lec(const char *func); -extern int lkcstring_to_lkc(const char *src); -extern int remap(char *key, const char *func, BOOLEAN for_dired); -extern void print_keymap(char **newfile); -extern void reset_emacs_keys(void); -extern void reset_numbers_as_arrows(void); -extern void reset_vi_keys(void); -extern void set_emacs_keys(void); -extern void set_numbers_as_arrows(void); -extern void set_vi_keys(void); -extern void set_vms_keys(void); +#ifdef __cplusplus +extern "C" { +#endif + extern BOOLEAN LYisNonAlnumKeyname(int ch, int KeyName); + extern HTList *LYcommandList(void); + extern char *LYKeycodeToString(int c, BOOLEAN upper8); + extern char *fmt_keys(int lkc_first, int lkc_second); + extern char *key_for_func(int func); + extern char *key_for_func_ext(int lac, int context_code); + extern int LYReverseKeymap(int KeyName); + extern int LYStringToKeycode(char *src); + extern int lacname_to_lac(const char *func); + extern int lecname_to_lec(const char *func); + extern int lkcstring_to_lkc(const char *src); + extern int remap(char *key, const char *func, BOOLEAN for_dired); + extern void print_keymap(char **newfile); + extern void reset_emacs_keys(void); + extern void reset_numbers_as_arrows(void); + extern void reset_vi_keys(void); + extern void set_emacs_keys(void); + extern void set_numbers_as_arrows(void); + extern void set_vi_keys(void); + extern void set_vms_keys(void); /* We only use unsigned keycodes; if there's a problem matching with enum * (which is supposed to be 'int'), that would be okay, but not as clean * for type-checking. */ -typedef unsigned short LYKeymap_t; + typedef unsigned short LYKeymap_t; #define KEYMAP_SIZE 661 -extern LYKeymap_t keymap[KEYMAP_SIZE]; /* main keymap matrix */ + extern LYKeymap_t keymap[KEYMAP_SIZE]; /* main keymap matrix */ #ifdef EXP_KEYBOARD_LAYOUT -typedef unsigned short LYKbLayout_t; -extern int current_layout; -extern LYKbLayout_t *LYKbLayouts[]; -extern const char *LYKbLayoutNames[]; -extern int LYSetKbLayout(char *layout_id); + typedef unsigned short LYKbLayout_t; + extern int current_layout; + extern LYKbLayout_t *LYKbLayouts[]; + extern const char *LYKbLayoutNames[]; + extern int LYSetKbLayout(char *layout_id); #endif #if defined(DIRED_SUPPORT) && defined(OK_OVERRIDE) -extern LYKeymap_t key_override[]; + extern LYKeymap_t key_override[]; #endif /* * * LynxKeyCodes * * */ @@ -56,7 +59,7 @@ extern LYKeymap_t key_override[]; /* Used to distinguish internal Lynx keycodes of (say) extended ncurses once. */ #define LKC_ISLKC 0x0400 /* flag: already lynxkeycode (not native) */ - /* 0x0400 is MOUSE_KEYSYM for slang in LYStrings.c */ + /* 0x0400 is MOUSE_KEYSYM for slang in LYStrings.c */ #define LKC_MASK 0x07FF /* mask for lynxkeycode proper */ #define LKC_DONE 0x07FE /* special value - operation done, not-a-key */ @@ -65,8 +68,8 @@ extern LYKeymap_t key_override[]; #define LAC_SHIFT 8 /* shift for lynxactioncode - must not overwrite any assigned LYK_* values */ #define LAC_MASK ((1<<LAC_SHIFT)-1) - /* mask for lynxactioncode - must cover all - assigned LYK_* values */ + /* mask for lynxactioncode - must cover all + assigned LYK_* values */ /* Return lkc masking single actioncode, given an lkc masking a lac + lec */ #define LKC2_TO_LKC(c) (((c) == -1 || !((c) & LKC_ISLECLAC)) ? (c) : \ @@ -105,142 +108,142 @@ extern LYKeymap_t key_override[]; * The values in this enum are indexed against the command names in the * 'revmap[]' array in LYKeymap.c */ -typedef enum { - LYK_UNKNOWN = 0 - ,LYK_COMMAND - ,LYK_1 - ,LYK_2 - ,LYK_3 - ,LYK_4 - ,LYK_5 - ,LYK_6 - ,LYK_7 - ,LYK_8 - ,LYK_9 - ,LYK_SOURCE - ,LYK_RELOAD - ,LYK_QUIT - ,LYK_ABORT - ,LYK_NEXT_PAGE - ,LYK_PREV_PAGE - ,LYK_UP_TWO - ,LYK_DOWN_TWO - ,LYK_UP_HALF - ,LYK_DOWN_HALF - ,LYK_REFRESH - ,LYK_HOME - ,LYK_END - ,LYK_FIRST_LINK - ,LYK_LAST_LINK - ,LYK_PREV_LINK - ,LYK_NEXT_LINK - ,LYK_LPOS_PREV_LINK - ,LYK_LPOS_NEXT_LINK - ,LYK_FASTBACKW_LINK - ,LYK_FASTFORW_LINK - ,LYK_UP_LINK - ,LYK_DOWN_LINK - ,LYK_RIGHT_LINK - ,LYK_LEFT_LINK - ,LYK_HISTORY - ,LYK_PREV_DOC - ,LYK_NEXT_DOC - ,LYK_ACTIVATE - ,LYK_SUBMIT /* mostly like LYK_ACTIVATE, for mouse use, don't map */ - ,LYK_GOTO - ,LYK_ECGOTO - ,LYK_HELP - ,LYK_DWIMHELP - ,LYK_INDEX - ,LYK_NOCACHE - ,LYK_INTERRUPT - ,LYK_MAIN_MENU - ,LYK_OPTIONS - ,LYK_INDEX_SEARCH - ,LYK_WHEREIS - ,LYK_PREV - ,LYK_NEXT - ,LYK_COMMENT - ,LYK_EDIT - ,LYK_INFO - ,LYK_PRINT - ,LYK_ADD_BOOKMARK - ,LYK_DEL_BOOKMARK - ,LYK_VIEW_BOOKMARK - ,LYK_VLINKS - ,LYK_SHELL - ,LYK_DOWNLOAD - ,LYK_TRACE_TOGGLE - ,LYK_TRACE_LOG - ,LYK_IMAGE_TOGGLE - ,LYK_INLINE_TOGGLE - ,LYK_HEAD - ,LYK_DO_NOTHING - ,LYK_TOGGLE_HELP - ,LYK_JUMP - ,LYK_KEYMAP - ,LYK_LIST - ,LYK_TOOLBAR - ,LYK_HISTORICAL - ,LYK_MINIMAL - ,LYK_SOFT_DQUOTES - ,LYK_RAW_TOGGLE - ,LYK_COOKIE_JAR - ,LYK_F_LINK_NUM - ,LYK_CLEAR_AUTH - ,LYK_SWITCH_DTD - ,LYK_ELGOTO - ,LYK_CHANGE_LINK - ,LYK_DWIMEDIT - ,LYK_EDIT_TEXTAREA - ,LYK_GROW_TEXTAREA - ,LYK_INSERT_FILE + typedef enum { + LYK_UNKNOWN = 0 + ,LYK_COMMAND + ,LYK_1 + ,LYK_2 + ,LYK_3 + ,LYK_4 + ,LYK_5 + ,LYK_6 + ,LYK_7 + ,LYK_8 + ,LYK_9 + ,LYK_SOURCE + ,LYK_RELOAD + ,LYK_QUIT + ,LYK_ABORT + ,LYK_NEXT_PAGE + ,LYK_PREV_PAGE + ,LYK_UP_TWO + ,LYK_DOWN_TWO + ,LYK_UP_HALF + ,LYK_DOWN_HALF + ,LYK_REFRESH + ,LYK_HOME + ,LYK_END + ,LYK_FIRST_LINK + ,LYK_LAST_LINK + ,LYK_PREV_LINK + ,LYK_NEXT_LINK + ,LYK_LPOS_PREV_LINK + ,LYK_LPOS_NEXT_LINK + ,LYK_FASTBACKW_LINK + ,LYK_FASTFORW_LINK + ,LYK_UP_LINK + ,LYK_DOWN_LINK + ,LYK_RIGHT_LINK + ,LYK_LEFT_LINK + ,LYK_HISTORY + ,LYK_PREV_DOC + ,LYK_NEXT_DOC + ,LYK_ACTIVATE + ,LYK_SUBMIT /* mostly like LYK_ACTIVATE, for mouse use, don't map */ + ,LYK_GOTO + ,LYK_ECGOTO + ,LYK_HELP + ,LYK_DWIMHELP + ,LYK_INDEX + ,LYK_NOCACHE + ,LYK_INTERRUPT + ,LYK_MAIN_MENU + ,LYK_OPTIONS + ,LYK_INDEX_SEARCH + ,LYK_WHEREIS + ,LYK_PREV + ,LYK_NEXT + ,LYK_COMMENT + ,LYK_EDIT + ,LYK_INFO + ,LYK_PRINT + ,LYK_ADD_BOOKMARK + ,LYK_DEL_BOOKMARK + ,LYK_VIEW_BOOKMARK + ,LYK_VLINKS + ,LYK_SHELL + ,LYK_DOWNLOAD + ,LYK_TRACE_TOGGLE + ,LYK_TRACE_LOG + ,LYK_IMAGE_TOGGLE + ,LYK_INLINE_TOGGLE + ,LYK_HEAD + ,LYK_DO_NOTHING + ,LYK_TOGGLE_HELP + ,LYK_JUMP + ,LYK_KEYMAP + ,LYK_LIST + ,LYK_TOOLBAR + ,LYK_HISTORICAL + ,LYK_MINIMAL + ,LYK_SOFT_DQUOTES + ,LYK_RAW_TOGGLE + ,LYK_COOKIE_JAR + ,LYK_F_LINK_NUM + ,LYK_CLEAR_AUTH + ,LYK_SWITCH_DTD + ,LYK_ELGOTO + ,LYK_CHANGE_LINK + ,LYK_DWIMEDIT + ,LYK_EDIT_TEXTAREA + ,LYK_GROW_TEXTAREA + ,LYK_INSERT_FILE #ifdef EXP_ADDRLIST_PAGE - ,LYK_ADDRLIST + ,LYK_ADDRLIST #else #define LYK_ADDRLIST LYK_ADD_BOOKMARK #endif #ifdef USE_EXTERNALS - ,LYK_EXTERN_LINK - ,LYK_EXTERN_PAGE + ,LYK_EXTERN_LINK + ,LYK_EXTERN_PAGE #else #define LYK_EXTERN_LINK LYK_UNKNOWN #define LYK_EXTERN_PAGE LYK_UNKNOWN #endif /* !defined(USE_EXTERNALS) */ #if defined(VMS) || defined(DIRED_SUPPORT) - ,LYK_DIRED_MENU + ,LYK_DIRED_MENU #else #define LYK_DIRED_MENU LYK_UNKNOWN #endif /* VMS || DIRED_SUPPORT */ #ifdef DIRED_SUPPORT - ,LYK_CREATE - ,LYK_REMOVE - ,LYK_MODIFY - ,LYK_TAG_LINK - ,LYK_UPLOAD - ,LYK_INSTALL + ,LYK_CREATE + ,LYK_REMOVE + ,LYK_MODIFY + ,LYK_TAG_LINK + ,LYK_UPLOAD + ,LYK_INSTALL #else #define LYK_TAG_LINK LYK_UNKNOWN #endif /* DIRED_SUPPORT */ - ,LYK_CHG_CENTER + ,LYK_CHG_CENTER #ifdef KANJI_CODE_OVERRIDE - ,LYK_CHG_KCODE + ,LYK_CHG_KCODE #endif #ifdef SUPPORT_CHDIR - ,LYK_CHDIR + ,LYK_CHDIR #endif #ifdef USE_CURSES_PADS - ,LYK_SHIFT_LEFT - ,LYK_SHIFT_RIGHT - ,LYK_LINEWRAP_TOGGLE + ,LYK_SHIFT_LEFT + ,LYK_SHIFT_RIGHT + ,LYK_LINEWRAP_TOGGLE #else #define LYK_SHIFT_LEFT LYK_UNKNOWN #define LYK_SHIFT_RIGHT LYK_UNKNOWN @@ -248,31 +251,34 @@ typedef enum { #endif #ifdef CAN_CUT_AND_PASTE - ,LYK_PASTE_URL - ,LYK_TO_CLIPBOARD + ,LYK_PASTE_URL + ,LYK_TO_CLIPBOARD #else #define LYK_PASTE_URL LYK_UNKNOWN #define LYK_TO_CLIPBOARD LYK_UNKNOWN #endif #ifdef EXP_NESTED_TABLES - ,LYK_NESTED_TABLES + ,LYK_NESTED_TABLES #else #define LYK_NESTED_TABLES LYK_UNKNOWN #endif -} LYKeymapCode; + } LYKeymapCode; /* * Symbol table for internal commands. */ -typedef struct { - LYKeymapCode code; - const char *name; - const char *doc; -} Kcmd; + typedef struct { + LYKeymapCode code; + const char *name; + const char *doc; + } Kcmd; -extern Kcmd *LYKeycodeToKcmd(LYKeymapCode code); -extern Kcmd *LYStringToKcmd(const char *name); + extern Kcmd *LYKeycodeToKcmd(LYKeymapCode code); + extern Kcmd *LYStringToKcmd(const char *name); -#endif /* LYKEYMAP_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYKEYMAP_H */ diff --git a/src/LYList.h b/src/LYList.h index a3955bc6..3d99adbe 100644 --- a/src/LYList.h +++ b/src/LYList.h @@ -3,7 +3,13 @@ #include <LYStructs.h> -extern int showlist(DocInfo *newdoc, BOOLEAN titles); -extern void printlist(FILE *fp, BOOLEAN titles); +#ifdef __cplusplus +extern "C" { +#endif + extern int showlist(DocInfo *newdoc, BOOLEAN titles); + extern void printlist(FILE *fp, BOOLEAN titles); -#endif /* LYLIST_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYLIST_H */ diff --git a/src/LYLocal.c b/src/LYLocal.c index 12c11902..595cf101 100644 --- a/src/LYLocal.c +++ b/src/LYLocal.c @@ -692,7 +692,7 @@ static int modify_tagged(char *testpath) /* * Prepare to get directory path from one of the tagged files. */ - cp = HTList_lastObject(tagged); + cp = (char *) HTList_lastObject(tagged); testpath = NULL; /* Won't be needed any more in this function, set to NULL as a flag. */ } @@ -1566,7 +1566,7 @@ void showtags(HTList *t) for (i = 0; i < nlinks; i++) { s = t; - while ((name = HTList_nextObject(s)) != NULL) { + while ((name = (char *) HTList_nextObject(s)) != NULL) { if (!strcmp(links[i].lname, name)) { tagflag(ON, i); break; @@ -2048,7 +2048,7 @@ int dired_options(DocInfo *doc, char **newfile) LYAddHtmlSep(&cd); m = (n < NUM_TAGS_TO_WRITE) ? n : NUM_TAGS_TO_WRITE; for (i = 1; i <= m; i++) { - cp1 = HTRelative(HTList_objectAt(tagged, i - 1), + cp1 = HTRelative((char *) HTList_objectAt(tagged, i - 1), (*cd ? cd : "file://localhost")); HTUnEscape(cp1); LYEntify(&cp1, TRUE); /* _should_ do this everywhere... */ @@ -2412,7 +2412,7 @@ void clear_tags(void) { char *cp = NULL; - while ((cp = HTList_removeLastObject(tagged)) != NULL) { + while ((cp = (char *) HTList_removeLastObject(tagged)) != NULL) { FREE(cp); } if (HTList_isEmpty(tagged)) @@ -2424,7 +2424,7 @@ void clear_tags(void) */ void add_menu_item(char *str) { - struct dired_menu *new, *mp; + struct dired_menu *tmp, *mp; char *cp; /* @@ -2433,9 +2433,9 @@ void add_menu_item(char *str) if (menu_head == defmenu) menu_head = NULL; - new = typecalloc(struct dired_menu); + tmp = typecalloc(struct dired_menu); - if (new == NULL) + if (tmp == NULL) outofmem(__FILE__, "add_menu_item"); /* @@ -2444,14 +2444,14 @@ void add_menu_item(char *str) cp = strchr(str, ':'); *cp++ = '\0'; if (strcasecomp(str, "tag") == 0) { - new->cond = DE_TAG; + tmp->cond = DE_TAG; } else if (strcasecomp(str, "dir") == 0) { - new->cond = DE_DIR; + tmp->cond = DE_DIR; } else if (strcasecomp(str, "file") == 0) { - new->cond = DE_FILE; + tmp->cond = DE_FILE; #ifdef S_IFLNK } else if (strcasecomp(str, "link") == 0) { - new->cond = DE_SYMLINK; + tmp->cond = DE_SYMLINK; #endif /* S_IFLNK */ } @@ -2461,25 +2461,25 @@ void add_menu_item(char *str) str = cp; cp = strchr(str, ':'); *cp++ = '\0'; - StrAllocCopy(new->sfx, str); + StrAllocCopy(tmp->sfx, str); str = cp; cp = strchr(str, ':'); *cp++ = '\0'; - StrAllocCopy(new->link, str); + StrAllocCopy(tmp->link, str); str = cp; cp = strchr(str, ':'); *cp++ = '\0'; - StrAllocCopy(new->rest, str); + StrAllocCopy(tmp->rest, str); - StrAllocCopy(new->href, cp); + StrAllocCopy(tmp->href, cp); if (menu_head) { for (mp = menu_head; mp && mp->next != NULL; mp = mp->next) ; - mp->next = new; + mp->next = tmp; } else - menu_head = new; + menu_head = tmp; } void reset_dired_menu(void) diff --git a/src/LYLocal.h b/src/LYLocal.h index 9a1fc636..9a7fe240 100644 --- a/src/LYLocal.h +++ b/src/LYLocal.h @@ -1,31 +1,36 @@ #ifndef LYLOCAL_H #define LYLOCAL_H -#ifdef DIRED_SUPPORT - #include <HTUtils.h> +#include <LYStructs.h> +#ifdef __cplusplus +extern "C" { +#endif +#ifdef DIRED_SUPPORT /* Special return code for LYMainLoop.c */ #define PERMIT_FORM_RESULT (-99) - -extern int local_create(DocInfo *doc); -extern int local_modify(DocInfo *doc, char **newpath); -extern int local_remove(DocInfo *doc); + extern int local_create(DocInfo *doc); + extern int local_modify(DocInfo *doc, char **newpath); + extern int local_remove(DocInfo *doc); #ifdef OK_INSTALL -extern BOOLEAN local_install(char *destpath, char *srcpath, char **newpath); + extern BOOLEAN local_install(char *destpath, char *srcpath, char **newpath); #endif /* MainLoop needs to know about this one for atexit cleanup */ -extern void clear_tags(void); + extern void clear_tags(void); -extern int dired_options(DocInfo *doc, char **newfile); -extern int local_dired(DocInfo *doc); -extern void add_menu_item(char *str); -extern void reset_dired_menu(void); -extern void showtags(HTList *tag); -extern void tagflag(int flag, int cur); + extern int dired_options(DocInfo *doc, char **newfile); + extern int local_dired(DocInfo *doc); + extern void add_menu_item(char *str); + extern void reset_dired_menu(void); + extern void showtags(HTList *tag); + extern void tagflag(int flag, int cur); -#endif /* DIRED_SUPPORT */ +#endif /* DIRED_SUPPORT */ -#endif /* LYLOCAL_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYLOCAL_H */ diff --git a/src/LYMail.h b/src/LYMail.h index b9baf792..7e58bbf7 100644 --- a/src/LYMail.h +++ b/src/LYMail.h @@ -5,18 +5,19 @@ #include <LYStructs.h> #endif /* LYSTRUCTS_H */ +#ifdef __cplusplus +extern "C" { +#endif #ifdef SH_EX #define USE_BLAT_MAILER 1 #else #define USE_BLAT_MAILER 0 #endif - #ifdef VMS #define USE_VMS_MAILER 1 #else #define USE_VMS_MAILER 0 #endif - /* * Ifdef's in case we have a working popen/pclose, useful for piping to the * mail program. @@ -26,28 +27,30 @@ #else #define CAN_PIPE_TO_MAILER 1 #endif + extern BOOLEAN term_letter; -extern BOOLEAN term_letter; + extern BOOLEAN LYSystemMail(void); + extern BOOLEAN LYMailPMDF(void); + extern FILE *LYPipeToMailer(void); + extern int LYSendMailFile(char *the_address, + char *the_filename, + char *the_subject, + char *the_ccaddr, + char *message); + extern void mailform(const char *mailto_address, + const char *mailto_subject, + const char *mailto_content, + const char *mailto_type); + extern void mailmsg(int cur, + char *owner_address, + char *filename, + char *linkname); + extern void reply_by_mail(char *mail_address, + char *filename, + const char *title, + const char *refid); -extern BOOLEAN LYSystemMail(void); -extern BOOLEAN LYMailPMDF(void); -extern FILE *LYPipeToMailer(void); -extern int LYSendMailFile(char *the_address, - char *the_filename, - char *the_subject, - char *the_ccaddr, - char *message); -extern void mailform(const char *mailto_address, - const char *mailto_subject, - const char *mailto_content, - const char *mailto_type); -extern void mailmsg(int cur, - char *owner_address, - char *filename, - char *linkname); -extern void reply_by_mail(char *mail_address, - char *filename, - const char *title, - const char *refid); - -#endif /* LYMAIL_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYMAIL_H */ diff --git a/src/LYMain.c b/src/LYMain.c index ef16071e..05b9b570 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -23,6 +23,7 @@ #include <LYReadCFG.h> #include <LYrcFile.h> #include <LYKeymap.h> +#include <HTForms.h> #include <LYList.h> #include <LYJump.h> #include <LYMainLoop.h> @@ -601,6 +602,10 @@ static HTList *LYStdinArgs = NULL; #define EXTENDED_STARTFILE_RECALL 1 #endif +#if EXTENDED_STARTFILE_RECALL +static char *nonoption = 0; +#endif + #ifndef OPTNAME_ALLOW_DASHES /* if set, then will allow dashes and underscores to be used interchangeable in commandline option's names - VH */ @@ -740,8 +745,10 @@ static void free_lynx_globals(void) FREE(proxyauth_info[0]); FREE(proxyauth_info[1]); FREE(lynxjumpfile); + FREE(ftp_lasthost); FREE(startrealm); FREE(personal_mail_address); + FREE(anonftp_password); FREE(URLDomainPrefixes); FREE(URLDomainSuffixes); FREE(XLoadImageCommand); @@ -754,11 +761,13 @@ static void free_lynx_globals(void) #endif FREE(UCAssume_MIMEcharset); LYUIPages_free(); - for (i = 0; i < nlinks; i++) { - FREE(links[i].lname); - } + LYFreeHilites(0, nlinks); nlinks = 0; - HTList_delete(LYcommandList()); + LYFreeStringList(LYcommandList()); + HTInitProgramPaths(); +#if EXTENDED_STARTFILE_RECALL + FREE(nonoption); +#endif return; } @@ -769,18 +778,8 @@ static void free_lynx_globals(void) */ static void LYStdinArgs_free(void) { - char *argument; - HTList *cur = LYStdinArgs; - - if (cur == NULL) - return; - - while (NULL != (argument = (char *) HTList_nextObject(cur))) { - FREE(argument); - } - HTList_delete(LYStdinArgs); + LYFreeStringList(LYStdinArgs); LYStdinArgs = NULL; - return; } void reset_signals(void) @@ -980,7 +979,7 @@ int main(int argc, #ifndef DISABLE_FTP /* malloc a sizeof(char) so 1st strcmp() won't dump in HTLoadFile() */ - ftp_lasthost = calloc(1, sizeof(char)); + ftp_lasthost = typecalloc(char); #endif #ifdef EXP_CHARSET_CHOICE @@ -1386,7 +1385,9 @@ int main(int argc, */ if ((cp = LYGetEnv("LYNX_TRACE_FILE")) == 0) cp = TRACE_FILE; - LYAddPathToHome(LYTraceLogPath = malloc(LY_MAXPATH), LY_MAXPATH, cp); + LYTraceLogPath = typeMallocn(char, LY_MAXPATH); + + LYAddPathToHome(LYTraceLogPath, LY_MAXPATH, cp); LYOpenTraceLog(); @@ -1674,7 +1675,9 @@ int main(int argc, */ if (persistent_cookies) { if (LYCookieFile == NULL) { - LYAddPathToHome(LYCookieFile = malloc(LY_MAXPATH), LY_MAXPATH, COOKIE_FILE); + LYCookieFile = typeMallocn(char, LY_MAXPATH); + + LYAddPathToHome(LYCookieFile, LY_MAXPATH, COOKIE_FILE); } else { tildeExpand(&LYCookieFile, FALSE); } @@ -2141,9 +2144,6 @@ int main(int argc, cleanup(); #if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401 if (!isendwin()) { - extern int saved_scrsize_x; - extern int saved_scrsize_y; - if ((saved_scrsize_x != 0) && (saved_scrsize_y != 0)) { resize_term(saved_scrsize_y, saved_scrsize_x); } @@ -4066,7 +4066,6 @@ static BOOL parse_arg(char **argv, char *arg_name; #if EXTENDED_STARTFILE_RECALL - static char *nonoption = 0; static BOOLEAN no_options_further = FALSE; /* set to TRUE after '--' argument */ #endif diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c index 0dfb8d33..e43a35ed 100644 --- a/src/LYMainLoop.c +++ b/src/LYMainLoop.c @@ -531,9 +531,14 @@ static BOOL set_curdoc_link(int nextlink) static void goto_line(int nextline) { int n; + int old_link = newdoc.link; + newdoc.link = 0; for (n = 0; n < nlinks; ++n) { if (nextline == links[n].anchor_line_num + 1) { + CTRACE((tfp, "top_of_screen %d\n", HText_getTopOfScreen() + 1)); + CTRACE((tfp, "goto_line(%d) -> link %d -> %d\n", nextline, + old_link, n)); newdoc.link = n; break; } @@ -705,7 +710,7 @@ static BOOL do_check_recall(int ch, char **old_user_input, int URLTotal, int *URLNum, - int recall, + RecallType recall, BOOLEAN *FirstURLRecall) { char *cp; @@ -2829,7 +2834,7 @@ static void handle_LYK_FIRST_LINK(void) static BOOLEAN handle_LYK_GOTO(int *ch, char *user_input_buffer, char **old_user_input, - int *recall, + RecallType * recall, int *URLTotal, int *URLNum, BOOLEAN *FirstURLRecall, @@ -3355,7 +3360,7 @@ static void handle_LYK_INSTALL(void) static BOOLEAN handle_LYK_JUMP(int c, char *user_input_buffer, char **old_user_input GCC_UNUSED, - int *recall GCC_UNUSED, + RecallType * recall GCC_UNUSED, BOOLEAN *FirstURLRecall GCC_UNUSED, int *URLNum GCC_UNUSED, int *URLTotal GCC_UNUSED, @@ -3631,12 +3636,9 @@ static BOOLEAN handle_LYK_OPTIONS(int *cmd, char *CurrentNegoLanguage = NULL; char *CurrentNegoCharset = NULL; - StrAllocCopy(CurrentUserAgent, (LYUserAgent ? - LYUserAgent : "")); - StrAllocCopy(CurrentNegoLanguage, (language ? - language : "")); - StrAllocCopy(CurrentNegoCharset, (pref_charset ? - pref_charset : "")); + StrAllocCopy(CurrentUserAgent, NonNull(LYUserAgent)); + StrAllocCopy(CurrentNegoLanguage, NonNull(language)); + StrAllocCopy(CurrentNegoCharset, NonNull(pref_charset)); LYoptions(); /** do the old-style options stuff **/ @@ -3653,12 +3655,9 @@ static BOOLEAN handle_LYK_OPTIONS(int *cmd, verbose_img_flag != verbose_img || LYUseDefaultRawMode_flag != LYUseDefaultRawMode || LYSelectPopups_flag != LYSelectPopups || - ((strcmp(CurrentUserAgent, (LYUserAgent ? - LYUserAgent : "")) || - strcmp(CurrentNegoLanguage, (language ? - language : "")) || - strcmp(CurrentNegoCharset, (pref_charset ? - pref_charset : ""))) && + ((strcmp(CurrentUserAgent, NonNull(LYUserAgent)) || + strcmp(CurrentNegoLanguage, NonNull(language)) || + strcmp(CurrentNegoCharset, NonNull(pref_charset))) && (!strncmp(curdoc.address, "http", 4) || isLYNXCGI(curdoc.address)))) { @@ -3678,8 +3677,7 @@ static BOOLEAN handle_LYK_OPTIONS(int *cmd, HTInfoMsg(WILL_NOT_RELOAD_DOC); } else { copy_address(&newdoc, &curdoc); - if (((strcmp(CurrentUserAgent, (LYUserAgent ? - LYUserAgent : "")) || + if (((strcmp(CurrentUserAgent, NonNull(LYUserAgent)) || strcmp(CurrentNegoLanguage, NonNull(language)) || strcmp(CurrentNegoCharset, NonNull(pref_charset))) && (strncmp(curdoc.address, "http", 4) == 0 || @@ -4956,7 +4954,7 @@ void handle_LYK_CHDIR(void) /* some people may prefer automatic clearing of the previous user input, here, to do this, just uncomment next line - VH */ /* buf[0]='\0'; */ - if (LYgetstr(buf, VISIBLE, sizeof(buf) - 1, 0) < 0 || !*buf) { + if (LYgetstr(buf, VISIBLE, sizeof(buf) - 1, NORECALL) < 0 || !*buf) { HTInfoMsg(CANCELLED); return; } @@ -5140,7 +5138,10 @@ int mainloop(void) #define BUFF_MAX 1024 char sjis_buff[BUFF_MAX]; #endif - int c = 0, real_c = 0, old_c = 0, pending_form_c = -1; + int c = 0; + int real_c = 0; + int old_c = 0; + int pending_form_c = -1; int cmd = LYK_DO_NOTHING, real_cmd = LYK_DO_NOTHING; int getresult; int arrowup = FALSE, show_help = FALSE; @@ -5159,7 +5160,8 @@ int mainloop(void) char cfile[128]; FILE *cfp; char *cp; - int ch, recall; + int ch; + RecallType recall; int URLTotal; int URLNum; BOOLEAN FirstURLRecall = TRUE; @@ -5840,8 +5842,7 @@ int mainloop(void) if (newdoc.address && curdoc.address && isLYNXDOWNLOAD(newdoc.address)) { copy_address(&newdoc, &curdoc); - StrAllocCopy(newdoc.title, (curdoc.title ? - curdoc.title : "")); + StrAllocCopy(newdoc.title, NonNull(curdoc.title)); StrAllocCopy(newdoc.bookmark, curdoc.bookmark); newdoc.line = curdoc.line; newdoc.link = curdoc.link; @@ -6187,7 +6188,8 @@ int mainloop(void) * If more equals TRUE, then there is more info below this page. */ more = HText_canScrollDown(); - goto_line(Newline); + if (newdoc.link < 0) + goto_line(Newline); curdoc.line = Newline = HText_getTopOfScreen() + 1; if (curdoc.title == NULL) { @@ -6240,6 +6242,8 @@ int mainloop(void) newdoc.line = 1; newdoc.link = 0; curdoc.line = Newline; /* set */ + } else if (newdoc.link < 0) { + newdoc.link = 0; /* ...just in case getfile set this */ } /* @@ -7458,16 +7462,8 @@ static int are_phys_different(DocInfo *doc1, DocInfo *doc2) #ifdef LY_FIND_LEAKS static void HTGotoURLs_free(void) { - char *url; - HTList *cur = Goto_URLs; - - if (cur != 0) { - while (NULL != (url = (char *) HTList_nextObject(cur))) { - FREE(url); - } - HTList_delete(Goto_URLs); - Goto_URLs = NULL; - } + LYFreeStringList(Goto_URLs); + Goto_URLs = NULL; } #endif @@ -7779,7 +7775,5 @@ static void status_link(char *curlink_name, const char *LYDownLoadAddress(void) { - const char *s = newdoc.address ? newdoc.address : ""; - - return s; + return NonNull(newdoc.address); } diff --git a/src/LYMainLoop.h b/src/LYMainLoop.h index c1cef7c4..3c220ddf 100644 --- a/src/LYMainLoop.h +++ b/src/LYMainLoop.h @@ -5,23 +5,29 @@ #include <HTUtils.h> #endif +#ifdef __cplusplus +extern "C" { +#endif #ifdef DISP_PARTIAL -extern BOOL LYMainLoop_pageDisplay(int line_num); + extern BOOL LYMainLoop_pageDisplay(int line_num); #endif -extern BOOLEAN LYOpenTraceLog(void); -extern const char *LYDownLoadAddress(void); -extern int LYGetNewline(void); -extern int mainloop(void); -extern void HTAddGotoURL(char *url); -extern void LYCloseTracelog(void); -extern void LYSetNewline(int value); -extern void handle_LYK_TRACE_TOGGLE(void); -extern void handle_LYK_WHEREIS(int cmd, BOOLEAN *refresh_screen); -extern void repaint_main_statusline(int for_what); + extern BOOLEAN LYOpenTraceLog(void); + extern const char *LYDownLoadAddress(void); + extern int LYGetNewline(void); + extern int mainloop(void); + extern void HTAddGotoURL(char *url); + extern void LYCloseTracelog(void); + extern void LYSetNewline(int value); + extern void handle_LYK_TRACE_TOGGLE(void); + extern void handle_LYK_WHEREIS(int cmd, BOOLEAN *refresh_screen); + extern void repaint_main_statusline(int for_what); #ifdef SUPPORT_CHDIR -extern void handle_LYK_CHDIR(void); + extern void handle_LYK_CHDIR(void); #endif -#endif /* LYMAINLOOP_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYMAINLOOP_H */ diff --git a/src/LYMap.c b/src/LYMap.c index c401a27e..5b563b85 100644 --- a/src/LYMap.c +++ b/src/LYMap.c @@ -125,7 +125,7 @@ BOOL LYAddImageMap(char *address, char *title, HTParentAnchor *node_anchor) { - LYImageMap *new = NULL; + LYImageMap *tmp = NULL; LYImageMap *old = NULL; HTList *cur = NULL; HTList *theList = NULL; @@ -189,17 +189,17 @@ BOOL LYAddImageMap(char *address, } } - new = (old != NULL) ? + tmp = (old != NULL) ? old : typecalloc(LYImageMap); - if (new == NULL) { + if (tmp == NULL) { outofmem(__FILE__, "LYAddImageMap"); return FALSE; } - StrAllocCopy(new->address, address); + StrAllocCopy(tmp->address, address); if (non_empty(title)) - StrAllocCopy(new->title, title); - if (new != old) - HTList_addObject(theList, new); + StrAllocCopy(tmp->title, title); + if (tmp != old) + HTList_addObject(theList, tmp); return TRUE; } @@ -213,7 +213,7 @@ BOOL LYAddMapElement(char *map, HTParentAnchor *node_anchor, BOOL intern_flag GCC_UNUSED) { - LYMapElement *new = NULL; + LYMapElement *tmp = NULL; LYImageMap *theMap = NULL; HTList *theList = NULL; HTList *cur = NULL; @@ -259,30 +259,30 @@ BOOL LYAddMapElement(char *map, if (!theMap->elements) theMap->elements = HTList_new(); cur = theMap->elements; - while (NULL != (new = (LYMapElement *) HTList_nextObject(cur))) { - if (!strcmp(new->address, address)) { - FREE(new->address); - FREE(new->title); - HTList_removeObject(theMap->elements, new); - FREE(new); + while (NULL != (tmp = (LYMapElement *) HTList_nextObject(cur))) { + if (!strcmp(tmp->address, address)) { + FREE(tmp->address); + FREE(tmp->title); + HTList_removeObject(theMap->elements, tmp); + FREE(tmp); break; } } - new = typecalloc(LYMapElement); - if (new == NULL) { + tmp = typecalloc(LYMapElement); + if (tmp == NULL) { perror("Out of memory in LYAddMapElement"); return FALSE; } - StrAllocCopy(new->address, address); + StrAllocCopy(tmp->address, address); if (non_empty(title)) - StrAllocCopy(new->title, title); + StrAllocCopy(tmp->title, title); else - StrAllocCopy(new->title, address); + StrAllocCopy(tmp->title, address); #ifndef DONT_TRACK_INTERNAL_LINKS - new->intern_flag = intern_flag; + tmp->intern_flag = intern_flag; #endif - HTList_appendObject(theMap->elements, new); + HTList_appendObject(theMap->elements, tmp); return TRUE; } @@ -394,7 +394,7 @@ static int LYLoadIMGmap(const char *arg, HTFormat format_in = WWW_HTML; HTStream *target = NULL; char *buf = NULL; - LYMapElement *new = NULL; + LYMapElement *tmp = NULL; LYImageMap *theMap = NULL; char *MapTitle = NULL; char *MapAddress = NULL; @@ -571,18 +571,18 @@ static int LYLoadIMGmap(const char *arg, "ol" : "ul")); PUTS(buf); cur = theMap->elements; - while (NULL != (new = (LYMapElement *) HTList_nextObject(cur))) { - StrAllocCopy(MapAddress, new->address); + while (NULL != (tmp = (LYMapElement *) HTList_nextObject(cur))) { + StrAllocCopy(MapAddress, tmp->address); LYEntify(&MapAddress, FALSE); PUTS("<li><a href=\""); PUTS(MapAddress); PUTS("\""); #ifndef DONT_TRACK_INTERNAL_LINKS - if (new->intern_flag) + if (tmp->intern_flag) PUTS(" TYPE=\"internal link\""); #endif PUTS("\n>"); - LYformTitle(&MapTitle, new->title); + LYformTitle(&MapTitle, tmp->title); LYEntify(&MapTitle, TRUE); PUTS(MapTitle); PUTS("</a>\n"); diff --git a/src/LYMap.h b/src/LYMap.h index 1f5ddabb..bd16ad8b 100644 --- a/src/LYMap.h +++ b/src/LYMap.h @@ -8,14 +8,20 @@ #include <HTList.h> #include <HTAnchor.h> -extern BOOL LYMapsOnly; +#ifdef __cplusplus +extern "C" { +#endif + extern BOOL LYMapsOnly; -extern void ImageMapList_free(HTList *list); -extern BOOL LYAddImageMap(char *address, char *title, - HTParentAnchor *node_anchor); -extern BOOL LYAddMapElement(char *map, char *address, char *title, - HTParentAnchor *node_anchor, - BOOL intern_flag); -extern BOOL LYHaveImageMap(char *address); + extern void ImageMapList_free(HTList *list); + extern BOOL LYAddImageMap(char *address, char *title, + HTParentAnchor *node_anchor); + extern BOOL LYAddMapElement(char *map, char *address, char *title, + HTParentAnchor *node_anchor, + BOOL intern_flag); + extern BOOL LYHaveImageMap(char *address); -#endif /* LYMAP_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYMAP_H */ diff --git a/src/LYNews.h b/src/LYNews.h index 4f19ef85..780f8fa6 100644 --- a/src/LYNews.h +++ b/src/LYNews.h @@ -5,8 +5,14 @@ #include <LYStructs.h> #endif /* LYSTRUCTS_H */ -extern BOOLEAN term_message; +#ifdef __cplusplus +extern "C" { +#endif + extern BOOLEAN term_message; -extern char *LYNewsPost(char *newsgroups, BOOLEAN followup); + extern char *LYNewsPost(char *newsgroups, BOOLEAN followup); -#endif /* LYNEWSPOST_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYNEWSPOST_H */ diff --git a/src/LYOptions.c b/src/LYOptions.c index 3ab09f00..ff309b27 100644 --- a/src/LYOptions.c +++ b/src/LYOptions.c @@ -2522,7 +2522,7 @@ static PostPair *break_data(bstring *data) * Like I said, screw efficiency. Sides, realloc is fast on * Linux ;-> */ - q = realloc(q, sizeof(PostPair) * (count + 1)); + q = typeRealloc(PostPair, q, count + 1); if (q == NULL) outofmem(__FILE__, "break_data(realloc)"); q[count].tag = NULL; @@ -3237,7 +3237,7 @@ static char *NewSecureValue(void) static char oops[] = "?"; FREE(secure_value); - if ((secure_value = malloc(80)) != 0) { + if ((secure_value = typeMallocn(char, 80)) != 0) { #if defined(RAND_MAX) long key = lynx_rand(); diff --git a/src/LYOptions.h b/src/LYOptions.h index 04b8b18e..2e402613 100644 --- a/src/LYOptions.h +++ b/src/LYOptions.h @@ -4,28 +4,34 @@ #include <LYStructs.h> #include <LYStrings.h> -extern BOOLEAN term_options; /* for LYgetstr() */ +#ifdef __cplusplus +extern "C" { +#endif + extern BOOLEAN term_options; /* for LYgetstr() */ -extern BOOLEAN LYCheckUserAgent(void); -extern void edit_bookmarks(void); -extern int popup_choice(int cur_choice, - int line, - int column, - const char **choices, - int length, - int disabled, - BOOLEAN mouse); + extern BOOLEAN LYCheckUserAgent(void); + extern void edit_bookmarks(void); + extern int popup_choice(int cur_choice, + int line, + int column, + const char **choices, + int length, + int disabled, + BOOLEAN mouse); #define LYChoosePopup(cur, line, column, choices, length, disabled, mouse) \ popup_choice(cur, line, column, (const char **)choices, length, disabled, mouse) #ifndef NO_OPTION_FORMS -extern void LYMenuVisitedLinks(FILE *fp0, int disable_all); -extern int postoptions(DocInfo *newdoc); -#endif /* !NO_OPTION_FORMS */ + extern void LYMenuVisitedLinks(FILE *fp0, int disable_all); + extern int postoptions(DocInfo *newdoc); +#endif /* !NO_OPTION_FORMS */ #ifndef NO_OPTION_MENU -extern void LYoptions(void); -#endif /* !NO_OPTION_MENU */ + extern void LYoptions(void); +#endif /* !NO_OPTION_MENU */ -#endif /* LYOPTIONS_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYOPTIONS_H */ diff --git a/src/LYPrettySrc.c b/src/LYPrettySrc.c index d4a46304..988a1ab6 100644 --- a/src/LYPrettySrc.c +++ b/src/LYPrettySrc.c @@ -106,7 +106,7 @@ static void append_close_tag(char *tagname, } subj = typecalloc(HT_tagspec); - subj->element = idx; + subj->element = (HTMLElement) idx; subj->present = typecallocn(BOOL, nattr); subj->value = typecallocn(char *, nattr); @@ -335,7 +335,7 @@ void html_src_clean_data(void) int i; for (i = 0; i < HTL_num_lexemes; ++i) - html_src_clean_item(i); + html_src_clean_item((HTlexeme) i); } void html_src_on_lynxcfg_reload(void) @@ -361,12 +361,13 @@ void HTMLSRC_init_caches(BOOL dont_exit) if ((p = strchr(buf, ':')) != 0) *p = '\0'; - if (html_src_parse_tagspec(buf, i, FALSE, TRUE) && !dont_exit) { + if (html_src_parse_tagspec(buf, (HTlexeme) i, FALSE, TRUE) && !dont_exit) { fprintf(stderr, "internal error while caching 1st tagspec of %d lexeme", i); exit_immediately(EXIT_FAILURE); } - if (html_src_parse_tagspec(p ? p + 1 : NULL, i, FALSE, FALSE) && !dont_exit) { + if (html_src_parse_tagspec(p ? p + 1 : NULL, (HTlexeme) i, FALSE, + FALSE) && !dont_exit) { fprintf(stderr, "internal error while caching 2nd tagspec of %d lexeme", i); exit_immediately(EXIT_FAILURE); diff --git a/src/LYPrettySrc.h b/src/LYPrettySrc.h index f12fe26d..9886a49d 100644 --- a/src/LYPrettySrc.h +++ b/src/LYPrettySrc.h @@ -5,79 +5,85 @@ #include <HTMLDTD.h> -extern BOOL psrc_convert_string; +#ifdef __cplusplus +extern "C" { +#endif + extern BOOL psrc_convert_string; - /*whether HTML_put_string should convert string passed with - TRANSLATE_AND_UNESCAPE_TO_STD */ -extern BOOL psrc_view; -extern BOOL LYpsrc; + /*whether HTML_put_string should convert string passed with + TRANSLATE_AND_UNESCAPE_TO_STD */ + extern BOOL psrc_view; + extern BOOL LYpsrc; /* * This is used for tracking down whether the SGML engine was initialized * ==TRUE if yes. It's value is meaningful if psrc_view = TRUE */ -extern BOOL sgml_in_psrc_was_initialized; + extern BOOL sgml_in_psrc_was_initialized; -extern BOOL psrc_nested_call; /* this is used when distinguishing whether + extern BOOL psrc_nested_call; /* this is used when distinguishing whether - the current call is nested or not in HTML.c HTML_{start,end}_element. - It ==FALSE if psrc_view==FALSE || sgml_in_psrc_was_initialized==TRUE */ + the current call is nested or not in HTML.c HTML_{start,end}_element. + It ==FALSE if psrc_view==FALSE || sgml_in_psrc_was_initialized==TRUE */ -extern BOOL psrc_first_tag; /* this is also used in HTML.c to trigger the + extern BOOL psrc_first_tag; /* this is also used in HTML.c to trigger the 1st tag to preform special. */ -extern BOOL mark_htext_as_source; + extern BOOL mark_htext_as_source; /* here is a list of lexeme codes. */ -typedef enum { - HTL_comm = 0, - HTL_tag, - HTL_attrib, - HTL_attrval, - HTL_abracket, - HTL_entity, - HTL_href, - HTL_entire, - HTL_badseq, - HTL_badtag, - HTL_badattr, - HTL_sgmlspecial, - HTL_num_lexemes -} HTlexeme; - -typedef struct _HT_tagspec { - struct _HT_tagspec *next; /* 0 at the last */ + typedef enum { + HTL_comm = 0, + HTL_tag, + HTL_attrib, + HTL_attrval, + HTL_abracket, + HTL_entity, + HTL_href, + HTL_entire, + HTL_badseq, + HTL_badtag, + HTL_badattr, + HTL_sgmlspecial, + HTL_num_lexemes + } HTlexeme; + + typedef struct _HT_tagspec { + struct _HT_tagspec *next; /* 0 at the last */ #ifdef USE_COLOR_STYLE - int style; /* precalculated value of the style */ - char *class_name; + int style; /* precalculated value of the style */ + char *class_name; #endif - /* these will be passed to HTML_start_element */ - HTMLElement element; - BOOL *present; - char **value; + /* these will be passed to HTML_start_element */ + HTMLElement element; + BOOL *present; + char **value; - BOOL start; /* if true, then this starts element, otherwise - ends */ -} HT_tagspec; + BOOL start; /* if true, then this starts element, otherwise - ends */ + } HT_tagspec; -extern char *HTL_tagspecs[HTL_num_lexemes]; -extern HT_tagspec *lexeme_start[HTL_num_lexemes]; -extern HT_tagspec *lexeme_end[HTL_num_lexemes]; + extern char *HTL_tagspecs[HTL_num_lexemes]; + extern HT_tagspec *lexeme_start[HTL_num_lexemes]; + extern HT_tagspec *lexeme_end[HTL_num_lexemes]; -extern int html_src_parse_tagspec(char *ts, HTlexeme lexeme, - BOOL checkonly, BOOL isstart); -extern void HTMLSRC_init_caches(BOOL dont_exit); -extern void html_src_clean_item(HTlexeme l); -extern void html_src_clean_data(void); -extern void html_src_on_lynxcfg_reload(void); + extern int html_src_parse_tagspec(char *ts, HTlexeme lexeme, + BOOL checkonly, BOOL isstart); + extern void HTMLSRC_init_caches(BOOL dont_exit); + extern void html_src_clean_item(HTlexeme l); + extern void html_src_clean_data(void); + extern void html_src_on_lynxcfg_reload(void); /* these 2 vars tell what kind of transform should be appiled to tag names and attribute names. 0 - lowercase, 1 - as is, 2 uppercase. */ -extern int tagname_transform; -extern int attrname_transform; + extern int tagname_transform; + extern int attrname_transform; -extern BOOL psrcview_no_anchor_numbering; -#endif /* ifdef USE_PRETTYSRC */ + extern BOOL psrcview_no_anchor_numbering; -#endif /* LYPrettySrc_H */ +#ifdef __cplusplus +} +#endif +#endif /* ifdef USE_PRETTYSRC */ +#endif /* LYPrettySrc_H */ diff --git a/src/LYPrint.c b/src/LYPrint.c index a547d06d..06ea81c7 100644 --- a/src/LYPrint.c +++ b/src/LYPrint.c @@ -178,7 +178,7 @@ static int RecallFilename(char *filename, { int ch; char *cp; - int recall; + RecallType recall; /* * Set up the sug_filenames recall buffer. diff --git a/src/LYPrint.h b/src/LYPrint.h index 02f98e28..645b8749 100644 --- a/src/LYPrint.h +++ b/src/LYPrint.h @@ -5,10 +5,16 @@ #include <LYStructs.h> #endif /* LYSTRUCTS_H */ -extern int printfile(DocInfo *newdoc); -extern int print_options(char **newfile, - const char *printed_url, - int lines_in_file); -extern char *GetFileName(void); +#ifdef __cplusplus +extern "C" { +#endif + extern int printfile(DocInfo *newdoc); + extern int print_options(char **newfile, + const char *printed_url, + int lines_in_file); + extern char *GetFileName(void); -#endif /* LYPRINT_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYPRINT_H */ diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c index 2f939a42..a6a8f384 100644 --- a/src/LYReadCFG.c +++ b/src/LYReadCFG.c @@ -426,10 +426,10 @@ static Config_Enum tbl_abort_source_cache[] = { #define PARSE_FUN(n,v) {n, CONF_FUN, UNION_FUN(v), 0} #define PARSE_REQ(n,v) {n, CONF_INCLUDE, UNION_FUN(v), 0} #define PARSE_DEF(n,v) {n, CONF_ADD_TRUSTED, UNION_DEF(v), 0} -#define PARSE_NIL {NULL,0, UNION_DEF(0), 0} +#define PARSE_NIL {NULL, CONF_NIL, UNION_DEF(0), 0} typedef enum { - CONF_UNSPECIFIED = 0 + CONF_NIL = 0 ,CONF_BOOL /* BOOLEAN type */ ,CONF_FUN ,CONF_TIME @@ -1150,7 +1150,7 @@ static int psrcspec_fun(char *s) s, e + 1)); return 0; } - parse_html_src_spec(found, e + 1, s); + parse_html_src_spec((HTlexeme) found, e + 1, s); return 0; } @@ -1747,7 +1747,7 @@ void LYSetConfigValue(char *name, case CONF_PRG: if (StrAllocCopy(temp, value)) - HTSetProgramPath(q->def_value, temp); + HTSetProgramPath((ProgramPaths) (q->def_value), temp); break; default: @@ -1878,7 +1878,7 @@ static void do_read_cfg(const char *cfg_filename, q = ParseUnionOf(tbl); switch ((fp0 != 0 && tbl->type != CONF_INCLUDE) - ? CONF_UNSPECIFIED + ? CONF_NIL : tbl->type) { case CONF_BOOL: case CONF_FUN: diff --git a/src/LYReadCFG.h b/src/LYReadCFG.h index 7853904a..bbdcf5c3 100644 --- a/src/LYReadCFG.h +++ b/src/LYReadCFG.h @@ -5,12 +5,13 @@ #include <LYStructs.h> #endif /* LYSTRUCTS_H */ +#ifdef __cplusplus +extern "C" { +#endif #if defined(USE_COLOR_STYLE) || defined(USE_COLOR_TABLE) - #define DEFAULT_COLOR -1 #define NO_COLOR -2 #define ERR_COLOR -3 - /* Note: the sense of colors that Lynx uses for defaults is the reverse of * the standard for color-curses. */ @@ -35,35 +36,38 @@ # define DEFAULT_FG COLOR_BLACK # define DEFAULT_BG COLOR_WHITE # endif -#endif /* USE_DEFAULT_COLORS */ - -extern int default_fg; -extern int default_bg; -extern BOOL default_color_reset; +#endif /* USE_DEFAULT_COLORS */ + extern int default_fg; + extern int default_bg; + extern BOOL default_color_reset; #if defined(HAVE_USE_DEFAULT_COLORS) && defined(USE_DEFAULT_COLORS) -extern int lynx_default_colors(void); + extern int lynx_default_colors(void); #endif -extern int check_color(char *color, int the_default); -extern const char *lookup_color(int code); + extern int check_color(char *color, int the_default); + extern const char *lookup_color(int code); #endif -extern void read_cfg(const char *cfg_filename, - const char *parent_filename, - int nesting_level, - FILE *fp0); -extern void free_lynx_cfg(void); -extern BOOLEAN have_read_cfg; + extern void read_cfg(const char *cfg_filename, + const char *parent_filename, + int nesting_level, + FILE *fp0); + extern void free_lynx_cfg(void); + extern BOOLEAN have_read_cfg; -extern FILE *LYOpenCFG(const char *cfg_filename, const char *parent_filename, const char *dft_filename); -extern int lynx_cfg_infopage(DocInfo *newdoc); -extern int lynx_compile_opts(DocInfo *newdoc); -extern int match_item_by_name(lynx_list_item_type *ptr, char *name, BOOLEAN only_overriders); -extern lynx_list_item_type *find_item_by_number(lynx_list_item_type * - list_ptr, - char *number); -extern void reload_read_cfg(void); /* implemented in LYMain.c */ -extern void LYSetConfigValue(char *name, char *value); + extern FILE *LYOpenCFG(const char *cfg_filename, const char + *parent_filename, const char *dft_filename); + extern int lynx_cfg_infopage(DocInfo *newdoc); + extern int lynx_compile_opts(DocInfo *newdoc); + extern int match_item_by_name(lynx_list_item_type *ptr, char *name, BOOLEAN only_overriders); + extern lynx_list_item_type *find_item_by_number(lynx_list_item_type * + list_ptr, + char *number); + extern void reload_read_cfg(void); /* implemented in LYMain.c */ + extern void LYSetConfigValue(char *name, char *value); -#endif /* LYREADCFG_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYREADCFG_H */ diff --git a/src/LYSearch.c b/src/LYSearch.c index 8bf4ad27..01fdc8ac 100644 --- a/src/LYSearch.c +++ b/src/LYSearch.c @@ -158,7 +158,8 @@ BOOL textsearch(DocInfo *cur_doc, char *prev_target, static char prev_target_buffer[512]; /* Search string buffer */ static BOOL first = TRUE; char *cp; - int ch = 0, recall; + int ch = 0; + RecallType recall; int QueryTotal; int QueryNum; BOOLEAN FirstRecall = TRUE; diff --git a/src/LYSearch.h b/src/LYSearch.h index 55118157..f9763301 100644 --- a/src/LYSearch.h +++ b/src/LYSearch.h @@ -1,4 +1,3 @@ - #ifndef LYSEARCH_H #define LYSEARCH_H @@ -6,16 +5,22 @@ #include <LYStructs.h> #endif /* LYSTRUCT_H */ -extern BOOL textsearch(DocInfo *cur_doc, - char *prev_target, - int target_size, - int direction); +#ifdef __cplusplus +extern "C" { +#endif + extern BOOL textsearch(DocInfo *cur_doc, + char *prev_target, + int target_size, + int direction); #define IN_FILE 1 #define IN_LINKS 2 #ifndef NOT_FOUND #define NOT_FOUND 0 -#endif /* NOT_FOUND */ +#endif /* NOT_FOUND */ -#endif /* LYSEARCH_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYSEARCH_H */ diff --git a/src/LYShowInfo.c b/src/LYShowInfo.c index b545a756..5133be88 100644 --- a/src/LYShowInfo.c +++ b/src/LYShowInfo.c @@ -440,9 +440,7 @@ int LYShowInfo(DocInfo *doc, } } else { ADD_SS("URL:", - (links[doc->link].lname - ? links[doc->link].lname - : "")); + NonNull(links[doc->link].lname)); } END_DL(); diff --git a/src/LYShowInfo.h b/src/LYShowInfo.h index 826821e0..443bff37 100644 --- a/src/LYShowInfo.h +++ b/src/LYShowInfo.h @@ -5,11 +5,17 @@ #include <LYStructs.h> #endif /* LYSTRUCTS_H */ -extern BOOL LYVersionIsRelease(void); -extern const char *LYVersionStatus(void); -extern const char *LYVersionDate(void); -extern int LYShowInfo(DocInfo *doc, - DocInfo *newdoc, - char *owner_address); +#ifdef __cplusplus +extern "C" { +#endif + extern BOOL LYVersionIsRelease(void); + extern const char *LYVersionStatus(void); + extern const char *LYVersionDate(void); + extern int LYShowInfo(DocInfo *doc, + DocInfo *newdoc, + char *owner_address); -#endif /* LYSHOWINFO_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYSHOWINFO_H */ diff --git a/src/LYSignal.h b/src/LYSignal.h index 95619457..ccb81021 100644 --- a/src/LYSignal.h +++ b/src/LYSignal.h @@ -1,26 +1,31 @@ - #ifndef LYSIGNAL_H #define LYSIGNAL_H #include <signal.h> +#ifdef __cplusplus +extern "C" { +#endif #ifdef VMS -extern void VMSsignal(int sig, void (*func) ()); + extern void VMSsignal(int sig, void (*func) ()); #ifdef signal #undef signal -#endif /* signal */ +#endif /* signal */ #define signal(a,b) VMSsignal(a,b) /* use LYCurses.c routines for interrupts */ -#endif /* VMS */ +#endif /* VMS */ #ifdef HAVE_SIGACTION -typedef void LYSigHandlerFunc_t(int); + typedef void LYSigHandlerFunc_t(int); /* implementation in LYUtils.c */ -extern void LYExtSignal(int sig, LYSigHandlerFunc_t * handler); + extern void LYExtSignal(int sig, LYSigHandlerFunc_t * handler); #else #define LYExtSignal(sig,h) signal(sig, h) #endif -#endif /* LYSIGNAL_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYSIGNAL_H */ diff --git a/src/LYStrings.c b/src/LYStrings.c index 14897d65..ec12ea65 100644 --- a/src/LYStrings.c +++ b/src/LYStrings.c @@ -277,7 +277,7 @@ static HTList *whichRecall(RecallType recall) */ static void LYRemoveFromCloset(HTList *list) { - char *data = HTList_removeFirstObject(list); + void *data = HTList_removeFirstObject(list); if (data != 0) FREE(data); @@ -305,7 +305,7 @@ static char *LYFindInCloset(RecallType recall, char *base) unsigned len = strlen(base); while (!HTList_isEmpty(list)) { - data = HTList_nextObject(list); + data = (char *) HTList_nextObject(list); if (!strncmp(base, data, len)) return (data); } @@ -3724,7 +3724,7 @@ static char **sortedList(HTList *list, BOOL ignorecase) outofmem(__FILE__, "sortedList"); while (!HTList_isEmpty(list)) - result[j++] = HTList_nextObject(list); + result[j++] = (char *) HTList_nextObject(list); if (count > 1) { qsort((char *) result, count, sizeof(*result), @@ -3879,7 +3879,8 @@ int LYhandlePopupList(int cur_choice, static char prev_target_buffer[MAX_LINE]; /* Next search buffer */ static BOOL first = TRUE; char *cp; - int ch = 0, recall; + int ch = 0; + RecallType recall; int QueryTotal; int QueryNum; BOOLEAN FirstRecall = TRUE; diff --git a/src/LYStrings.h b/src/LYStrings.h index 290b5e25..5fca7a06 100644 --- a/src/LYStrings.h +++ b/src/LYStrings.h @@ -3,69 +3,72 @@ #include <LYCurses.h> -typedef enum { - NORECALL = 0 - ,RECALL_URL - ,RECALL_CMD - ,RECALL_MAIL -} RecallType; +#ifdef __cplusplus +extern "C" { +#endif + typedef enum { + NORECALL = 0 + ,RECALL_URL + ,RECALL_CMD + ,RECALL_MAIL + } RecallType; #define is8bits(ch) (UCH(ch) >= 128) /* isascii(ch) is not POSIX */ /* UPPER8(ch1,ch2) is an extension of (TOUPPER(ch1) - TOUPPER(ch2)) */ -extern int UPPER8(int ch1, - int ch2); - -extern int get_mouse_link(void); -extern int peek_mouse_link(void); -extern int peek_mouse_levent(void); -extern int fancy_mouse(WINDOW * win, int row, int *position); - -extern char *LYstrncpy(char *dst, - const char *src, - int n); -extern void ena_csi(BOOLEAN flag); -extern int get_popup_number(const char *msg, - int *c, - int *rel); -extern int LYarrayLength(const char **list); -extern int LYarrayWidth(const char **list); -extern int LYgetch(void); -extern int LYgetch_choice(void); -extern int LYgetch_input(void); -extern int LYgetch_single(void); -extern int LYgetstr(char *inputline, - int hidden, - size_t bufsize, - RecallType recall); -extern char *LYstrsep(char **stringp, - const char *delim); -extern char *LYstrstr(char *chptr, - const char *tarptr); -extern char *LYmbcsstrncpy(char *dst, + extern int UPPER8(int ch1, + int ch2); + + extern int get_mouse_link(void); + extern int peek_mouse_link(void); + extern int peek_mouse_levent(void); + extern int fancy_mouse(WINDOW * win, int row, int *position); + + extern char *LYstrncpy(char *dst, const char *src, - int n_bytes, - int n_glyphs, - BOOL utf_flag); -extern const char *LYmbcs_skip_glyphs(const char *data, - int n_glyphs, - BOOL utf_flag); -extern int LYmbcsstrlen(const char *str, - BOOL utf_flag, - BOOL count_gcells); - -extern const char *LYno_attr_mbcs_strstr(const char *chptr, - const char *tarptr, - BOOL utf_flag, - BOOL count_gcells, - int *nstartp, - int *nendp); -extern const char *LYno_attr_mbcs_case_strstr(const char *chptr, - const char *tarptr, - BOOL utf_flag, - BOOL count_gcells, - int *nstartp, - int *nendp); + int n); + extern void ena_csi(BOOLEAN flag); + extern int get_popup_number(const char *msg, + int *c, + int *rel); + extern int LYarrayLength(const char **list); + extern int LYarrayWidth(const char **list); + extern int LYgetch(void); + extern int LYgetch_choice(void); + extern int LYgetch_input(void); + extern int LYgetch_single(void); + extern int LYgetstr(char *inputline, + int hidden, + size_t bufsize, + RecallType recall); + extern char *LYstrsep(char **stringp, + const char *delim); + extern char *LYstrstr(char *chptr, + const char *tarptr); + extern char *LYmbcsstrncpy(char *dst, + const char *src, + int n_bytes, + int n_glyphs, + BOOL utf_flag); + extern const char *LYmbcs_skip_glyphs(const char *data, + int n_glyphs, + BOOL utf_flag); + extern int LYmbcsstrlen(const char *str, + BOOL utf_flag, + BOOL count_gcells); + + extern const char *LYno_attr_mbcs_strstr(const char *chptr, + const char *tarptr, + BOOL utf_flag, + BOOL count_gcells, + int *nstartp, + int *nendp); + extern const char *LYno_attr_mbcs_case_strstr(const char *chptr, + const char *tarptr, + BOOL utf_flag, + BOOL count_gcells, + int *nstartp, + int *nendp); #define non_empty(s) !isEmpty(s) @@ -74,35 +77,35 @@ extern const char *LYno_attr_mbcs_case_strstr(const char *chptr, ? LYno_attr_mbcs_strstr(chptr, tarptr, utf_flag, count_gcells, nstartp, nendp) \ : LYno_attr_mbcs_case_strstr(chptr, tarptr, utf_flag, count_gcells, nstartp, nendp)) -extern const char *LYno_attr_char_strstr(const char *chptr, - const char *tarptr); -extern const char *LYno_attr_char_case_strstr(const char *chptr, - const char *tarptr); + extern const char *LYno_attr_char_strstr(const char *chptr, + const char *tarptr); + extern const char *LYno_attr_char_case_strstr(const char *chptr, + const char *tarptr); #define LYno_attr_strstr(chptr, tarptr) \ (case_sensitive \ ? LYno_attr_char_strstr(chptr, tarptr) \ : LYno_attr_char_case_strstr(chptr, tarptr)) -extern char *SNACopy(char **dest, - const char *src, - int n); -extern char *SNACat(char **dest, - const char *src, - int n); + extern char *SNACopy(char **dest, + const char *src, + int n); + extern char *SNACat(char **dest, + const char *src, + int n); #define StrnAllocCopy(dest, src, n) SNACopy (&(dest), src, n) #define StrnAllocCat(dest, src, n) SNACat (&(dest), src, n) -extern char *LYSafeGets(char **src, FILE *fp); + extern char *LYSafeGets(char **src, FILE *fp); #ifdef EXP_CMD_LOGGING -extern BOOL LYHaveCmdScript(void); -extern int LYReadCmdKey(int mode); -extern void LYCloseCmdLogfile(void); -extern void LYOpenCmdLogfile(int argc, char **argv); -extern void LYOpenCmdScript(void); -extern void LYWriteCmdKey(int ch); + extern BOOL LYHaveCmdScript(void); + extern int LYReadCmdKey(int mode); + extern void LYCloseCmdLogfile(void); + extern void LYOpenCmdLogfile(int argc, char **argv); + extern void LYOpenCmdScript(void); + extern void LYWriteCmdKey(int ch); #else #define LYHaveCmdScript() FALSE @@ -182,91 +185,91 @@ extern void LYWriteCmdKey(int ch); /* EditFieldData preserves state between calls to LYEdit1 */ -typedef struct _EditFieldData { - - int sx; /* Origin of editfield */ - int sy; - int dspwdth; /* Screen real estate for editting */ - - int strlen; /* Current size of string. */ - int maxlen; /* Max size of string, excluding zero at end */ - char pad; /* Right padding typically ' ' or '_' */ - BOOL hidden; /* Masked password entry flag */ - - BOOL dirty; /* accumulate refresh requests */ - BOOL panon; /* Need horizontal scroll indicator */ - int xpan; /* Horizontal scroll offset */ - int pos; /* Insertion point in string */ - int margin; /* Number of columns look-ahead/look-back */ - int current_modifiers; /* Modifiers for next input lynxkeycode */ + typedef struct _EditFieldData { + + int sx; /* Origin of editfield */ + int sy; + int dspwdth; /* Screen real estate for editting */ + + int strlen; /* Current size of string. */ + int maxlen; /* Max size of string, excluding zero at end */ + char pad; /* Right padding typically ' ' or '_' */ + BOOL hidden; /* Masked password entry flag */ + + BOOL dirty; /* accumulate refresh requests */ + BOOL panon; /* Need horizontal scroll indicator */ + int xpan; /* Horizontal scroll offset */ + int pos; /* Insertion point in string */ + int margin; /* Number of columns look-ahead/look-back */ + int current_modifiers; /* Modifiers for next input lynxkeycode */ #ifdef ENHANCED_LINEEDIT - int mark; /* position of emacs-like mark, or -1-pos to denote + int mark; /* position of emacs-like mark, or -1-pos to denote unactive mark. */ #endif - char buffer[1024]; /* String buffer */ + char buffer[1024]; /* String buffer */ -} EditFieldData; + } EditFieldData; /* line-edit action encoding */ -typedef enum { - LYE_NOP = 0 /* Do Nothing */ - ,LYE_CHAR /* Insert printable char */ - ,LYE_ENTER /* Input complete, return char/lynxkeycode */ - ,LYE_TAB /* Input complete, return TAB */ - ,LYE_STOP /* Input complete, deactivate */ - ,LYE_ABORT /* Input cancelled */ + typedef enum { + LYE_NOP = 0 /* Do Nothing */ + ,LYE_CHAR /* Insert printable char */ + ,LYE_ENTER /* Input complete, return char/lynxkeycode */ + ,LYE_TAB /* Input complete, return TAB */ + ,LYE_STOP /* Input complete, deactivate */ + ,LYE_ABORT /* Input cancelled */ - ,LYE_FORM_PASS /* In form fields: input complete, + ,LYE_FORM_PASS /* In form fields: input complete, return char / lynxkeycode; Elsewhere: Do Nothing */ - ,LYE_DELN /* Delete next/curr char */ - ,LYE_DELC /* Obsolete (DELC case was equiv to DELN) */ - ,LYE_DELP /* Delete prev char */ - ,LYE_DELNW /* Delete next word */ - ,LYE_DELPW /* Delete prev word */ + ,LYE_DELN /* Delete next/curr char */ + ,LYE_DELC /* Obsolete (DELC case was equiv to DELN) */ + ,LYE_DELP /* Delete prev char */ + ,LYE_DELNW /* Delete next word */ + ,LYE_DELPW /* Delete prev word */ - ,LYE_ERASE /* Erase the line */ + ,LYE_ERASE /* Erase the line */ - ,LYE_BOL /* Go to begin of line */ - ,LYE_EOL /* Go to end of line */ - ,LYE_FORW /* Cursor forwards */ - ,LYE_FORW_RL /* Cursor forwards or right link */ - ,LYE_BACK /* Cursor backwards */ - ,LYE_BACK_LL /* Cursor backwards or left link */ - ,LYE_FORWW /* Word forward */ - ,LYE_BACKW /* Word back */ + ,LYE_BOL /* Go to begin of line */ + ,LYE_EOL /* Go to end of line */ + ,LYE_FORW /* Cursor forwards */ + ,LYE_FORW_RL /* Cursor forwards or right link */ + ,LYE_BACK /* Cursor backwards */ + ,LYE_BACK_LL /* Cursor backwards or left link */ + ,LYE_FORWW /* Word forward */ + ,LYE_BACKW /* Word back */ - ,LYE_LOWER /* Lower case the line */ - ,LYE_UPPER /* Upper case the line */ + ,LYE_LOWER /* Lower case the line */ + ,LYE_UPPER /* Upper case the line */ - ,LYE_LKCMD /* Invoke command prompt */ + ,LYE_LKCMD /* Invoke command prompt */ - ,LYE_AIX /* Hex 97 */ + ,LYE_AIX /* Hex 97 */ - ,LYE_DELBL /* Delete back to BOL */ - ,LYE_DELEL /* Delete thru EOL */ + ,LYE_DELBL /* Delete back to BOL */ + ,LYE_DELEL /* Delete thru EOL */ - ,LYE_SWMAP /* Switch input keymap */ + ,LYE_SWMAP /* Switch input keymap */ - ,LYE_TPOS /* Transpose characters */ + ,LYE_TPOS /* Transpose characters */ - ,LYE_SETM1 /* Set modifier 1 flag */ - ,LYE_SETM2 /* Set modifier 2 flag */ - ,LYE_UNMOD /* Fall back to no-modifier command */ + ,LYE_SETM1 /* Set modifier 1 flag */ + ,LYE_SETM2 /* Set modifier 2 flag */ + ,LYE_UNMOD /* Fall back to no-modifier command */ - ,LYE_C1CHAR /* Insert C1 char if printable */ + ,LYE_C1CHAR /* Insert C1 char if printable */ - ,LYE_SETMARK /* emacs-like set-mark-command */ - ,LYE_XPMARK /* emacs-like exchange-point-and-mark */ - ,LYE_KILLREG /* emacs-like kill-region */ - ,LYE_YANK /* emacs-like yank */ + ,LYE_SETMARK /* emacs-like set-mark-command */ + ,LYE_XPMARK /* emacs-like exchange-point-and-mark */ + ,LYE_KILLREG /* emacs-like kill-region */ + ,LYE_YANK /* emacs-like yank */ #ifdef CAN_CUT_AND_PASTE - ,LYE_PASTE /* ClipBoard to Lynx */ + ,LYE_PASTE /* ClipBoard to Lynx */ #endif -} LYEditCodes; + } LYEditCodes; /* All preceding values must be within 0x00..0x7f - kw */ @@ -277,70 +280,73 @@ typedef enum { lower bits. Doesn't fit in a char! */ #if defined(USE_KEYMAPS) -extern int lynx_initialize_keymaps(void); -extern int map_string_to_keysym(const char *src, int *lec); + extern int lynx_initialize_keymaps(void); + extern int map_string_to_keysym(const char *src, int *lec); #endif -extern char *LYElideString(char *str, - int cut_pos); -extern void LYEscapeStartfile(char **buffer); -extern void LYLowerCase(char *buffer); -extern void LYUpperCase(char *buffer); -extern BOOLEAN LYRemoveNewlines(char *buffer); -extern char *LYReduceBlanks(char *buffer); -extern char *LYRemoveBlanks(char *buffer); -extern char *LYSkipBlanks(char *buffer); -extern char *LYSkipNonBlanks(char *buffer); -extern const char *LYSkipCBlanks(const char *buffer); -extern const char *LYSkipCNonBlanks(const char *buffer); -extern void LYTrimLeading(char *buffer); -extern char *LYTrimNewline(char *buffer); -extern void LYTrimTrailing(char *buffer); -extern void LYTrimAllStartfile(char *buffer); -extern BOOLEAN LYTrimStartfile(char *buffer); -extern void LYSetupEdit(EditFieldData *edit, char *old, - int maxstr, - int maxdsp); -extern void LYRefreshEdit(EditFieldData *edit); -extern int EditBinding(int ch); /* in LYEditmap.c */ -extern BOOL LYRemapEditBinding(int xlkc, - int lec, - int select_edi); /* in LYEditmap.c */ -extern int LYKeyForEditAction(int lec); /* in LYEditmap.c */ -extern int LYEditKeyForAction(int lac, int *pmodkey); /* LYEditmap.c */ -extern int LYEdit1(EditFieldData *edit, int ch, - int action, - BOOL maxMessage); -extern void LYCloseCloset(RecallType recall); -extern int LYhandlePopupList(int cur_choice, - int ly, - int lx, - const char **choices, - int width, - int i_length, - int disabled, - BOOLEAN for_mouse, - BOOLEAN numbered); - -typedef unsigned char LYEditCode; - -extern int current_lineedit; -extern const char *LYLineeditNames[]; -extern LYEditCode *LYLineEditors[]; -extern const char *LYLineeditHelpURLs[]; - -extern const char *LYLineeditHelpURL(void); - -extern int escape_bound; + extern char *LYElideString(char *str, + int cut_pos); + extern void LYEscapeStartfile(char **buffer); + extern void LYLowerCase(char *buffer); + extern void LYUpperCase(char *buffer); + extern BOOLEAN LYRemoveNewlines(char *buffer); + extern char *LYReduceBlanks(char *buffer); + extern char *LYRemoveBlanks(char *buffer); + extern char *LYSkipBlanks(char *buffer); + extern char *LYSkipNonBlanks(char *buffer); + extern const char *LYSkipCBlanks(const char *buffer); + extern const char *LYSkipCNonBlanks(const char *buffer); + extern void LYTrimLeading(char *buffer); + extern char *LYTrimNewline(char *buffer); + extern void LYTrimTrailing(char *buffer); + extern void LYTrimAllStartfile(char *buffer); + extern BOOLEAN LYTrimStartfile(char *buffer); + extern void LYSetupEdit(EditFieldData *edit, char *old, + int maxstr, + int maxdsp); + extern void LYRefreshEdit(EditFieldData *edit); + extern int EditBinding(int ch); /* in LYEditmap.c */ + extern BOOL LYRemapEditBinding(int xlkc, + int lec, + int select_edi); /* in LYEditmap.c */ + extern int LYKeyForEditAction(int lec); /* in LYEditmap.c */ + extern int LYEditKeyForAction(int lac, int *pmodkey); /* LYEditmap.c */ + extern int LYEdit1(EditFieldData *edit, int ch, + int action, + BOOL maxMessage); + extern void LYCloseCloset(RecallType recall); + extern int LYhandlePopupList(int cur_choice, + int ly, + int lx, + const char **choices, + int width, + int i_length, + int disabled, + BOOLEAN for_mouse, + BOOLEAN numbered); + + typedef unsigned char LYEditCode; + + extern int current_lineedit; + extern const char *LYLineeditNames[]; + extern LYEditCode *LYLineEditors[]; + extern const char *LYLineeditHelpURLs[]; + + extern const char *LYLineeditHelpURL(void); + + extern int escape_bound; #define LYLineEdit(e,c,m) LYEdit1(e, c, EditBinding(c) & ~LYE_DF, m) /* Dummy initializer for LYEditmap.c */ -extern int LYEditmapDeclared(void); + extern int LYEditmapDeclared(void); -extern int LYEditInsert(EditFieldData *edit, - unsigned const char *s, - int len, int map_active, - BOOL maxMessage); + extern int LYEditInsert(EditFieldData *edit, + unsigned const char *s, + int len, int map_active, + BOOL maxMessage); -#endif /* LYSTRINGS_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYSTRINGS_H */ diff --git a/src/LYStructs.h b/src/LYStructs.h index 361fc8af..4d604736 100644 --- a/src/LYStructs.h +++ b/src/LYStructs.h @@ -5,100 +5,99 @@ #include <HTAnchor.h> #endif /* HTANCHOR_H */ -typedef struct { - char *hl_text; - short hl_x; -} HiliteInfo; - -typedef struct { - HiliteInfo *hl_info; - HiliteInfo hl_base; - short hl_len; /* number of strings in this struct */ -} HiliteList; - -typedef struct { - char *lname; - char *target; - char *l_hightext; - char *l_hightext2; - int l_hightext2_offset; - BOOL inUnderline; /* TRUE when this link is in underlined context. */ - int lx; - int ly; - int type; /* Type of link, Forms, WWW, etc. */ - int anchor_number; /* The anchor number within the HText structure. */ - int anchor_line_num; /* The anchor line number in the HText structure. */ - HiliteList list; - struct _FormInfo *l_form; /* Pointer to form info. */ -} LinkInfo; -extern LinkInfo links[MAXLINKS]; -extern int nlinks; - -typedef struct { - /* FIXME: see DocAddress */ - char *title; - char *address; - bstring *post_data; - char *post_content_type; - char *bookmark; - BOOL isHEAD; - BOOL safe; - - int link; - int line; - BOOL internal_link; /* whether doc was reached via an internal +#ifdef __cplusplus +extern "C" { +#endif + typedef struct { + char *hl_text; + short hl_x; + } HiliteInfo; + + typedef struct { + HiliteInfo *hl_info; + HiliteInfo hl_base; + short hl_len; /* number of strings in this struct */ + } HiliteList; + + typedef struct { + char *lname; + char *target; + char *l_hightext; + char *l_hightext2; + int l_hightext2_offset; + BOOL inUnderline; /* TRUE when this link is in underlined context. */ + int lx; + int ly; + int type; /* Type of link, Forms, WWW, etc. */ + int anchor_number; /* The anchor number within the HText structure. */ + int anchor_line_num; /* The anchor line number in the HText structure. */ + HiliteList list; + struct _FormInfo *l_form; /* Pointer to form info. */ + } LinkInfo; + extern LinkInfo links[MAXLINKS]; + extern int nlinks; + + typedef struct { + /* FIXME: see DocAddress */ + char *title; + char *address; + bstring *post_data; + char *post_content_type; + char *bookmark; + BOOL isHEAD; + BOOL safe; + + int link; + int line; + BOOL internal_link; /* whether doc was reached via an internal (fragment) link. - kw */ #ifdef USE_COLOR_STYLE - char *style; + char *style; #endif -} DocInfo; - -#ifndef HTFORMS_H -#include <HTForms.h> -#endif /* HTFORMS_H */ + } DocInfo; -typedef struct { - DocInfo hdoc; - int intern_seq_start; /* indicates which element on the history + typedef struct { + DocInfo hdoc; + int intern_seq_start; /* indicates which element on the history is the start of this sequence of "internal links", otherwise -1 */ -} HistInfo; + } HistInfo; #define HDOC(n) history[n].hdoc -extern int Visited_Links_As; + extern int Visited_Links_As; #define VISITED_LINKS_AS_FIRST_V 0 #define VISITED_LINKS_AS_TREE 1 #define VISITED_LINKS_AS_LATEST 2 #define VISITED_LINKS_REVERSE 4 -typedef struct _VisitedLink { - char *title; - char *address; - int level; - struct _VisitedLink *next_tree; - struct _VisitedLink *prev_latest; - struct _VisitedLink *next_latest; - struct _VisitedLink *prev_first; -} VisitedLink; + typedef struct _VisitedLink { + char *title; + char *address; + int level; + struct _VisitedLink *next_tree; + struct _VisitedLink *prev_latest; + struct _VisitedLink *next_latest; + struct _VisitedLink *prev_first; + } VisitedLink; -extern HistInfo *history; -extern int nhist; -extern int size_history; + extern HistInfo *history; + extern int nhist; + extern int size_history; /******************************************************************************/ -typedef struct _lynx_list_item_type { - struct _lynx_list_item_type *next; /* the next item in the linked list */ - char *name; /* a description of the item */ - char *command; /* the command to execute */ - int always_enabled; /* a constant to tell whether or + typedef struct _lynx_list_item_type { + struct _lynx_list_item_type *next; /* the next item in the linked list */ + char *name; /* a description of the item */ + char *command; /* the command to execute */ + int always_enabled; /* a constant to tell whether or * not to disable the printer * when the no_print option is on */ - /* HTML lists: */ - BOOL override_primary_action; /* whether primary action will be + /* HTML lists: */ + BOOL override_primary_action; /* whether primary action will be * overridden by this - e.g. this * allows invoking user's MUA when * mailto: link is activated using @@ -106,33 +105,33 @@ typedef struct _lynx_list_item_type { * field is only examined by code that * handles EXTERNAL command. */ - /* PRINTER lists: */ - int pagelen; /* an integer to store the printer's + /* PRINTER lists: */ + int pagelen; /* an integer to store the printer's * page length */ -} lynx_list_item_type; + } lynx_list_item_type; -extern lynx_list_item_type *printers; + extern lynx_list_item_type *printers; /* for download commands */ -extern lynx_list_item_type *downloaders; + extern lynx_list_item_type *downloaders; /* for upload commands */ -extern lynx_list_item_type *uploaders; + extern lynx_list_item_type *uploaders; #ifdef USE_EXTERNALS /* for external commands */ -extern lynx_list_item_type *externals; + extern lynx_list_item_type *externals; #endif /******************************************************************************/ -typedef struct { - const char *name; - int value; -} Config_Enum; + typedef struct { + const char *name; + int value; + } Config_Enum; -typedef int (*ParseFunc) (char *); + typedef int (*ParseFunc) (char *); #define ParseUnionMembers \ lynx_list_item_type** add_value; \ @@ -142,9 +141,9 @@ typedef int (*ParseFunc) (char *); ParseFunc fun_value; \ long def_value -typedef union { - ParseUnionMembers; -} ParseUnion; + typedef union { + ParseUnionMembers; + } ParseUnion; #ifdef PARSE_DEBUG #define ParseUnionPtr Config_Type * @@ -170,4 +169,7 @@ typedef union { #define UNION_DEF(v) (long) (v) #endif -#endif /* LYSTRUCTS_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYSTRUCTS_H */ diff --git a/src/LYStyle.c b/src/LYStyle.c index 0ea3bc41..6e8743bf 100644 --- a/src/LYStyle.c +++ b/src/LYStyle.c @@ -1,6 +1,6 @@ /* character level styles for Lynx * (c) 1996 Rob Partington -- donated to the Lyncei (if they want it :-) - * @Id: LYStyle.c 1.58 Thu, 30 Dec 2004 04:11:59 -0800 dickey @ + * @Id: LYStyle.c 1.59 Sun, 02 Jan 2005 15:35:21 -0800 dickey @ */ #include <HTUtils.h> #include <HTML.h> @@ -441,7 +441,7 @@ void parse_userstyles(void) if (HTList_isEmpty(cur)) { initialise_default_stylesheet(); } else { - while ((name = HTList_nextObject(cur)) != NULL) { + while ((name = (char *) HTList_nextObject(cur)) != NULL) { CTRACE2(TRACE_STYLE, (tfp, "LSS:%s\n", (name ? name @@ -499,11 +499,7 @@ static void HStyle_addStyle(char *buffer) void style_deleteStyleList(void) { - char *name; - - while ((name = HTList_removeLastObject(lss_styles)) != NULL) - FREE(name); - HTList_delete(lss_styles); + LYFreeStringList(lss_styles); lss_styles = NULL; } diff --git a/src/LYStyle.h b/src/LYStyle.h index fc31d698..474efa54 100644 --- a/src/LYStyle.h +++ b/src/LYStyle.h @@ -8,63 +8,67 @@ #include <AttrList.h> #include <HTMLDTD.h> -/* list of elements */ -extern const SGML_dtd HTML_dtd; +#ifdef __cplusplus +extern "C" { +#endif +/* list of elements */ extern const SGML_dtd HTML_dtd; /* array of currently set styles */ -extern HTCharStyle displayStyles[DSTYLE_ELEMENTS]; + extern HTCharStyle displayStyles[DSTYLE_ELEMENTS]; /* Set all the buckets in the hash table to be empty */ -extern void parse_userstyles(void); + extern void parse_userstyles(void); -extern void style_deleteStyleList(void); + extern void style_deleteStyleList(void); -extern void style_defaultStyleSheet(void); + extern void style_defaultStyleSheet(void); -extern int style_readFromFile(char *file); + extern int style_readFromFile(char *file); -extern void TrimColorClass(const char *tagname, - char *styleclassname, - int *phcode); + extern void TrimColorClass(const char *tagname, + char *styleclassname, + int *phcode); /* this is an array of styles for tags that don't specify 'class' - the values * from that array will be suggested by SGML.c by setting the following * variable. Value of -1 means that style value should be calculated honestly. * -HV */ -extern int cached_tag_styles[HTML_ELEMENTS]; + extern int cached_tag_styles[HTML_ELEMENTS]; /* the style for current tag is suggested in current_tag_style. If * force_current_tag_style =TRUE, then no attempts to calculate the color style * for current tag should be made - the value of 'current_tag_style' must be * used. */ -extern int current_tag_style; -extern BOOL force_current_tag_style; + extern int current_tag_style; + extern BOOL force_current_tag_style; -extern BOOL force_classname; + extern BOOL force_classname; /* if force_current_tag_style =TRUE, then here will be the classname (this is * done to avoid copying the class name to the buffer class_name. */ -extern char *forced_classname; + extern char *forced_classname; /* This is called each time lss styles are read. It will fill each elt of * 'cached_tag_styles' -HV */ -extern void cache_tag_styles(void); + extern void cache_tag_styles(void); /* this is global var - it can be used for reading the end of string found * during last invokation of TrimColorClass. */ -extern void FastTrimColorClass(const char *tag_name, - int name_len, - char *stylename, - char **pstylename_end, - int *hcode); - -#endif /* USE_COLOR_STYLE */ - + extern void FastTrimColorClass(const char *tag_name, + int name_len, + char *stylename, + char **pstylename_end, + int *hcode); + +#ifdef __cplusplus +} +#endif +#endif /* USE_COLOR_STYLE */ extern int lynx_has_color; #endif /* LYSTYLE_H */ diff --git a/src/LYTraversal.h b/src/LYTraversal.h index 7da7da36..8e712e51 100644 --- a/src/LYTraversal.h +++ b/src/LYTraversal.h @@ -7,11 +7,17 @@ #include <HTUtils.h> /* BOOL, ARGS */ #endif -extern BOOLEAN lookup_link(char *target); -extern void add_to_table(char *target); -extern void add_to_traverse_list(char *fname, char *prev_link_name); -extern void dump_traversal_history(void); -extern void add_to_reject_list(char *target); -extern BOOLEAN lookup_reject(char *target); +#ifdef __cplusplus +extern "C" { +#endif + extern BOOLEAN lookup_link(char *target); + extern void add_to_table(char *target); + extern void add_to_traverse_list(char *fname, char *prev_link_name); + extern void dump_traversal_history(void); + extern void add_to_reject_list(char *target); + extern BOOLEAN lookup_reject(char *target); -#endif /* TRAVERSAL_H */ +#ifdef __cplusplus +} +#endif +#endif /* TRAVERSAL_H */ diff --git a/src/LYUpload.h b/src/LYUpload.h index be421626..84a71a03 100644 --- a/src/LYUpload.h +++ b/src/LYUpload.h @@ -1,4 +1,3 @@ - #ifndef LYUPLOAD_H #define LYUPLOAD_H @@ -6,7 +5,13 @@ #include <LYStructs.h> #endif /* LYSTRUCTS_H */ -extern int LYUpload(char *line); -extern int LYUpload_options(char **newfile, char *directory); +#ifdef __cplusplus +extern "C" { +#endif + extern int LYUpload(char *line); + extern int LYUpload_options(char **newfile, char *directory); -#endif /* LYUPLOAD_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYUPLOAD_H */ diff --git a/src/LYUtils.c b/src/LYUtils.c index beacf9fa..a33686cf 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -265,6 +265,19 @@ size_t utf8_length(BOOL utf_flag, } /* + * Free storage used for the link-highlighting. + */ +void LYFreeHilites(int first, int last) +{ + int i; + + for (i = first; i < last; i++) { + LYSetHilite(i, NULL); + FREE(links[i].lname); + } +} + +/* * Set the initial highlight information for a given link. */ void LYSetHilite(int cur, @@ -285,12 +298,12 @@ void LYAddHilite(int cur, HiliteList *list = &(links[cur].list); HiliteInfo *have = list->hl_info; unsigned need = (list->hl_len - 1); - unsigned want = (list->hl_len += 1) * sizeof(HiliteInfo); + unsigned want = (list->hl_len += 1); if (have != NULL) { - have = realloc(have, want); + have = typeRealloc(HiliteInfo, have, want); } else { - have = malloc(want); + have = typeMallocn(HiliteInfo, want); } list->hl_info = have; have[need].hl_text = text; @@ -396,8 +409,7 @@ static BOOL show_whereis_targets(int flag, * the screen. -FM */ LYmbcsstrncpy(buffer, - (LYGetHiliteStr(cur, count) ? - LYGetHiliteStr(cur, count) : ""), + NonNull(LYGetHiliteStr(cur, count)), (sizeof(buffer) - 1), (LYcolLimit - LYGetHilitePos(cur, count)), utf_flag); @@ -1076,8 +1088,7 @@ void LYhighlight(int flag, * screen. */ LYmbcsstrncpy(buffer, - (LYGetHiliteStr(cur, 0) ? - LYGetHiliteStr(cur, 0) : ""), + NonNull(LYGetHiliteStr(cur, 0)), (sizeof(buffer) - 1), (LYcolLimit - links[cur].lx), utf_flag); @@ -1311,7 +1322,7 @@ void statusline(const char *text) /* * Deal with any newlines or tabs in the string. - FM */ - convert_to_spaces((char *) temp, FALSE); + LYReduceBlanks((char *) temp); /* * Handle the Kanji, making sure the text is not longer than the @@ -1351,7 +1362,7 @@ void statusline(const char *text) /* * Deal with any newlines or tabs in the string. - FM */ - convert_to_spaces(buffer, FALSE); + LYReduceBlanks(buffer); } /* @@ -1611,12 +1622,10 @@ int HTCheckForInterrupt(void) FD_SET(0, &readfds); #ifdef SOCKS if (socks_flag) - ret = Rselect(1, (void *) &readfds, NULL, NULL, - &socket_timeout); + ret = Rselect(1, &readfds, NULL, NULL, &socket_timeout); else #endif /* SOCKS */ - ret = select(1, (void *) &readfds, NULL, NULL, - &socket_timeout); + ret = select(1, &readfds, NULL, NULL, &socket_timeout); /** Suspended? **/ if ((ret == -1) && (SOCKET_ERRNO == EINTR)) @@ -1640,7 +1649,7 @@ int HTCheckForInterrupt(void) #endif /* PDCURSES */ #else /* VMS: */ - extern int typeahead(); + extern int typeahead(void); if (fake_zap > 0) { fake_zap--; @@ -1900,22 +1909,28 @@ BOOLEAN LYisLocalHost(const char *filename) } /* - * Utility for freeing the list of local host aliases. - FM + * Free an HTList that contains strings. */ -void LYLocalhostAliases_free(void) +void LYFreeStringList(HTList *list) { - char *alias; - HTList *cur = localhost_aliases; + if (list != NULL) { + char *argument; + HTList *cur = list; - if (!cur) - return; - - while (NULL != (alias = (char *) HTList_nextObject(cur))) { - FREE(alias); + while (NULL != (argument = (char *) HTList_nextObject(cur))) { + FREE(argument); + } + HTList_delete(list); } - HTList_delete(localhost_aliases); +} + +/* + * Utility for freeing the list of local host aliases. - FM + */ +void LYLocalhostAliases_free(void) +{ + LYFreeStringList(localhost_aliases); localhost_aliases = NULL; - return; } /* @@ -1986,7 +2001,7 @@ BOOLEAN LYisLocalAlias(const char *filename) * it returns UNKNOWN_URL_TYPE. Otherwise, it returns * 0 (not a URL). - FM */ -int LYCheckForProxyURL(char *filename) +UrlTypes LYCheckForProxyURL(char *filename) { char *cp = filename; char *cp1; @@ -2009,6 +2024,7 @@ int LYCheckForProxyURL(char *filename) if ((cp2 = strchr((cp + 1), '/')) != NULL && cp2 < cp1) return (NOT_A_URL_TYPE); *cp1 = '\0'; + cp2 = NULL; StrAllocCopy(cp2, cp); *cp1 = ':'; StrAllocCat(cp2, "_proxy"); @@ -2075,11 +2091,11 @@ static BOOLEAN compare_type(char *tst, * Chains to LYCheckForProxyURL() if a colon * is present but the type is not recognized. */ -int is_url(char *filename) +UrlTypes is_url(char *filename) { char *cp = filename; char *cp1; - int result = NOT_A_URL_TYPE; + UrlTypes result = NOT_A_URL_TYPE; int len; int limit; @@ -2877,18 +2893,8 @@ void size_change(int sig GCC_UNUSED) */ void HTSugFilenames_free(void) { - char *fname; - HTList *cur = sug_filenames; - - if (!cur) - return; - - while (NULL != (fname = (char *) HTList_nextObject(cur))) { - FREE(fname); - } - HTList_delete(sug_filenames); + LYFreeStringList(sug_filenames); sug_filenames = NULL; - return; } /* @@ -2897,33 +2903,33 @@ void HTSugFilenames_free(void) */ void HTAddSugFilename(char *fname) { - char *new = NULL; + char *tmp = NULL; char *old; HTList *cur; if (!non_empty(fname)) return; - StrAllocCopy(new, fname); + StrAllocCopy(tmp, fname); if (!sug_filenames) { sug_filenames = HTList_new(); #ifdef LY_FIND_LEAKS atexit(HTSugFilenames_free); #endif - HTList_addObject(sug_filenames, new); + HTList_addObject(sug_filenames, tmp); return; } cur = sug_filenames; while (NULL != (old = (char *) HTList_nextObject(cur))) { - if (!strcmp(old, new)) { + if (!strcmp(old, tmp)) { HTList_removeObject(sug_filenames, old); FREE(old); break; } } - HTList_addObject(sug_filenames, new); + HTList_addObject(sug_filenames, tmp); return; } @@ -4475,8 +4481,9 @@ BOOLEAN LYExpandHostForURL(char **AllocatedString, * Set the first prefix, making it a zero-length string if the list is NULL * or if the potential host field ends with a dot. - FM */ - StartP = ((prefix_list && Str[strlen(Str) - 1] != '.') ? - prefix_list : ""); + StartP = ((prefix_list && Str[strlen(Str) - 1] != '.') + ? prefix_list + : ""); /* * If we have a prefix, but the allocated string is one of the common host * prefixes, make our prefix a zero-length string. - FM @@ -4512,8 +4519,9 @@ BOOLEAN LYExpandHostForURL(char **AllocatedString, * Set the first suffix, making it a zero-length string if the list is * NULL or if the potential host field begins with a dot. - FM */ - StartS = ((suffix_list && *Str != '.') ? - suffix_list : ""); + StartS = ((suffix_list && *Str != '.') + ? suffix_list + : ""); while ((*StartS) && (WHITE(*StartS) || *StartS == ',')) { StartS++; /* Skip whitespace and separators */ } @@ -6442,7 +6450,7 @@ BOOL LYIsUIPage3(const char *url, char *p; HTList *l0 = ly_uip[i].alturls; - while ((p = HTList_nextObject(l0)) != NULL) { + while ((p = (char *) HTList_nextObject(l0)) != NULL) { if ((flagparam & UIP_P_FRAG) ? (!strncmp(p, url, (l = strlen(p))) && (url[l] == '\0' || url[l] == '#')) : @@ -6475,7 +6483,7 @@ void LYRegisterUIPage(const char *url, int n = 0; HTList *l0 = ly_uip[i].alturls; - while ((p = HTList_nextObject(l0)) != NULL) { + while ((p = (char *) HTList_nextObject(l0)) != NULL) { if (!strcmp(p, url)) return; if (!strcmp(p, ly_uip[i].url)) { @@ -6502,17 +6510,11 @@ void LYRegisterUIPage(const char *url, void LYUIPages_free(void) { unsigned int i; - char *p; - HTList *l0; for (i = 0; i < TABLESIZE(ly_uip); i++) { FREE(ly_uip[i].url); FREE(ly_uip[i].file); - l0 = ly_uip[i].alturls; - while ((p = HTList_nextObject(l0)) != NULL) { - FREE(p); - } - HTList_delete(ly_uip[i].alturls); + LYFreeStringList(ly_uip[i].alturls); ly_uip[i].alturls = NULL; } } @@ -7447,7 +7449,8 @@ char *get_clip_grab(void) if (strchr(paste_buf + off, '\r') || strchr(paste_buf + off, '\n')) break; - paste_buf = realloc(paste_buf, size += PASTE_BUFFER - 1); + paste_buf = typeRealloc(char, paste_buf, size += PASTE_BUFFER - 1); + off += len; } return paste_buf; diff --git a/src/LYUtils.h b/src/LYUtils.h index 51a7680b..d9e26567 100644 --- a/src/LYUtils.h +++ b/src/LYUtils.h @@ -11,30 +11,37 @@ #ifdef VMS #include <HTFTP.h> #include <HTVMSUtils.h> -#define HTSYS_name(path) HTVMS_name("", path) -#define HTSYS_purge(path) HTVMS_purge(path) -#define HTSYS_remove(path) HTVMS_remove(path) #endif /* VMS */ #if defined(USE_DOS_DRIVES) #include <HTDOS.h> -#define HTSYS_name(path) HTDOS_name(path) #endif +#if defined(SYSLOG_REQUESTED_URLS) +#include <syslog.h> +#endif + +#ifdef __cplusplus +extern "C" { +#endif +#ifdef VMS +#define HTSYS_name(path) HTVMS_name("", path) +#define HTSYS_purge(path) HTVMS_purge(path) +#define HTSYS_remove(path) HTVMS_remove(path) +#endif /* VMS */ +#if defined(USE_DOS_DRIVES) +#define HTSYS_name(path) HTDOS_name(path) +#endif #ifndef HTSYS_name #define HTSYS_name(path) path #endif - #ifndef HTSYS_purge #define HTSYS_purge(path) /* nothing */ #endif - #ifndef HTSYS_remove #define HTSYS_remove(path) remove(path) #endif - #define LYIsPipeCommand(s) ((s)[0] == '|') - #ifdef VMS #define TTY_DEVICE "tt:" #define NUL_DEVICE "nl:" @@ -61,21 +68,17 @@ #define LYIsNullDevice(s) LYSameFilename(s,NUL_DEVICE) #define LYSameFilename(a,b) (!strcmp(a,b)) #define LYSameHostname(a,b) (!strcmp(a,b)) -#endif /* __CYGWIN__ */ -#endif /* DOSPATH */ -#endif /* VMS */ - +#endif /* __CYGWIN__ */ +#endif /* DOSPATH */ +#endif /* VMS */ /* See definitions in src/LYCharVals.h. The hardcoded values... This prohibits binding C-c and C-g. Maybe it is better to remove this? */ #define LYCharIsINTERRUPT_HARD(ch) \ ((ch) == LYCharINTERRUPT1 || ch == LYCharINTERRUPT2) - #define LYCharIsINTERRUPT(ch) \ (LYCharIsINTERRUPT_HARD(ch) || LKC_TO_LAC(keymap,ch) == LYK_INTERRUPT) - #define LYCharIsINTERRUPT_NO_letter(ch) \ (LYCharIsINTERRUPT(ch) && !isprint(ch)) - #if defined(USE_DOS_DRIVES) #define PATHSEP_STR "\\" #define LYIsPathSep(ch) ((ch) == '/' || (ch) == '\\') @@ -85,7 +88,6 @@ #define LYIsPathSep(ch) ((ch) == '/') #define LYIsDosDrive(s) FALSE /* really nothing */ #endif - #ifdef EXP_ADDRLIST_PAGE #define LYIsListpageTitle(name) \ (!strcmp((name), LIST_PAGE_TITLE) || \ @@ -94,183 +96,181 @@ #define LYIsListpageTitle(name) \ (!strcmp((name), LIST_PAGE_TITLE)) #endif - #define LYIsHtmlSep(ch) ((ch) == '/') - #define findPoundSelector(address) strchr(address, '#') #define restorePoundSelector(pound) if ((pound) != NULL) *(pound) = '#' - -extern BOOL strn_dash_equ(const char *p1, const char *p2, int len); -extern BOOLEAN LYAddSchemeForURL(char **AllocatedString, const char *default_scheme); -extern BOOLEAN LYCachedTemp(char *result, char **cached); -extern BOOLEAN LYCanDoHEAD(const char *address); -extern BOOLEAN LYCanReadFile(const char *name); -extern BOOLEAN LYCanWriteFile(const char *name); -extern BOOLEAN LYCloseInput(FILE *fp); -extern BOOLEAN LYCloseOutput(FILE *fp); -extern BOOLEAN LYExpandHostForURL(char **AllocatedString, char *prefix_list, char *suffix_list); -extern BOOLEAN LYFixCursesOnForAccess(const char *addr, const char *physical); -extern BOOLEAN LYPathOffHomeOK(char *fbuffer, size_t fbuffer_size); -extern BOOLEAN LYValidateFilename(char *result, char *given); -extern BOOLEAN LYisAbsPath(const char *path); -extern BOOLEAN LYisLocalAlias(const char *filename); -extern BOOLEAN LYisLocalFile(const char *filename); -extern BOOLEAN LYisLocalHost(const char *filename); -extern BOOLEAN LYisRootPath(const char *path); -extern BOOLEAN inlocaldomain(void); -extern FILE *InternalPageFP(char *filename, int reuse_flag); -extern FILE *LYAppendToTxtFile(const char *name); -extern FILE *LYNewBinFile(const char *name); -extern FILE *LYNewTxtFile(const char *name); -extern FILE *LYOpenScratch(char *result, const char *prefix); -extern FILE *LYOpenTemp(char *result, const char *suffix, const char *mode); -extern FILE *LYOpenTempRewrite(char *result, const char *suffix, const char *mode); -extern FILE *LYReopenTemp(char *name); -extern char *Current_Dir(char *pathname); -extern char *LYAddPathToSave(char *fname); -extern char *LYGetEnv(const char *name); -extern char *LYLastPathSep(const char *path); -extern char *LYPathLeaf(char *pathname); -extern char *LYgetXDisplay(void); -extern char *strip_trailing_slash(char *my_dirname); -extern char *trimPoundSelector(char *address); -extern const char *Home_Dir(void); -extern const char *LYGetHiliteStr(int cur, int count); -extern const char *LYSysShell(void); -extern const char *index_to_restriction(int inx); -extern const char *wwwName(const char *pathname); -extern int HTCheckForInterrupt(void); -extern int LYCheckForProxyURL(char *filename); -extern int LYConsoleInputFD(BOOLEAN need_selectable); -extern int LYCopyFile(char *src, char *dst); -extern int LYGetHilitePos(int cur, int count); -extern int LYRemoveTemp(char *name); -extern int LYSystem(char *command); -extern int LYValidateOutput(char *filename); -extern int find_restriction(const char *name, int len); -extern int is_url(char *filename); -extern int number2arrows(int number); -extern size_t utf8_length(BOOL utf_flag, const char *data); -extern time_t LYmktime(char *string, BOOL absolute); -extern void BeginInternalPage(FILE *fp0, const char *Title, const char *HelpURL); -extern void EndInternalPage(FILE *fp0); -extern void HTAddSugFilename(char *fname); -extern void HTSugFilenames_free(void); -extern void LYAddHilite(int cur, char *text, int x); -extern void LYAddHtmlSep(char **path); -extern void LYAddHtmlSep0(char *path); -extern void LYAddLocalhostAlias(char *alias); -extern void LYAddPathSep(char **path); -extern void LYAddPathSep0(char *path); -extern void LYAddPathToHome(char *fbuffer, size_t fbuffer_size, const char *fname); -extern void LYCheckBibHost(void); -extern void LYCheckMail(void); -extern void LYCleanupTemp(void); -extern void LYCloseTemp(char *name); -extern void LYCloseTempFP(FILE *fp); -extern void LYConvertToURL(char **AllocatedString, int fixit); -extern void LYDoCSI(char *url, const char *comment, char **csi); -extern void LYEnsureAbsoluteURL(char **href, const char *name, int fixit); -extern void LYFakeZap(BOOL set); -extern void LYFixCursesOn(const char *reason); -extern void LYLocalFileToURL(char **target, const char *source); -extern void LYLocalhostAliases_free(void); -extern void LYRenamedTemp(char *oldname, char *newname); -extern void LYSetHilite(int cur, const char *text); -extern void LYTrimHtmlSep(char *path); -extern void LYTrimPathSep(char *path); -extern void LYTrimRelFromAbsPath(char *path); -extern void LYhighlight(int flag, int cur, const char *target); -extern void LYmsec_delay(unsigned msec); -extern void LYsetXDisplay(char *new_display); -extern void WriteInternalTitle(FILE *fp0, const char *Title); -extern void change_sug_filename(char *fname); -extern void convert_to_spaces(char *string, BOOL condense); -extern void free_and_clear(char **obj); -extern void noviceline(int more_flag); -extern void parse_restrictions(const char *s); -extern void print_restrictions_to_fd(FILE *fp); -extern void remove_backslashes(char *buf); -extern void size_change(int sig); -extern void statusline(const char *text); -extern void toggle_novice_line(void); + extern BOOL strn_dash_equ(const char *p1, const char *p2, int len); + extern BOOLEAN LYAddSchemeForURL(char **AllocatedString, const char *default_scheme); + extern BOOLEAN LYCachedTemp(char *result, char **cached); + extern BOOLEAN LYCanDoHEAD(const char *address); + extern BOOLEAN LYCanReadFile(const char *name); + extern BOOLEAN LYCanWriteFile(const char *name); + extern BOOLEAN LYCloseInput(FILE *fp); + extern BOOLEAN LYCloseOutput(FILE *fp); + extern BOOLEAN LYExpandHostForURL(char **AllocatedString, char + *prefix_list, char *suffix_list); + extern BOOLEAN LYFixCursesOnForAccess(const char *addr, const char *physical); + extern BOOLEAN LYPathOffHomeOK(char *fbuffer, size_t fbuffer_size); + extern BOOLEAN LYValidateFilename(char *result, char *given); + extern BOOLEAN LYisAbsPath(const char *path); + extern BOOLEAN LYisLocalAlias(const char *filename); + extern BOOLEAN LYisLocalFile(const char *filename); + extern BOOLEAN LYisLocalHost(const char *filename); + extern BOOLEAN LYisRootPath(const char *path); + extern BOOLEAN inlocaldomain(void); + extern FILE *InternalPageFP(char *filename, int reuse_flag); + extern FILE *LYAppendToTxtFile(const char *name); + extern FILE *LYNewBinFile(const char *name); + extern FILE *LYNewTxtFile(const char *name); + extern FILE *LYOpenScratch(char *result, const char *prefix); + extern FILE *LYOpenTemp(char *result, const char *suffix, const char *mode); + extern FILE *LYOpenTempRewrite(char *result, const char *suffix, const char *mode); + extern FILE *LYReopenTemp(char *name); + extern char *Current_Dir(char *pathname); + extern char *LYAddPathToSave(char *fname); + extern char *LYGetEnv(const char *name); + extern char *LYLastPathSep(const char *path); + extern char *LYPathLeaf(char *pathname); + extern char *LYgetXDisplay(void); + extern char *strip_trailing_slash(char *my_dirname); + extern char *trimPoundSelector(char *address); + extern const char *Home_Dir(void); + extern const char *LYGetHiliteStr(int cur, int count); + extern const char *LYSysShell(void); + extern const char *index_to_restriction(int inx); + extern const char *wwwName(const char *pathname); + extern int HTCheckForInterrupt(void); + extern int LYConsoleInputFD(BOOLEAN need_selectable); + extern int LYCopyFile(char *src, char *dst); + extern int LYGetHilitePos(int cur, int count); + extern int LYRemoveTemp(char *name); + extern int LYSystem(char *command); + extern int LYValidateOutput(char *filename); + extern int find_restriction(const char *name, int len); + extern int number2arrows(int number); + extern size_t utf8_length(BOOL utf_flag, const char *data); + extern time_t LYmktime(char *string, BOOL absolute); + extern void BeginInternalPage(FILE *fp0, const char *Title, const char *HelpURL); + extern void EndInternalPage(FILE *fp0); + extern void HTAddSugFilename(char *fname); + extern void HTSugFilenames_free(void); + extern void LYAddHilite(int cur, char *text, int x); + extern void LYAddHtmlSep(char **path); + extern void LYAddHtmlSep0(char *path); + extern void LYAddLocalhostAlias(char *alias); + extern void LYAddPathSep(char **path); + extern void LYAddPathSep0(char *path); + extern void LYAddPathToHome(char *fbuffer, size_t fbuffer_size, const char *fname); + extern void LYCheckBibHost(void); + extern void LYCheckMail(void); + extern void LYCleanupTemp(void); + extern void LYCloseTemp(char *name); + extern void LYCloseTempFP(FILE *fp); + extern void LYConvertToURL(char **AllocatedString, int fixit); + extern void LYDoCSI(char *url, const char *comment, char **csi); + extern void LYEnsureAbsoluteURL(char **href, const char *name, int fixit); + extern void LYFakeZap(BOOL set); + extern void LYFixCursesOn(const char *reason); + extern void LYFreeHilites(int first, int last); + extern void LYFreeStringList(HTList *list); + extern void LYLocalFileToURL(char **target, const char *source); + extern void LYLocalhostAliases_free(void); + extern void LYRenamedTemp(char *oldname, char *newname); + extern void LYSetHilite(int cur, const char *text); + extern void LYTrimHtmlSep(char *path); + extern void LYTrimPathSep(char *path); + extern void LYTrimRelFromAbsPath(char *path); + extern void LYhighlight(int flag, int cur, const char *target); + extern void LYmsec_delay(unsigned msec); + extern void LYsetXDisplay(char *new_display); + extern void WriteInternalTitle(FILE *fp0, const char *Title); + extern void change_sug_filename(char *fname); + extern void convert_to_spaces(char *string, BOOL condense); + extern void free_and_clear(char **obj); + extern void noviceline(int more_flag); + extern void parse_restrictions(const char *s); + extern void print_restrictions_to_fd(FILE *fp); + extern void remove_backslashes(char *buf); + extern void size_change(int sig); + extern void statusline(const char *text); + extern void toggle_novice_line(void); #ifdef EXP_ASCII_CTYPES -extern int ascii_tolower(int i); -extern int ascii_toupper(int i); -extern int ascii_isupper(int i); + extern int ascii_tolower(int i); + extern int ascii_toupper(int i); + extern int ascii_isupper(int i); #endif #ifdef __CYGWIN__ -extern int Cygwin_Shell(void); + extern int Cygwin_Shell(void); #endif #ifdef _WIN_CC -extern int exec_command(char *cmd, int wait_flag); /* xsystem.c */ -extern int xsystem(char *cmd); + extern int exec_command(char *cmd, int wait_flag); /* xsystem.c */ + extern int xsystem(char *cmd); #endif /* Keeping track of User Interface Pages: */ -typedef enum { - UIP_UNKNOWN = -1 - ,UIP_HISTORY = 0 - ,UIP_DOWNLOAD_OPTIONS - ,UIP_PRINT_OPTIONS - ,UIP_SHOWINFO - ,UIP_LIST_PAGE - ,UIP_VLINKS - ,UIP_LYNXCFG - ,UIP_OPTIONS_MENU - ,UIP_DIRED_MENU - ,UIP_PERMIT_OPTIONS - ,UIP_UPLOAD_OPTIONS - ,UIP_ADDRLIST_PAGE - ,UIP_CONFIG_DEF - ,UIP_TRACELOG - ,UIP_INSTALL -} UIP_t; + typedef enum { + UIP_UNKNOWN = -1 + ,UIP_HISTORY = 0 + ,UIP_DOWNLOAD_OPTIONS + ,UIP_PRINT_OPTIONS + ,UIP_SHOWINFO + ,UIP_LIST_PAGE + ,UIP_VLINKS + ,UIP_LYNXCFG + ,UIP_OPTIONS_MENU + ,UIP_DIRED_MENU + ,UIP_PERMIT_OPTIONS + ,UIP_UPLOAD_OPTIONS + ,UIP_ADDRLIST_PAGE + ,UIP_CONFIG_DEF + ,UIP_TRACELOG + ,UIP_INSTALL + } UIP_t; #define UIP_P_FRAG 0x0001 /* flag: consider "url#frag" as matching "url" */ -extern BOOL LYIsUIPage3(const char *url, UIP_t type, int flagparam); + extern BOOL LYIsUIPage3(const char *url, UIP_t type, int flagparam); #define LYIsUIPage(url,type) LYIsUIPage3(url, type, UIP_P_FRAG) -extern void LYRegisterUIPage(const char *url, UIP_t type); + extern void LYRegisterUIPage(const char *url, UIP_t type); #define LYUnRegisterUIPage(type) LYRegisterUIPage(NULL, type) -extern void LYUIPages_free(void); + extern void LYUIPages_free(void); #ifdef CAN_CUT_AND_PASTE -extern int put_clip(const char *szBuffer); + extern int put_clip(const char *szBuffer); /* get_clip_grab() returns a pointer to the string in the system area. get_clip_release() should be called ASAP after this. */ -extern char *get_clip_grab(void); -extern void get_clip_release(void); + extern char *get_clip_grab(void); + extern void get_clip_release(void); # ifdef WIN_EX # define size_clip() 8192 # else -extern int size_clip(void); + extern int size_clip(void); # endif #endif #if defined(WIN_EX) /* 1997/10/16 (Thu) 20:13:28 */ -extern char *HTDOS_short_name(char *path); -extern char *w32_strerror(DWORD ercode); + extern char *HTDOS_short_name(char *path); + extern char *w32_strerror(DWORD ercode); #endif #ifdef VMS -extern void Define_VMSLogical(char *LogicalName, char *LogicalValue); -#endif /* VMS */ + extern void Define_VMSLogical(char *LogicalName, char *LogicalValue); +#endif /* VMS */ #if ! HAVE_PUTENV -extern int putenv(const char *string); -#endif /* HAVE_PUTENV */ + extern int putenv(const char *string); +#endif /* HAVE_PUTENV */ #if defined(MULTI_USER_UNIX) -extern void LYRelaxFilePermissions(const char *name); + extern void LYRelaxFilePermissions(const char *name); #else #define LYRelaxFilePermissions(name) /* nothing */ @@ -279,7 +279,7 @@ extern void LYRelaxFilePermissions(const char *name); /* * Whether or not the status line must be shown. */ -extern BOOLEAN mustshow; + extern BOOLEAN mustshow; #define _statusline(msg) mustshow = TRUE, statusline(msg) @@ -288,59 +288,62 @@ extern BOOLEAN mustshow; * * Universal document id types (see LYCheckForProxyURL) */ -typedef enum { - NOT_A_URL_TYPE = 0, - UNKNOWN_URL_TYPE = 1, /* must be nonzero */ - - HTTP_URL_TYPE, - FILE_URL_TYPE, - FTP_URL_TYPE, - NCFTP_URL_TYPE, - WAIS_URL_TYPE, - NEWS_URL_TYPE, - NNTP_URL_TYPE, - TELNET_URL_TYPE, - TN3270_URL_TYPE, - RLOGIN_URL_TYPE, - GOPHER_URL_TYPE, - HTML_GOPHER_URL_TYPE, - TELNET_GOPHER_URL_TYPE, - INDEX_GOPHER_URL_TYPE, - MAILTO_URL_TYPE, - BIBP_URL_TYPE, - FINGER_URL_TYPE, - CSO_URL_TYPE, - HTTPS_URL_TYPE, - SNEWS_URL_TYPE, - PROSPERO_URL_TYPE, - AFS_URL_TYPE, - - DATA_URL_TYPE, - - LYNXEXEC_URL_TYPE, - LYNXPROG_URL_TYPE, - LYNXCGI_URL_TYPE, - - NEWSPOST_URL_TYPE, - NEWSREPLY_URL_TYPE, - SNEWSPOST_URL_TYPE, - SNEWSREPLY_URL_TYPE, - - LYNXPRINT_URL_TYPE, - LYNXHIST_URL_TYPE, - LYNXDOWNLOAD_URL_TYPE, - LYNXKEYMAP_URL_TYPE, - LYNXIMGMAP_URL_TYPE, - LYNXCOOKIE_URL_TYPE, - LYNXDIRED_URL_TYPE, - LYNXOPTIONS_URL_TYPE, - LYNXCFG_URL_TYPE, - LYNXCOMPILE_OPTS_URL_TYPE, - LYNXMESSAGES_URL_TYPE, - - PROXY_URL_TYPE - -} UrlTypes; + typedef enum { + NOT_A_URL_TYPE = 0, + UNKNOWN_URL_TYPE = 1, /* must be nonzero */ + + HTTP_URL_TYPE, + FILE_URL_TYPE, + FTP_URL_TYPE, + NCFTP_URL_TYPE, + WAIS_URL_TYPE, + NEWS_URL_TYPE, + NNTP_URL_TYPE, + TELNET_URL_TYPE, + TN3270_URL_TYPE, + RLOGIN_URL_TYPE, + GOPHER_URL_TYPE, + HTML_GOPHER_URL_TYPE, + TELNET_GOPHER_URL_TYPE, + INDEX_GOPHER_URL_TYPE, + MAILTO_URL_TYPE, + BIBP_URL_TYPE, + FINGER_URL_TYPE, + CSO_URL_TYPE, + HTTPS_URL_TYPE, + SNEWS_URL_TYPE, + PROSPERO_URL_TYPE, + AFS_URL_TYPE, + + DATA_URL_TYPE, + + LYNXEXEC_URL_TYPE, + LYNXPROG_URL_TYPE, + LYNXCGI_URL_TYPE, + + NEWSPOST_URL_TYPE, + NEWSREPLY_URL_TYPE, + SNEWSPOST_URL_TYPE, + SNEWSREPLY_URL_TYPE, + + LYNXPRINT_URL_TYPE, + LYNXHIST_URL_TYPE, + LYNXDOWNLOAD_URL_TYPE, + LYNXKEYMAP_URL_TYPE, + LYNXIMGMAP_URL_TYPE, + LYNXCOOKIE_URL_TYPE, + LYNXDIRED_URL_TYPE, + LYNXOPTIONS_URL_TYPE, + LYNXCFG_URL_TYPE, + LYNXCOMPILE_OPTS_URL_TYPE, + LYNXMESSAGES_URL_TYPE, + + PROXY_URL_TYPE + + } UrlTypes; + + extern UrlTypes LYCheckForProxyURL(char *filename); + extern UrlTypes is_url(char *filename); /* common URLs */ #define STR_BIBP_URL "bibp:" @@ -472,19 +475,16 @@ typedef enum { /* * For change_sug_filename(). */ -extern HTList *sug_filenames; + extern HTList *sug_filenames; /* * syslog() facility */ #if defined(SYSLOG_REQUESTED_URLS) -#include <syslog.h> - -extern void LYOpenlog(const char *banner); -extern void LYSyslog(char *arg); -extern void LYCloselog(void); - -#endif /* SYSLOG_REQUESTED_URLS */ + extern void LYOpenlog(const char *banner); + extern void LYSyslog(char *arg); + extern void LYCloselog(void); +#endif /* SYSLOG_REQUESTED_URLS */ /* * Miscellaneous. @@ -511,4 +511,7 @@ extern void LYCloselog(void); #define BIN_W "wb" #define BIN_A "ab+" -#endif /* LYUTILS_H */ +#ifdef __cplusplus +} +#endif +#endif /* LYUTILS_H */ diff --git a/src/LYrcFile.c b/src/LYrcFile.c index 5cebd3bd..c2f90fb0 100644 --- a/src/LYrcFile.c +++ b/src/LYrcFile.c @@ -216,10 +216,10 @@ BOOL LYgetEnum(Config_Enum * table, char *name, #define MAYBE_FUN(n,v,w,h) {n, 0, CONF_FUN, UNION_FUN(v), 0, 0, w, h} #define MAYBE_MBM(n,h) {n, 0, CONF_MBM, UNION_DEF(0), 0, 0, 0, h} -#define PARSE_NIL {NULL, 1, 0, UNION_DEF(0), 0, 0, 0, 0} +#define PARSE_NIL {NULL, 1, CONF_NIL, UNION_DEF(0), 0, 0, 0, 0} typedef enum { - CONF_UNSPECIFIED = 0 + CONF_NIL = 0 ,CONF_ARRAY ,CONF_BOOL ,CONF_FUN @@ -750,7 +750,7 @@ void read_rc(FILE *fp) StrAllocCopy(*(q->str_value), value); break; - case CONF_UNSPECIFIED: + case CONF_NIL: break; } } @@ -936,7 +936,7 @@ It is not this file.\n\ : ""); break; - case CONF_UNSPECIFIED: + case CONF_NIL: break; } tbl++; diff --git a/src/TRSTable.c b/src/TRSTable.c index f25906c8..aedb56a7 100644 --- a/src/TRSTable.c +++ b/src/TRSTable.c @@ -451,9 +451,8 @@ static int Stbl_addCellToRow(STable_rowinfo *me, STable_cellinfo *colinfo, int n if (me->allocated == 0 && !me->cells) { cells = typecallocn(STable_cellinfo, growby); } else { - cells = realloc(me->cells, - (me->allocated + growby) - * sizeof(STable_cellinfo)); + cells = typeRealloc(STable_cellinfo, me->cells, + (me->allocated + growby)); for (i = 0; cells && i < growby; i++) { cells[me->allocated + i].alignment = HT_ALIGN_NONE; @@ -520,9 +519,8 @@ static int Stbl_reserveCellsInRow(STable_rowinfo *me, int icell, (tfp, "TRST:Stbl_reserveCellsInRow(icell=%d, colspan=%d\n", icell, colspan)); if (growby > 0) { - cells = realloc(me->cells, - (me->allocated + growby) - * sizeof(STable_cellinfo)); + cells = typeRealloc(STable_cellinfo, me->cells, + (me->allocated + growby)); if (cells) { for (i = 0; i < growby; i++) { @@ -980,9 +978,8 @@ static int Stbl_reserveCellsInTable(STable_info *me, int icell, growby = me->nrows + rowspan - 1 - me->allocated_rows; if (growby > 0) { - rows = realloc(me->rows, - (me->allocated_rows + growby) - * sizeof(STable_rowinfo)); + rows = typeRealloc(STable_rowinfo, me->rows, + (me->allocated_rows + growby)); if (!rows) return 0; /* ignore silently, no free memory, may be recoverable */ @@ -1079,9 +1076,8 @@ int Stbl_addRowToTable(STable_info *me, int alignment, if (me->allocated_rows == 0 && !me->rows) { rows = typecallocn(STable_rowinfo, growby); } else { - rows = realloc(me->rows, - (me->allocated_rows + growby) - * sizeof(STable_rowinfo)); + rows = typeRealloc(STable_rowinfo, me->rows, + (me->allocated_rows + growby)); for (i = 0; rows && i < growby; i++) { row = rows + me->allocated_rows + i; @@ -1334,9 +1330,8 @@ static int Stbl_fakeFinishCellInTable(STable_info *me, table lines, not displayed lines. We need to duplicate the reservation structure when we fake new logical lines. */ int prev_row_n = prev_row - me->rows; - STable_rowinfo *rows = realloc(me->rows, - (me->allocated_rows + 1) - * sizeof(STable_rowinfo)); + STable_rowinfo *rows = typeRealloc(STable_rowinfo, me->rows, + (me->allocated_rows + 1)); int need_cells = prev_reserved_last + 1; int n; @@ -1482,9 +1477,8 @@ int Stbl_addCellToTable(STable_info *me, int colspan, if (me->allocated_sumcols == 0 && !me->sumcols) { sumcols = typecallocn(STable_cellinfo, growby); } else { - sumcols = realloc(me->sumcols, - (me->allocated_sumcols + growby) - * sizeof(STable_cellinfo)); + sumcols = typeRealloc(STable_cellinfo, me->sumcols, + (me->allocated_sumcols + growby)); for (i = 0; sumcols && i < growby; i++) { sumcol = sumcols + me->allocated_sumcols + i; @@ -1675,9 +1669,8 @@ int Stbl_addColInfo(STable_info *me, int colspan, if (me->allocated_sumcols == 0) { sumcols = typecallocn(STable_cellinfo, growby); } else { - sumcols = realloc(me->sumcols, - (me->allocated_sumcols + growby) - * sizeof(STable_cellinfo)); + sumcols = typeRealloc(STable_cellinfo, me->sumcols, + (me->allocated_sumcols + growby)); for (i = 0; sumcols && i < growby; i++) { sumcol = sumcols + me->allocated_sumcols + i; diff --git a/src/TRSTable.h b/src/TRSTable.h index 10a95aaf..ef11cd54 100644 --- a/src/TRSTable.h +++ b/src/TRSTable.h @@ -3,18 +3,20 @@ #include <HTUtils.h> -/* TRST_MAXCOLSPAN and TRST_MAXCOLSPAN are defined in userdefs.h */ - -typedef struct _STable_info STable_info; -extern STable_info *Stbl_startTABLE(short); -extern int Stbl_finishTABLE(STable_info *); -extern void Stbl_free(STable_info *); -extern int Stbl_addRowToTable(STable_info *, int, int); -extern int Stbl_addCellToTable(STable_info *, int, int, int, int, int, int, int); -extern int Stbl_finishCellInTable(STable_info *, int, int, int, int); -extern int Stbl_addColInfo(STable_info *, int, short, BOOL); -extern int Stbl_finishColGroup(STable_info *); -extern int Stbl_addRowGroup(STable_info *, short); +#ifdef __cplusplus +extern "C" { +#endif +/* TRST_MAXCOLSPAN and TRST_MAXCOLSPAN are defined in userdefs.h */ typedef struct _STable_info STable_info; + extern STable_info *Stbl_startTABLE(short); + extern int Stbl_finishTABLE(STable_info *); + extern void Stbl_free(STable_info *); + extern int Stbl_addRowToTable(STable_info *, int, int); + extern int Stbl_addCellToTable(STable_info *, int, int, int, int, int, + int, int); + extern int Stbl_finishCellInTable(STable_info *, int, int, int, int); + extern int Stbl_addColInfo(STable_info *, int, short, BOOL); + extern int Stbl_finishColGroup(STable_info *); + extern int Stbl_addRowGroup(STable_info *, short); #define TRST_ENDCELL_ENDTD 1 #define TRST_ENDCELL_LINEBREAK 0 @@ -22,23 +24,26 @@ extern int Stbl_addRowGroup(STable_info *, short); #define TRST_FAKING_CELLS 2 #define Stbl_lineBreak(stbl,l,off,pos) Stbl_finishCellInTable(stbl, TRST_ENDCELL_LINEBREAK, l, off, pos) -extern int Stbl_getStartLine(STable_info *); -extern int Stbl_getFixupPositions(STable_info *me, int lineno, - int *oldpos, - int *newpos); -extern short Stbl_getAlignment(STable_info *); + extern int Stbl_getStartLine(STable_info *); + extern int Stbl_getFixupPositions(STable_info *me, int lineno, + int *oldpos, + int *newpos); + extern short Stbl_getAlignment(STable_info *); #ifdef EXP_NESTED_TABLES -extern void Stbl_update_enclosing(STable_info *me, int max_width, - int last_lineno); -struct _TextAnchor; -extern void Stbl_set_enclosing(STable_info *me, STable_info *encl, struct _TextAnchor *last_anchor); -extern STable_info *Stbl_get_enclosing(STable_info *me); -extern struct _TextAnchor *Stbl_get_last_anchor_before(STable_info *me); -extern int Stbl_getStartLineDeep(STable_info *); + extern void Stbl_update_enclosing(STable_info *me, int max_width, + int last_lineno); + struct _TextAnchor; + extern void Stbl_set_enclosing(STable_info *me, STable_info *encl, struct _TextAnchor *last_anchor); + extern STable_info *Stbl_get_enclosing(STable_info *me); + extern struct _TextAnchor *Stbl_get_last_anchor_before(STable_info *me); + extern int Stbl_getStartLineDeep(STable_info *); #else #define Stbl_getStartLineDeep(t) Stbl_getStartLine(t) #endif -#endif /* TRSTABLE_H */ +#ifdef __cplusplus +} +#endif +#endif /* TRSTABLE_H */ diff --git a/src/UCAuto.c b/src/UCAuto.c index 1558e997..0f71a000 100644 --- a/src/UCAuto.c +++ b/src/UCAuto.c @@ -225,11 +225,12 @@ void UCChangeTerminalCodepage(int newcs, LYCloseTempFP(fp1); LYCloseTempFP(fp2); if ((nlen = strlen(old_font)) + 1 < LY_MAXPATH && - (rp = realloc(old_font, nlen + 1))) - old_font = rp; + (rp = typeRealloc(char, old_font, nlen + 1))) + old_font = rp; + if ((nlen = strlen(old_umap)) + 1 < LY_MAXPATH && - (rp = realloc(old_umap, nlen + 1))) - old_umap = rp; + (rp = typeRealloc(char, old_umap, nlen + 1))) + old_umap = rp; } else { if (fp1) LYRemoveTemp(old_font); diff --git a/src/UCAuto.h b/src/UCAuto.h index d3646a84..98d2243f 100644 --- a/src/UCAuto.h +++ b/src/UCAuto.h @@ -3,6 +3,12 @@ #include <UCDefs.h> -extern void UCChangeTerminalCodepage(int newcs, LYUCcharset *p); +#ifdef __cplusplus +extern "C" { +#endif + extern void UCChangeTerminalCodepage(int newcs, LYUCcharset *p); -#endif /* UCAUTO_H */ +#ifdef __cplusplus +} +#endif +#endif /* UCAUTO_H */ diff --git a/src/UCdomap.h b/src/UCdomap.h index 51e4478e..1a2f00e8 100644 --- a/src/UCdomap.h +++ b/src/UCdomap.h @@ -11,6 +11,9 @@ #include <UCkd.h> +#ifdef __cplusplus +extern "C" { +#endif /* * [old comments: - KW ] * consolemap.h @@ -21,42 +24,40 @@ #define GRAF_MAP 1 #define IBMPC_MAP 2 #define USER_MAP 3 - /* * Some conventions I try to follow (loosely): * [a-z]* only internal, names from linux driver code. * UC_* to be only known internally. * UC[A-Z]* to be exported to other parts of Lynx. -KW - */ -extern void UC_Charset_Setup(const char *UC_MIMEcharset, - const char *UC_LYNXcharset, - const u8 * unicount, - const u16 * unitable, - int nnuni, - struct unimapdesc_str replacedesc, - int lowest_eight, - int UC_rawuni, - int codepage); - -struct UC_charset { - const char *MIMEname; - const char *LYNXname; - const u8 *unicount; - const u16 *unitable; - int num_uni; - struct unimapdesc_str replacedesc; - int uc_status; - int LYhndl; - int GN; - int lowest_eight; - int enc; - int codepage; /* codepage number, used by OS/2 font-switching code */ -}; - -extern int UCNumCharsets; -extern int UCInitialized; - -extern void UCInit(void); + */ extern void UC_Charset_Setup(const char *UC_MIMEcharset, + const char *UC_LYNXcharset, + const u8 * unicount, + const u16 * unitable, + int nnuni, + struct unimapdesc_str replacedesc, + int lowest_eight, + int UC_rawuni, + int codepage); + + struct UC_charset { + const char *MIMEname; + const char *LYNXname; + const u8 *unicount; + const u16 *unitable; + int num_uni; + struct unimapdesc_str replacedesc; + int uc_status; + int LYhndl; + int GN; + int lowest_eight; + int enc; + int codepage; /* codepage number, used by OS/2 font-switching code */ + }; + + extern int UCNumCharsets; + extern int UCInitialized; + + extern void UCInit(void); /* * INSTRUCTIONS for adding new character sets which do not have Unicode tables. @@ -69,12 +70,12 @@ extern void UCInit(void); * when changing ucmaketbl.c, see also UC_Charset_Setup() above for details. */ - /* - * There is no strict correlation for the next five, since the transfer - * charset gets decoded into Display Char Set by the CJK code (separate from - * Unicode mechanism). For now we use the MIME name that describes what is - * output to the terminal. - KW - */ + /* + * There is no strict correlation for the next five, since the transfer + * charset gets decoded into Display Char Set by the CJK code (separate from + * Unicode mechanism). For now we use the MIME name that describes what is + * output to the terminal. - KW + */ /*----------------------------------------------------------------------------*/ @@ -143,9 +144,9 @@ extern void UCInit(void); /*----------------------------------------------------------------------------*/ - /* - * Placeholder for non-translation mode. - FM - */ + /* + * Placeholder for non-translation mode. - FM + */ #ifndef NO_CHARSET_x_transparent #define NO_CHARSET_x_transparent !ALL_CHARSETS @@ -171,4 +172,7 @@ extern void UCInit(void); 0, 128,UCT_ENC_UTF8,-4) #endif -#endif /* UCDOMAP_H */ +#ifdef __cplusplus +} +#endif +#endif /* UCDOMAP_H */ diff --git a/src/chrtrans/caselower.h b/src/chrtrans/caselower.h index 4953162c..5894a3f2 100644 --- a/src/chrtrans/caselower.h +++ b/src/chrtrans/caselower.h @@ -24,9 +24,9 @@ default mappings listed in the Unicode Character Database. typedef struct { u16 upper; u16 lower; -} unipair; +} unipair_case; -static const unipair unicode_to_lower_case[] = +static const unipair_case unicode_to_lower_case[] = /* *INDENT-OFF* */ { {0x0041, 0x0061}, /* LATIN CAPITAL LETTER A */ diff --git a/src/chrtrans/makeuctb.c b/src/chrtrans/makeuctb.c index a2f0f5d6..e11cd1fe 100644 --- a/src/chrtrans/makeuctb.c +++ b/src/chrtrans/makeuctb.c @@ -807,7 +807,8 @@ static const u8 dfont_unicount%s[%d] = \n\ fprintf(chdr, "\nstatic const u16 dfont_unitable%s[%d] = \n{\n\t", id_append, nuni); } else { - fprintf(chdr, "\nstatic const u16 dfont_unitable%s[1]; /* dummy */\n", id_append); + fprintf(chdr, + "\nstatic const u16 dfont_unitable%s[1] = {0}; /* dummy */\n", id_append); } fp0 = 0; diff --git a/src/makefile.in b/src/makefile.in index 0d6ea42a..36a18ae3 100644 --- a/src/makefile.in +++ b/src/makefile.in @@ -120,6 +120,9 @@ clean: rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS cd chrtrans && $(MAKE) clean +tags: + ctags *.[ch] + distclean: clean CMN=$(top_srcdir)/WWW/Library/Implementation/ diff --git a/userdefs.h b/userdefs.h index 920e2e62..a7c10de4 100644 --- a/userdefs.h +++ b/userdefs.h @@ -1360,11 +1360,11 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8.6dev.9" +#define LYNX_VERSION "2.8.6dev.10" #define LYNX_WWW_HOME "http://lynx.isc.org/" #define LYNX_WWW_DIST "http://lynx.isc.org/current/" /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ -#define LYNX_DATE "Thu, 30 Dec 2004 04:11:59 -0800" +#define LYNX_DATE "Sun, 02 Jan 2005 15:35:21 -0800" #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ |