Changeset 6843a9c in mainline for uspace/srv/fs/fat/fat_dentry.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/srv/fs/fat/fat_dentry.c (modified) (2 diffs)

uspace/srv/fs/fat/fat_dentry.c

@@ -43 +43 @@
 #include <byteorder.h>
 #include <assert.h>
+#include <unistd.h>
 
 /** Compare path component with the name read from the dentry.
@@ -334 +335 @@
         while (i < count) {
                 if ((ch = str_decode(src, &off, STR_NO_LIMIT)) != 0) {
-                        if (ascii_check(ch) & IS_D_CHAR(ch))
+                        if (ascii_check(ch) && IS_D_CHAR(ch))
                                 *dst = toupper(ch);
                         else