Lines 38-50
Link Here
|
38 |
#endif |
38 |
#endif |
39 |
|
39 |
|
40 |
#ifndef DISABLE_GETENV_PROPERTIES |
40 |
#ifndef DISABLE_GETENV_PROPERTIES |
41 |
#include <ctype.h> |
|
|
42 |
#include <java-props.h> |
41 |
#include <java-props.h> |
43 |
#define PROCESS_GCJ_PROPERTIES process_gcj_properties() |
42 |
#define PROCESS_GCJ_PROPERTIES process_gcj_properties() |
44 |
#else |
43 |
#else |
45 |
#define PROCESS_GCJ_PROPERTIES |
44 |
#define PROCESS_GCJ_PROPERTIES |
46 |
#endif // DISABLE_GETENV_PROPERTIES |
45 |
#endif // DISABLE_GETENV_PROPERTIES |
47 |
|
46 |
|
|
|
47 |
#define c_isspace(c) (memchr (" \t\n\r\v\f", c, 6) != NULL) |
48 |
|
48 |
#include <java/lang/Class.h> |
49 |
#include <java/lang/Class.h> |
49 |
#include <java/lang/ClassLoader.h> |
50 |
#include <java/lang/ClassLoader.h> |
50 |
#include <java/lang/Runtime.h> |
51 |
#include <java/lang/Runtime.h> |
Lines 993-999
Link Here
|
993 |
JvAssert (s); |
994 |
JvAssert (s); |
994 |
|
995 |
|
995 |
// Skip over whitespace |
996 |
// Skip over whitespace |
996 |
while (isspace (*s)) |
997 |
while (c_isspace (*s)) |
997 |
s++; |
998 |
s++; |
998 |
|
999 |
|
999 |
// If we've reached the end, return NULL. Also return NULL if for |
1000 |
// If we've reached the end, return NULL. Also return NULL if for |
Lines 1005-1011
Link Here
|
1005 |
|
1006 |
|
1006 |
// Determine the length of the property key. |
1007 |
// Determine the length of the property key. |
1007 |
while (s[l] != 0 |
1008 |
while (s[l] != 0 |
1008 |
&& ! isspace (s[l]) |
1009 |
&& ! c_isspace (s[l]) |
1009 |
&& s[l] != ':' |
1010 |
&& s[l] != ':' |
1010 |
&& s[l] != '=') |
1011 |
&& s[l] != '=') |
1011 |
{ |
1012 |
{ |
Lines 1027-1045
Link Here
|
1027 |
|
1028 |
|
1028 |
JvAssert (s); |
1029 |
JvAssert (s); |
1029 |
|
1030 |
|
1030 |
while (isspace (*s)) |
1031 |
while (c_isspace (*s)) |
1031 |
s++; |
1032 |
s++; |
1032 |
|
1033 |
|
1033 |
if (*s == ':' |
1034 |
if (*s == ':' |
1034 |
|| *s == '=') |
1035 |
|| *s == '=') |
1035 |
s++; |
1036 |
s++; |
1036 |
|
1037 |
|
1037 |
while (isspace (*s)) |
1038 |
while (c_isspace (*s)) |
1038 |
s++; |
1039 |
s++; |
1039 |
|
1040 |
|
1040 |
// Determine the length of the property value. |
1041 |
// Determine the length of the property value. |
1041 |
while (s[l] != 0 |
1042 |
while (s[l] != 0 |
1042 |
&& ! isspace (s[l]) |
1043 |
&& ! c_isspace (s[l]) |
1043 |
&& s[l] != ':' |
1044 |
&& s[l] != ':' |
1044 |
&& s[l] != '=') |
1045 |
&& s[l] != '=') |
1045 |
{ |
1046 |
{ |