projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged silc_1_0_branch to trunk.
[silc.git]
/
lib
/
silcutil
/
silcconfig.c
diff --git
a/lib/silcutil/silcconfig.c
b/lib/silcutil/silcconfig.c
index 2066f95719ed0531315ffaebdc7bb2e9d8c36346..03fb2a492e6ac0fdb0b8583580a6ff78ed268bb0 100644
(file)
--- a/
lib/silcutil/silcconfig.c
+++ b/
lib/silcutil/silcconfig.c
@@
-95,7
+95,7
@@
char *silc_config_strerror(int errnum)
static void my_trim_spaces(SilcConfigFile *file)
{
register char *r = file->p;
static void my_trim_spaces(SilcConfigFile *file)
{
register char *r = file->p;
- while (isspace(*r))
+ while (
(*r != '\0' && *r != EOF) &&
isspace(*r))
if (*r++ == '\n') file->line++;
file->p = r;
}
if (*r++ == '\n') file->line++;
file->p = r;
}
@@
-103,8
+103,8
@@
static void my_trim_spaces(SilcConfigFile *file)
static void my_skip_line(SilcConfigFile *file)
{
register char *r = file->p;
static void my_skip_line(SilcConfigFile *file)
{
register char *r = file->p;
- while (
*r
&& (*r != '\n') && (*r != '\r')) r++;
- file->p = (
*r
? r + 1 : r);
+ while (
(*r != '\0' && *r != EOF)
&& (*r != '\n') && (*r != '\r')) r++;
+ file->p = (
(*r != '\0' && *r != EOF)
? r + 1 : r);
file->line++;
}
/* Obtains a text token from the current position until first separator.
file->line++;
}
/* Obtains a text token from the current position until first separator.