Remove experimental Unicode support.
This reverts commit 7f0f43e6f9 and some related
subsequent commits.
This compiles, but I have not done extensive testing.
Conflicts:
include/config.h
include/decl.h
include/extern.h
include/global.h
include/tradstdc.h
include/wintty.h
src/drawing.c
src/files.c
src/hacklib.c
src/mapglyph.c
src/options.c
sys/winnt/nttty.c
win/tty/getline.c
win/tty/topl.c
win/tty/wintty.c
This commit is contained in:
188
src/hacklib.c
188
src/hacklib.c
@@ -768,192 +768,4 @@ midnight()
|
||||
return(getlt()->tm_hour == 0);
|
||||
}
|
||||
|
||||
#ifdef UNICODE_WIDEWINPORT
|
||||
nhwchar *
|
||||
nhwstrncpy(dest, strSource, cnt)
|
||||
nhwchar *dest;
|
||||
const char *strSource;
|
||||
size_t cnt;
|
||||
{
|
||||
nhwchar *d = dest;
|
||||
const char *s = strSource;
|
||||
size_t dcnt = 0;
|
||||
|
||||
while(*s && dcnt < cnt) {
|
||||
*d++ = (nhwchar)*s++;
|
||||
dcnt++;
|
||||
}
|
||||
if (dcnt < cnt) *d = 0;
|
||||
return dest;
|
||||
}
|
||||
|
||||
nhwchar *
|
||||
nhwncpy(dest, src, cnt)
|
||||
nhwchar *dest;
|
||||
const nhwchar *src;
|
||||
size_t cnt;
|
||||
{
|
||||
nhwchar *d = dest;
|
||||
const nhwchar *s = src;
|
||||
size_t dcnt = 0;
|
||||
|
||||
while(*s && dcnt < cnt) {
|
||||
*d++ = *s++;
|
||||
dcnt++;
|
||||
}
|
||||
if (dcnt < cnt) *d = 0;
|
||||
return dest;
|
||||
}
|
||||
|
||||
nhwchar *
|
||||
nhwcpy(dest, src)
|
||||
nhwchar *dest;
|
||||
const nhwchar *src;
|
||||
{
|
||||
nhwchar *d = dest;
|
||||
const nhwchar *s = src;
|
||||
|
||||
while(*s) {
|
||||
*d++ = *s++;
|
||||
}
|
||||
*d = 0;
|
||||
return dest;
|
||||
}
|
||||
|
||||
nhwchar *
|
||||
nhwstrcpy(dest, strSource)
|
||||
nhwchar *dest;
|
||||
const char *strSource;
|
||||
{
|
||||
nhwchar *d = dest;
|
||||
const char *s = strSource;
|
||||
|
||||
while(*s) {
|
||||
*d++ = *s++;
|
||||
}
|
||||
*d = 0;
|
||||
return dest;
|
||||
}
|
||||
|
||||
char *
|
||||
strnhwcpy(strDest, src)
|
||||
char *strDest;
|
||||
const nhwchar *src;
|
||||
{
|
||||
char *d = strDest;
|
||||
const nhwchar *s = src;
|
||||
|
||||
while(*s) {
|
||||
*d++ = (char)*s++;
|
||||
}
|
||||
*d = 0;
|
||||
return strDest;
|
||||
}
|
||||
|
||||
nhwchar *
|
||||
nhwstrcat(dest, strSource)
|
||||
nhwchar *dest;
|
||||
const char *strSource;
|
||||
{
|
||||
nhwchar *d = dest;
|
||||
const char *s = strSource;
|
||||
|
||||
while(*d) d++;
|
||||
while(*s) {
|
||||
*d++ = *s++;
|
||||
}
|
||||
*d = 0;
|
||||
return dest;
|
||||
}
|
||||
|
||||
nhwchar *
|
||||
nhwcat(dest, src)
|
||||
nhwchar *dest;
|
||||
const nhwchar *src;
|
||||
{
|
||||
nhwchar *d = dest;
|
||||
const nhwchar *s = src;
|
||||
|
||||
while(*d) d++;
|
||||
while(*s) {
|
||||
*d++ = *s++;
|
||||
}
|
||||
*d = 0;
|
||||
return dest;
|
||||
}
|
||||
|
||||
nhwchar *
|
||||
nhwindex(ss, c)
|
||||
const nhwchar *ss;
|
||||
int c;
|
||||
{
|
||||
const nhwchar *s = ss;
|
||||
|
||||
while (*s) {
|
||||
if (*s == c) return (nhwchar *)s;
|
||||
s++;
|
||||
}
|
||||
if (*s == c) return (nhwchar *)s;
|
||||
return (nhwchar *)0;
|
||||
}
|
||||
|
||||
size_t nhwlen(src)
|
||||
const nhwchar *src;
|
||||
{
|
||||
register size_t dl = 0;
|
||||
|
||||
while(*src++) dl++;
|
||||
return dl;
|
||||
}
|
||||
|
||||
int
|
||||
nhwcmp(s1, s2) /* case sensitive comparison */
|
||||
register const nhwchar *s1, *s2;
|
||||
{
|
||||
register nhwchar t1, t2;
|
||||
|
||||
for (;;) {
|
||||
if (!*s2) return (*s1 != 0); /* s1 >= s2 */
|
||||
else if (!*s1) return -1; /* s1 < s2 */
|
||||
t1 = *s1++;
|
||||
t2 = *s2++;
|
||||
if (t1 != t2) return (t1 > t2) ? 1 : -1;
|
||||
}
|
||||
return 0; /* s1 == s2 */
|
||||
}
|
||||
|
||||
int
|
||||
nhwncmp(s1, s2, n) /* case sensitive counted nhwchar (wide string) comparison */
|
||||
register const nhwchar *s1, *s2;
|
||||
register int n; /*(should probably be size_t, which is usually unsigned)*/
|
||||
{
|
||||
register nhwchar t1, t2;
|
||||
|
||||
while (n--) {
|
||||
if (!*s2) return (*s1 != 0); /* s1 >= s2 */
|
||||
else if (!*s1) return -1; /* s1 < s2 */
|
||||
t1 = *s1++;
|
||||
t2 = *s2++;
|
||||
if (t1 != t2) return (t1 > t2) ? 1 : -1;
|
||||
}
|
||||
return 0; /* s1 == s2 */
|
||||
}
|
||||
|
||||
int
|
||||
nhwstrcmp(s1, s2)
|
||||
register const nhwchar *s1;
|
||||
const char *s2;
|
||||
{
|
||||
register nhwchar t1, t2;
|
||||
|
||||
for (;;) {
|
||||
if (!*s2) return (*s1 != 0); /* s1 >= s2 */
|
||||
else if (!*s1) return -1; /* s1 < s2 */
|
||||
t1 = *s1++;
|
||||
t2 = (nhwchar)*s2++;
|
||||
if (t1 != t2) return (t1 > t2) ? 1 : -1;
|
||||
}
|
||||
return 0; /* s1 == s2 */
|
||||
}
|
||||
#endif
|
||||
/*hacklib.c*/
|
||||
|
||||
Reference in New Issue
Block a user