From a34963f388a39217b340f32aae95bfd807056a40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Thu, 16 Mar 2006 11:09:43 +0000 Subject: [PATCH] added posix_gnu_string added more posix definitions git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16813 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/posix/stdlib.h | 3 + headers/posix/sys/types.h | 1 + headers/posix/unistd.h | 2 + headers/posix/wchar.h | 72 ++++++++++++++++--- src/system/libroot/posix/glibc/Jamfile | 1 + src/system/libroot/posix/glibc/string/Jamfile | 11 +++ 6 files changed, 79 insertions(+), 11 deletions(-) create mode 100644 src/system/libroot/posix/glibc/string/Jamfile diff --git a/headers/posix/stdlib.h b/headers/posix/stdlib.h index ec34ced19a..9db9b3011f 100644 --- a/headers/posix/stdlib.h +++ b/headers/posix/stdlib.h @@ -153,6 +153,9 @@ extern int wctomb(char *string, wchar_t wchar); extern size_t mbstowcs(wchar_t *pwcs, const char *string, size_t maxSize); extern size_t wcstombs(char *string, const wchar_t *pwcs, size_t maxSize); +/* crypt */ +extern void setkey(const char *key); + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/headers/posix/sys/types.h b/headers/posix/sys/types.h index 1a03f8f671..ea1a3e3662 100644 --- a/headers/posix/sys/types.h +++ b/headers/posix/sys/types.h @@ -45,6 +45,7 @@ typedef int daddr_t; typedef char * caddr_t; typedef unsigned long addr_t; +typedef long key_t; #include #include diff --git a/headers/posix/unistd.h b/headers/posix/unistd.h index 585a8b61e5..4b29b74ac1 100644 --- a/headers/posix/unistd.h +++ b/headers/posix/unistd.h @@ -172,7 +172,9 @@ extern int ttyname_r(int fd, char *buffer, size_t bufferSize); /* misc */ extern char *crypt(const char *key, const char *salt); +extern void encrypt(char block[64], int edflag); extern int getopt(int argc, char *const *argv, const char *shortOpts); +extern void swab(const void *src, void *dest, ssize_t nbytes); /* getopt() related external variables */ extern char *optarg; diff --git a/headers/posix/wchar.h b/headers/posix/wchar.h index a3413186c6..7c11f31526 100644 --- a/headers/posix/wchar.h +++ b/headers/posix/wchar.h @@ -11,6 +11,7 @@ #define _WINT_T typedef unsigned int wint_t; +typedef int wctype_t; typedef struct { int __count; @@ -19,17 +20,66 @@ typedef struct { #include -size_t mbrlen(const char *s, size_t n, mbstate_t *ps); -size_t mbrtowc(wchar_t *pwc, const char *s, size_t n, mbstate_t *ps); -size_t mbsrtowcs(wchar_t *dst, const char **src, size_t len, - mbstate_t *ps); -int mbsinit(const mbstate_t *); -size_t wcrtomb(char *, wchar_t, mbstate_t *); -wchar_t *wcschr(const wchar_t *ws, wchar_t wc); -int wcscmp(const wchar_t *ws1, const wchar_t *ws2); -int wcscoll(const wchar_t *ws1, const wchar_t *ws2); -size_t wcsrtombs(char *dst, const wchar_t **src, size_t len, - mbstate_t *ps); +extern wint_t fgetwc(FILE *); +extern wchar_t *fgetws(wchar_t *, int, FILE *); +extern wint_t fputwc(wchar_t, FILE *); +extern int fputws(const wchar_t *, FILE *); +extern wint_t getwc(FILE *); +extern wint_t getwchar(void); + +extern int iswalnum(wint_t); +extern int iswalpha(wint_t); +extern int iswcntrl(wint_t); +extern int iswdigit(wint_t); +extern int iswgraph(wint_t); +extern int iswlower(wint_t); +extern int iswprint(wint_t); +extern int iswpunct(wint_t); +extern int iswspace(wint_t); +extern int iswupper(wint_t); +extern int iswxdigit(wint_t); +extern int iswctype(wint_t, wctype_t); + +extern wint_t putwc(wchar_t, FILE *); +extern wint_t putwchar(wchar_t); + +extern size_t mbrlen(const char *s, size_t n, mbstate_t *ps); +extern size_t mbrtowc(wchar_t *pwc, const char *s, size_t n, mbstate_t *ps); +extern size_t mbsrtowcs(wchar_t *dst, const char **src, size_t len, + mbstate_t *ps); +extern int mbsinit(const mbstate_t *); + +extern wint_t towlower(wint_t); +extern wint_t towupper(wint_t); +extern wint_t ungetwc(wint_t, FILE *); + +extern size_t wcrtomb(char *, wchar_t, mbstate_t *); +extern wchar_t *wcscat(wchar_t *, const wchar_t *); +extern wchar_t *wcschr(const wchar_t *, wchar_t); +extern int wcscmp(const wchar_t *ws1, const wchar_t *ws2); +extern int wcscoll(const wchar_t *ws1, const wchar_t *ws2); +extern wchar_t *wcscpy(wchar_t *, const wchar_t *); +extern size_t wcscspn(const wchar_t *, const wchar_t *); +extern size_t wcsftime(wchar_t *, size_t, const wchar_t *, + const struct tm *); +extern size_t wcslen(const wchar_t *); +extern wchar_t *wcsncat(wchar_t *, const wchar_t *, size_t); +extern int wcsncmp(const wchar_t *, const wchar_t *, size_t); +extern wchar_t *wcsncpy(wchar_t *, const wchar_t *, size_t); +extern wchar_t *wcspbrk(const wchar_t *, const wchar_t *); +extern wchar_t *wcsrchr(const wchar_t *, wchar_t); +extern size_t wcsrtombs(char *dst, const wchar_t **src, size_t len, + mbstate_t *ps); +extern size_t wcsspn(const wchar_t *, const wchar_t *); +extern double wcstod(const wchar_t *, wchar_t **); +extern wchar_t *wcstok(wchar_t *, const wchar_t *, wchar_t **); +extern long int wcstol(const wchar_t *, wchar_t **, int); +extern unsigned long int wcstoul(const wchar_t *, wchar_t **, int); +extern wchar_t *wcswcs(const wchar_t *, const wchar_t *); +extern int wcswidth(const wchar_t *, size_t); +extern size_t wcsxfrm(wchar_t *, const wchar_t *, size_t); +extern wctype_t wctype(const char *); +extern int wcwidth(wchar_t); #define WEOF ((wint_t)(-1)) diff --git a/src/system/libroot/posix/glibc/Jamfile b/src/system/libroot/posix/glibc/Jamfile index ef727b4aed..fcdc5f95d0 100644 --- a/src/system/libroot/posix/glibc/Jamfile +++ b/src/system/libroot/posix/glibc/Jamfile @@ -8,5 +8,6 @@ SubInclude HAIKU_TOP src system libroot posix glibc libio ; SubInclude HAIKU_TOP src system libroot posix glibc regex ; SubInclude HAIKU_TOP src system libroot posix glibc stdio-common ; SubInclude HAIKU_TOP src system libroot posix glibc stdlib ; +SubInclude HAIKU_TOP src system libroot posix glibc string ; SubInclude HAIKU_TOP src system libroot posix glibc wcsmbs ; SubInclude HAIKU_TOP src system libroot posix glibc wctype ; diff --git a/src/system/libroot/posix/glibc/string/Jamfile b/src/system/libroot/posix/glibc/string/Jamfile new file mode 100644 index 0000000000..fecd7105aa --- /dev/null +++ b/src/system/libroot/posix/glibc/string/Jamfile @@ -0,0 +1,11 @@ +SubDir HAIKU_TOP src system libroot posix glibc string ; + +SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc include arch $(TARGET_ARCH) ; +SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc include arch generic ; +SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc include ; +#SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc locale ; +#SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc ; + +MergeObject posix_gnu_string.o : + swab.c +;