Changeset e4f8c77 in mainline for uspace/lib/posix/string.h

Timestamp:

2011-07-13T22:39:18Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e6910c8

Parents:

5974661 (diff), 8ecef91 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libposix.

File:

• uspace/lib/posix/string.h (modified) (4 diffs)

uspace/lib/posix/string.h

@@ -85 +85 @@
 extern char *posix_strchr(const char *s, int c);
 extern char *posix_strrchr(const char *s, int c);
+extern char *gnu_strchrnul(const char *s, int c);
 extern char *posix_strpbrk(const char *s1, const char *s2);
 extern size_t posix_strcspn(const char *s1, const char *s2);
@@ -101 +102 @@
 extern size_t posix_strlen(const char *s);
 extern size_t posix_strnlen(const char *s, size_t n);
+
+/* Signal messages */
+extern char *posix_strsignal(int signum);
+
+/* Legacy declarations */
+#ifndef POSIX_STRINGS_H_
+extern int posix_ffs(int i);
+extern int posix_strcasecmp(const char *s1, const char *s2);
+extern int posix_strncasecmp(const char *s1, const char *s2, size_t n);
+#endif
 
 #ifndef LIBPOSIX_INTERNAL
@@ -120 +131 @@
         #define strchr posix_strchr
         #define strrchr posix_strrchr
+        #define strchrnul gnu_strchrnul
         #define strpbrk posix_strpbrk
         #define strcspn posix_strcspn
@@ -130 +142 @@
         #define strerror posix_strerror
         #define strerror_r posix_strerror_r
-        #define strsignal(i) ((char *) "SIGNonSense: There are no signals in HelenOS.")
 
         #define strlen posix_strlen
         #define strnlen posix_strnlen
+
+        #define strsignal posix_strsignal
+
+        #define ffs posix_ffs
+        #define strcasecmp posix_strcasecmp
+        #define strncasecmp posix_strncasecmp
 #endif