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
|
--- lib/component.c.orig 2005-06-28 18:49:36 UTC
+++ lib/component.c
@@ -40,11 +40,13 @@ UnshieldComponent* unshield_component_ne
case 7:
case 8:
case 9:
+ case 10:
+ case 11:
+ case 12:
+ case 13:
+ default:
p += 0x6b;
break;
-
- default:
- abort();
}
self->file_group_count = READ_UINT16(p); p += 2;
--- lib/file.c.orig 2007-01-06 14:34:57 UTC
+++ lib/file.c
@@ -77,6 +77,11 @@ static FileDescriptor* unshield_read_fil
case 7:
case 8:
case 9:
+ case 10:
+ case 11:
+ case 12:
+ case 13:
+ default:
saved_p = p = header->data +
header->common.cab_descriptor_offset +
header->cab.file_table_offset +
@@ -117,10 +122,6 @@ static FileDescriptor* unshield_read_fil
assert((p - saved_p) == 0x57);
break;
-
- default:
- unshield_error("Unknown major version: %i", header->major_version);
- abort();
}
if (!(fd->flags & FILE_COMPRESSED) &&
@@ -363,6 +364,11 @@ static bool unshield_reader_open_volume(
case 7:
case 8:
case 9:
+ case 10:
+ case 11:
+ case 12:
+ case 13:
+ default:
{
uint8_t six_header[VOLUME_HEADER_SIZE_V6];
uint8_t* p = six_header;
@@ -389,10 +395,6 @@ static bool unshield_reader_open_volume(
reader->volume_header.last_file_size_compressed_high = READ_UINT32(p); p += 4;
}
break;
-
- default:
- abort();
- goto exit;
}
#if VERBOSE >= 2
--- lib/libunshield.c.orig 2004-08-24 06:10:27 UTC
+++ lib/libunshield.c
@@ -205,7 +205,7 @@ static bool unshield_header_get_file_gro
/**
Read all header files
*/
-static bool unshield_read_headers(Unshield* unshield)/*{{{*/
+static bool unshield_read_headers(Unshield* unshield, int version)/*{{{*/
{
int i;
bool iterate = true;
@@ -268,8 +268,21 @@ static bool unshield_read_headers(Unshie
unshield_error("Failed to read common header from header file %i", i);
goto error;
}
-
- header->major_version = (header->common.version >> 12) & 0xf;
+
+ if (version != -1)
+ {
+ header->major_version = version;
+ }
+ else if (header->common.version >> 24 == 1)
+ {
+ header->major_version = (header->common.version >> 12) & 0xf;
+ }
+ else if (header->common.version >> 24 == 2)
+ {
+ header->major_version = (header->common.version & 0xffff);
+ if (header->major_version != 0)
+ header->major_version = header->major_version / 100;
+ }
#if 0
if (header->major_version < 5)
@@ -326,6 +339,11 @@ error:
Unshield* unshield_open(const char* filename)/*{{{*/
{
+ unshield_open_force_version(filename, -1);
+}/*}}}*/
+
+Unshield* unshield_open_force_version(const char* filename, int version)/*{{{*/
+{
Unshield* unshield = NEW1(Unshield);
if (!unshield)
{
@@ -339,7 +357,7 @@ Unshield* unshield_open(const char* file
goto error;
}
- if (!unshield_read_headers(unshield))
+ if (!unshield_read_headers(unshield, version))
{
unshield_error("Failed to read header files");
goto error;
--- lib/libunshield.h.orig 2007-01-06 14:34:57 UTC
+++ lib/libunshield.h
@@ -33,6 +33,7 @@ void unshield_set_log_level(int level);
*/
Unshield* unshield_open(const char* filename);
+Unshield* unshield_open_force_version(const char* filename, int version);
void unshield_close(Unshield* unshield);
/*
--- man/unshield.1.orig 2008-02-15 16:36:33 UTC
+++ man/unshield.1
@@ -2,7 +2,7 @@
.SH NAME
unshield \- extract CAB files from an InstallShield installer archive
.SH SYNOPSIS
-unshield [\-c COMPONENT] [\-d DIRECTORY] [\-D LEVEL] [\-g GROUP] [\-h] [\-j] [\-L] [\-n] [\-o] [\-O] [\-r] [\-v] [\-V] c|g|l|t|x CABFILE
+unshield [\-c COMPONENT] [\-d DIRECTORY] [\-D LEVEL] [\-g GROUP] [\-h] [\-i VERSION] [\-j] [\-L] [\-n] [\-o] [\-O] [\-r] [\-v] [\-V] c|g|l|t|x CABFILE
.SH DESCRIPTION
Unshield extracts CAB files from InstallShield installers, used to
install software on Microsoft Windows based machines.
@@ -27,6 +27,11 @@ Only list/extract this file group
\fB\-h\fR
Show help message
.TP
+\fB\-i\fR VERSION
+Force InstallShield version number (don't autodetect)\n
+.br
+Use this option if you have a very old archive (generated with InstallShield <= 4) and / or the automatic detection fails
+.TP
\fB\-j\fR
Junk paths (do not make directories)
.TP
--- src/unshield.c.orig 2009-06-18 05:11:31 UTC
+++ src/unshield.c
@@ -58,6 +58,7 @@ static OVERWRITE overwrite =
static int log_level = UNSHIELD_LOG_LEVEL_LOWEST;
static int exit_status = 0;
static FORMAT format = FORMAT_NEW;
+static int is_version = -1;
static bool make_sure_directory_exists(const char* directory)/*{{{*/
{
@@ -108,7 +109,7 @@ static void show_usage(const char* name)
fprintf(stderr,
"Syntax:\n"
"\n"
- "\t%s [-c COMPONENT] [-d DIRECTORY] [-D LEVEL] [-g GROUP] [-GhlOrV] c|g|l|t|x CABFILE\n"
+ "\t%s [-c COMPONENT] [-d DIRECTORY] [-D LEVEL] [-g GROUP] [-i VERSION] [-GhlOrV] c|g|l|t|x CABFILE\n"
"\n"
"Options:\n"
"\t-c COMPONENT Only list/extract this component\n"
@@ -120,6 +121,7 @@ static void show_usage(const char* name)
"\t 3 - Errors, warnings and debug messages\n"
"\t-g GROUP Only list/extract this file group\n"
"\t-h Show this help message\n"
+ "\t-i VERSION Force InstallShield version number (don't autodetect)\n"
"\t-j Junk paths (do not make directories)\n"
"\t-L Make file and directory names lowercase\n"
"\t-O Use old compression\n"
@@ -152,7 +154,7 @@ static bool handle_parameters(
{
int c;
- while ((c = getopt(argc, argv, "c:d:D:g:hjLnoOrV")) != -1)
+ while ((c = getopt(argc, argv, "c:d:D:g:hi:jLnoOrV")) != -1)
{
switch (c)
{
@@ -172,6 +174,10 @@ static bool handle_parameters(
file_group_name = optarg;
break;
+ case 'i':
+ is_version = atoi(optarg);
+ break;
+
case 'j':
junk_paths = true;
break;
@@ -532,7 +538,7 @@ int main(int argc, char** argv)
cabfile = argv[last_optind];
- unshield = unshield_open(cabfile);
+ unshield = unshield_open_force_version(cabfile, is_version);
if (!unshield)
{
fprintf(stderr, "Failed to open %s as an InstallShield Cabinet File\n", cabfile);
|
