diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-30 22:13:03 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-30 22:13:03 +0000 |
commit | 4e1e258d1f5745f3dc05ead3cb834c445e6e8818 (patch) | |
tree | bfbc91107d6bfe7b2a68d8701562e59856116a6a /misc.c | |
parent | 4a20a0b23bd0e1db5e69f27c65aaa11a5a2eacd0 (diff) | |
parent | a55bd782aa819b7f5ae716de000f19f4f531850e (diff) |
Merge 4.1p1 to the trunk.
Diffstat (limited to 'misc.c')
-rw-r--r-- | misc.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: misc.c,v 1.28 2005/03/01 10:09:52 djm Exp $"); | 26 | RCSID("$OpenBSD: misc.c,v 1.29 2005/03/10 22:01:05 deraadt Exp $"); |
27 | 27 | ||
28 | #include "misc.h" | 28 | #include "misc.h" |
29 | #include "log.h" | 29 | #include "log.h" |
@@ -303,13 +303,13 @@ hpdelim(char **cp) | |||
303 | case '\0': | 303 | case '\0': |
304 | *cp = NULL; /* no more fields*/ | 304 | *cp = NULL; /* no more fields*/ |
305 | break; | 305 | break; |
306 | 306 | ||
307 | case ':': | 307 | case ':': |
308 | case '/': | 308 | case '/': |
309 | *s = '\0'; /* terminate */ | 309 | *s = '\0'; /* terminate */ |
310 | *cp = s + 1; | 310 | *cp = s + 1; |
311 | break; | 311 | break; |
312 | 312 | ||
313 | default: | 313 | default: |
314 | return NULL; | 314 | return NULL; |
315 | } | 315 | } |
@@ -391,7 +391,7 @@ read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz, | |||
391 | debug("%s: %s line %lu exceeds size limit", __func__, | 391 | debug("%s: %s line %lu exceeds size limit", __func__, |
392 | filename, *lineno); | 392 | filename, *lineno); |
393 | /* discard remainder of line */ | 393 | /* discard remainder of line */ |
394 | while(fgetc(f) != '\n' && !feof(f)) | 394 | while (fgetc(f) != '\n' && !feof(f)) |
395 | ; /* nothing */ | 395 | ; /* nothing */ |
396 | } | 396 | } |
397 | } | 397 | } |