1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
|
Index: build/cmake/config.h.in
===================================================================
--- build/cmake/config.h.in (revision 3670)
+++ build/cmake/config.h.in (revision 3737)
@@ -1,5 +1,8 @@
/* config.h. Generated from config.h.cmake by cmake configure */
+/* Define ZLIB_WINAPI if zlib was built on Visual Studio. */
+#cmakedefine ZLIB_WINAPI 1
+
/* MD5 via ARCHIVE_HASH_MD5_LIBC supported. */
#cmakedefine ARCHIVE_HASH_MD5_LIBC
Index: libarchive/archive_read_support_format_all.c
===================================================================
--- libarchive/archive_read_support_format_all.c (revision 3670)
+++ libarchive/archive_read_support_format_all.c (revision 3737)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2003-2007 Tim Kientzle
+ * Copyright (c) 2003-2011 Tim Kientzle
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -39,5 +39,13 @@
archive_read_support_format_tar(a);
archive_read_support_format_xar(a);
archive_read_support_format_zip(a);
+
+ /* Note: We always return ARCHIVE_OK here, even if some of the
+ * above return ARCHIVE_WARN. The intent here is to enable
+ * "as much as possible." Clients who need specific
+ * compression should enable those individually so they can
+ * verify the level of support. */
+ /* Clear any warning messages set by the above functions. */
+ archive_clear_error(a);
return (ARCHIVE_OK);
}
Index: libarchive/archive_write_disk.c
===================================================================
--- libarchive/archive_write_disk.c (revision 3670)
+++ libarchive/archive_write_disk.c (revision 3737)
@@ -1513,6 +1513,22 @@
}
#if defined(_WIN32) || defined(__CYGWIN__)
+static int
+guidword(const char *p, int n)
+{
+ int i;
+
+ for (i = 0; i < n; i++) {
+ if ((*p >= '0' && *p <= '9') ||
+ (*p >= 'a' && *p <= 'f') ||
+ (*p >= 'A' && *p <= 'F'))
+ p++;
+ else
+ return (-1);
+ }
+ return (0);
+}
+
/*
* 1. Convert a path separator from '\' to '/' .
* We shouldn't check multi-byte character directly because some
@@ -1521,26 +1537,92 @@
* 2. Replace unusable characters in Windows with underscore('_').
* See also : http://msdn.microsoft.com/en-us/library/aa365247.aspx
*/
-static void
+static int
cleanup_pathname_win(struct archive_write_disk *a)
{
wchar_t wc;
char *p;
size_t alen, l;
- alen = 0;
- l = 0;
- for (p = a->name; *p != '\0'; p++) {
- ++alen;
- if (*p == '\\')
- l = 1;
+ p = a->name;
+ /* Skip leading "\\.\" or "\\?\" or "\\?\UNC\" or
+ * "\\?\Volume{GUID}\"
+ * (absolute path prefixes used by Windows API) */
+ if ((p[0] == '\\' || p[0] == '/') && (p[1] == '\\' || p[1] == '/' ) &&
+ (p[2] == '.' || p[2] == '?') && (p[3] == '\\' || p[3] == '/'))
+ {
+ /* A path begin with "\\?\UNC\" */
+ if (p[2] == '?' &&
+ (p[4] == 'U' || p[4] == 'u') &&
+ (p[5] == 'N' || p[5] == 'n') &&
+ (p[6] == 'C' || p[6] == 'c') &&
+ (p[7] == '\\' || p[7] == '/'))
+ p += 8;
+ /* A path begin with "\\?\Volume{GUID}\" */
+ else if (p[2] == '?' &&
+ (p[4] == 'V' || p[4] == 'v') &&
+ (p[5] == 'O' || p[5] == 'o') &&
+ (p[6] == 'L' || p[6] == 'l') &&
+ (p[7] == 'U' || p[7] == 'u') &&
+ (p[8] == 'M' || p[8] == 'm') &&
+ (p[9] == 'E' || p[9] == 'e') &&
+ p[10] == '{') {
+ if (guidword(p+11, 8) == 0 && p[19] == '-' &&
+ guidword(p+20, 4) == 0 && p[24] == '-' &&
+ guidword(p+25, 4) == 0 && p[29] == '-' &&
+ guidword(p+30, 4) == 0 && p[34] == '-' &&
+ guidword(p+35, 12) == 0 && p[47] == '}' &&
+ (p[48] == '\\' || p[48] == '/'))
+ p += 49;
+ else
+ p += 4;
+ /* A path begin with "\\.\PhysicalDriveX" */
+ } else if (p[2] == '.' &&
+ (p[4] == 'P' || p[4] == 'p') &&
+ (p[5] == 'H' || p[5] == 'h') &&
+ (p[6] == 'Y' || p[6] == 'y') &&
+ (p[7] == 'S' || p[7] == 's') &&
+ (p[8] == 'I' || p[8] == 'i') &&
+ (p[9] == 'C' || p[9] == 'c') &&
+ (p[9] == 'A' || p[9] == 'a') &&
+ (p[9] == 'L' || p[9] == 'l') &&
+ (p[9] == 'D' || p[9] == 'd') &&
+ (p[9] == 'R' || p[9] == 'r') &&
+ (p[9] == 'I' || p[9] == 'i') &&
+ (p[9] == 'V' || p[9] == 'v') &&
+ (p[9] == 'E' || p[9] == 'e') &&
+ (p[10] >= '0' && p[10] <= '9') &&
+ p[11] == '\0') {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Path is a physical drive name");
+ return (ARCHIVE_FAILED);
+ } else
+ p += 4;
+ }
+
+ /* Skip leading drive letter from archives created
+ * on Windows. */
+ if (((p[0] >= 'a' && p[0] <= 'z') ||
+ (p[0] >= 'A' && p[0] <= 'Z')) &&
+ p[1] == ':') {
+ if (p[2] == '\0') {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Path is a drive name");
+ return (ARCHIVE_FAILED);
+ }
+ if (p[2] == '\\' || p[2] == '/')
+ p += 3;
+ }
+
+ for (; *p != '\0'; p++) {
/* Rewrite the path name if its character is a unusable. */
if (*p == ':' || *p == '*' || *p == '?' || *p == '"' ||
*p == '<' || *p == '>' || *p == '|')
*p = '_';
}
- if (alen == 0 || l == 0)
- return;
+ alen = p - a->name;
+ if (alen == 0 || strchr(a->name, '\\') == NULL)
+ return (ARCHIVE_OK);
/*
* Convert path separator.
*/
@@ -1560,6 +1642,7 @@
p += l;
alen -= l;
}
+ return (ARCHIVE_OK);
}
#endif
@@ -1583,7 +1666,8 @@
}
#if defined(_WIN32) || defined(__CYGWIN__)
- cleanup_pathname_win(a);
+ if (cleanup_pathname_win(a) != ARCHIVE_OK)
+ return (ARCHIVE_FAILED);
#endif
/* Skip leading '/'. */
if (*src == '/')
Index: libarchive/archive_util.c
===================================================================
--- libarchive/archive_util.c (revision 3670)
+++ libarchive/archive_util.c (revision 3737)
@@ -155,6 +155,7 @@
{
archive_string_empty(&a->error_string);
a->error = NULL;
+ a->archive_error_number = 0;
}
void
Index: libarchive/archive_read_extract.c
===================================================================
--- libarchive/archive_read_extract.c (revision 3670)
+++ libarchive/archive_read_extract.c (revision 3737)
@@ -108,7 +108,7 @@
if (r != ARCHIVE_OK)
/* If _write_header failed, copy the error. */
archive_copy_error(&a->archive, ad);
- else if (archive_entry_size(entry) > 0)
+ else if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) > 0)
/* Otherwise, pour data into the entry. */
r = copy_data(_a, ad);
r2 = archive_write_finish_entry(ad);
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (revision 3670)
+++ CMakeLists.txt (revision 3737)
@@ -154,6 +154,13 @@
SET(HAVE_ZLIB_H 1)
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
+ IF(WIN32 AND NOT CYGWIN)
+ SET(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
+ SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
+ CHECK_C_SOURCE_Runs(
+ "#ifndef ZLIB_WINAPI\n#define ZLIB_WINAPI\n#endif\n#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
+ ZLIB_WINAPI)
+ ENDIF(WIN32 AND NOT CYGWIN)
ENDIF(ZLIB_FOUND)
MARK_AS_ADVANCED(CLEAR ZLIB_INCLUDE_DIR)
MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY)
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
Merged /trunk:r1989,3247,3722
|
