Changeset 2b3dd78 in mainline for uspace/lib/posix/src/fnmatch.c

Timestamp:

2018-01-31T12:02:00Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/lib/posix/src/fnmatch.c (moved) (moved from uspace/lib/posix/source/fnmatch.c ) (7 diffs)

uspace/lib/posix/src/fnmatch.c

@@ -42 +42 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "libc/stdbool.h"
 #include "posix/ctype.h"
@@ -183 +180 @@
         { "alnum", isalnum },
         { "alpha", isalpha },
-        { "blank", posix_isblank },
-        { "cntrl", posix_iscntrl },
+        { "blank", isblank },
+        { "cntrl", iscntrl },
         { "digit", isdigit },
-        { "graph", posix_isgraph },
+        { "graph", isgraph },
         { "lower", islower },
-        { "print", posix_isprint },
-        { "punct", posix_ispunct },
+        { "print", isprint },
+        { "punct", ispunct },
         { "space", isspace },
         { "upper", isupper },
-        { "xdigit", posix_isxdigit }
+        { "xdigit", isxdigit }
 };
 
@@ -205 +202 @@
 {
         const struct _char_class *class = elem;
-        return posix_strcmp((const char *) key, class->name);
+        return strcmp((const char *) key, class->name);
 }
 
@@ -218 +215 @@
 {
         /* Search for class in the array of supported character classes. */
-        const struct _char_class *class = posix_bsearch(cname, _char_classes,
+        const struct _char_class *class = bsearch(cname, _char_classes,
             sizeof(_char_classes) / sizeof(struct _char_class),
             sizeof(struct _char_class), _class_compare);
@@ -582 +579 @@
 {
         assert(s != NULL);
-        char *result = posix_strdup(s);
+        char *result = strdup(s);
         for (char *i = result; *i != '\0'; ++i) {
                 *i = tolower(*i);
@@ -598 +595 @@
  * @return Zero if the string matches the pattern, FNM_NOMATCH otherwise.
  */
-int posix_fnmatch(const char *pattern, const char *string, int flags)
+int fnmatch(const char *pattern, const char *string, int flags)
 {
         assert(pattern != NULL);
@@ -637 +634 @@
         #undef assert
         #define assert(x) { if (x) printf("SUCCESS: "#x"\n"); else { printf("FAILED: "#x"\n"); fail++; } }
-        #define match(s1, s2, flags) assert(posix_fnmatch(s1, s2, flags) == 0)
-        #define nomatch(s1, s2, flags) assert(posix_fnmatch(s1, s2, flags) == FNM_NOMATCH)
+        #define match(s1, s2, flags) assert(fnmatch(s1, s2, flags) == 0)
+        #define nomatch(s1, s2, flags) assert(fnmatch(s1, s2, flags) == FNM_NOMATCH)
 
         static_assert(FNM_PATHNAME == FNM_FILE_NAME);