Changeset e4f8c77 in mainline for uspace/lib/posix/fnmatch.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/fnmatch.h (modified) (3 diffs)

uspace/lib/posix/fnmatch.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Petr Koupy
+ * Copyright (c) 2011 Jiri Zarevucky
  * All rights reserved.
  *
@@ -36 +36 @@
 #define POSIX_FNMATCH_H_
 
-/* fnmatch flags */
+/* Error Values. */
+#undef FNM_NOMATCH
+#define FNM_NOMATCH 1
+
+/* Flags */
 #undef FNM_PATHNAME
+#undef FNM_PERIOD
 #undef FNM_NOESCAPE
-#undef FNM_PERIOD
-#define FNM_PATHNAME  (1 << 0) /* Slash cannot be matched to the wildcard. */
-#define FNM_NOESCAPE  (1 << 1) /* Disable backslash escaping. */
-#define FNM_PERIOD    (1 << 2) /* Leading period must be exactly matched. */
+#define FNM_PATHNAME 1
+#define FNM_PERIOD 2
+#define FNM_NOESCAPE 4
 
-/* fnmatch return values */
-#undef FNM_NOMATCH
-#undef FNM_NOSYS
-#define FNM_NOMATCH          1 /* The string does not match the pattern. */
-#define FNM_NOSYS             (-1) /* In case fnmatch is not supported. */
+/* GNU Extensions */
+#undef FNM_FILE_NAME
+#undef FNM_LEADING_DIR
+#undef FNM_CASEFOLD
+#define FNM_FILE_NAME FNM_PATHNAME
+#define FNM_LEADING_DIR 8
+#define FNM_CASEFOLD 16
 
 extern int posix_fnmatch(const char *pattern, const char *string, int flags);
@@ -60 +66 @@
 /** @}
  */
+