[Pkg-mc-commits] r112 - trunk/debian/patches

[winnie at alioth.debian.org]

Author: winnie
Date: 2008-02-27 19:20:35 +0000 (Wed, 27 Feb 2008)
New Revision: 112

Modified:
   trunk/debian/patches/63_fix_whitespace_via_fish.patch
Log:
Merge from utf8 branch


Modified: trunk/debian/patches/63_fix_whitespace_via_fish.patch
===================================================================
--- trunk/debian/patches/63_fix_whitespace_via_fish.patch	2008-02-27 19:11:29 UTC (rev 111)
+++ trunk/debian/patches/63_fix_whitespace_via_fish.patch	2008-02-27 19:20:35 UTC (rev 112)
@@ -1,6 +1,6 @@
 diff -Nurwd mc-4.6.2~pre1.orig/vfs/fish.c mc-4.6.2~pre1/vfs/fish.c
---- mc-4.6.2~pre1.orig/vfs/fish.c	2008-02-27 19:10:02.000000000 +0100
-+++ mc-4.6.2~pre1/vfs/fish.c	2008-02-27 19:09:35.000000000 +0100
+--- mc-4.6.2~pre1.orig/vfs/fish.c	2008-02-27 20:08:15.000000000 +0100
++++ mc-4.6.2~pre1/vfs/fish.c	2008-02-27 20:07:51.000000000 +0100
 @@ -364,15 +364,15 @@
      dir->timestamp.tv_sec += fish_directory_timeout;
      quoted_path = name_quote (remote_path, 0);
@@ -15,7 +15,7 @@
  	      "done\n"
  	    ")\n"
 -	    "ls -lan /%s 2>/dev/null | grep '^[cb]' | (\n"
-+	    "ls -Qlan /%s 2>/dev/null | grep '^[cb]' | (\n"
++	    "ls -Qlan \"/%s\" 2>/dev/null | grep '^[cb]' | (\n"
  	      "while read p l u g a i m d y n; do\n"
 -	        "echo \"P$p $u.$g\nE$a$i\nd$m $d $y\n:$n\n\"\n"
 +	        "echo \"P$p $u.$g\nE$a$i\nd$m $d $y\n:$n\n\" | sed 's#\\\"##g' \n"
@@ -29,7 +29,8 @@
 -
 +	name = unescape_string(name);
      print_vfs_message(_("fish: store %s: sending command..."), name );
-     quoted_name = name_quote (name, 0);
+-    quoted_name = name_quote (name, 0);
++    quoted_name = unescape_string (name_quote (name, 0));
  
      /* FIXME: File size is limited to ULONG_MAX */
      if (!fh->u.fish.append)