aboutsummaryrefslogtreecommitdiff
path: root/libpsn00b/include
diff options
context:
space:
mode:
authorspicyjpeg <thatspicyjpeg@gmail.com>2023-04-04 15:39:21 +0200
committerspicyjpeg <thatspicyjpeg@gmail.com>2023-04-04 15:39:21 +0200
commit651415f5b549b363dec971e2ef589cce098ee1f2 (patch)
tree476d772f3655ca4942dcc417917043f818ec3607 /libpsn00b/include
parent870f4dca9d7b5e86544216d0e36863d17aefef62 (diff)
downloadpsn00bsdk-651415f5b549b363dec971e2ef589cce098ee1f2.tar.gz
Fix non-standard string.h functions, remove argv parser
Diffstat (limited to 'libpsn00b/include')
-rw-r--r--libpsn00b/include/ctype.h13
-rw-r--r--libpsn00b/include/stdlib.h10
-rw-r--r--libpsn00b/include/string.h44
3 files changed, 40 insertions, 27 deletions
diff --git a/libpsn00b/include/ctype.h b/libpsn00b/include/ctype.h
index 24ee9d9..ad78397 100644
--- a/libpsn00b/include/ctype.h
+++ b/libpsn00b/include/ctype.h
@@ -1,6 +1,6 @@
/*
* PSn00bSDK standard library
- * (C) 2019-2022 PSXSDK authors, Lameguy64, spicyjpeg - MPL licensed
+ * (C) 2019-2023 PSXSDK authors, Lameguy64, spicyjpeg - MPL licensed
*/
#ifndef __CTYPE_H
@@ -10,8 +10,15 @@
extern "C" {
#endif
-int tolower(int chr);
-int toupper(int chr);
+int isprint(int ch);
+int isgraph(int ch);
+int isspace(int ch);
+int isblank(int ch);
+int isalpha(int ch);
+int isdigit(int ch);
+
+int tolower(int ch);
+int toupper(int ch);
#ifdef __cplusplus
}
diff --git a/libpsn00b/include/stdlib.h b/libpsn00b/include/stdlib.h
index 049d067..49ae7b9 100644
--- a/libpsn00b/include/stdlib.h
+++ b/libpsn00b/include/stdlib.h
@@ -39,11 +39,11 @@ void srand(int seed);
int abs(int j);
long labs(long i);
-long strtol(const char *nptr, char **endptr, int base);
-long long strtoll(const char *nptr, char **endptr, int base);
-float strtof(const char *nptr, char **endptr);
-double strtod(const char *nptr, char **endptr);
-long double strtold(const char *nptr, char **endptr);
+long strtol(const char *str, char **str_end, int base);
+long long strtoll(const char *str, char **str_end, int base);
+//float strtof(const char *str, char **str_end);
+//double strtod(const char *str, char **str_end);
+//long double strtold(const char *str, char **str_end);
void InitHeap(void *addr, size_t size);
void *sbrk(ptrdiff_t incr);
diff --git a/libpsn00b/include/string.h b/libpsn00b/include/string.h
index ceee066..84afbae 100644
--- a/libpsn00b/include/string.h
+++ b/libpsn00b/include/string.h
@@ -6,29 +6,35 @@
#ifndef __STRING_H
#define __STRING_H
+#include <stddef.h>
+
#ifdef __cplusplus
extern "C" {
#endif
-int strcmp(const char *dst , const char *src);
-int strncmp(const char *dst , const char *src , int len);
-char *strpbrk(const char *dst , const char *src);
-char *strtok(char *s , char *set);
-char *strstr(const char *big , const char *little);
-
-char *strcat(char *s , const char *append);
-char *strncat(char *s , const char *append, int n);
-char *strcpy(char *dst , const char *src);
-char *strncpy(char *dst , const char *src , int n);
-int strlen(const char *s);
-char *strchr(const char *s , int c);
-char *strrchr(const char *s , int c);
-
-void *memmove(void *dst , const void *src , int n);
-void *memchr(void *s , int c , int n);
-void *memcpy(void *dst , const void *src , int n);
-void *memset(void *dst , char c , int n);
-int memcmp(const void *b1 , const void *b2 , int n);
+void *memset(void *dest, int ch, size_t count);
+void *memcpy(void *dest, const void *src, size_t count);
+void *memccpy(void *dest, const void *src, int ch, size_t count);
+void *memmove(void *dest, const void *src, size_t count);
+int memcmp(const void *lhs, const void *rhs, size_t count);
+void *memchr(const void *ptr, int ch, size_t count);
+
+char *strcpy(char *dest, const char *src);
+char *strncpy(char *dest, const char *src, size_t count);
+int strcmp(const char *lhs, const char *rhs);
+int strncmp(const char *lhs, const char *rhs, size_t count);
+char *strchr(const char *str, int ch);
+char *strrchr(const char *str, int ch);
+char *strpbrk(const char *str, const char *breakset);
+char *strstr(const char *str, const char *substr);
+
+size_t strlen(const char *str);
+char *strcat(char *dest, const char *src);
+char *strncat(char *dest, const char *src, size_t count);
+char *strdup(const char *str);
+char *strndup(const char *str, size_t count);
+
+char *strtok(char *str, const char *delim);
#ifdef __cplusplus
}