[w3m-dev 03207] strchr(), strcasecmp(), and strncasecmp()

* etc.c (strchr): removed
	(strcasecmp): removed
	(strncasecmp): removed
* indep.c (strchr): moved, cast
	(strcasecmp): moved, fix the case that s1 = ""
	(strncasecmp): moved, fix the case that s1 is shorter than s2
* indep.h (strchr): added
	(strcasecmp): added
	(strncasecmp): added
From: Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-06-07 15:46:44 +00:00
parent 51bd5e7bff
commit 259d1f18be
4 changed files with 68 additions and 52 deletions

50
etc.c
View File

@@ -1,4 +1,4 @@
/* $Id: etc.c,v 1.21 2002/03/07 16:10:22 ukai Exp $ */
/* $Id: etc.c,v 1.22 2002/06/07 15:46:44 ukai Exp $ */
#include "fm.h"
#include <pwd.h>
#include "myctype.h"
@@ -25,54 +25,6 @@
#endif /* __WATT32__ */
#ifndef HAVE_STRCHR
char *
strchr(char *s, char c)
{
while (*s) {
if (*s == c)
return s;
s++;
}
return NULL;
}
#endif /* not HAVE_STRCHR */
#ifndef HAVE_STRCASECMP
int
strcasecmp(char *s1, char *s2)
{
int x;
while (*s1) {
x = tolower(*s1) - tolower(*s2);
if (x != 0)
break;
s1++;
s2++;
}
if (x != 0)
return x;
return -tolower(*s2);
}
int
strncasecmp(char *s1, char *s2, int n)
{
int x;
while (*s1 && n) {
x = tolower(*s1) - tolower(*s2);
if (x != 0)
break;
s1++;
s2++;
n--;
}
if (x != 0)
return x;
return 0;
}
#endif /* not HAVE_STRCASECMP */
int
columnSkip(Buffer *buf, int offset)
{