Remove EOF handling after Bruce explanation. This step returns
to 4.4 way to not allow EOF in ctype and now all signed chars (including '\377' which becomes EOF) converted to (unsigned char) properly.
This commit is contained in:
@@ -103,16 +103,9 @@ __END_DECLS
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(_USE_CTYPE_INLINE_)
|
#if defined(_USE_CTYPE_INLINE_)
|
||||||
|
|
||||||
#ifndef EOF
|
|
||||||
#define EOF (-1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static __inline int
|
static __inline int
|
||||||
__istype(_BSD_RUNE_T_ c, unsigned long f)
|
__istype(_BSD_RUNE_T_ c, unsigned long f)
|
||||||
{
|
{
|
||||||
if (c == EOF)
|
|
||||||
return 0;
|
|
||||||
if (c < 0)
|
if (c < 0)
|
||||||
c = (unsigned char) c;
|
c = (unsigned char) c;
|
||||||
return((((c & _CRMASK) ? ___runetype(c) :
|
return((((c & _CRMASK) ? ___runetype(c) :
|
||||||
@@ -122,8 +115,6 @@ __istype(_BSD_RUNE_T_ c, unsigned long f)
|
|||||||
static __inline int
|
static __inline int
|
||||||
__isctype(_BSD_RUNE_T_ c, unsigned long f)
|
__isctype(_BSD_RUNE_T_ c, unsigned long f)
|
||||||
{
|
{
|
||||||
if (c == EOF)
|
|
||||||
return 0;
|
|
||||||
if (c < 0)
|
if (c < 0)
|
||||||
c = (unsigned char) c;
|
c = (unsigned char) c;
|
||||||
return((((c & _CRMASK) ? 0 :
|
return((((c & _CRMASK) ? 0 :
|
||||||
@@ -135,8 +126,6 @@ __isctype(_BSD_RUNE_T_ c, unsigned long f)
|
|||||||
static __inline _BSD_RUNE_T_
|
static __inline _BSD_RUNE_T_
|
||||||
toupper(_BSD_RUNE_T_ c)
|
toupper(_BSD_RUNE_T_ c)
|
||||||
{
|
{
|
||||||
if (c == EOF)
|
|
||||||
return EOF;
|
|
||||||
if (c < 0)
|
if (c < 0)
|
||||||
c = (unsigned char) c;
|
c = (unsigned char) c;
|
||||||
return((c & _CRMASK) ?
|
return((c & _CRMASK) ?
|
||||||
@@ -146,8 +135,6 @@ toupper(_BSD_RUNE_T_ c)
|
|||||||
static __inline _BSD_RUNE_T_
|
static __inline _BSD_RUNE_T_
|
||||||
tolower(_BSD_RUNE_T_ c)
|
tolower(_BSD_RUNE_T_ c)
|
||||||
{
|
{
|
||||||
if (c == EOF)
|
|
||||||
return EOF;
|
|
||||||
if (c < 0)
|
if (c < 0)
|
||||||
c = (unsigned char) c;
|
c = (unsigned char) c;
|
||||||
return((c & _CRMASK) ?
|
return((c & _CRMASK) ?
|
||||||
|
|||||||
@@ -103,16 +103,9 @@ __END_DECLS
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(_USE_CTYPE_INLINE_)
|
#if defined(_USE_CTYPE_INLINE_)
|
||||||
|
|
||||||
#ifndef EOF
|
|
||||||
#define EOF (-1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static __inline int
|
static __inline int
|
||||||
__istype(_BSD_RUNE_T_ c, unsigned long f)
|
__istype(_BSD_RUNE_T_ c, unsigned long f)
|
||||||
{
|
{
|
||||||
if (c == EOF)
|
|
||||||
return 0;
|
|
||||||
if (c < 0)
|
if (c < 0)
|
||||||
c = (unsigned char) c;
|
c = (unsigned char) c;
|
||||||
return((((c & _CRMASK) ? ___runetype(c) :
|
return((((c & _CRMASK) ? ___runetype(c) :
|
||||||
@@ -122,8 +115,6 @@ __istype(_BSD_RUNE_T_ c, unsigned long f)
|
|||||||
static __inline int
|
static __inline int
|
||||||
__isctype(_BSD_RUNE_T_ c, unsigned long f)
|
__isctype(_BSD_RUNE_T_ c, unsigned long f)
|
||||||
{
|
{
|
||||||
if (c == EOF)
|
|
||||||
return 0;
|
|
||||||
if (c < 0)
|
if (c < 0)
|
||||||
c = (unsigned char) c;
|
c = (unsigned char) c;
|
||||||
return((((c & _CRMASK) ? 0 :
|
return((((c & _CRMASK) ? 0 :
|
||||||
@@ -135,8 +126,6 @@ __isctype(_BSD_RUNE_T_ c, unsigned long f)
|
|||||||
static __inline _BSD_RUNE_T_
|
static __inline _BSD_RUNE_T_
|
||||||
toupper(_BSD_RUNE_T_ c)
|
toupper(_BSD_RUNE_T_ c)
|
||||||
{
|
{
|
||||||
if (c == EOF)
|
|
||||||
return EOF;
|
|
||||||
if (c < 0)
|
if (c < 0)
|
||||||
c = (unsigned char) c;
|
c = (unsigned char) c;
|
||||||
return((c & _CRMASK) ?
|
return((c & _CRMASK) ?
|
||||||
@@ -146,8 +135,6 @@ toupper(_BSD_RUNE_T_ c)
|
|||||||
static __inline _BSD_RUNE_T_
|
static __inline _BSD_RUNE_T_
|
||||||
tolower(_BSD_RUNE_T_ c)
|
tolower(_BSD_RUNE_T_ c)
|
||||||
{
|
{
|
||||||
if (c == EOF)
|
|
||||||
return EOF;
|
|
||||||
if (c < 0)
|
if (c < 0)
|
||||||
c = (unsigned char) c;
|
c = (unsigned char) c;
|
||||||
return((c & _CRMASK) ?
|
return((c & _CRMASK) ?
|
||||||
|
|||||||
Reference in New Issue
Block a user