diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-24 10:13:10 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-08-24 10:13:10 -0400 |
| commit | 107df8e65019b89f82249395bc09efe5dc9e2a7f (patch) | |
| tree | 552fc25b0159b83e08be798f5ae30dc3d80a5266 /Utilities/cmlibarchive/libarchive/archive_acl.c | |
| parent | 3d05964b0293a0bb9eb9f1f3b6d3cff1d86aa85a (diff) | |
| parent | dadea0e5ce7dd04c7a2c1d22f3fd12affdbd6a89 (diff) | |
| download | cmake-107df8e65019b89f82249395bc09efe5dc9e2a7f.tar.gz | |
Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
LibArchive 2020-12-26 (227a4b97)
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_acl.c')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_acl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_acl.c b/Utilities/cmlibarchive/libarchive/archive_acl.c index 952e20df4d..ead7e36e49 100644 --- a/Utilities/cmlibarchive/libarchive/archive_acl.c +++ b/Utilities/cmlibarchive/libarchive/archive_acl.c @@ -595,7 +595,7 @@ archive_acl_text_len(struct archive_acl *acl, int want_type, int flags, else length += sizeof(uid_t) * 3 + 1; } else { - r = archive_mstring_get_mbs_l(&ap->name, &name, + r = archive_mstring_get_mbs_l(a, &ap->name, &name, &len, sc); if (r != 0) return (0); @@ -968,7 +968,7 @@ archive_acl_to_text_l(struct archive_acl *acl, ssize_t *text_len, int flags, else prefix = NULL; r = archive_mstring_get_mbs_l( - &ap->name, &name, &len, sc); + NULL, &ap->name, &name, &len, sc); if (r != 0) { free(s); return (NULL); @@ -1402,14 +1402,14 @@ isint_w(const wchar_t *start, const wchar_t *end, int *result) if (start >= end) return (0); while (start < end) { - if (*start < '0' || *start > '9') + if (*start < L'0' || *start > L'9') return (0); if (n > (INT_MAX / 10) || - (n == INT_MAX / 10 && (*start - '0') > INT_MAX % 10)) { + (n == INT_MAX / 10 && (*start - L'0') > INT_MAX % 10)) { n = INT_MAX; } else { n *= 10; - n += *start - '0'; + n += *start - L'0'; } start++; } |