system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 02:37:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Handle EOF case in all macros by ANSI standard.

Browse source 
Cast all ints < 0 to (unsigned char) to fix common problem
with sign extention on signed char.
This commit is contained in:
Andrey A. Chernov 1994-10-08 17:36:44 +00:00
parent d341e762bb
commit 262fb20771
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=3433
2 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
include/_ctype.h
View file

@ -103,9 +103,18 @@ __END_DECLS
#endif
#if defined(_USE_CTYPE_INLINE_)
#ifndef EOF
#define EOF (-1)
#endif
static __inline int
__istype(_BSD_RUNE_T_ c, unsigned long f)
{
if (c == EOF)
return 0;
if (c < 0)
c = (unsigned char) c;
return((((c & _CRMASK) ? ___runetype(c) :
_CurrentRuneLocale->runetype[c]) & f) ? 1 : 0);
}
@ -113,6 +122,10 @@ __istype(_BSD_RUNE_T_ c, unsigned long f)
static __inline int
__isctype(_BSD_RUNE_T_ c, unsigned long f)
{
if (c == EOF)
return 0;
if (c < 0)
c = (unsigned char) c;
return((((c & _CRMASK) ? 0 :
_DefaultRuneLocale.runetype[c]) & f) ? 1 : 0);
}
@ -122,6 +135,10 @@ __isctype(_BSD_RUNE_T_ c, unsigned long f)
static __inline _BSD_RUNE_T_
toupper(_BSD_RUNE_T_ c)
{
if (c == EOF)
return EOF;
if (c < 0)
c = (unsigned char) c;
return((c & _CRMASK) ?
___toupper(c) : _CurrentRuneLocale->mapupper[c]);
}
@ -129,6 +146,10 @@ toupper(_BSD_RUNE_T_ c)
static __inline _BSD_RUNE_T_
tolower(_BSD_RUNE_T_ c)
{
if (c == EOF)
return EOF;
if (c < 0)
c = (unsigned char) c;
return((c & _CRMASK) ?
___tolower(c) : _CurrentRuneLocale->maplower[c]);
}

21
include/ctype.h
View file

@ -103,9 +103,18 @@ __END_DECLS
#endif
#if defined(_USE_CTYPE_INLINE_)
#ifndef EOF
#define EOF (-1)
#endif
static __inline int
__istype(_BSD_RUNE_T_ c, unsigned long f)
{
if (c == EOF)
return 0;
if (c < 0)
c = (unsigned char) c;
return((((c & _CRMASK) ? ___runetype(c) :
_CurrentRuneLocale->runetype[c]) & f) ? 1 : 0);
}
@ -113,6 +122,10 @@ __istype(_BSD_RUNE_T_ c, unsigned long f)
static __inline int
__isctype(_BSD_RUNE_T_ c, unsigned long f)
{
if (c == EOF)
return 0;
if (c < 0)
c = (unsigned char) c;
return((((c & _CRMASK) ? 0 :
_DefaultRuneLocale.runetype[c]) & f) ? 1 : 0);
}
@ -122,6 +135,10 @@ __isctype(_BSD_RUNE_T_ c, unsigned long f)
static __inline _BSD_RUNE_T_
toupper(_BSD_RUNE_T_ c)
{
if (c == EOF)
return EOF;
if (c < 0)
c = (unsigned char) c;
return((c & _CRMASK) ?
___toupper(c) : _CurrentRuneLocale->mapupper[c]);
}
@ -129,6 +146,10 @@ toupper(_BSD_RUNE_T_ c)
static __inline _BSD_RUNE_T_
tolower(_BSD_RUNE_T_ c)
{
if (c == EOF)
return EOF;
if (c < 0)
c = (unsigned char) c;
return((c & _CRMASK) ?
___tolower(c) : _CurrentRuneLocale->maplower[c]);
}