Browse code

clamdscan-win32

aCaB authored on 2010/02/01 01:12:34
Showing 14 changed files
... ...
@@ -1,3 +1,7 @@
1
+Sun Jan 31 17:12:48 CET 2010 (acab)
2
+-----------------------------------
3
+ * win32: clamdscan added
4
+
1 5
 Sat Jan 30 04:19:29 CET 2010 (acab)
2 6
 -----------------------------------
3 7
  * win32: clamd (sort of) works
... ...
@@ -25,7 +25,9 @@
25 25
 #include <stdio.h>
26 26
 #include <string.h>
27 27
 #include <stdlib.h>
28
+#ifdef HAVE_UNISTD_H
28 29
 #include <unistd.h>
30
+#endif
29 31
 #ifndef _WIN32
30 32
 #include <sys/time.h>
31 33
 #endif
... ...
@@ -58,8 +60,9 @@ int main(int argc, char **argv)
58 58
 	time_t starttime;
59 59
         struct optstruct *opts;
60 60
         const struct optstruct *opt;
61
+#ifndef _WIN32
61 62
 	struct sigaction sigact;
62
-
63
+#endif
63 64
 
64 65
     if((opts = optparse(NULL, argc, argv, 1, OPT_CLAMDSCAN, OPT_CLAMSCAN, NULL)) == NULL) {
65 66
 	mprintf("!Can't parse command line options\n");
... ...
@@ -117,11 +120,13 @@ int main(int argc, char **argv)
117 117
 	exit(2);
118 118
     }
119 119
 
120
+#ifndef _WIN32
120 121
     memset(&sigact, 0, sizeof(struct sigaction));
121 122
     sigact.sa_handler = SIG_IGN;
122 123
     sigemptyset(&sigact.sa_mask);
123 124
     sigaddset(&sigact.sa_mask, SIGPIPE);
124 125
     sigaction(SIGPIPE, &sigact, NULL);
126
+#endif
125 127
 
126 128
     time(&starttime);
127 129
     /* ctime() does \n, but I need it once more */
