From: Sebastian Harl <sh@tokkee.org>
Date: Tue, 3 Feb 2009 09:38:05 +0000 (+0100)
Subject: debian/patches: Added tigrc-parsing-fix.dpatch.
X-Git-Tag: tig-0.13-1~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f963baa3d0c65181f895f01841ef6366b06bcced;p=pkg-tig.git

debian/patches: Added tigrc-parsing-fix.dpatch.

Upstream patch fixing a regression in parsing ~/.tigrc.
---

diff --git a/debian/changelog b/debian/changelog
index a4d4ea0..4cf93a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ tig (0.13-1) experimental; urgency=low
   * debian/patches:
     - Added non-utf8-fix.dpatch - upstream patch fixing a regression in the
       handling of non-UTF-8 locales.
+    - Added tigrc-parsing-fix.dpatch - upstream patch fixing a regression in
+      parsing ~/.tigrc.
 
- -- Sebastian Harl <sh@tokkee.org>  Tue, 03 Feb 2009 10:33:22 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Tue, 03 Feb 2009 10:37:15 +0100
 
 tig (0.12.1-1) experimental; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 0c853cf..8857e8b 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
 non-utf8-fix.dpatch
+tigrc-parsing-fix.dpatch
 
diff --git a/debian/patches/tigrc-parsing-fix.dpatch b/debian/patches/tigrc-parsing-fix.dpatch
new file mode 100755
index 0000000..d784dba
--- /dev/null
+++ b/debian/patches/tigrc-parsing-fix.dpatch
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## tigrc-parsing-fix.dpatch by Jonas Fonseca <fonseca@diku.dk>
+##
+## DP: Fix tokenizing when parsing ~/.tigrc
+## DP:
+## DP: When moving to use argv_from_string() in set_option() a regression was
+## DP: introduced causing problems with parsing of multiple spaces between
+## DP: arguments. For example:
+## DP:
+## DP: 	color date              yellow  default
+## DP:
+## DP: Reported by Clifford Caoile.
+
+diff a/tig.c b/tig.c
+--- a/tig.c
++++ b/tig.c
+@@ -292,7 +292,7 @@ argv_from_string(const char *argv[SIZEOF_ARG], int *argc, char *cmd)
+ 
+ 		cmd[valuelen] = 0;
+ 		argv[(*argc)++] = chomp_string(cmd);
+-		cmd += valuelen + advance;
++		cmd = chomp_string(cmd + valuelen + advance);
+ 	}
+ 
+ 	if (*argc < SIZEOF_ARG)