fix for mingw
CI / FreeBSD (autotools) (push) Failing after 2s
CI / FreeBSD (cmake) (push) Failing after 1s
CI / MacOS (autotools) (push) Canceled after 0s
CI / MacOS (cmake) (push) Canceled after 0s
CI / Ubuntu (autotools, mbedtls) (push) Canceled after 0s
CI / Ubuntu (autotools, nettle) (push) Canceled after 0s
CI / Ubuntu (autotools, openssl) (push) Canceled after 0s
CI / Ubuntu (cmake, mbedtls) (push) Canceled after 0s
CI / Ubuntu (cmake, nettle) (push) Canceled after 0s
CI / Ubuntu (cmake, openssl) (push) Canceled after 0s
CI / Ubuntu-distcheck (push) Canceled after 0s
CI / Windows (cygwin-gcc) (push) Canceled after 0s
CI / Windows (mingw-gcc) (push) Canceled after 0s
CI / Windows (msvc) (push) Canceled after 0s
Lint / Lint (push) Canceled after 0s
CI / FreeBSD (autotools) (push) Failing after 2s
CI / FreeBSD (cmake) (push) Failing after 1s
CI / MacOS (autotools) (push) Canceled after 0s
CI / MacOS (cmake) (push) Canceled after 0s
CI / Ubuntu (autotools, mbedtls) (push) Canceled after 0s
CI / Ubuntu (autotools, nettle) (push) Canceled after 0s
CI / Ubuntu (autotools, openssl) (push) Canceled after 0s
CI / Ubuntu (cmake, mbedtls) (push) Canceled after 0s
CI / Ubuntu (cmake, nettle) (push) Canceled after 0s
CI / Ubuntu (cmake, openssl) (push) Canceled after 0s
CI / Ubuntu-distcheck (push) Canceled after 0s
CI / Windows (cygwin-gcc) (push) Canceled after 0s
CI / Windows (mingw-gcc) (push) Canceled after 0s
CI / Windows (msvc) (push) Canceled after 0s
Lint / Lint (push) Canceled after 0s
This commit is contained in:
1 parent
57a2e910a5
commit
36e7fc6b07
5 files changed
+8
-7
No files matched your search
@@ -171,7 +171,6 @@ SET(libarchive_SOURCES
|
||||
archive_write_set_options.c
|
||||
archive_write_set_passphrase.c
|
||||
archive_xxhash.h
|
||||
filter_fork_posix.c
|
||||
filter_fork.h
|
||||
xxhash.c
|
||||
)
|
||||
@@ -228,6 +227,8 @@ IF(WIN32 AND NOT CYGWIN)
|
||||
LIST(APPEND libarchive_SOURCES archive_windows.h)
|
||||
LIST(APPEND libarchive_SOURCES archive_write_disk_windows.c)
|
||||
LIST(APPEND libarchive_SOURCES filter_fork_windows.c)
|
||||
ELSE(WIN32 AND NOT CYGWIN)
|
||||
LIST(APPEND libarchive_SOURCES filter_fork_posix.c)
|
||||
ENDIF(WIN32 AND NOT CYGWIN)
|
||||
|
||||
IF(ARCHIVE_BLAKE2)
|
||||
|
||||
@@ -448,7 +448,7 @@ default_iconv_charset(const char *charset) {
|
||||
#if HAVE_LOCALE_CHARSET && HAVE_LOCALCHARSET_H && !defined(__APPLE__)
|
||||
/* locale_charset() is broken on Mac OS */
|
||||
return locale_charset();
|
||||
#elif defined(HAVE_LANGINFO_H) && defined(CODESET)
|
||||
#elif defined(HAVE_LANGINFO_H) && defined(CODESET) && !defined(__MINGW32__)
|
||||
return nl_langinfo(CODESET);
|
||||
#elif defined(__BIONIC__)
|
||||
return "UTF-8";
|
||||
|
||||
@@ -1783,7 +1783,7 @@ create_filesystem_object(struct archive_write_disk *a)
|
||||
* incidentally writing through the entry we are about to create.
|
||||
*/
|
||||
a->path_safe.s[0] = 0;
|
||||
#if HAVE_SYMLINK
|
||||
#if HAVE_SYMLINK && !defined(__MINGW32__)
|
||||
return symlink(linkname, a->name) ? errno : 0;
|
||||
#else
|
||||
errno = 0;
|
||||
@@ -2799,7 +2799,7 @@ set_mode(struct archive_write_disk *a, int mode)
|
||||
}
|
||||
|
||||
if (S_ISLNK(a->mode)) {
|
||||
#ifdef HAVE_LCHMOD
|
||||
#if defined(HAVE_LCHMOD) && !defined(__MINGW32__)
|
||||
/*
|
||||
* If this is a symlink, use lchmod(). If the
|
||||
* platform doesn't support lchmod(), just skip it. A
|
||||
@@ -2821,7 +2821,7 @@ set_mode(struct archive_write_disk *a, int mode)
|
||||
* an fd. Dirs get their perms set during the
|
||||
* post-extract fixup, which is handled elsewhere.
|
||||
*/
|
||||
#ifdef HAVE_FCHMOD
|
||||
#if defined(HAVE_FCHMOD) && !defined(__MINGW32__)
|
||||
if (a->fd >= 0) {
|
||||
if (fchmod(a->fd, mode) != 0) {
|
||||
archive_set_error(&a->archive, errno,
|
||||
|
||||
@@ -2505,7 +2505,7 @@ get_gmoffset(struct tm *tm)
|
||||
{
|
||||
long offset;
|
||||
|
||||
#if defined(HAVE__GET_TIMEZONE)
|
||||
#if defined(HAVE__GET_TIMEZONE) && !defined(__MINGW32__)
|
||||
_get_timezone(&offset);
|
||||
#elif defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
|
||||
offset = _timezone;
|
||||
|
||||
@@ -935,7 +935,7 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
|
||||
if (strcmp(archive_string_conversion_charset_name(
|
||||
zip->opt_sconv), "UTF-8") == 0)
|
||||
zip->entry_flags |= ZIP_ENTRY_FLAG_UTF8_NAME;
|
||||
#if HAVE_NL_LANGINFO
|
||||
#if HAVE_NL_LANGINFO && !defined(__MINGW32__)
|
||||
} else if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0) {
|
||||
zip->entry_flags |= ZIP_ENTRY_FLAG_UTF8_NAME;
|
||||
#endif
|
||||
|
||||
Reference in new issue
Block a user