... ...
@@ -51,6 +51,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clamd", "clamd.vcproj", "{B
51 51
 		{3AD5B16C-340A-40AC-96AD-6017B941A316} = {3AD5B16C-340A-40AC-96AD-6017B941A316}
52 52
 	EndProjectSection
53 53
 EndProject
54
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clamdscan", "clamdscan.vcproj", "{9571E1BE-DDDA-47CB-8675-238D405FCADA}"
55
+	ProjectSection(ProjectDependencies) = postProject
56
+		{3AD5B16C-340A-40AC-96AD-6017B941A316} = {3AD5B16C-340A-40AC-96AD-6017B941A316}
57
+	EndProjectSection
58
+EndProject
54 59
 Global
55 60
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
56 61
 		Debug|Win32 = Debug|Win32
... ...
@@ -109,6 +114,10 @@ Global
109 109
 		{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Debug|Win32.Build.0 = Debug|Win32
110 110
 		{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Release|Win32.ActiveCfg = Release|Win32
111 111
 		{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Release|Win32.Build.0 = Release|Win32
112
+		{9571E1BE-DDDA-47CB-8675-238D405FCADA}.Debug|Win32.ActiveCfg = Debug|Win32
113
+		{9571E1BE-DDDA-47CB-8675-238D405FCADA}.Debug|Win32.Build.0 = Debug|Win32
114
+		{9571E1BE-DDDA-47CB-8675-238D405FCADA}.Release|Win32.ActiveCfg = Release|Win32
115
+		{9571E1BE-DDDA-47CB-8675-238D405FCADA}.Release|Win32.Build.0 = Release|Win32
112 116
 	EndGlobalSection
113 117
 	GlobalSection(SolutionProperties) = preSolution
114 118
 		HideSolutionNode = FALSE
... ...
@@ -6,7 +6,7 @@
6 6
 	ProjectType="Visual C++"
7 7
 	RootNamespace="LLVMcodegen"
8 8
 	TargetFrameworkVersion="196613"
9
-	Version="9.00"
9
+	Version="9,00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
... ...
@@ -41,7 +41,7 @@
41 41
 			<Tool
42 42
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
43 43
 				BasicRuntimeChecks="3"
44
-				DebugInformationFormat="4"
44
+				DebugInformationFormat="3"
45 45
 				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
46 46
 				ExceptionHandling="1"
47 47
 				MinimalRebuild="true"
... ...
@@ -105,7 +105,7 @@
105 105
 			/>
106 106
 			<Tool
107 107
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
108
-				DebugInformationFormat="0"
108
+				DebugInformationFormat="3"
109 109
 				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
110 110
 				EnableFunctionLevelLinking="false"
111 111
 				EnableIntrinsicFunctions="true"
... ...
@@ -400,11 +400,11 @@
400 400
 				>
401 401
 			</File>
402 402
 			<File
403
-				RelativePath="..\libclamav\c++\llvm\lib\MC\MCAsmInfoDarwin.cpp"
403
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachOWriter.cpp"
404 404
 				>
405 405
 			</File>
406 406
 			<File
407
-				RelativePath="..\libclamav\c++\llvm\lib\MC\MCMachOStreamer.cpp"
407
+				RelativePath="..\libclamav\c++\llvm\lib\MC\MCAsmInfoDarwin.cpp"
408 408
 				>
409 409
 			</File>
410 410
 			<File
... ...
@@ -420,6 +420,10 @@
420 420
 				>
421 421
 			</File>
422 422
 			<File
423
+				RelativePath="..\libclamav\c++\llvm\lib\MC\MCMachOStreamer.cpp"
424
+				>
425
+			</File>
426
+			<File
423 427
 				RelativePath="..\libclamav\c++\llvm\lib\MC\MCStreamer.cpp"
424 428
 				>
425 429
 			</File>
... ...
@@ -436,10 +440,6 @@
436 436
 				>
437 437
 			</File>
438 438
 			<File
439
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachOWriter.cpp"
440
-				>
441
-			</File>
442
-			<File
443 439
 				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\Passes.cpp"
444 440
 				>
445 441
 			</File>
... ...
@@ -6,7 +6,7 @@
6 6
 	ProjectType="Visual C++"
7 7
 	RootNamespace="LLVMjit"
8 8
 	TargetFrameworkVersion="196613"
9
-	Version="9.00"
9
+	Version="9,00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
... ...
@@ -41,7 +41,7 @@
41 41
 			<Tool
42 42
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
43 43
 				BasicRuntimeChecks="3"
44
-				DebugInformationFormat="4"
44
+				DebugInformationFormat="3"
45 45
 				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
46 46
 				ExceptionHandling="1"
47 47
 				MinimalRebuild="true"
... ...
@@ -105,7 +105,7 @@
105 105
 			/>
106 106
 			<Tool
107 107
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
108
-				DebugInformationFormat="0"
108
+				DebugInformationFormat="3"
109 109
 				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
110 110
 				EnableFunctionLevelLinking="false"
111 111
 				EnableIntrinsicFunctions="true"
... ...
@@ -156,367 +156,367 @@
156 156
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
157 157
 			>
158 158
 			<File
159
-				RelativePath="..\libclamav\c++\llvm\lib\Support\SmallVector.cpp"
159
+				RelativePath="..\libclamav\c++\llvm\lib\Analysis\AliasAnalysis.cpp"
160 160
 				>
161 161
 			</File>
162 162
 			<File
163
-				RelativePath="..\libclamav\c++\llvm\lib\Support\PrettyStackTrace.cpp"
163
+				RelativePath="..\libclamav\c++\llvm\lib\Support\Allocator.cpp"
164 164
 				>
165 165
 			</File>
166 166
 			<File
167
-				RelativePath="..\libclamav\c++\llvm\lib\Support\Triple.cpp"
167
+				RelativePath="..\libclamav\c++\llvm\lib\Support\APFloat.cpp"
168 168
 				>
169 169
 			</File>
170 170
 			<File
171
-				RelativePath="..\libclamav\c++\llvm\lib\Support\SourceMgr.cpp"
171
+				RelativePath="..\libclamav\c++\llvm\lib\Support\APInt.cpp"
172 172
 				>
173 173
 			</File>
174 174
 			<File
175
-				RelativePath="..\libclamav\c++\llvm\lib\Support\APInt.cpp"
175
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\AsmWriter.cpp"
176 176
 				>
177 177
 			</File>
178 178
 			<File
179
-				RelativePath="..\libclamav\c++\llvm\lib\Support\GraphWriter.cpp"
179
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Attributes.cpp"
180 180
 				>
181 181
 			</File>
182 182
 			<File
183
-				RelativePath="..\libclamav\c++\llvm\lib\Support\ConstantRange.cpp"
183
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\AutoUpgrade.cpp"
184 184
 				>
185 185
 			</File>
186 186
 			<File
187
-				RelativePath="..\libclamav\c++\llvm\lib\Support\ManagedStatic.cpp"
187
+				RelativePath="..\libclamav\c++\llvm\lib\Analysis\BasicAliasAnalysis.cpp"
188 188
 				>
189 189
 			</File>
190 190
 			<File
191
-				RelativePath="..\libclamav\c++\llvm\lib\Support\Statistic.cpp"
191
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\BasicBlock.cpp"
192 192
 				>
193 193
 			</File>
194 194
 			<File
195
-				RelativePath="..\libclamav\c++\llvm\lib\Support\StringExtras.cpp"
195
+				RelativePath="..\libclamav\c++\llvm\lib\Analysis\CaptureTracking.cpp"
196 196
 				>
197 197
 			</File>
198 198
 			<File
199
-				RelativePath="..\libclamav\c++\llvm\lib\Support\CommandLine.cpp"
199
+				RelativePath="..\libclamav\c++\llvm\lib\Support\circular_raw_ostream.cpp"
200 200
 				>
201 201
 			</File>
202 202
 			<File
203
-				RelativePath="..\libclamav\c++\llvm\lib\Support\Allocator.cpp"
203
+				RelativePath="..\libclamav\c++\llvm\lib\Support\CommandLine.cpp"
204 204
 				>
205 205
 			</File>
206 206
 			<File
207
-				RelativePath="..\libclamav\c++\llvm\lib\Support\StringMap.cpp"
207
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\ConstantFold.cpp"
208 208
 				>
209 209
 			</File>
210 210
 			<File
211
-				RelativePath="..\libclamav\c++\llvm\lib\Support\APFloat.cpp"
211
+				RelativePath="..\libclamav\c++\llvm\lib\Support\ConstantRange.cpp"
212 212
 				>
213 213
 			</File>
214 214
 			<File
215
-				RelativePath="..\libclamav\c++\llvm\lib\Support\circular_raw_ostream.cpp"
215
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Constants.cpp"
216 216
 				>
217 217
 			</File>
218 218
 			<File
219
-				RelativePath="..\libclamav\c++\llvm\lib\Support\Debug.cpp"
219
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Core.cpp"
220 220
 				>
221 221
 			</File>
222 222
 			<File
223
-				RelativePath="..\libclamav\c++\llvm\lib\Support\TargetRegistry.cpp"
223
+				RelativePath="..\libclamav\c++\llvm\lib\Support\Debug.cpp"
224 224
 				>
225 225
 			</File>
226 226
 			<File
227
-				RelativePath="..\libclamav\c++\llvm\lib\Support\StringPool.cpp"
227
+				RelativePath="..\libclamav\c++\llvm\lib\Analysis\DebugInfo.cpp"
228 228
 				>
229 229
 			</File>
230 230
 			<File
231
-				RelativePath="..\libclamav\c++\llvm\lib\Support\Dwarf.cpp"
231
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Dominators.cpp"
232 232
 				>
233 233
 			</File>
234 234
 			<File
235
-				RelativePath="..\libclamav\c++\llvm\lib\Support\Timer.cpp"
235
+				RelativePath="..\libclamav\c++\llvm\lib\Support\Dwarf.cpp"
236 236
 				>
237 237
 			</File>
238 238
 			<File
239
-				RelativePath="..\libclamav\c++\llvm\lib\Support\FoldingSet.cpp"
239
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\ELFCodeEmitter.cpp"
240 240
 				>
241 241
 			</File>
242 242
 			<File
243
-				RelativePath="..\libclamav\c++\llvm\lib\Support\SmallPtrSet.cpp"
243
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\ELFWriter.cpp"
244 244
 				>
245 245
 			</File>
246 246
 			<File
247
-				RelativePath="..\libclamav\c++\llvm\lib\Support\MemoryBuffer.cpp"
247
+				RelativePath="..\libclamav\c++\llvm\lib\Support\ErrorHandling.cpp"
248 248
 				>
249 249
 			</File>
250 250
 			<File
251
-				RelativePath="..\libclamav\c++\llvm\lib\Support\FormattedStream.cpp"
251
+				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\ExecutionEngine.cpp"
252 252
 				>
253 253
 			</File>
254 254
 			<File
255
-				RelativePath="..\libclamav\c++\llvm\lib\Support\raw_ostream.cpp"
255
+				RelativePath="..\libclamav\c++\llvm\lib\Support\FoldingSet.cpp"
256 256
 				>
257 257
 			</File>
258 258
 			<File
259
-				RelativePath="..\libclamav\c++\llvm\lib\Support\ErrorHandling.cpp"
259
+				RelativePath="..\libclamav\c++\llvm\lib\Support\FormattedStream.cpp"
260 260
 				>
261 261
 			</File>
262 262
 			<File
263
-				RelativePath="..\libclamav\c++\llvm\lib\Support\Twine.cpp"
263
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Function.cpp"
264 264
 				>
265 265
 			</File>
266 266
 			<File
267
-				RelativePath="..\libclamav\c++\llvm\lib\Support\StringRef.cpp"
267
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Globals.cpp"
268 268
 				>
269 269
 			</File>
270 270
 			<File
271
-				RelativePath="..\libclamav\c++\llvm\lib\Analysis\AliasAnalysis.cpp"
271
+				RelativePath="..\libclamav\c++\llvm\lib\Support\GraphWriter.cpp"
272 272
 				>
273 273
 			</File>
274 274
 			<File
275
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\AsmWriter.cpp"
275
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\InlineAsm.cpp"
276 276
 				>
277 277
 			</File>
278 278
 			<File
279
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Attributes.cpp"
279
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Instruction.cpp"
280 280
 				>
281 281
 			</File>
282 282
 			<File
283
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\AutoUpgrade.cpp"
283
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Instructions.cpp"
284 284
 				>
285 285
 			</File>
286 286
 			<File
287
-				RelativePath="..\libclamav\c++\llvm\lib\Analysis\BasicAliasAnalysis.cpp"
287
+				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\Intercept.cpp"
288 288
 				>
289 289
 			</File>
290 290
 			<File
291
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\BasicBlock.cpp"
291
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\IntrinsicInst.cpp"
292 292
 				>
293 293
 			</File>
294 294
 			<File
295
-				RelativePath="..\libclamav\c++\llvm\lib\Analysis\CaptureTracking.cpp"
295
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\IRBuilder.cpp"
296 296
 				>
297 297
 			</File>
298 298
 			<File
299
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\ConstantFold.cpp"
299
+				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JIT.cpp"
300 300
 				>
301 301
 			</File>
302 302
 			<File
303
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Constants.cpp"
303
+				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITDebugRegisterer.cpp"
304 304
 				>
305 305
 			</File>
306 306
 			<File
307
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Core.cpp"
307
+				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITDwarfEmitter.cpp"
308 308
 				>
309 309
 			</File>
310 310
 			<File
311
-				RelativePath="..\libclamav\c++\llvm\lib\Analysis\DebugInfo.cpp"
311
+				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITEmitter.cpp"
312 312
 				>
313 313
 			</File>
314 314
 			<File
315
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Dominators.cpp"
315
+				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITMemoryManager.cpp"
316 316
 				>
317 317
 			</File>
318 318
 			<File
319
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\ELFCodeEmitter.cpp"
319
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\LeakDetector.cpp"
320 320
 				>
321 321
 			</File>
322 322
 			<File
323
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\ELFWriter.cpp"
323
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\LLVMContext.cpp"
324 324
 				>
325 325
 			</File>
326 326
 			<File
327
-				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\ExecutionEngine.cpp"
327
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineBasicBlock.cpp"
328 328
 				>
329 329
 			</File>
330 330
 			<File
331
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Function.cpp"
331
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineFunction.cpp"
332 332
 				>
333 333
 			</File>
334 334
 			<File
335
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Globals.cpp"
335
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineFunctionAnalysis.cpp"
336 336
 				>
337 337
 			</File>
338 338
 			<File
339
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\InlineAsm.cpp"
339
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineFunctionPass.cpp"
340 340
 				>
341 341
 			</File>
342 342
 			<File
343
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Instruction.cpp"
343
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineInstr.cpp"
344 344
 				>
345 345
 			</File>
346 346
 			<File
347
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Instructions.cpp"
347
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineModuleInfo.cpp"
348 348
 				>
349 349
 			</File>
350 350
 			<File
351
-				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\Intercept.cpp"
351
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineRegisterInfo.cpp"
352 352
 				>
353 353
 			</File>
354 354
 			<File
355
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\IntrinsicInst.cpp"
355
+				RelativePath="..\libclamav\c++\llvm\lib\Support\ManagedStatic.cpp"
356 356
 				>
357 357
 			</File>
358 358
 			<File
359
-				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JIT.cpp"
359
+				RelativePath="..\libclamav\c++\llvm\lib\Target\Mangler.cpp"
360 360
 				>
361 361
 			</File>
362 362
 			<File
363
-				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITDebugRegisterer.cpp"
363
+				RelativePath="..\libclamav\c++\llvm\lib\MC\MCAsmInfo.cpp"
364 364
 				>
365 365
 			</File>
366 366
 			<File
367
-				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITDwarfEmitter.cpp"
367
+				RelativePath="..\libclamav\c++\llvm\lib\MC\MCContext.cpp"
368 368
 				>
369 369
 			</File>
370 370
 			<File
371
-				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITEmitter.cpp"
371
+				RelativePath="..\libclamav\c++\llvm\lib\MC\MCExpr.cpp"
372 372
 				>
373 373
 			</File>
374 374
 			<File
375
-				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITMemoryManager.cpp"
375
+				RelativePath="..\libclamav\c++\llvm\lib\MC\MCSection.cpp"
376 376
 				>
377 377
 			</File>
378 378
 			<File
379
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\LeakDetector.cpp"
379
+				RelativePath="..\libclamav\c++\llvm\lib\MC\MCSectionELF.cpp"
380 380
 				>
381 381
 			</File>
382 382
 			<File
383
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\LLVMContext.cpp"
383
+				RelativePath="..\libclamav\c++\llvm\lib\MC\MCSectionMachO.cpp"
384 384
 				>
385 385
 			</File>
386 386
 			<File
387
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineBasicBlock.cpp"
387
+				RelativePath="..\libclamav\c++\llvm\lib\MC\MCSymbol.cpp"
388 388
 				>
389 389
 			</File>
390 390
 			<File
391
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineFunction.cpp"
391
+				RelativePath="..\libclamav\c++\llvm\lib\Support\MemoryBuffer.cpp"
392 392
 				>
393 393
 			</File>
394 394
 			<File
395
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineFunctionAnalysis.cpp"
395
+				RelativePath="..\libclamav\c++\llvm\lib\Analysis\MemoryBuiltins.cpp"
396 396
 				>
397 397
 			</File>
398 398
 			<File
399
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineFunctionPass.cpp"
399
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Metadata.cpp"
400 400
 				>
401 401
 			</File>
402 402
 			<File
403
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineInstr.cpp"
403
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Module.cpp"
404 404
 				>
405 405
 			</File>
406 406
 			<File
407
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineModuleInfo.cpp"
407
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\ModuleProvider.cpp"
408 408
 				>
409 409
 			</File>
410 410
 			<File
411
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineRegisterInfo.cpp"
411
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\ObjectCodeEmitter.cpp"
412 412
 				>
413 413
 			</File>
414 414
 			<File
415
-				RelativePath="..\libclamav\c++\llvm\lib\MC\MCAsmInfo.cpp"
415
+				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\OProfileJITEventListener.cpp"
416 416
 				>
417 417
 			</File>
418 418
 			<File
419
-				RelativePath="..\libclamav\c++\llvm\lib\MC\MCContext.cpp"
419
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Pass.cpp"
420 420
 				>
421 421
 			</File>
422 422
 			<File
423
-				RelativePath="..\libclamav\c++\llvm\lib\MC\MCExpr.cpp"
423
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\PassManager.cpp"
424 424
 				>
425 425
 			</File>
426 426
 			<File
427
-				RelativePath="..\libclamav\c++\llvm\lib\MC\MCSection.cpp"
427
+				RelativePath="..\libclamav\c++\llvm\lib\Support\PrettyStackTrace.cpp"
428 428
 				>
429 429
 			</File>
430 430
 			<File
431
-				RelativePath="..\libclamav\c++\llvm\lib\MC\MCSectionELF.cpp"
431
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\PrintModulePass.cpp"
432 432
 				>
433 433
 			</File>
434 434
 			<File
435
-				RelativePath="..\libclamav\c++\llvm\lib\MC\MCSectionMachO.cpp"
435
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\PseudoSourceValue.cpp"
436 436
 				>
437 437
 			</File>
438 438
 			<File
439
-				RelativePath="..\libclamav\c++\llvm\lib\MC\MCSymbol.cpp"
439
+				RelativePath="..\libclamav\c++\llvm\lib\Support\raw_ostream.cpp"
440 440
 				>
441 441
 			</File>
442 442
 			<File
443
-				RelativePath="..\libclamav\c++\llvm\lib\Analysis\MemoryBuiltins.cpp"
443
+				RelativePath="..\libclamav\c++\llvm\lib\Support\SmallPtrSet.cpp"
444 444
 				>
445 445
 			</File>
446 446
 			<File
447
-				RelativePath="..\libclamav\c++\llvm\lib\Target\Mangler.cpp"
447
+				RelativePath="..\libclamav\c++\llvm\lib\Support\SmallVector.cpp"
448 448
 				>
449 449
 			</File>
450 450
 			<File
451
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\IRBuilder.cpp"
451
+				RelativePath="..\libclamav\c++\llvm\lib\Support\SourceMgr.cpp"
452 452
 				>
453 453
 			</File>
454 454
 			<File
455
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Metadata.cpp"
455
+				RelativePath="..\libclamav\c++\llvm\lib\Support\Statistic.cpp"
456 456
 				>
457 457
 			</File>
458 458
 			<File
459
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Module.cpp"
459
+				RelativePath="..\libclamav\c++\llvm\lib\Support\StringExtras.cpp"
460 460
 				>
461 461
 			</File>
462 462
 			<File
463
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\ModuleProvider.cpp"
463
+				RelativePath="..\libclamav\c++\llvm\lib\Support\StringMap.cpp"
464 464
 				>
465 465
 			</File>
466 466
 			<File
467
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\ObjectCodeEmitter.cpp"
467
+				RelativePath="..\libclamav\c++\llvm\lib\Support\StringPool.cpp"
468 468
 				>
469 469
 			</File>
470 470
 			<File
471
-				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\OProfileJITEventListener.cpp"
471
+				RelativePath="..\libclamav\c++\llvm\lib\Support\StringRef.cpp"
472 472
 				>
473 473
 			</File>
474 474
 			<File
475
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\Pass.cpp"
475
+				RelativePath="..\libclamav\c++\llvm\lib\Target\SubtargetFeature.cpp"
476 476
 				>
477 477
 			</File>
478 478
 			<File
479
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\PassManager.cpp"
479
+				RelativePath="..\libclamav\c++\llvm\lib\Target\TargetData.cpp"
480 480
 				>
481 481
 			</File>
482 482
 			<File
483
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\PrintModulePass.cpp"
483
+				RelativePath="..\libclamav\c++\llvm\lib\Target\TargetInstrInfo.cpp"
484 484
 				>
485 485
 			</File>
486 486
 			<File
487
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\PseudoSourceValue.cpp"
487
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\TargetInstrInfoImpl.cpp"
488 488
 				>
489 489
 			</File>
490 490
 			<File
491
-				RelativePath="..\libclamav\c++\llvm\lib\Target\SubtargetFeature.cpp"
491
+				RelativePath="..\libclamav\c++\llvm\lib\Target\TargetLoweringObjectFile.cpp"
492 492
 				>
493 493
 			</File>
494 494
 			<File
495
-				RelativePath="..\libclamav\c++\llvm\lib\Target\TargetData.cpp"
495
+				RelativePath="..\libclamav\c++\llvm\lib\Target\TargetMachine.cpp"
496 496
 				>
497 497
 			</File>
498 498
 			<File
499
-				RelativePath="..\libclamav\c++\llvm\lib\Target\TargetInstrInfo.cpp"
499
+				RelativePath="..\libclamav\c++\llvm\lib\Target\TargetRegisterInfo.cpp"
500 500
 				>
501 501
 			</File>
502 502
 			<File
503
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\TargetInstrInfoImpl.cpp"
503
+				RelativePath="..\libclamav\c++\llvm\lib\Support\TargetRegistry.cpp"
504 504
 				>
505 505
 			</File>
506 506
 			<File
507
-				RelativePath="..\libclamav\c++\llvm\lib\Target\TargetLoweringObjectFile.cpp"
507
+				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\TargetSelect.cpp"
508 508
 				>
509 509
 			</File>
510 510
 			<File
511
-				RelativePath="..\libclamav\c++\llvm\lib\Target\TargetMachine.cpp"
511
+				RelativePath="..\libclamav\c++\llvm\lib\Support\Timer.cpp"
512 512
 				>
513 513
 			</File>
514 514
 			<File
515
-				RelativePath="..\libclamav\c++\llvm\lib\Target\TargetRegisterInfo.cpp"
515
+				RelativePath="..\libclamav\c++\llvm\lib\Support\Triple.cpp"
516 516
 				>
517 517
 			</File>
518 518
 			<File
519
-				RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\TargetSelect.cpp"
519
+				RelativePath="..\libclamav\c++\llvm\lib\Support\Twine.cpp"
520 520
 				>
521 521
 			</File>
522 522
 			<File
... ...
@@ -6,7 +6,7 @@
6 6
 	ProjectType="Visual C++"
7 7
 	RootNamespace="LLVMsystem"
8 8
 	TargetFrameworkVersion="196613"
9
-	Version="9.00"
9
+	Version="9,00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
... ...
@@ -41,7 +41,7 @@
41 41
 			<Tool
42 42
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;"
43 43
 				BasicRuntimeChecks="3"
44
-				DebugInformationFormat="4"
44
+				DebugInformationFormat="3"
45 45
 				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
46 46
 				ExceptionHandling="1"
47 47
 				MinimalRebuild="true"
... ...
@@ -105,7 +105,7 @@
105 105
 			/>
106 106
 			<Tool
107 107
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;"
108
-				DebugInformationFormat="0"
108
+				DebugInformationFormat="3"
109 109
 				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
110 110
 				EnableFunctionLevelLinking="false"
111 111
 				EnableIntrinsicFunctions="true"
... ...
@@ -41,7 +41,7 @@
41 41
 			<Tool
42 42
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86&quot;;&quot;$(SolutionDir)..\libclamav\c++\&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
43 43
 				BasicRuntimeChecks="3"
44
-				DebugInformationFormat="4"
44
+				DebugInformationFormat="3"
45 45
 				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
46 46
 				MinimalRebuild="true"
47 47
 				Name="VCCLCompilerTool"
... ...
@@ -104,7 +104,7 @@
104 104
 			/>
105 105
 			<Tool
106 106
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86&quot;;&quot;$(SolutionDir)..\libclamav\c++\&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
107
-				DebugInformationFormat="1"
107
+				DebugInformationFormat="3"
108 108
 				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
109 109
 				EnableFunctionLevelLinking="false"
110 110
 				EnableIntrinsicFunctions="true"
... ...
@@ -493,7 +493,7 @@
493 493
 /* #undef USE_SYSLOG */
494 494
 
495 495
 /* Version number of package */
496
-#define VERSION "devel-r5076-720-g288b945"
496
+#define VERSION "devel-r5076-723-ge4bf8f9"
497 497
 
498 498
 /* Version suffix for package */
499 499
 #define VERSION_SUFFIX ""
500 500
new file mode 100644
... ...
@@ -0,0 +1,235 @@
0
+<?xml version="1.0" encoding="Windows-1252"?>
1
+<VisualStudioProject
2
+	Keyword="Win32Proj"
3
+	Name="clamdscan"
4
+	ProjectGUID="{9571E1BE-DDDA-47CB-8675-238D405FCADA}"
5
+	ProjectType="Visual C++"
6
+	RootNamespace="clamdscan"
7
+	TargetFrameworkVersion="196613"
8
+	Version="9,00"
9
+	>
10
+	<Platforms>
11
+		<Platform
12
+			Name="Win32"
13
+		/>
14
+	</Platforms>
15
+	<ToolFiles>
16
+	</ToolFiles>
17
+	<Configurations>
18
+		<Configuration
19
+			CharacterSet="2"
20
+			ConfigurationType="1"
21
+			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
22
+			Name="Debug|Win32"
23
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
24
+			>
25
+			<Tool
26
+				Name="VCPreBuildEventTool"
27
+			/>
28
+			<Tool
29
+				Name="VCCustomBuildTool"
30
+			/>
31
+			<Tool
32
+				Name="VCXMLDataGeneratorTool"
33
+			/>
34
+			<Tool
35
+				Name="VCWebServiceProxyGeneratorTool"
36
+			/>
37
+			<Tool
38
+				Name="VCMIDLTool"
39
+			/>
40
+			<Tool
41
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
42
+				BasicRuntimeChecks="3"
43
+				CompileAs="1"
44
+				DebugInformationFormat="3"
45
+				DisableSpecificWarnings="4996;4244;4090"
46
+				MinimalRebuild="true"
47
+				Name="VCCLCompilerTool"
48
+				Optimization="0"
49
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
50
+				RuntimeLibrary="3"
51
+				UsePrecompiledHeader="0"
52
+				WarningLevel="3"
53
+			/>
54
+			<Tool
55
+				Name="VCManagedResourceCompilerTool"
56
+			/>
57
+			<Tool
58
+				Name="VCResourceCompilerTool"
59
+			/>
60
+			<Tool
61
+				Name="VCPreLinkEventTool"
62
+			/>
63
+			<Tool
64
+				GenerateDebugInformation="true"
65
+				LinkIncremental="1"
66
+				Name="VCLinkerTool"
67
+				SubSystem="1"
68
+				TargetMachine="1"
69
+			/>
70
+			<Tool
71
+				Name="VCALinkTool"
72
+			/>
73
+			<Tool
74
+				Name="VCManifestTool"
75
+			/>
76
+			<Tool
77
+				Name="VCXDCMakeTool"
78
+			/>
79
+			<Tool
80
+				Name="VCBscMakeTool"
81
+			/>
82
+			<Tool
83
+				Name="VCFxCopTool"
84
+			/>
85
+			<Tool
86
+				Name="VCAppVerifierTool"
87
+			/>
88
+			<Tool
89
+				Name="VCPostBuildEventTool"
90
+			/>
91
+		</Configuration>
92
+		<Configuration
93
+			CharacterSet="2"
94
+			ConfigurationType="1"
95
+			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
96
+			Name="Release|Win32"
97
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
98
+			WholeProgramOptimization="1"
99
+			>
100
+			<Tool
101
+				Name="VCPreBuildEventTool"
102
+			/>
103
+			<Tool
104
+				Name="VCCustomBuildTool"
105
+			/>
106
+			<Tool
107
+				Name="VCXMLDataGeneratorTool"
108
+			/>
109
+			<Tool
110
+				Name="VCWebServiceProxyGeneratorTool"
111
+			/>
112
+			<Tool
113
+				Name="VCMIDLTool"
114
+			/>
115
+			<Tool
116
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
117
+				CompileAs="1"
118
+				DebugInformationFormat="3"
119
+				DisableSpecificWarnings="4996;4244;4090"
120
+				EnableFunctionLevelLinking="true"
121
+				EnableIntrinsicFunctions="true"
122
+				Name="VCCLCompilerTool"
123
+				Optimization="2"
124
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
125
+				RuntimeLibrary="2"
126
+				UsePrecompiledHeader="0"
127
+				WarningLevel="3"
128
+			/>
129
+			<Tool
130
+				Name="VCManagedResourceCompilerTool"
131
+			/>
132
+			<Tool
133
+				Name="VCResourceCompilerTool"
134
+			/>
135
+			<Tool
136
+				Name="VCPreLinkEventTool"
137
+			/>
138
+			<Tool
139
+				EnableCOMDATFolding="2"
140
+				GenerateDebugInformation="true"
141
+				LinkIncremental="1"
142
+				Name="VCLinkerTool"
143
+				OptimizeReferences="2"
144
+				SubSystem="1"
145
+				TargetMachine="1"
146
+			/>
147
+			<Tool
148
+				Name="VCALinkTool"
149
+			/>
150
+			<Tool
151
+				Name="VCManifestTool"
152
+			/>
153
+			<Tool
154
+				Name="VCXDCMakeTool"
155
+			/>
156
+			<Tool
157
+				Name="VCBscMakeTool"
158
+			/>
159
+			<Tool
160
+				Name="VCFxCopTool"
161
+			/>
162
+			<Tool
163
+				Name="VCAppVerifierTool"
164
+			/>
165
+			<Tool
166
+				Name="VCPostBuildEventTool"
167
+			/>
168
+		</Configuration>
169
+	</Configurations>
170
+	<References>
171
+	</References>
172
+	<Files>
173
+		<Filter
174
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
175
+			Name="Source Files"
176
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
177
+			>
178
+			<File
179
+				RelativePath="..\clamdscan\clamdscan.c"
180
+				>
181
+			</File>
182
+			<File
183
+				RelativePath="..\clamdscan\client.c"
184
+				>
185
+			</File>
186
+			<File
187
+				RelativePath="..\clamdscan\proto.c"
188
+				>
189
+			</File>
190
+			<Filter
191
+				Name="shared"
192
+				>
193
+				<File
194
+					RelativePath="..\shared\actions.c"
195
+					>
196
+				</File>
197
+				<File
198
+					RelativePath="..\shared\misc.c"
199
+					>
200
+				</File>
201
+				<File
202
+					RelativePath="..\shared\output.c"
203
+					>
204
+				</File>
205
+			</Filter>
206
+			<Filter
207
+				Name="compat"
208
+				>
209
+				<File
210
+					RelativePath=".\compat\libgen.c"
211
+					>
212
+				</File>
213
+				<File
214
+					RelativePath=".\compat\setargv.c"
215
+					>
216
+				</File>
217
+			</Filter>
218
+		</Filter>
219
+		<Filter
220
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
221
+			Name="Header Files"
222
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
223
+			>
224
+		</Filter>
225
+		<Filter
226
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
227
+			Name="Resource Files"
228
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
229
+			>
230
+		</Filter>
231
+	</Files>
232
+	<Globals>
233
+	</Globals>
234
+</VisualStudioProject>
... ...
@@ -104,6 +104,7 @@ EXPORTS htonl
104 104
 EXPORTS htons
105 105
 EXPORTS ntohl
106 106
 EXPORTS ntohs
107
+EXPORTS __WSAFDIsSet
107 108
 EXPORTS gettimeofday
108 109
 EXPORTS pthread_mutex_lock
109 110
 EXPORTS pthread_mutex_unlock
... ...
@@ -145,4 +146,4 @@ EXPORTS w32_select
145 145
 EXPORTS poll_with_event
146 146
 EXPORTS w32_stat
147 147
 EXPORTS w32_strerror
148
-EXPORTS w32_strerror_r
148
+EXPORTS w32_strerror_r
149 149
\ No newline at end of file
... ...
@@ -1,12 +1,12 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	ProjectType="Visual C++"
4
-	Version="9.00"
3
+	Keyword="Win32Proj"
5 4
 	Name="libclamavcxx"
6 5
 	ProjectGUID="{F5DF01F6-8CB6-4C27-8DA8-2379323B31E7}"
6
+	ProjectType="Visual C++"
7 7
 	RootNamespace="libclamavcxx"
8
-	Keyword="Win32Proj"
9 8
 	TargetFrameworkVersion="196613"
9
+	Version="9.00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
... ...
@@ -17,11 +17,11 @@
17 17
 	</ToolFiles>
18 18
 	<Configurations>
19 19
 		<Configuration
20
+			CharacterSet="1"
21
+			ConfigurationType="4"
22
+			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
20 23
 			Name="Debug|Win32"
21 24
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23
-			ConfigurationType="4"
24
-			CharacterSet="1"
25 25
 			>
26 26
 			<Tool
27 27
 				Name="VCPreBuildEventTool"
... ...
@@ -39,17 +39,17 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
43
+				BasicRuntimeChecks="3"
44
+				DebugInformationFormat="3"
45
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
46
+				MinimalRebuild="true"
42 47
 				Name="VCCLCompilerTool"
43 48
 				Optimization="0"
44
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
45 49
 				PreprocessorDefinitions="__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
-				MinimalRebuild="true"
47
-				BasicRuntimeChecks="3"
48 50
 				RuntimeLibrary="3"
49 51
 				UsePrecompiledHeader="0"
50 52
 				WarningLevel="3"
51
-				DebugInformationFormat="3"
52
-				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
53 53
 			/>
54 54
 			<Tool
55 55
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -80,11 +80,11 @@
80 80
 			/>
81 81
 		</Configuration>
82 82
 		<Configuration
83
+			CharacterSet="1"
84
+			ConfigurationType="4"
85
+			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
83 86
 			Name="Release|Win32"
84 87
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
85
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
86
-			ConfigurationType="4"
87
-			CharacterSet="1"
88 88
 			WholeProgramOptimization="1"
89 89
 			>
90 90
 			<Tool
... ...
@@ -103,18 +103,18 @@
103 103
 				Name="VCMIDLTool"
104 104
 			/>
105 105
 			<Tool
106
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
107
+				DebugInformationFormat="0"
108
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
109
+				EnableFunctionLevelLinking="false"
110
+				EnableIntrinsicFunctions="true"
106 111
 				Name="VCCLCompilerTool"
107 112
 				Optimization="2"
108
-				EnableIntrinsicFunctions="true"
109
-				WholeProgramOptimization="false"
110
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
111 113
 				PreprocessorDefinitions="NDEBUG;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
112 114
 				RuntimeLibrary="2"
113
-				EnableFunctionLevelLinking="false"
114 115
 				UsePrecompiledHeader="0"
115 116
 				WarningLevel="3"
116
-				DebugInformationFormat="0"
117
-				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
117
+				WholeProgramOptimization="false"
118 118
 			/>
119 119
 			<Tool
120 120
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -149,8 +149,8 @@
149 149
 	</References>
150 150
 	<Files>
151 151
 		<Filter
152
-			Name="Source Files"
153 152
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
153
+			Name="Source Files"
154 154
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
155 155
 			>
156 156
 			<File
... ...
@@ -1,12 +1,12 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	ProjectType="Visual C++"
4
-	Version="9.00"
3
+	Keyword="Win32Proj"
5 4
 	Name="libclamunrar"
6 5
 	ProjectGUID="{41B2E193-92E3-429C-8DAC-9B287E3D7182}"
6
+	ProjectType="Visual C++"
7 7
 	RootNamespace="libclamunrar"
8
-	Keyword="Win32Proj"
9 8
 	TargetFrameworkVersion="196613"
9
+	Version="9.00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
... ...
@@ -17,11 +17,11 @@
17 17
 	</ToolFiles>
18 18
 	<Configurations>
19 19
 		<Configuration
20
+			CharacterSet="2"
21
+			ConfigurationType="2"
22
+			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
20 23
 			Name="Debug|Win32"
21 24
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23
-			ConfigurationType="2"
24
-			CharacterSet="2"
25 25
 			>
26 26
 			<Tool
27 27
 				Name="VCPreBuildEventTool"
... ...
@@ -39,18 +39,18 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
43
+				BasicRuntimeChecks="3"
44
+				CompileAs="1"
45
+				DebugInformationFormat="3"
46
+				DisableSpecificWarnings="4996;4244;4018;4146"
47
+				MinimalRebuild="true"
42 48
 				Name="VCCLCompilerTool"
43 49
 				Optimization="0"
44
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
45 50
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
-				MinimalRebuild="true"
47
-				BasicRuntimeChecks="3"
48 51
 				RuntimeLibrary="3"
49 52
 				UsePrecompiledHeader="0"
50 53
 				WarningLevel="3"
51
-				DebugInformationFormat="3"
52
-				CompileAs="1"
53
-				DisableSpecificWarnings="4996;4244;4018;4146"
54 54
 			/>
55 55
 			<Tool
56 56
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -62,10 +62,10 @@
62 62
 				Name="VCPreLinkEventTool"
63 63
 			/>
64 64
 			<Tool
65
-				Name="VCLinkerTool"
65
+				GenerateDebugInformation="true"
66 66
 				LinkIncremental="1"
67 67
 				ModuleDefinitionFile="$(SolutionDir)libclamunrar.def"
68
-				GenerateDebugInformation="true"
68
+				Name="VCLinkerTool"
69 69
 				SubSystem="2"
70 70
 				TargetMachine="1"
71 71
 			/>
... ...
@@ -92,11 +92,11 @@
92 92
 			/>
93 93
 		</Configuration>
94 94
 		<Configuration
95
+			CharacterSet="2"
96
+			ConfigurationType="2"
97
+			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
95 98
 			Name="Release|Win32"
96 99
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
97
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
98
-			ConfigurationType="2"
99
-			CharacterSet="2"
100 100
 			WholeProgramOptimization="1"
101 101
 			>
102 102
 			<Tool
... ...
@@ -115,19 +115,19 @@
115 115
 				Name="VCMIDLTool"
116 116
 			/>
117 117
 			<Tool
118
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
119
+				BufferSecurityCheck="false"
120
+				CompileAs="1"
121
+				DebugInformationFormat="3"
122
+				DisableSpecificWarnings="4996;4244;4018;4146"
123
+				EnableFunctionLevelLinking="true"
124
+				EnableIntrinsicFunctions="true"
118 125
 				Name="VCCLCompilerTool"
119 126
 				Optimization="2"
120
-				EnableIntrinsicFunctions="true"
121
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
122 127
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
123 128
 				RuntimeLibrary="2"
124
-				BufferSecurityCheck="false"
125
-				EnableFunctionLevelLinking="true"
126 129
 				UsePrecompiledHeader="0"
127 130
 				WarningLevel="3"
128
-				DebugInformationFormat="3"
129
-				CompileAs="1"
130
-				DisableSpecificWarnings="4996;4244;4018;4146"
131 131
 			/>
132 132
 			<Tool
133 133
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -139,13 +139,13 @@
139 139
 				Name="VCPreLinkEventTool"
140 140
 			/>
141 141
 			<Tool
142
-				Name="VCLinkerTool"
142
+				EnableCOMDATFolding="2"
143
+				GenerateDebugInformation="true"
143 144
 				LinkIncremental="1"
144 145
 				ModuleDefinitionFile="$(SolutionDir)libclamunrar.def"
145
-				GenerateDebugInformation="true"
146
-				SubSystem="2"
146
+				Name="VCLinkerTool"
147 147
 				OptimizeReferences="2"
148
-				EnableCOMDATFolding="2"
148
+				SubSystem="2"
149 149
 				TargetMachine="1"
150 150
 			/>
151 151
 			<Tool
... ...
@@ -175,8 +175,8 @@
175 175
 	</References>
176 176
 	<Files>
177 177
 		<Filter
178
-			Name="Source Files"
179 178
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
179
+			Name="Source Files"
180 180
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
181 181
 			>
182 182
 			<File
... ...
@@ -213,14 +213,14 @@
213 213
 			</File>
214 214
 		</Filter>
215 215
 		<Filter
216
-			Name="Header Files"
217 216
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
217
+			Name="Header Files"
218 218
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
219 219
 			>
220 220
 		</Filter>
221 221
 		<Filter
222
-			Name="Resource Files"
223 222
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
223
+			Name="Resource Files"
224 224
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
225 225
 			>
226 226
 			<File
... ...
@@ -1,12 +1,12 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	ProjectType="Visual C++"
4
-	Version="9.00"
3
+	Keyword="Win32Proj"
5 4
 	Name="libclamunrar_iface"
6 5
 	ProjectGUID="{3E9C718E-7670-4E33-9D94-C4E9ABE49F81}"
6
+	ProjectType="Visual C++"
7 7
 	RootNamespace="libclamunrar_iface"
8
-	Keyword="Win32Proj"
9 8
 	TargetFrameworkVersion="196613"
9
+	Version="9.00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
... ...
@@ -17,11 +17,11 @@
17 17
 	</ToolFiles>
18 18
 	<Configurations>
19 19
 		<Configuration
20
+			CharacterSet="2"
21
+			ConfigurationType="2"
22
+			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
20 23
 			Name="Debug|Win32"
21 24
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23
-			ConfigurationType="2"
24
-			CharacterSet="2"
25 25
 			>
26 26
 			<Tool
27 27
 				Name="VCPreBuildEventTool"
... ...
@@ -39,18 +39,18 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
43
+				BasicRuntimeChecks="3"
44
+				CompileAs="1"
45
+				DebugInformationFormat="3"
46
+				DisableSpecificWarnings="4996"
47
+				MinimalRebuild="true"
42 48
 				Name="VCCLCompilerTool"
43 49
 				Optimization="0"
44
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
45 50
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
-				MinimalRebuild="true"
47
-				BasicRuntimeChecks="3"
48 51
 				RuntimeLibrary="3"
49 52
 				UsePrecompiledHeader="0"
50 53
 				WarningLevel="3"
51
-				DebugInformationFormat="3"
52
-				CompileAs="1"
53
-				DisableSpecificWarnings="4996"
54 54
 			/>
55 55
 			<Tool
56 56
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -62,10 +62,10 @@
62 62
 				Name="VCPreLinkEventTool"
63 63
 			/>
64 64
 			<Tool
65
-				Name="VCLinkerTool"
65
+				GenerateDebugInformation="true"
66 66
 				LinkIncremental="1"
67 67
 				ModuleDefinitionFile="$(SolutionDir)libclamunrar_iface.def"
68
-				GenerateDebugInformation="true"
68
+				Name="VCLinkerTool"
69 69
 				SubSystem="2"
70 70
 				TargetMachine="1"
71 71
 			/>
... ...
@@ -92,11 +92,11 @@
92 92
 			/>
93 93
 		</Configuration>
94 94
 		<Configuration
95
+			CharacterSet="2"
96
+			ConfigurationType="2"
97
+			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
95 98
 			Name="Release|Win32"
96 99
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
97
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
98
-			ConfigurationType="2"
99
-			CharacterSet="2"
100 100
 			WholeProgramOptimization="1"
101 101
 			>
102 102
 			<Tool
... ...
@@ -115,19 +115,19 @@
115 115
 				Name="VCMIDLTool"
116 116
 			/>
117 117
 			<Tool
118
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
119
+				BufferSecurityCheck="false"
120
+				CompileAs="1"
121
+				DebugInformationFormat="3"
122
+				DisableSpecificWarnings="4996"
123
+				EnableFunctionLevelLinking="true"
124
+				EnableIntrinsicFunctions="true"
118 125
 				Name="VCCLCompilerTool"
119 126
 				Optimization="2"
120
-				EnableIntrinsicFunctions="true"
121
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
122 127
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
123 128
 				RuntimeLibrary="2"
124
-				BufferSecurityCheck="false"
125
-				EnableFunctionLevelLinking="true"
126 129
 				UsePrecompiledHeader="0"
127 130
 				WarningLevel="3"
128
-				DebugInformationFormat="3"
129
-				CompileAs="1"
130
-				DisableSpecificWarnings="4996"
131 131
 			/>
132 132
 			<Tool
133 133
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -139,13 +139,13 @@
139 139
 				Name="VCPreLinkEventTool"
140 140
 			/>
141 141
 			<Tool
142
-				Name="VCLinkerTool"
142
+				EnableCOMDATFolding="2"
143
+				GenerateDebugInformation="true"
143 144
 				LinkIncremental="1"
144 145
 				ModuleDefinitionFile="$(SolutionDir)libclamunrar_iface.def"
145
-				GenerateDebugInformation="true"
146
-				SubSystem="2"
146
+				Name="VCLinkerTool"
147 147
 				OptimizeReferences="2"
148
-				EnableCOMDATFolding="2"
148
+				SubSystem="2"
149 149
 				TargetMachine="1"
150 150
 			/>
151 151
 			<Tool
... ...
@@ -175,8 +175,8 @@
175 175
 	</References>
176 176
 	<Files>
177 177
 		<Filter
178
-			Name="Source Files"
179 178
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
179
+			Name="Source Files"
180 180
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
181 181
 			>
182 182
 			<File
... ...
@@ -193,14 +193,14 @@
193 193
 			</Filter>
194 194
 		</Filter>
195 195
 		<Filter
196
-			Name="Header Files"
197 196
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
197
+			Name="Header Files"
198 198
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
199 199
 			>
200 200
 		</Filter>
201 201
 		<Filter
202
-			Name="Resource Files"
203 202
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
203
+			Name="Resource Files"
204 204
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
205 205
 			>
206 206
 			<File
... ...
@@ -217,6 +217,9 @@ my @PROJECTS = (
217 217
     # CLAMSCAN #
218 218
     {makefile => 'clamscan', sections => ['clamscan'], output => 'win32/clamscan.vcproj', makefile_only => '(optparser\\.c|getopt\\.c)$', vcproj_only => 'compat\\\\'},
219 219
 
220
+    # CLAMDSCAN #
221
+    {makefile => 'clamdscan', sections => ['clamdscan'], output => 'win32/clamdscan.vcproj', makefile_only => '(optparser\\.c|getopt\\.c)$', vcproj_only => 'compat\\\\'},
222
+
220 223
     # CLAMD #
221 224
     {makefile => 'clamd', sections => ['clamd'], output => 'win32/clamd.vcproj', makefile_only => '(optparser\\.c|getopt\\.c|(daz|clam)uko.*)$', vcproj_only => 'compat\\\\'},
222 225