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

[Patrick Winnertz]

Author: winnie
Date: 2009-08-08 10:46:57 +0000 (Sat, 08 Aug 2009)
New Revision: 230

Added:
   trunk/debian/patches/bugs/03_don_t_escape_tilde.patch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
Fix escape of ~ on cmdline


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-08-07 12:06:14 UTC (rev 229)
+++ trunk/debian/changelog	2009-08-08 10:46:57 UTC (rev 230)
@@ -2,11 +2,12 @@
 
   [ Patrick Winnertz ]
   * Fix layout issue in the info page (Closes: #539958)
+  * Fix escape of ~ in ~/Desk or something similar (Closes: #520026)
 
   [ Denis Briand ]
   * Fix wrong path to wrapper scripts (Closes: #540238).
 
- -- Patrick Winnertz <winnie at debian.org>  Fri, 07 Aug 2009 12:45:59 +0200
+ -- Patrick Winnertz <winnie at debian.org>  Sat, 08 Aug 2009 12:40:45 +0200
 
 mc (2:4.7.0-pre1-2) unstable; urgency=low
 

Added: trunk/debian/patches/bugs/03_don_t_escape_tilde.patch
===================================================================
--- trunk/debian/patches/bugs/03_don_t_escape_tilde.patch	                        (rev 0)
+++ trunk/debian/patches/bugs/03_don_t_escape_tilde.patch	2009-08-08 10:46:57 UTC (rev 230)
@@ -0,0 +1,15 @@
+diff --git a/src/strescape.c b/src/strescape.c
+index d23010d..bd4c0e6 100644
+--- a/src/strescape.c
++++ b/src/strescape.c
+@@ -37,8 +37,8 @@
+ 
+ /*** file scope variables ************************************************************************/
+ 
+-static const char ESCAPE_SHELL_CHARS[] = " !#$%()&~{}[]`?|<>;*\\\"";
+-static const char ESCAPE_REGEX_CHARS[] = "^!#$%()&~{}[]`?|<>;*.\\";
++static const char ESCAPE_SHELL_CHARS[] = " !#$%()&{}[]`?|<>;*\\\"";
++static const char ESCAPE_REGEX_CHARS[] = "^!#$%()&{}[]`?|<>;*.\\";
+ static const char ESCAPE_GLOB_CHARS[]  = "$*\\";
+ 
+ /*** file scope functions ************************************************************************/

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2009-08-07 12:06:14 UTC (rev 229)
+++ trunk/debian/patches/series	2009-08-08 10:46:57 UTC (rev 230)
@@ -10,6 +10,7 @@
 vfs/09_choose_correct_urar.patch
 bugs/01_bashism.patch
 bugs/02_uzip_broken_528239.patch
+bugs/03_don_t_escape_tilde.patch
 bugs/1392_regression_in_tar_support.patch
 bugs/1453_fix_crash_on_f14.patch
 bugs/1404_ctrl-c_kills_mc.patch