Changeset 4c53333 in mainline for uspace/lib/posix/source/fnmatch.c

Timestamp:

2013-07-11T08:21:10Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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 mainline changes

File:

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

uspace/lib/posix/source/fnmatch.c

@@ -42 +42 @@
  */
 
-#include "stdbool.h"
-#include "ctype.h"
-#include "string.h"
-#include "stdlib.h"
-#include "assert.h"
-
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
+
+#include "libc/stdbool.h"
+#include "posix/ctype.h"
+#include "posix/string.h"
+#include "posix/stdlib.h"
+#include "posix/assert.h"
 
 #include "internal/common.h"
-#include "fnmatch.h"
+#include "posix/fnmatch.h"
 
 /* Returned by _match... functions. */
@@ -182 +183 @@
         { "alnum", isalnum },
         { "alpha", isalpha },
-        { "blank", isblank },
-        { "cntrl", iscntrl },
+        { "blank", posix_isblank },
+        { "cntrl", posix_iscntrl },
         { "digit", isdigit },
-        { "graph", isgraph },
+        { "graph", posix_isgraph },
         { "lower", islower },
-        { "print", isprint },
-        { "punct", ispunct },
+        { "print", posix_isprint },
+        { "punct", posix_ispunct },
         { "space", isspace },
         { "upper", isupper },
-        { "xdigit", isxdigit }
+        { "xdigit", posix_isxdigit }
 };
 
@@ -204 +205 @@
 {
         const struct _char_class *class = elem;
-        return strcmp((const char *) key, class->name);
+        return posix_strcmp((const char *) key, class->name);
 }
 
@@ -217 +218 @@
 {
         /* Search for class in the array of supported character classes. */
-        const struct _char_class *class = bsearch(cname, _char_classes,
+        const struct _char_class *class = posix_bsearch(cname, _char_classes,
             sizeof(_char_classes) / sizeof(struct _char_class),
             sizeof(struct _char_class), _class_compare);
@@ -549 +550 @@
                         end = string;
                 } else {
-                        end = strchrnul(string, pathname ? '/' : '\0');
+                        end = gnu_strchrnul(string, pathname ? '/' : '\0');
                 }
 
@@ -581 +582 @@
 {
         assert(s != NULL);
-        char *result = strdup(s);
+        char *result = posix_strdup(s);
         for (char *i = result; *i != '\0'; ++i) {
                 *i = tolower(*i);