diff options
| author | Scott Moser <smoser@brickies.net> | 2021-01-13 21:31:00 -0500 |
|---|---|---|
| committer | David Oberhollenzer <goliath@infraroot.at> | 2021-01-15 17:33:09 +0100 |
| commit | cd3346a66910f02722e60c6a136405b6e2e4e0fe (patch) | |
| tree | db84964217ff0c2ad2b30837469f0b5a31bb3c6e /lib/sqfs | |
| parent | 0e3bb2104a8e3fd07e201e6ba99f8d017fdc72a8 (diff) | |
Fix more normalization of slashes in filenames.
It looks like the last commit missed a couple more occurences
where '\' was treated incorrectly.
Fixes were still needed in sqfs_dir_reader_find_by_path and
sqfs_dir_reader_get_full_hierarchy.
This path is used in extras/browse.c.
Diffstat (limited to 'lib/sqfs')
| -rw-r--r-- | lib/sqfs/dir_reader.c | 5 | ||||
| -rw-r--r-- | lib/sqfs/read_tree.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/sqfs/dir_reader.c b/lib/sqfs/dir_reader.c index 49d1188..65962d8 100644 --- a/lib/sqfs/dir_reader.c +++ b/lib/sqfs/dir_reader.c @@ -277,8 +277,8 @@ int sqfs_dir_reader_find_by_path(sqfs_dir_reader_t *rd, return ret; while (*path != '\0') { - if (*path == '/' || *path == '\\') { - while (*path == '/' || *path == '\\') + if (*path == '/') { + while (*path == '/') ++path; continue; } @@ -290,7 +290,6 @@ int sqfs_dir_reader_find_by_path(sqfs_dir_reader_t *rd, ptr = strchr(path, '/'); if (ptr == NULL) { - ptr = strchr(path, '\\'); if (ptr == NULL) { for (ptr = path; *ptr != '\0'; ++ptr) diff --git a/lib/sqfs/read_tree.c b/lib/sqfs/read_tree.c index b668ef4..56b4f0c 100644 --- a/lib/sqfs/read_tree.c +++ b/lib/sqfs/read_tree.c @@ -214,8 +214,8 @@ int sqfs_dir_reader_get_full_hierarchy(sqfs_dir_reader_t *rd, inode = NULL; while (path != NULL && *path != '\0') { - if (*path == '/' || *path == '\\') { - while (*path == '/' || *path == '\\') + if (*path == '/') { + while (*path == '/') ++path; continue; } @@ -226,7 +226,6 @@ int sqfs_dir_reader_get_full_hierarchy(sqfs_dir_reader_t *rd, ptr = strchr(path, '/'); if (ptr == NULL) { - ptr = strchr(path, '\\'); if (ptr == NULL) { for (ptr = path; *ptr != '\0'; ++ptr) |