[Pkg-mc-commits] r244 - in trunk/debian: . patches patches/bugs

[Patrick Winnertz]

Author: winnie
Date: 2009-08-14 12:10:47 +0000 (Fri, 14 Aug 2009)
New Revision: 244

Added:
   trunk/debian/patches/bugs/267_fix_codejump_on_functions_with_nums.patch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
Fix codejump when function (or var name) contains numbers



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-08-14 08:55:49 UTC (rev 243)
+++ trunk/debian/changelog	2009-08-14 12:10:47 UTC (rev 244)
@@ -1,10 +1,11 @@
 mc (2:4.7.0-pre1-4) unstable; urgency=low
 
   * Fix misleading description of mc and mc-dbg:
-	SMB protocol is not further possible with mc, due to security
-	issues. (Closes: #541267)
+        SMB protocol is not further possible with mc, due to security
+        issues. (Closes: #541267)
+  * Added patch to fix codejump if there is a number in the function name
 
- -- Patrick Winnertz <winnie at debian.org>  Fri, 14 Aug 2009 10:53:16 +0200
+ -- Patrick Winnertz <winnie at debian.org>  Fri, 14 Aug 2009 14:04:37 +0200
 
 mc (2:4.7.0-pre1-3) unstable; urgency=low
 

Added: trunk/debian/patches/bugs/267_fix_codejump_on_functions_with_nums.patch
===================================================================
--- trunk/debian/patches/bugs/267_fix_codejump_on_functions_with_nums.patch	                        (rev 0)
+++ trunk/debian/patches/bugs/267_fix_codejump_on_functions_with_nums.patch	2009-08-14 12:10:47 UTC (rev 244)
@@ -0,0 +1,55 @@
+commit 7e2f20bc324dbd74d9a574b41050b891348f929a
+Author: Ilia Maslakov <il.smind at google.com>
+Date:   Fri Aug 14 11:13:47 2009 +0000
+
+    Ticket #267 (etags incorrect get the line number definition)
+    
+        fix: etags incorrect get the line number of function definition
+
+diff --git a/edit/etags.c b/edit/etags.c
+index c9007e3..474203f 100644
+--- a/edit/etags.c
++++ b/edit/etags.c
+@@ -46,7 +46,7 @@
+ 
+ static gboolean parse_define(char *buf, char **long_name, char **short_name, long *line)
+ {
+-    enum {in_longname, in_shortname, in_line, finish} def_state = in_longname;
++    enum {in_longname, in_shortname, in_shortname_first_char, in_line, finish} def_state = in_longname;
+ 
+     static char longdef[LONG_DEF_LEN];
+     static char shortdef[SHORT_DEF_LEN];
+@@ -69,7 +69,7 @@ static gboolean parse_define(char *buf, char **long_name, char **short_name, lon
+                 }
+             }
+             break;
+-        case in_shortname:
++        case in_shortname_first_char:
+             if ( isdigit(c) ) {
+                 nshort = 0;
+                 buf--;
+@@ -79,11 +79,23 @@ static gboolean parse_define(char *buf, char **long_name, char **short_name, lon
+             } else {
+                 if ( nshort < SHORT_DEF_LEN - 1 ) {
+                     shortdef[nshort++] = c;
++                    def_state = in_shortname;
++                }
++            }
++            break;
++        case in_shortname:
++            if ( c == 0x01 ) {
++                def_state = in_line;
++            } else if ( c == '\n' ) {
++                def_state = finish;
++            } else {
++                if ( nshort < SHORT_DEF_LEN - 1 ) {
++                    shortdef[nshort++] = c;
+                 }
+             }
+             break;
+         case in_line:
+-            if ( c == ',' ) {
++            if ( c == ',' || c == '\n') {
+                 def_state = finish;
+             } else if ( isdigit(c) ) {
+                 if ( nline < LINE_DEF_LEN - 1 ) {

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2009-08-14 08:55:49 UTC (rev 243)
+++ trunk/debian/patches/series	2009-08-14 12:10:47 UTC (rev 244)
@@ -28,6 +28,7 @@
 bugs/1496_search_backwards_broken.patch
 bugs/1527_fix_heap_corruption_on_large_filenames.patch
 bugs/1521_ctrl-z-doesnt_work.patch
+bugs/267_fix_codejump_on_functions_with_nums.patch
 man/10_FSSTND_hu_man.patch
 man/11_FSSTND_it_man.patch
 man/12_FSSTND_man.patch