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
235
236
237
238
239
240
241
242
243
244
245
246
|
diff -ur unzip60/consts.h unzip60+iPhone/consts.h
--- unzip60/consts.h 2002-03-23 05:52:48.000000000 -1000
+++ unzip60+iPhone/consts.h 2018-08-06 11:35:37.000000000 -1000
@@ -50,5 +50,5 @@
#ifndef SFX
ZCONST char Far Zipnfo[] = "zipinfo";
- ZCONST char Far CompiledWith[] = "Compiled with %s%s for %s%s%s%s.\n\n";
+ ZCONST char Far CompiledWith[] = "Compiled with %s%s for %s%s.\n\n";
#endif
diff -ur unzip60/unix/unix.c unzip60+iPhone/unix/unix.c
--- unzip60/unix/unix.c 2009-01-23 13:31:26.000000000 -1000
+++ unzip60+iPhone/unix/unix.c 2018-08-06 11:43:37.000000000 -1000
@@ -1517,162 +1517,170 @@
IZ_OS_NAME,
#if defined(sgi) || defined(__sgi)
- " (Silicon Graphics IRIX)",
+ " (Silicon Graphics IRIX)"
#else
#ifdef sun
# ifdef sparc
# ifdef __SVR4
- " (Sun SPARC/Solaris)",
+ " (Sun SPARC/Solaris)"
# else /* may or may not be SunOS */
- " (Sun SPARC)",
+ " (Sun SPARC)"
# endif
# else
# if defined(sun386) || defined(i386)
- " (Sun 386i)",
+ " (Sun 386i)"
# else
# if defined(mc68020) || defined(__mc68020__)
- " (Sun 3)",
+ " (Sun 3)"
# else /* mc68010 or mc68000: Sun 2 or earlier */
- " (Sun 2)",
+ " (Sun 2)"
# endif
# endif
# endif
#else
#ifdef __hpux
- " (HP-UX)",
+ " (HP-UX)"
#else
#ifdef __osf__
- " (DEC OSF/1)",
+ " (DEC OSF/1)"
#else
#ifdef _AIX
- " (IBM AIX)",
+ " (IBM AIX)"
#else
#ifdef aiws
- " (IBM RT/AIX)",
+ " (IBM RT/AIX)"
#else
#if defined(CRAY) || defined(cray)
# ifdef _UNICOS
- (sprintf(os_namebuf, " (Cray UNICOS release %d)", _UNICOS), os_namebuf),
+ (sprintf(os_namebuf, " (Cray UNICOS release %d)", _UNICOS), os_namebuf)
# else
- " (Cray UNICOS)",
+ " (Cray UNICOS)"
# endif
#else
#if defined(uts) || defined(UTS)
- " (Amdahl UTS)",
+ " (Amdahl UTS)"
#else
#ifdef NeXT
# ifdef mc68000
- " (NeXTStep/black)",
+ " (NeXTStep/black)"
# else
- " (NeXTStep for Intel)",
+ " (NeXTStep for Intel)"
# endif
#else /* the next dozen or so are somewhat order-dependent */
#ifdef LINUX
# ifdef __ELF__
- " (Linux ELF)",
+ " (Linux ELF)"
# else
- " (Linux a.out)",
+ " (Linux a.out)"
# endif
#else
#ifdef MINIX
- " (Minix)",
+ " (Minix)"
#else
#ifdef M_UNIX
- " (SCO Unix)",
+ " (SCO Unix)"
#else
#ifdef M_XENIX
- " (SCO Xenix)",
+ " (SCO Xenix)"
#else
#ifdef __NetBSD__
# ifdef NetBSD0_8
(sprintf(os_namebuf, " (NetBSD 0.8%c)", (char)(NetBSD0_8 - 1 + 'A')),
- os_namebuf),
+ os_namebuf)
# else
# ifdef NetBSD0_9
(sprintf(os_namebuf, " (NetBSD 0.9%c)", (char)(NetBSD0_9 - 1 + 'A')),
- os_namebuf),
+ os_namebuf)
# else
# ifdef NetBSD1_0
(sprintf(os_namebuf, " (NetBSD 1.0%c)", (char)(NetBSD1_0 - 1 + 'A')),
- os_namebuf),
+ os_namebuf)
# else
- (BSD4_4 == 0.5)? " (NetBSD before 0.9)" : " (NetBSD 1.1 or later)",
+ (BSD4_4 == 0.5)? " (NetBSD before 0.9)" : " (NetBSD 1.1 or later)"
# endif
# endif
# endif
#else
#ifdef __FreeBSD__
- (BSD4_4 == 0.5)? " (FreeBSD 1.x)" : " (FreeBSD 2.0 or later)",
+ (BSD4_4 == 0.5)? " (FreeBSD 1.x)" : " (FreeBSD 2.0 or later)"
#else
#ifdef __bsdi__
- (BSD4_4 == 0.5)? " (BSD/386 1.0)" : " (BSD/386 1.1 or later)",
+ (BSD4_4 == 0.5)? " (BSD/386 1.0)" : " (BSD/386 1.1 or later)"
#else
#ifdef __386BSD__
- (BSD4_4 == 1)? " (386BSD, post-4.4 release)" : " (386BSD)",
+ (BSD4_4 == 1)? " (386BSD, post-4.4 release)" : " (386BSD)"
#else
#ifdef __CYGWIN__
- " (Cygwin)",
+ " (Cygwin)"
#else
#if defined(i686) || defined(__i686) || defined(__i686__)
- " (Intel 686)",
+ " (Intel 686)"
#else
#if defined(i586) || defined(__i586) || defined(__i586__)
- " (Intel 586)",
+ " (Intel 586)"
#else
#if defined(i486) || defined(__i486) || defined(__i486__)
- " (Intel 486)",
+ " (Intel 486)"
#else
#if defined(i386) || defined(__i386) || defined(__i386__)
- " (Intel 386)",
+ " (Intel 386)"
#else
#ifdef pyr
- " (Pyramid)",
+ " (Pyramid)"
#else
#ifdef ultrix
# ifdef mips
- " (DEC/MIPS)",
+ " (DEC/MIPS)"
# else
# ifdef vax
- " (DEC/VAX)",
+ " (DEC/VAX)"
# else /* __alpha? */
- " (DEC/Alpha)",
+ " (DEC/Alpha)"
# endif
# endif
#else
#ifdef gould
- " (Gould)",
+ " (Gould)"
#else
#ifdef MTS
- " (MTS)",
+ " (MTS)"
#else
#ifdef __convexc__
- " (Convex)",
+ " (Convex)"
#else
#ifdef __QNX__
- " (QNX 4)",
+ " (QNX 4)"
#else
#ifdef __QNXNTO__
- " (QNX Neutrino)",
+ " (QNX Neutrino)"
#else
#ifdef Lynx
- " (LynxOS)",
+ " (LynxOS)"
#else
#ifdef __APPLE__
# ifdef __i386__
- " Mac OS X Intel i32",
+ " Mac OS X Intel i32"
# else
# ifdef __ppc__
- " Mac OS X PowerPC",
+ " Mac OS X PowerPC"
# else
# ifdef __ppc64__
- " Mac OS X PowerPC64",
+ " Mac OS X PowerPC64"
# else
- " Mac OS X",
+# ifdef __arm__
+ " iPhoneOS ARM"
+# else
+# ifdef __arm64__
+ " iPhoneOS ARM64"
+# else
+ " Mac OS X"
+# endif /* __arm64__ */
+# endif /* __arm__ */
# endif /* __ppc64__ */
# endif /* __ppc__ */
# endif /* __i386__ */
#else
- "",
+ ""
#endif /* Apple */
#endif /* Lynx */
#endif /* QNX Neutrino */
@@ -1704,12 +1712,6 @@
#endif /* HP-UX */
#endif /* Sun */
#endif /* SGI */
-
-#ifdef __DATE__
- " on ", __DATE__
-#else
- "", ""
-#endif
);
(*G.message)((zvoid *)&G, slide, (ulg)strlen((char *)slide), 0);
Only in unzip60+iPhone/unix: unix.c.orig
Only in unzip60+iPhone/unix: unix.c.rej
|
