yetangitu/fernly
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bionic: Fix strnlen to work with length of -1

Browse source 
This is used to mean INT_MAX.
This commit is contained in:
Sean Cross 2014-09-09 13:59:18 +08:00
parent a066600558
commit f82c53bfdc
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bionic.c
View file

@ -697,7 +697,7 @@ int _strlen(const char *s)
return i; return i;
} }
int _strnlen(const char *s, int maxlen) int _strnlen(const char *s, uint32_t maxlen)
{ {
int i = 0; int i = 0;
while(s[i++] && i < maxlen); while(s[i++] && i < maxlen);

5
include/bionic.h
View file

@ -1,6 +1,9 @@
#ifndef __BIONIC_H__ #ifndef __BIONIC_H__
#define __BIONIC_H__ #define __BIONIC_H__
#include <stdint.h>
# define ULONG_MAX 4294967295UL # define ULONG_MAX 4294967295UL
size_t _strspn(const char *s1, const char *s2); size_t _strspn(const char *s1, const char *s2);
char * _strpbrk(const char *s1, const char *s2); char * _strpbrk(const char *s1, const char *s2);
char *_strtok(char *str, const char *delim, char **saveptr); char *_strtok(char *str, const char *delim, char **saveptr);
@ -9,7 +12,7 @@ void *_memcpy(void *dst0, const void *src0, size_t length);
void _memset(void *dst0, char val, size_t length); void _memset(void *dst0, char val, size_t length);
unsigned long _strtoul(const void *nptr, void **endptr, int base); unsigned long _strtoul(const void *nptr, void **endptr, int base);
int _strlen(const char *s); int _strlen(const char *s);
int _strnlen(const char *s, int maxlen); int _strnlen(const char *s, uint32_t maxlen);
/* ctype replacements */ /* ctype replacements */