diff options
author | Thomas E. Dickey <dickey@invisible-island.net> | 1998-04-18 20:30:00 -0400 |
---|---|---|
committer | Thomas E. Dickey <dickey@invisible-island.net> | 1998-04-18 20:30:00 -0400 |
commit | 84271e583d80f546251ea914a33f8c537fddbac7 (patch) | |
tree | c819869cda13abc7b46a47aa7e860f2dbf0c7626 /WWW | |
parent | af9be28bc2701ea448898282942bd5b957439f18 (diff) | |
download | lynx-snapshots-84271e583d80f546251ea914a33f8c537fddbac7.tar.gz |
snapshot of project "lynx", label v2-8-1dev_6
Diffstat (limited to 'WWW')
-rw-r--r-- | WWW/Library/Implementation/HTAABrow.c | 4 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTTCP.c | 17 | ||||
-rw-r--r-- | WWW/Library/Implementation/SGML.c | 78 | ||||
-rw-r--r-- | WWW/Library/djgpp/makefile | 1 |
4 files changed, 76 insertions, 24 deletions
diff --git a/WWW/Library/Implementation/HTAABrow.c b/WWW/Library/Implementation/HTAABrow.c index 4082d96a..38c6ca50 100644 --- a/WWW/Library/Implementation/HTAABrow.c +++ b/WWW/Library/Implementation/HTAABrow.c @@ -603,7 +603,7 @@ PRIVATE char *compose_auth_string ARGS3( realm = HTAARealm_lookup(setup->server->realms, realmname); if (!(realm && realm->username && *realm->username && - realm->password && *realm->password) || setup->retry) { + realm->password) || setup->retry) { if (!realm) { if (TRACE) fprintf(stderr, "%s `%s' %s\n", @@ -675,7 +675,7 @@ PRIVATE char *compose_auth_string ARGS3( * Signals to retry. - FM */ return NULL; - } else if (*realm->username == '\0' || *realm->password == '\0') { + } else if (*realm->username == '\0') { /* * Signals to abort. - FM */ diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c index daf37411..9749e530 100644 --- a/WWW/Library/Implementation/HTTCP.c +++ b/WWW/Library/Implementation/HTTCP.c @@ -30,6 +30,8 @@ #define FREE(x) if (x) {free(x); x = NULL;} +#define OK_HOST(p) ((p) != 0 && (p->h_length) != 0) + extern int HTCheckForInterrupt NOPARAMS; #ifdef SVR4_BSDSELECT @@ -456,14 +458,13 @@ PUBLIC int HTParseInet ARGS2( /* ** Return value (or nulls). */ - if (phost != NULL) + if (OK_HOST(phost)) { write(pfd[1], phost->h_addr, phost->h_length); - else + _exit(0); + } else { write(pfd[1], &cst1, 4); - /* - ** Return an error code. - */ - _exit(phost == NULL); + _exit(1); /* return an error code */ + } } /* @@ -541,7 +542,7 @@ PUBLIC int HTParseInet ARGS2( " Trying again without forking.\n"); } phost = gethostbyname(host); /* See netdb.h */ - if (!phost) { + if (!OK_HOST(phost)) { if (TRACE) { fprintf(stderr, "HTParseInet: Can't find internet node name `%s'.\n", @@ -727,7 +728,7 @@ PRIVATE void get_host_details NOARGS #ifndef DECNET /* Decnet ain't got no damn name server 8#OO */ #ifdef NEED_HOST_ADDRESS /* no -- needs name server! */ phost = gethostbyname(name); /* See netdb.h */ - if (!phost) { + if (!OK_HOST(phost)) { if (TRACE) fprintf(stderr, "TCP: Can't find my own internet node address for `%s'!!\n", name); diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c index 91c1b00d..90210c13 100644 --- a/WWW/Library/Implementation/SGML.c +++ b/WWW/Library/Implementation/SGML.c @@ -3296,19 +3296,69 @@ PUBLIC void JISx0201TO0208_EUC ARGS4( register unsigned char *, OLO) { static char *table[] = { - "\xA1\xA3", "\xA1\xD6", "\xA1\xD7", "\xA1\xA2", "\xA1\xA6", "\xA5\xF2", - "\xA5\xA1", "\xA5\xA3", "\xA5\xA5", "\xA5\xA7", "\xA5\xA9", - "\xA5\xE3", "\xA5\xE5", "\xA5\xE7", "\xA5\xC3", "\xA1\xBC", - "\xA5\xA2", "\xA5\xA4", "\xA5\xA6", "\xA5\xA8", "\xA5\xAA", - "\xA5\xAB", "\xA5\xAD", "\xA5\xAF", "\xA5\xB1", "\xA5\xB3", - "\xA5\xB5", "\xA5\xB7", "\xA5\xB9", "\xA5\xBB", "\xA5\xBD", - "\xA5\xBF", "\xA5\xC1", "\xA5\xC4", "\xA5\xC6", "\xA5\xC8", - "\xA5\xCA", "\xA5\xCB", "\xA5\xCC", "\xA5\xCD", "\xA5\xCE", - "\xA5\xCF", "\xA5\xD2", "\xA5\xD5", "\xA5\xD8", "\xA5\xDB", - "\xA5\xDE", "\xA5\xDF", "\xA5\xE0", "\xA5\xE1", "\xA5\xE2", - "\xA5\xE4", "\xA5\xE6", "\xA5\xE8", "\xA5\xE9", "\xA5\xEA", - "\xA5\xEB", "\xA5\xEC", "\xA5\xED", "\xA5\xEF", "\xA5\xF3", - "\xA1\xAB", "\xA1\xAC" + "\241\243", /* A1,A3 */ + "\241\326", /* A1,D6 */ + "\241\327", /* A1,D7 */ + "\241\242", /* A1,A2 */ + "\241\246", /* A1,A6 */ + "\245\362", /* A5,F2 */ + "\245\241", /* A5,A1 */ + "\245\243", /* A5,A3 */ + "\245\245", /* A5,A5 */ + "\245\247", /* A5,A7 */ + "\245\251", /* A5,A9 */ + "\245\343", /* A5,E3 */ + "\245\345", /* A5,E5 */ + "\245\347", /* A5,E7 */ + "\245\303", /* A5,C3 */ + "\241\274", /* A1,BC */ + "\245\242", /* A5,A2 */ + "\245\244", /* A5,A4 */ + "\245\246", /* A5,A6 */ + "\245\250", /* A5,A8 */ + "\245\252", /* A5,AA */ + "\245\253", /* A5,AB */ + "\245\255", /* A5,AD */ + "\245\257", /* A5,AF */ + "\245\261", /* A5,B1 */ + "\245\263", /* A5,B3 */ + "\245\265", /* A5,B5 */ + "\245\267", /* A5,B7 */ + "\245\271", /* A5,B9 */ + "\245\273", /* A5,BB */ + "\245\275", /* A5,BD */ + "\245\277", /* A5,BF */ + "\245\301", /* A5,C1 */ + "\245\304", /* A5,C4 */ + "\245\306", /* A5,C6 */ + "\245\310", /* A5,C8 */ + "\245\312", /* A5,CA */ + "\245\313", /* A5,CB */ + "\245\314", /* A5,CC */ + "\245\315", /* A5,CD */ + "\245\316", /* A5,CE */ + "\245\317", /* A5,CF */ + "\245\322", /* A5,D2 */ + "\245\325", /* A5,D5 */ + "\245\330", /* A5,D8 */ + "\245\333", /* A5,DB */ + "\245\336", /* A5,DE */ + "\245\337", /* A5,DF */ + "\245\340", /* A5,E0 */ + "\245\341", /* A5,E1 */ + "\245\342", /* A5,E2 */ + "\245\344", /* A5,E4 */ + "\245\346", /* A5,E6 */ + "\245\350", /* A5,E8 */ + "\245\351", /* A5,E9 */ + "\245\352", /* A5,EA */ + "\245\353", /* A5,EB */ + "\245\354", /* A5,EC */ + "\245\355", /* A5,ED */ + "\245\357", /* A5,EF */ + "\245\363", /* A5,F3 */ + "\241\253", /* A1,AB */ + "\241\254" /* A1,AC */ }; if ((IHI == 0x8E) && (ILO >= 0xA1) && (ILO <= 0xDF)) { @@ -3377,7 +3427,7 @@ PUBLIC void JISx0201TO0208_SJIS ARGS3( { unsigned char SJCODE[2]; - JISx0201TO0208_EUC('\x8E', I, OHI, OLO); + JISx0201TO0208_EUC('\216', I, OHI, OLO); JIS_TO_SJIS1(*OHI&0x7F, *OLO&0x7F, SJCODE); *OHI = SJCODE[0]; *OLO = SJCODE[1]; diff --git a/WWW/Library/djgpp/makefile b/WWW/Library/djgpp/makefile index 87a9a103..5e1783e6 100644 --- a/WWW/Library/djgpp/makefile +++ b/WWW/Library/djgpp/makefile @@ -8,6 +8,7 @@ WWW_MACH = djgpp #ASIS_MACH = hardware/os CFLAGS = -O3 -DUSE_ZLIB -DDOSPATH -DNOUSERS -DDEBUG \ +-I../implemen \ -I../../../djgpp/tcplib/include \ -I../../../djgpp/tcplib/include/tcp \ -I../../../src \ |