Commit 69e57267 authored by Axel Beckert's avatar Axel Beckert

Imported Upstream version 2.8.9dev2

parent 535881b5
-- $LynxId: CHANGES,v 1.746 2014/03/12 18:39:52 tom Exp $
-- $LynxId: CHANGES,v 1.766 2014/12/21 21:30:08 tom Exp $
===============================================================================
Changes since Lynx 2.8 release
===============================================================================
2014-12-21 (2.8.9dev.2)
* correct an inconsistent check for reload using isLYNXCGI() in the
options-screen -TD
* add script after using msginit to create en.po, to work around renaming in
Cygwin environment -TD
* improve overlay of field contents in form for "-dump" option; the change
in 2.8.8dev.3 did not take into account UTF-8 values (Debian #770011) -TD
* correct a bug in the map_string_to_keysym() function introduced in
2.8.8dev.17: as used via the remap() function, this returns the curses
code for a special key rather than Lynx's internal code (Debian #769601) -TD
* add checks when translating from UTF-8 to Unicode, to ensure that only the
shortest encoding is accepted. Other/longer encodings are mapped to the UCS
replacement character as in xterm (Debian #763268) -TD
* modify LYExpandHostForURL() to call HTGetAddrInfo(), allowing DNS lookups
for IPv6 to be interrupted, e.g., by typing ^G. This was a path overlooked
in 2.8.8dev.13 (reports by Chad Kline, etc.) -TD
* drop libgnutls-extra when using --with-gnutls-compat option -TD
* drop libgcrypt dependency when building with gnutls, using gnutls_rnd()
rather than gcry_randomize() (adapted from patch by Andreas Metzler,
Debian #753699) -TD
* fix a reference-after-free in scan_cookie_sublist(), probably fixing RedHat
#1120925 (patch by Mike Gorse).
* update eo.po, id.po from
http://translationproject.org/latest/lynx
* improve workaround for too-long pathnames in LYPrint.c SetupFilename() -TD
* fix a few inconsistencies between #if / #ifdef, including one for sleep()
which broke cross-compiles for MinGW -TD
* updated/improved configure script macros (TD):
+ CF_ACVERSION_CHECK: work around another gratuitous incompatibility
introduced in 2.69 (reported by Ross Burton, openembedded.org)
+ CF_ADD_CFLAGS: workaround for ash-shell
+ CF_ADD_LIBS: workaround in CF_X_TOOLKIT uses pkgconfig, whose files
generally are using incomplete dependencies - in turn introducing lots of
duplication. filter out the duplicates.
+ CF_CHECK_CFLAGS: workaround for ash-shell
+ CF_CURSES_FUNCS: improve workaround for weak-linkage, seems to fix tests
with NetBSD 6.1
+ CF_INTEL_COMPILER: cleanup the -no-gcc option which was leftover from
testing - prcs does not build with this option.
+ CF_MAKEFLAGS: workaround for GNU make 4.0 incompatibility with previous
releases.
+ CF_SUBDIR_PATH: add /usr/pkg and /opt/local to help configuring with
pkgsrc and macports -TD
+ CF_XOPEN_SOURCE: Minix3.2 ifdef's the POSIX.1-2001 functions inside
_NETBSD_SOURCE, even though it was released 2012-02-29 - appease it. At
the same time, turn on the verbose flag to show that most platforms need
platform-specific define's to get POSIX (sic). Also, add case for UnixWare
(report/discussion with Mark Ryan).
+ CF_X_ATHENA: add --with-Xaw3dxft option
+ CF_X_TOOLKIT: add workaround for breakage in XQuartz upgrades
* add check to ensure that "submit" command from 2.8.8dev.10 is performed
in a form (report by Karen Lewellen) -TD
* update config.guess (2014-03-23), config.sub (2014-07-28)
2014-03-12 (2.8.9dev.1)
2014-03-09 (2.8.8rel.2)
......@@ -187,7 +241,7 @@ Changes since Lynx 2.8 release
* protect redefined errno values for Windows port from redefinition warnings
when using MinGW build, since the WSAxxx values are what the configuration
actually uses -TD
* modify <address> tag to treat it like <p> when used within a list -TD
* modify <address> tag to treat it like <p> when used within a list -TD
* update fi.po from
http://translationproject.org/latest/lynx
* add on/off toggles to options menu for the color-style and default-colors
......@@ -636,7 +690,7 @@ Changes since Lynx 2.8 release
* promote some experimental options to normal, tidy up related EXP_xxx vs
USE_xxx symbols -TD
EXP_ASCII_CTYPES is now USE_ASCII_CTYPES
EXP_JUSTIFY_ELTS is now USE_JUSTIFY_ELTS
EXP_JUSTIFY_ELTS is now USE_JUSTIFY_ELTS
EXP_CHARSET_CHOICE is now USE_CHARSET_CHOICE
The scrollbar, progressbar, sessions and session-cache options are now
enabled by default.
......@@ -664,7 +718,7 @@ Changes since Lynx 2.8 release
* add <sys/types.h> include in socklen_t configure check (from OpenBSD CVS)
* eliminate UCPutUtf8ToBuffer() - redundant -TD
* use memset's to simplify some initialization in HTML.c, extending a change
made in 2.8.7dev.10 (prompted by issue in OpenBSD) -TD
made in 2.8.7dev.10 (prompted by issue in OpenBSD) -TD
* add optional support for IDNA using GNU libidn (Debian #352596) -TD
* ignore LEFT-TO-RIGHT-MARK (U+200E) in HTML files (Debian #408835) -TD
* correct check for return-value from gnutls_certificate_verify_peers2(), which
......
lynx-dev (2.8.9dev.1) unstable; urgency=low
lynx-dev (2.8.9dev.2) unstable; urgency=low
* maintenance updates
-- Thomas E. Dickey <dickey@invisible-island.net> Mon, 10 Mar 2014 17:44:33 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 16 Mar 2014 11:03:40 -0400
lynx-dev (2.8.8dev.16) unstable; urgency=high
......
; $LynxId: lynx.iss,v 1.12 2014/01/09 00:26:08 tom Exp $
; $LynxId: lynx.iss,v 1.13 2014/12/22 00:44:43 tom Exp $
; vile:ts=2 sw=2 notabinsert
;
; This is the BASE script for different flavors of the installer for Lynx.
......@@ -87,7 +87,7 @@ AppName={#MyAppName}
#define LYNX_TARGET0 StringChange(LYNX_VERSION,LYNX_RELEASE + "rel.",LYNX_RELEASE + ".00")
#define LYNX_TARGET1 StringChange(LYNX_TARGET0,LYNX_TARGETS + "dev.",LYNX_RELEASE + ".10")
#define LYNX_TARGET2 StringChange(LYNX_TARGET1,LYNX_TARGETS + "pre.",LYNX_RELEASE + ".20")
#emit 'VersionInfoVersion=' + LYNX_TARGET2
#emit 'VersionInfoVersion=' + LYNX_TARGET1
AppVerName={#MyAppVerName}
AppPublisher={#MyAppPublisher}
AppCopyright= 1997-2013,2014, Thomas E. Dickey
......@@ -139,8 +139,8 @@ Name: "{app}\tmp"
#emit 'Source: "' + DllsSrcDir + '\' + BzipExeName + '"; DestDir: "{app}"; DestName: ' + BzipExeName + '; Flags: ignoreversion'
#emit 'Source: "' + DllsSrcDir + '\' + GzipExeName + '"; DestDir: "{app}"; DestName: ' + GzipExeName + '; Flags: ignoreversion'
#emit 'Source: "' + DocsSrcDir + '\*.*"; DestDir: "{app}\doc"; Flags: '
#emit 'Source: "' + DocsSrcDir + '\samples\*.*"; DestDir: "{app}\doc\samples"; Flags: '
#emit 'Source: "' + DocsSrcDir + '\test\*.*"; DestDir: "{app}\doc\test"; Flags: '
#emit 'Source: "' + DocsSrcDir + '\..\samples\*.*"; DestDir: "{app}\doc\samples"; Flags: '
#emit 'Source: "' + DocsSrcDir + '\..\test\*.*"; DestDir: "{app}\doc\test"; Flags: '
#emit 'Source: "' + HelpSrcDir + '\*.*"; DestDir: "{app}\help"; Flags: '
#emit 'Source: "' + HelpSrcDir + '\keystrokes\*.*"; DestDir: "{app}\help\keystrokes"; Flags: '
......
; $LynxId: lynx.nsi,v 1.18 2014/03/10 21:44:33 tom Exp $
; $LynxId: lynx.nsi,v 1.19 2014/03/16 15:03:40 tom Exp $
; Script originally generated with the Venis Install Wizard, but customized.
; The Inno Setup script is preferred; but this can be built via cross-compiling.
......@@ -9,8 +9,8 @@
!define VERSION_EPOCH "2"
!define VERSION_MAJOR "8"
!define VERSION_MINOR "9"
!define VERSION_LEVEL "1001"
!define VERSION_PATCH "dev.1"
!define VERSION_LEVEL "1002"
!define VERSION_PATCH "dev.2"
!define SUBKEY "Lynx"
......
# $LynxId: lynx.spec,v 1.26 2014/03/10 21:44:33 tom Exp $
# $LynxId: lynx.spec,v 1.27 2014/03/16 15:03:40 tom Exp $
Summary: A text-based Web browser
Name: lynx
Version: 2.8.9
Release: dev.1
Release: dev.2
License: GPLv2
Group: Applications/Internet
Source: lynx%{version}%{release}.tgz
......
; version used for Inno Setup files.
; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
#define LYNX_VERSION "2.8.9dev.1"
#define LYNX_VERSION "2.8.9dev.2"
; most-recent full release and target
#define LYNX_RELEASE "2.8.8"
#define LYNX_TARGETS "2.8.8"
#define LYNX_RELEASE "2.8.9"
#define LYNX_TARGETS "2.8.9"
#define MyAppName "Lynx - web browser"
#define MyAppPublisher "Thomas E Dickey"
......
/*
* $LynxId: HTFTP.c,v 1.125 2013/11/28 11:11:05 tom Exp $
* $LynxId: HTFTP.c,v 1.126 2014/07/24 22:08:24 tom Exp $
*
* File Transfer Protocol (FTP) Client
* for a WorldWideWeb browser
......@@ -159,7 +159,7 @@ typedef struct _connection {
tag, \
entry_info->filename, \
NonNull(entry_info->date), \
entry_info->size))
CAST_off_t(entry_info->size)))
struct _HTStructured {
const HTStructuredClass *isa;
......@@ -2717,7 +2717,7 @@ static char *FormatSize(char **bufp,
HTSprintf(bufp, fmt, value);
} else {
sprintf(fmt, "%" PRI_off_t, value);
sprintf(fmt, "%" PRI_off_t, CAST_off_t (value));
StrAllocCat(*bufp, fmt);
}
......
/*
* $LynxId: HTFile.c,v 1.142 2014/02/13 18:30:01 tom Exp $
* $LynxId: HTFile.c,v 1.144 2014/12/08 01:38:05 tom Exp $
*
* File Access HTFile.c
* ===========
......@@ -212,7 +212,7 @@ static char *FormatSize(char **bufp,
HTSprintf0(bufp, fmt, entry);
} else {
sprintf(fmt, "%" PRI_off_t, entry);
sprintf(fmt, "%" PRI_off_t, CAST_off_t (entry));
StrAllocCopy(*bufp, fmt);
}
......@@ -905,7 +905,7 @@ HTFormat HTFileFormat(const char *filename,
HTFormat result;
StrAllocCopy(newname, filename);
*(FindSearch(newname)) = '\0';
newname[((const char *) search) - filename] = '\0';
result = HTFileFormat(newname, pencoding, pdesc);
free(newname);
return result;
......
/*
* $LynxId: HTFormat.c,v 1.82 2013/11/28 11:12:32 tom Exp $
* $LynxId: HTFormat.c,v 1.83 2014/07/24 22:08:24 tom Exp $
*
* Manage different file formats HTFormat.c
* =============================
......@@ -884,7 +884,7 @@ int HTCopy(HTParentAnchor *anchor,
if (anchor != 0) {
CTRACE((tfp, "HTCopy copied %"
PRI_off_t " actual, %"
PRI_off_t " limit\n", bytes, limit));
PRI_off_t " limit\n", CAST_off_t (bytes), CAST_off_t (limit)));
anchor->actual_length = bytes;
}
......
/*
* $LynxId: HTMIME.c,v 1.88 2013/11/28 11:12:52 tom Exp $
* $LynxId: HTMIME.c,v 1.89 2014/07/24 22:08:24 tom Exp $
*
* MIME Message Parse HTMIME.c
* ==================
......@@ -580,8 +580,8 @@ static int pumpData(HTStream *me)
CTRACE((tfp, "...end of pumpData, copied %"
PRI_off_t " vs %"
PRI_off_t "\n",
me->anchor->actual_length,
me->anchor->content_length));
CAST_off_t (me->anchor->actual_length),
CAST_off_t (me->anchor->content_length)));
me->anchor->actual_length = 0;
return HT_OK;
}
......@@ -800,7 +800,7 @@ static int dispatchField(HTStream *me)
if (me->anchor->content_length < 0)
me->anchor->content_length = 0;
CTRACE((tfp, " Converted to integer: '%" PRI_off_t "'\n",
me->anchor->content_length));
CAST_off_t (me->anchor->content_length)));
break;
case miCONTENT_LOCATION:
HTMIME_TrimDoubleQuotes(me->value);
......
/*
* $LynxId: HTPlain.c,v 1.51 2013/05/02 11:09:30 tom Exp $
* $LynxId: HTPlain.c,v 1.59 2014/12/08 01:11:15 tom Exp $
*
* Plain text object HTWrite.c
* =================
......@@ -55,16 +55,8 @@ struct _HTStream {
*/
LYUCcharset *outUCI;
int outUCLYhndl;
/*
* Counter, value, buffer and pointer for UTF-8 handling. - FM
*/
char utf_count;
UCode_t utf_char;
char utf_buf[8];
char *utf_buf_p;
/*
* The charset transformation structure. - FM
*/
UTFDecodeState U;
UCTransParams T;
};
......@@ -193,11 +185,11 @@ static void HTPlain_write(HTStream *me, const char *s, int l)
{
const char *p;
const char *e = s + l;
char c;
int c;
unsigned c_unsign;
BOOL chk;
UCode_t code, uck = -1;
char saved_char_in = '\0';
int saved_char_in = '\0';
for (p = s; p < e; p++) {
#ifdef REMOVE_CR_ONLY
......@@ -227,12 +219,6 @@ static void HTPlain_write(HTStream *me, const char *s, int l)
HTPlain_bs_pending = 2;
HTPlain_lastraw = UCH(*p);
continue;
#if 0
} else if (HTPlain_bs_pending != 2) {
HTPlain_bs_pending--; /* 1 -> 0, 3 -> 2 */
HTPlain_lastraw = UCH(*p);
continue;
#endif
}
}
......@@ -288,91 +274,23 @@ static void HTPlain_write(HTStream *me, const char *s, int l)
saved_char_in = '\0';
/*
* Combine any UTF-8 multibytes into Unicode to check for special
* characters. - FM
* characters. - FM, TD
*/
if (me->T.decode_utf8) {
/*
* Combine UTF-8 into Unicode. Incomplete characters silently
* ignored. from Linux kernel's console.c - KW
*/
if (TOASCII(c_unsign) > 127) { /* S/390 -- gil -- 0371 */
/*
* We have an octet from a multibyte character. - FM
*/
if (me->utf_count > 0 && (c & 0xc0) == 0x80) {
/*
* Adjust the UCode_t value, add the octet to the buffer,
* and decrement the byte count. - FM
*/
me->utf_char = (me->utf_char << 6) | (c & 0x3f);
me->utf_count--;
*(me->utf_buf_p) = c;
(me->utf_buf_p)++;
if (me->utf_count == 0) {
/*
* Got a complete multibyte character.
*/
*(me->utf_buf_p) = '\0';
code = me->utf_char;
if (code > 0 && code < 256) {
c = FROMASCII((char) code);
c_unsign = UCH(c);
}
} else {
/*
* Get the next byte. - FM
*/
continue;
}
} else {
/*
* Start handling a new multibyte character. - FM
*/
me->utf_buf_p[0] = c;
me->utf_buf_p = &me->utf_buf[1];
if ((*p & 0xe0) == 0xc0) {
me->utf_count = 1;
me->utf_char = (c & 0x1f);
} else if ((*p & 0xf0) == 0xe0) {
me->utf_count = 2;
me->utf_char = (c & 0x0f);
} else if ((*p & 0xf8) == 0xf0) {
me->utf_count = 3;
me->utf_char = (c & 0x07);
} else if ((*p & 0xfc) == 0xf8) {
me->utf_count = 4;
me->utf_char = (c & 0x03);
} else if ((*p & 0xfe) == 0xfc) {
me->utf_count = 5;
me->utf_char = (c & 0x01);
} else {
/*
* We got garbage, so ignore it. - FM
*/
me->utf_count = 0;
me->utf_buf_p[0] = '\0';
me->utf_buf_p = me->utf_buf;
}
/*
* Get the next byte. - FM
*/
continue;
switch (HTDecodeUTF8(&(me->U), &c, &code)) {
case dUTF8_ok:
if (code < 256) {
c = FROMASCII((char) code);
c_unsign = UCH(c);
}
} else if (me->utf_count > 0) {
/*
* Got an ASCII character when expecting UTF-8 multibytes, so
* ignore the buffered multibye characters and fall through
* with the current ASCII character. - FM
*/
me->utf_count = 0;
me->utf_buf[0] = '\0';
me->utf_buf_p = me->utf_buf;
code = (UCode_t) c_unsign;
} else {
/*
* Got a valid ASCII character, so fall through with it. - FM
*/
code = (UCode_t) c_unsign;
break;
case dUTF8_err:
code = UCS_REPL;
strcpy(me->U.utf_buf, "\357\277\275");
me->U.utf_buf_p = (me->U.utf_buf + 3);
break;
case dUTF8_more:
continue;
}
}
/*
......@@ -381,10 +299,6 @@ static void HTPlain_write(HTStream *me, const char *s, int l)
*/
if (!(me->T.decode_utf8 &&
UCH(*p) > 127)) {
#ifdef NOTDEFINED
if (me->T.strip_raw_char_in)
saved_char_in = c;
#endif /* NOTDEFINED */
if (me->T.trans_to_uni &&
(TOASCII(code) >= LYlowest_eightbit[me->inUCLYhndl] || /* S/390 -- gil -- 0389 */
(code < ' ' && code != 0 &&
......@@ -430,7 +344,7 @@ static void HTPlain_write(HTStream *me, const char *s, int l)
if (uck == 0) {
continue;
} else if (uck < 0) {
me->utf_buf[0] = '\0';
me->U.utf_buf[0] = '\0';
} else {
c = replace_buf[0];
if (c && replace_buf[1]) {
......@@ -438,11 +352,11 @@ static void HTPlain_write(HTStream *me, const char *s, int l)
continue;
}
}
me->utf_buf[0] = '\0';
me->U.utf_buf[0] = '\0';
code = UCH(c);
} /* Next line end of ugly stuff for C0. - KW */
} else {
me->utf_buf[0] = '\0';
me->U.utf_buf[0] = '\0';
code = UCH(c);
}
}
......@@ -498,7 +412,7 @@ static void HTPlain_write(HTStream *me, const char *s, int l)
/*
* If we get to here, pass the displayable ASCII characters. - FM
*/
} else if ((code >= ' ' && TOASCII(code) < 127) ||
} else if ((code >= ' ' && code != UCS_REPL && TOASCII(code) < 127) ||
(PASSHI8BIT &&
c >= LYlowest_eightbit[me->outUCLYhndl]) ||
*p == '\n' || *p == '\t') {
......@@ -545,10 +459,10 @@ static void HTPlain_write(HTStream *me, const char *s, int l)
/*
* We want UTF-8 output, so do it now. - FM
*/
if (*me->utf_buf) {
HText_appendText(me->text, me->utf_buf);
me->utf_buf[0] = '\0';
me->utf_buf_p = me->utf_buf;
if (*me->U.utf_buf) {
HText_appendText(me->text, me->U.utf_buf);
me->U.utf_buf[0] = '\0';
me->U.utf_buf_p = me->U.utf_buf;
} else if (UCConvertUniToUtf8(code, replace_buf)) {
HText_appendText(me->text, replace_buf);
} else {
......@@ -559,15 +473,6 @@ static void HTPlain_write(HTStream *me, const char *s, int l)
sprintf(replace_buf, "U%.2lX", (unsigned long) TOASCII(code));
HText_appendText(me->text, replace_buf);
}
#ifdef NOTDEFINED
} else if (me->T.strip_raw_char_in &&
UCH(*p) >= 192 &&
UCH(*p) < 255) {
/*
* KOI special: strip high bit, gives (somewhat) readable ASCII.
*/
HText_appendCharacter(me->text, (char) (*p & 0x7f));
#endif /* NOTDEFINED */
/*
* If we don't actually want the character, make it safe and output
* that now. - FM
......@@ -678,10 +583,10 @@ HTStream *HTPlainPresent(HTPresentation *pres GCC_UNUSED, HTParentAnchor *anchor
HTPlain_lastraw = -1;
me->utf_count = 0;
me->utf_char = 0;
me->utf_buf[0] = me->utf_buf[6] = me->utf_buf[7] = '\0';
me->utf_buf_p = me->utf_buf;
me->U.utf_count = 0;
me->U.utf_char = 0;
me->U.utf_buf[0] = me->U.utf_buf[6] = me->U.utf_buf[7] = '\0';
me->U.utf_buf_p = me->U.utf_buf;
me->outUCLYhndl = HTAnchor_getUCLYhndl(anchor, UCT_STAGE_HTEXT);
me->inUCLYhndl = HTAnchor_getUCLYhndl(anchor, UCT_STAGE_PARSER);
HTPlain_getChartransInfo(me, anchor);
......
This diff is collapsed.
/* /Net/dxcern/userd/timbl/hypertext/WWW/Library/src/HTTCP.html
GENERIC TCP/IP COMMUNICATION
This module has the common code for handling TCP/IP connections etc.
/*
* $LynxId: HTTCP.h,v 1.24 2014/12/03 00:27:57 tom Exp $
*
* /Net/dxcern/userd/timbl/hypertext/WWW/Library/src/HTTCP.html
* GENERIC TCP/IP COMMUNICATION
*
* This module has the common code for handling TCP/IP connections etc.
*/
#ifndef HTTCP_H
#define HTTCP_H
......@@ -86,7 +88,18 @@ extern "C" {
*/
extern int lynx_nsl_status;
extern struct hostent *LYGetHostByName(char *str);
#ifndef LYNX_HOSTENT
#define LYNX_HOSTENT void
#endif
extern LYNX_HOSTENT *LYGetHostByName(char *host);
#ifdef INET6
#ifndef LYNX_ADDRINFO
#define LYNX_ADDRINFO void
#endif
extern LYNX_ADDRINFO *HTGetAddrInfo(const char *str, const int defport);
#endif
/* Get Name of This Machine
* ------------------------
......
/*
* $LynxId: HTTP.c,v 1.135 2014/01/11 16:52:29 tom Exp $
* $LynxId: HTTP.c,v 1.136 2014/11/30 22:51:30 tom Exp $
*
* HyperText Tranfer Protocol - Client implementation HTTP.c
* ==========================
......@@ -119,7 +119,11 @@ SSL *HTGetSSLHandle(void)
#else
SSLeay_add_ssl_algorithms();
ssl_ctx = SSL_CTX_new(SSLv23_client_method());
#ifdef SSL_OP_NO_SSLv2
SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2);
#else
SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL);
#endif
#ifdef SSL_OP_NO_COMPRESSION
SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_COMPRESSION);
#endif
......
This source diff could not be displayed because it is too large. You can view the blob instead.
/*
* $LynxId: UCAux.h,v 1.18 2010/11/07 21:20:59 tom Exp $
* $LynxId: UCAux.h,v 1.22 2014/12/10 09:48:41 tom Exp $
*/
#ifndef UCAUX_H
#define UCAUX_H
......@@ -46,6 +46,21 @@ extern "C" {
};
typedef struct _UCTransParams UCTransParams;
typedef struct {
char utf_count;
UCode_t utf_char;
char utf_buf[8];
char *utf_buf_p;
} UTFDecodeState;
typedef enum {
dUTF8_ok,
dUTF8_err,
dUTF8_more
} dUTF8;
extern dUTF8 HTDecodeUTF8(UTFDecodeState * me, int *c_in_out, UCode_t *result);
extern void UCSetTransParams(UCTransParams * pT, int cs_in,
const LYUCcharset *p_in,
int cs_out,
......@@ -69,7 +84,7 @@ extern "C" {
extern BOOL UCConvertUniToUtf8(UCode_t code,
char *buffer);
extern UCode_t UCGetUniFromUtf8String(char **ppuni);
extern UCode_t UCGetUniFromUtf8String(const char **ppuni);
#ifdef __cplusplus
}
......
/*
* $LynxId: UCMap.h,v 1.27 2011/12/01 02:00:57 tom Exp $
* $LynxId: UCMap.h,v 1.28 2014/12/07 14:40:40 tom Exp $
*/
#ifndef UCMAP_H
#define UCMAP_H
......@@ -11,6 +11,10 @@
#ifdef __cplusplus
extern "C" {
#endif
#define UCS_HIDE 0xffff
#define UCS_REPL 0xfffd
typedef enum {
ucError = -1,
ucZeroWidth = -2,
......
This diff is collapsed.
......@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2014 Free Software Foundation, Inc.
timestamp='2014-01-01'
timestamp='2014-03-23'
# 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
......@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
LIBC=gnu
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
;;
esac
......@@ -826,7 +826,7 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:MSYS*:*)
*:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
......@@ -969,10 +969,10 @@ EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
or1k:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
openrisc*:Linux:*:*)
echo or1k-unknown-linux-${LIBC}
exit ;;
or32:Linux:*:*)
or32:Linux:*:* | or1k*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
......@@ -1371,154 +1371,6 @@ EOF
exit ;;
esac
eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
# include <sys/utsname.h>
#endif
main ()
{
#if defined (sony)
#if defined (MIPSEB)
/* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
I don't know.... */
printf ("mips-sony-bsd\n"); exit (0);
#else
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
"4"
#else
""
#endif
); exit (0);
#endif
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
printf ("arm-acorn-riscix\n"); exit (0);
#endif
#if defined (hp300) && !defined (hpux)
printf ("m68k-hp-bsd\n"); exit (0);
#endif
#if defined (NeXT)
#if !defined (__ARCHITECTURE__)
#define __ARCHITECTURE__ "m68k"
#endif
int version;
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
if (version < 4)
printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
else
printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
exit (0);
#endif
#if defined (MULTIMAX) || defined (n16)
#if defined (UMAXV)
printf ("ns32k-encore-sysv\n"); exit (0);
#else
#if defined (CMU)
printf ("ns32k-encore-mach\n"); exit (0);
#else
printf ("ns32k-encore-bsd\n"); exit (0);
#endif
#endif
#endif
#if defined (__386BSD__)
printf ("i386-pc-bsd\n"); exit (0);
#endif
#if defined (sequent)
#if defined (i386)
printf ("i386-sequent-dynix\n"); exit (0);
#endif
#if defined (ns32000)
printf ("ns32k-sequent-dynix\n"); exit (0);
#endif
#endif
#if defined (_SEQUENT_)
struct utsname un;