diff options
| -rw-r--r-- | sys/pc98/boot/biosboot/boot.h | 8 | ||||
| -rw-r--r-- | sys/pc98/boot/biosboot/io.c | 14 |
2 files changed, 7 insertions, 15 deletions
diff --git a/sys/pc98/boot/biosboot/boot.h b/sys/pc98/boot/biosboot/boot.h index 0951c3fb..8032583 100644 --- a/sys/pc98/boot/biosboot/boot.h +++ b/sys/pc98/boot/biosboot/boot.h @@ -24,11 +24,10 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:03 rpd - * $Id: boot.h,v 1.11 1997/07/13 12:13:02 kato Exp $ + * $Id: boot.h,v 1.12 1997/09/01 10:38:32 kato Exp $ */ #include <sys/param.h> -#include <sys/lock.h> #include <sys/time.h> #include <ufs/ffs/fs.h> @@ -80,10 +79,9 @@ void printf(const char *format, ...); void putchar(int c); void delay1ms(void); int gets(char *buf); -#ifndef CDBOOT int strcmp(const char *s1, const char *s2); -#else /* CDBOOT */ -int strncasecmp(const char *s1, const char *s2, size_t s); +#ifdef CDBOOT +int strcasecmp(const char *s1, const char *s2); #endif /* !CDBOOT */ void bcopy(const void *from, void *to, size_t len); void twiddle(void); diff --git a/sys/pc98/boot/biosboot/io.c b/sys/pc98/boot/biosboot/io.c index a4bc0cc..0e4b6f3 100644 --- a/sys/pc98/boot/biosboot/io.c +++ b/sys/pc98/boot/biosboot/io.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:57 rpd - * $Id: io.c,v 1.11 1997/06/09 13:44:04 kato Exp $ + * $Id: io.c,v 1.12 1997/07/13 12:13:02 kato Exp $ */ #include "boot.h" @@ -257,8 +257,6 @@ gets(char *buf) return 0; } -#ifndef CDBOOT - int strcmp(const char *s1, const char *s2) { @@ -270,26 +268,22 @@ strcmp(const char *s1, const char *s2) return 1; } -#else /* CDBOOT */ - +#ifdef CDBOOT int -strncasecmp(const char *s1, const char *s2, size_t s) +strcasecmp(const char *s1, const char *s2) { /* * We only consider ASCII chars and don't anticipate * control characters (they are invalid in filenames * anyway). */ - while (s > 0 && (*s1 & 0x5f) == (*s2 & 0x5f)) { + while ((*s1 & 0x5f) == (*s2 & 0x5f)) { if (!*s1++) return 0; s2++; } - if (s == 0) - return 0; return 1; } - #endif /* !CDBOOT */ void |
