[Forensics-changes] [yara] 07/415: Fixed missing dir issue when generating source package (issue #2)

Hilko Bengen bengen at moszumanska.debian.org
Thu Apr 3 05:42:37 UTC 2014


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

bengen pushed a commit to branch debian
in repository yara.

commit fa6c0d4104d391d013c3f1aa09a7d6536ed5468d
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Sat Jan 17 17:19:25 2009 +0000

    Fixed missing dir issue when generating source package (issue #2)
---
 Makefile               |  7 ++++---
 Makefile.am            |  7 +++++--
 Makefile.in            |  7 ++++---
 libyara/ast.c          |  3 ---
 libyara/lex.l          |  2 ++
 libyara/libyara.tmproj | 56 ++++++++++++++++++--------------------------------
 libyara/scan.c         | 12 ++++++-----
 doc/yara.1 => yara.man |  0
 8 files changed, 42 insertions(+), 52 deletions(-)

diff --git a/Makefile b/Makefile
index 5e33b2e..be6e61e 100644
--- a/Makefile
+++ b/Makefile
@@ -69,12 +69,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	ps-recursive uninstall-recursive
 man1dir = $(mandir)/man1
 NROFF = nroff
-MANS = $(man_MANS)
+MANS = $(man1_MANS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -171,12 +170,14 @@ top_srcdir = .
 
 # Build the library in the hand subdirectory first.
 SUBDIRS = libyara
+DIST_SUBDIRS = libyara
 AM_CPPFLAGS = -I$(srcdir)/libyara
 yara_SOURCES = yara.c
 yara_LDADD = libyara/.libs/libyara.a
 
 # man page
-man_MANS = doc/yara.1
+man1_MANS = yara.man
+EXTRA_DIST = $(man1_MANS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff --git a/Makefile.am b/Makefile.am
index dda5f10..e486ddd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,16 @@
 
 # Build the library in the hand subdirectory first.
 SUBDIRS = libyara
+DIST_SUBDIRS = libyara
 
 AM_CPPFLAGS = -I$(srcdir)/libyara
 
-
 bin_PROGRAMS = yara
 yara_SOURCES = yara.c
 yara_LDADD = libyara/.libs/libyara.a
 
 # man page
-man_MANS = doc/yara.1
+man1_MANS = yara.man
+
+EXTRA_DIST = $(man1_MANS)
+
diff --git a/Makefile.in b/Makefile.in
index b73130f..4ce5915 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,12 +69,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	ps-recursive uninstall-recursive
 man1dir = $(mandir)/man1
 NROFF = nroff
-MANS = $(man_MANS)
+MANS = $(man1_MANS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -171,12 +170,14 @@ top_srcdir = @top_srcdir@
 
 # Build the library in the hand subdirectory first.
 SUBDIRS = libyara
+DIST_SUBDIRS = libyara
 AM_CPPFLAGS = -I$(srcdir)/libyara
 yara_SOURCES = yara.c
 yara_LDADD = libyara/.libs/libyara.a
 
 # man page
-man_MANS = doc/yara.1
+man1_MANS = yara.man
+EXTRA_DIST = $(man1_MANS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff --git a/libyara/ast.c b/libyara/ast.c
index b84088f..e4ad568 100644
--- a/libyara/ast.c
+++ b/libyara/ast.c
@@ -414,9 +414,6 @@ int new_text_string(SIZED_STRING* charstr, int flags, unsigned char** hexstr, RE
              options |= PCRE_CASELESS;
          }
          
-         
-         printf("regexp: %s\n", *hexstr);
-     
          re->regexp = pcre_compile((char*) *hexstr, options, &error, &erroffset, NULL); 
 
          if (re->regexp != NULL)  
diff --git a/libyara/lex.l b/libyara/lex.l
index c0682bd..a001327 100644
--- a/libyara/lex.l
+++ b/libyara/lex.l
@@ -274,3 +274,5 @@ $({letter}|{digit})* {
 %%
 
 
+
+
diff --git a/libyara/libyara.tmproj b/libyara/libyara.tmproj
index 3d0a482..e573e11 100644
--- a/libyara/libyara.tmproj
+++ b/libyara/libyara.tmproj
@@ -13,7 +13,7 @@
 					<key>filename</key>
 					<string>scan.c</string>
 					<key>lastUsed</key>
-					<date>2009-01-08T11:09:40Z</date>
+					<date>2009-01-14T08:19:15Z</date>
 				</dict>
 				<dict>
 					<key>filename</key>
@@ -31,7 +31,7 @@
 					<key>filename</key>
 					<string>eval.c</string>
 					<key>lastUsed</key>
-					<date>2008-12-23T10:51:13Z</date>
+					<date>2009-01-12T18:47:42Z</date>
 				</dict>
 				<dict>
 					<key>filename</key>
@@ -49,13 +49,13 @@
 					<key>filename</key>
 					<string>ast.c</string>
 					<key>lastUsed</key>
-					<date>2009-01-08T11:55:41Z</date>
+					<date>2009-01-12T16:01:10Z</date>
 				</dict>
 				<dict>
 					<key>filename</key>
 					<string>lex.l</string>
 					<key>lastUsed</key>
-					<date>2009-01-08T11:55:41Z</date>
+					<date>2009-01-17T17:10:56Z</date>
 					<key>selected</key>
 					<true/>
 				</dict>
@@ -63,7 +63,7 @@
 					<key>filename</key>
 					<string>grammar.y</string>
 					<key>lastUsed</key>
-					<date>2009-01-08T11:09:56Z</date>
+					<date>2009-01-17T17:10:56Z</date>
 				</dict>
 				<dict>
 					<key>filename</key>
@@ -170,30 +170,14 @@
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>0</integer>
+				<integer>9</integer>
 				<key>line</key>
-				<integer>416</integer>
+				<integer>415</integer>
 			</dict>
-			<key>columnSelection</key>
-			<false/>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>384</integer>
-			<key>selectFrom</key>
-			<dict>
-				<key>column</key>
-				<integer>41</integer>
-				<key>line</key>
-				<integer>417</integer>
-			</dict>
-			<key>selectTo</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>416</integer>
-			</dict>
+			<integer>356</integer>
 		</dict>
 		<key>ast.h</key>
 		<dict>
@@ -272,14 +256,14 @@
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>0</integer>
+				<integer>3</integer>
 				<key>line</key>
-				<integer>92</integer>
+				<integer>99</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>16</integer>
+			<integer>0</integer>
 		</dict>
 		<key>eval.h</key>
 		<dict>
@@ -342,28 +326,28 @@
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>5</integer>
+				<integer>37</integer>
 				<key>line</key>
-				<integer>397</integer>
+				<integer>332</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>384</integer>
+			<integer>222</integer>
 		</dict>
 		<key>lex.l</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>20</integer>
+				<integer>0</integer>
 				<key>line</key>
-				<integer>210</integer>
+				<integer>275</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>187</integer>
+			<integer>237</integer>
 		</dict>
 		<key>pefile.c</key>
 		<dict>
@@ -384,14 +368,14 @@
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>28</integer>
+				<integer>7</integer>
 				<key>line</key>
-				<integer>187</integer>
+				<integer>573</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>160</integer>
+			<integer>674</integer>
 		</dict>
 		<key>sizedstr.h</key>
 		<dict>
diff --git a/libyara/scan.c b/libyara/scan.c
index b452c8c..1b36bb9 100644
--- a/libyara/scan.c
+++ b/libyara/scan.c
@@ -37,7 +37,7 @@ GNU General Public License for more details.
 /* Function implementations */
 
 
-int compare(char* str1, char* str2, int len)
+inline int compare(char* str1, char* str2, int len)
 {
 	char* s1 = str1;
 	char* s2 = str2;
@@ -51,7 +51,7 @@ int compare(char* str1, char* str2, int len)
 	return ((i==len) ? i : 0);
 }
 
-int icompare(char* str1, char* str2, int len)
+inline int icompare(char* str1, char* str2, int len)
 {
 	char* s1 = str1;
 	char* s2 = str2;
@@ -63,7 +63,7 @@ int icompare(char* str1, char* str2, int len)
 }
 
 
-int wcompare(char* str1, char* str2, int len)
+inline int wcompare(char* str1, char* str2, int len)
 {
 	char* s1 = str1;
 	char* s2 = str2;
@@ -79,7 +79,7 @@ int wcompare(char* str1, char* str2, int len)
 	return ((i==len) ? i * 2 : 0);
 }
 
-int wicompare(char* str1, char* str2, int len)
+inline int wicompare(char* str1, char* str2, int len)
 {
 	char* s1 = str1;
 	char* s2 = str2;
@@ -130,6 +130,8 @@ int hex_match(unsigned char* buffer, unsigned int buffer_size, unsigned char* pa
 			
             i = 0;
             
+            //TODO: improve performance of range skips
+            
             while (i <= delta && b + i < buffer_size)
             {
        			tmp = hex_match(buffer + b + i, buffer_size - b - i,  pattern + p, pattern_length - p, mask + m);
@@ -569,7 +571,7 @@ int find_matches_for_strings(   STRING_LIST_ENTRY* first_string,
 }
 
 
-int find_matches(	unsigned char first_char, 
+inline int find_matches(	unsigned char first_char, 
 					unsigned char second_char, 
 					unsigned char* buffer, 
 					unsigned int buffer_size, 
diff --git a/doc/yara.1 b/yara.man
similarity index 100%
rename from doc/yara.1
rename to yara.man

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



More information about the forensics-changes mailing list