diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-09 18:22:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-04-09 18:22:44 (GMT) |
| commit | 0740677b9c67cfe8d26c9cf4cbddb8410d7f920a (patch) | |
| tree | 21f2ef746d93829300935000a3f7c7f2be250cc5 | |
| parent | 048c6d19253759b1a4405813afc4272c28721c05 (diff) | |
| parent | 1f33b45d5daca380e0be0ecfc595eac881328f29 (diff) | |
| download | CMake-0740677b9c67cfe8d26c9cf4cbddb8410d7f920a.zip CMake-0740677b9c67cfe8d26c9cf4cbddb8410d7f920a.tar.gz CMake-0740677b9c67cfe8d26c9cf4cbddb8410d7f920a.tar.bz2 | |
Merge branch 'fix-libarchive-mktemp' into release
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_util.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_util.c b/Utilities/cmlibarchive/libarchive/archive_util.c index 96b88d8..d136498 100644 --- a/Utilities/cmlibarchive/libarchive/archive_util.c +++ b/Utilities/cmlibarchive/libarchive/archive_util.c @@ -249,6 +249,8 @@ __archive_errx(int retvalue, const char *msg) int __archive_mktemp(const char *tmpdir) { + static const wchar_t *prefix = L"libarchive_"; + static const wchar_t *suffix = L"XXXXXXXXXX"; static const wchar_t num[] = { L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9', L'A', L'B', L'C', L'D', L'E', L'F', @@ -323,10 +325,10 @@ __archive_mktemp(const char *tmpdir) /* * Create a temporary file. */ - archive_wstrcat(&temp_name, L"libarchive_"); - xp = temp_name.s + archive_strlen(&temp_name); - archive_wstrcat(&temp_name, L"XXXXXXXXXX"); + archive_wstrcat(&temp_name, prefix); + archive_wstrcat(&temp_name, suffix); ep = temp_name.s + archive_strlen(&temp_name); + xp = ep - wcslen(suffix); if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) { |