[Forensics-changes] [yara] 240/415: Fix some issues while building in Windows

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch debian
in repository yara.

commit 5ffd9249146bfe016026d6d759669d1b4e120aab
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Fri Nov 22 15:32:12 2013 +0000

    Fix some issues while building in Windows
---
 libyara/elf.h                   |  2 ++
 libyara/re.c                    |  3 ++-
 libyara/rules.c                 |  2 ++
 windows/libyara/libyara.vcxproj |  2 ++
 yara.c                          | 32 +++++++-------------------------
 5 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/libyara/elf.h b/libyara/elf.h
index dbe2329..1885130 100644
--- a/libyara/elf.h
+++ b/libyara/elf.h
@@ -18,6 +18,8 @@ limitations under the License.
 #define _ELF_H
 
 #ifdef _MSC_VER
+typedef __int8 int8_t;
+typedef unsigned __int8 uint8_t;
 typedef __int16 int16_t;
 typedef unsigned __int16 uint16_t;
 typedef __int32 int32_t;
diff --git a/libyara/re.c b/libyara/re.c
index 5134002..b243e54 100644
--- a/libyara/re.c
+++ b/libyara/re.c
@@ -874,6 +874,7 @@ RE_STACK* _yr_re_clone_stack(
     RE_STACK_POOL* pool)
 {
   RE_STACK* clon;
+  int i;
 
   if (stack == NULL)
     return NULL;
@@ -881,7 +882,7 @@ RE_STACK* _yr_re_clone_stack(
   clon = _yr_re_alloc_stack(pool);
   clon->top = stack->top;
 
-  for (int i = 0; i < clon->top; i++)
+  for (i = 0; i < clon->top; i++)
     clon->items[i] = stack->items[i];
 
   return clon;
diff --git a/libyara/rules.c b/libyara/rules.c
index 377e870..edc23f3 100644
--- a/libyara/rules.c
+++ b/libyara/rules.c
@@ -991,6 +991,8 @@ int yr_rules_scan_mem_blocks(
 
     if (!RULE_IS_PRIVATE(rule))
     {
+	  printf("$ id:%s $\n", rule->identifier);
+
       switch (callback(message, rule, user_data))
       {
         case CALLBACK_ABORT:
diff --git a/windows/libyara/libyara.vcxproj b/windows/libyara/libyara.vcxproj
index e354d8f..e0c3cb1 100644
--- a/windows/libyara/libyara.vcxproj
+++ b/windows/libyara/libyara.vcxproj
@@ -101,6 +101,7 @@
       <PreprocessorDefinitions>WIN32;PCRE_STATIC;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\libyara\regex;..\libyara;..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <DisableSpecificWarnings>4005;4273;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>pcre32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -111,6 +112,7 @@
     <ClCompile>
       <PreprocessorDefinitions>WIN32;PCRE_STATIC</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\windows\include;..\libyara;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4005;4273;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>pcre64.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/yara.c b/yara.c
index c40e137..9150794 100644
--- a/yara.c
+++ b/yara.c
@@ -20,15 +20,17 @@ limitations under the License.
 #include <dirent.h>
 #include <unistd.h>
 #include <time.h>
+#include <inttypes.h>
 
 #else
 
 #include <windows.h>
 #include "getopt.h"
 
+#define PRIx64 "llx"
+
 #endif
 
-#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -324,7 +326,7 @@ void print_string(
     uint8_t* data,
     int length)
 {
-  unsigned int i;
+  int i;
   char* str;
 
   str = (char*) (data);
@@ -344,7 +346,7 @@ void print_hex_string(
     uint8_t* data,
     int length)
 {
-  unsigned int i;
+  int i;
 
   for (i = 0; i < length; i++)
     printf("%02X ", (uint8_t) data[i]);
@@ -608,7 +610,7 @@ void* scanning_thread(void* param)
     file_path = file_queue_get();
   }
 
-  yr_re_finalize_thread();
+  yr_finalize_thread();
 
   return 0;
 }
@@ -838,9 +840,6 @@ int main(
   int errors;
   int result;
 
-  clock_t start, end;
-  double cpu_time_used;
-
   THREAD thread[MAX_THREADS];
 
   if (!process_cmd_line(argc, argv))
@@ -935,8 +934,6 @@ int main(
 
     if (rule_file != NULL)
     {
-      start = clock();
-
       yr_compiler_push_file_name(compiler, argv[optind]);
 
       errors = yr_compiler_add_file(compiler, rule_file, NULL);
@@ -948,10 +945,6 @@ int main(
 
       yr_compiler_destroy(compiler);
 
-      end = clock();
-
-      printf( "Compiling time: %f s\n", ((float)(end - start)) / CLOCKS_PER_SEC);
-
       if (errors > 0)
       {
         yr_finalize();
@@ -1007,10 +1000,6 @@ int main(
   }
   else
   {
-
-
-    start = clock();
-
     result = yr_rules_scan_file(
         rules,
         argv[argc - 1],
@@ -1018,14 +1007,7 @@ int main(
         (void*) argv[argc - 1],
         fast_scan,
         timeout);
-
-    end = clock();
-
-    cpu_time_used = (float)(end - start) / CLOCKS_PER_SEC;
-
-    printf("Scanning time: %f\n", cpu_time_used);
-
-
+ 
     if (result != ERROR_SUCCESS)
     {
       fprintf(stderr, "Error scanning %s: ", argv[argc - 1]);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git