Update copyright years.

[android-x86/external-exfat.git] / libexfat / lookup.c

diff --git a/libexfat/lookup.c b/libexfat/lookup.c
index 1841082..23aa141 100644 (file)
--- a/libexfat/lookup.c
+++ b/libexfat/lookup.c
@@ -2,11 +2,12 @@
        lookup.c (02.09.09)
        exFAT file system implementation library.
 
-       Copyright (C) 2009, 2010  Andrew Nayenko
+       Free exFAT implementation.
+       Copyright (C) 2010-2018  Andrew Nayenko
 
-       This program is free software: you can redistribute it and/or modify
+       This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
-       the Free Software Foundation, either version 3 of the License, or
+       the Free Software Foundation, either version 2 of the License, or
        (at your option) any later version.
 
        This program is distributed in the hope that it will be useful,
@@ -14,8 +15,9 @@
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
        GNU General Public License for more details.
 
-       You should have received a copy of the GNU General Public License
-       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+       You should have received a copy of the GNU General Public License along
+       with this program; if not, write to the Free Software Foundation, Inc.,
+       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "exfat.h"
@@ -44,7 +46,7 @@ void exfat_closedir(struct exfat* ef, struct exfat_iterator* it)
        it->current = NULL;
 }
 
-struct exfat_node* exfat_readdir(struct exfat* ef, struct exfat_iterator* it)
+struct exfat_node* exfat_readdir(struct exfat_iterator* it)
 {
        if (it->current == NULL)
                it->current = it->parent->child;
@@ -59,10 +61,7 @@ struct exfat_node* exfat_readdir(struct exfat* ef, struct exfat_iterator* it)
 
 static int compare_char(struct exfat* ef, uint16_t a, uint16_t b)
 {
-       if (a >= ef->upcase_chars || b >= ef->upcase_chars)
-               return (int) a - (int) b;
-
-       return (int) le16_to_cpu(ef->upcase[a]) - (int) le16_to_cpu(ef->upcase[b]);
+       return (int) ef->upcase[a] - (int) ef->upcase[b];
 }
 
 static int compare_name(struct exfat* ef, const le16_t* a, const le16_t* b)
@@ -87,14 +86,14 @@ static int lookup_name(struct exfat* ef, struct exfat_node* parent,
 
        *node = NULL;
 
-       rc = utf8_to_utf16(buffer, name, EXFAT_NAME_MAX, n);
+       rc = utf8_to_utf16(buffer, name, EXFAT_NAME_MAX + 1, n);
        if (rc != 0)
                return rc;
 
        rc = exfat_opendir(ef, parent, &it);
        if (rc != 0)
                return rc;
-       while ((*node = exfat_readdir(ef, &it)))
+       while ((*node = exfat_readdir(&it)))
        {
                if (compare_name(ef, buffer, (*node)->name) == 0)
                {
@@ -125,6 +124,7 @@ int exfat_lookup(struct exfat* ef, struct exfat_node** node,
        struct exfat_node* parent;
        const char* p;
        size_t n;
+       int rc;
 
        /* start from the root directory */
        parent = *node = exfat_get_node(ef->root);
@@ -132,10 +132,11 @@ int exfat_lookup(struct exfat* ef, struct exfat_node** node,
        {
                if (n == 1 && *p == '.')                                /* skip "." component */
                        continue;
-               if (lookup_name(ef, parent, node, p, n) != 0)
+               rc = lookup_name(ef, parent, node, p, n);
+               if (rc != 0)
                {
                        exfat_put_node(ef, parent);
-                       return -ENOENT;
+                       return rc;
                }
                exfat_put_node(ef, parent);
                parent = *node;
@@ -143,16 +144,33 @@ int exfat_lookup(struct exfat* ef, struct exfat_node** node,
        return 0;
 }
 
-static int is_last_comp(const char* comp, size_t length)
+static bool is_last_comp(const char* comp, size_t length)
 {
        const char* p = comp + length;
 
        return get_comp(p, &p) == 0;
 }
 
-static int is_allowed(const char* comp, size_t length)
+static bool is_allowed(const char* comp, size_t length)
 {
-       return strcspn(comp, "/\\:*?\"<>|") >= length;
+       size_t i;
+
+       for (i = 0; i < length; i++)
+               switch (comp[i])
+               {
+               case 0x01 ... 0x1f:
+               case '/':
+               case '\\':
+               case ':':
+               case '*':
+               case '?':
+               case '"':
+               case '<':
+               case '>':
+               case '|':
+                       return false;
+               }
+       return true;
 }
 
 int exfat_split(struct exfat* ef, struct exfat_node** parent,
@@ -160,7 +178,9 @@ int exfat_split(struct exfat* ef, struct exfat_node** parent,
 {
        const char* p;
        size_t n;
+       int rc;
 
+       memset(name, 0, (EXFAT_NAME_MAX + 1) * sizeof(le16_t));
        *parent = *node = exfat_get_node(ef->root);
        for (p = path; (n = get_comp(p, &p)); p += n)
        {
@@ -168,15 +188,13 @@ int exfat_split(struct exfat* ef, struct exfat_node** parent,
                        continue;
                if (is_last_comp(p, n))
                {
-                       int rc;
-
                        if (!is_allowed(p, n))
                        {
                                /* contains characters that are not allowed */
                                exfat_put_node(ef, *parent);
                                return -ENOENT;
                        }
-                       rc = utf8_to_utf16(name, p, EXFAT_NAME_MAX, n);
+                       rc = utf8_to_utf16(name, p, EXFAT_NAME_MAX + 1, n);
                        if (rc != 0)
                        {
                                exfat_put_node(ef, *parent);
@@ -191,10 +209,11 @@ int exfat_split(struct exfat* ef, struct exfat_node** parent,
                        }
                        return 0;
                }
-               if (lookup_name(ef, *parent, node, p, n) != 0)
+               rc = lookup_name(ef, *parent, node, p, n);
+               if (rc != 0)
                {
                        exfat_put_node(ef, *parent);
-                       return -ENOENT;
+                       return rc;
                }
                exfat_put_node(ef, *parent);
                *parent = *node;