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

[winnie at alioth.debian.org]

Author: winnie
Date: 2008-02-27 18:16:40 +0000 (Wed, 27 Feb 2008)
New Revision: 106

Modified:
   trunk/debian/patches/63_fix_whitespace_via_fish.patch
Log:
Same as before but now for trunk


Modified: trunk/debian/patches/63_fix_whitespace_via_fish.patch
===================================================================
--- trunk/debian/patches/63_fix_whitespace_via_fish.patch	2008-02-27 18:15:21 UTC (rev 105)
+++ trunk/debian/patches/63_fix_whitespace_via_fish.patch	2008-02-27 18:16:40 UTC (rev 106)
@@ -1,15 +1,7 @@
 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 17:14:21.000000000 +0100
-+++ mc-4.6.2~pre1/vfs/fish.c	2008-02-27 17:13:58.000000000 +0100
-@@ -95,6 +95,7 @@
-     return code / 100;
- }
- 
-+
- /* Returns a reply code, check /usr/include/arpa/ftp.h for possible values */
- static int fish_get_reply (struct vfs_class *me, int sock, char *string_buf, int string_len)
- {
-@@ -364,15 +365,15 @@
+--- 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
+@@ -364,15 +364,15 @@
      dir->timestamp.tv_sec += fish_directory_timeout;
      quoted_path = name_quote (remote_path, 0);
      fish_command (me, super, NONE,
@@ -30,7 +22,15 @@
  	      "done\n"
  	    ")\n"
  	    "echo '### 200'\n",
-@@ -523,9 +524,9 @@
+@@ -516,16 +516,16 @@
+      *	instead of stderr. It makes impossible the use of "head || dd"
+      *	algorithm for file appending case, therefore just "dd" is used for it.
+      */
+-
++	name = unescape_string(name);
+     print_vfs_message(_("fish: store %s: sending command..."), name );
+     quoted_name = name_quote (name, 0);
+ 
      /* FIXME: File size is limited to ULONG_MAX */
      if (!fh->u.fish.append)
  	n = fish_command (me, super, WAIT_REPLY,
@@ -42,7 +42,7 @@
                   "res=`exec 3>&1\n"
  		 "(\n"
  		   "head -c %lu -q - || echo DD >&3\n"
-@@ -547,10 +548,10 @@
+@@ -547,10 +547,10 @@
  		 (unsigned long) s.st_size);
      else
  	n = fish_command (me, super, WAIT_REPLY,
@@ -55,7 +55,7 @@
  			"rest=%lu\n"
  			"while [ $rest -gt 0 ]\n"
  			"do\n"
-@@ -616,7 +617,7 @@
+@@ -616,7 +616,7 @@
  	return 0;
      quoted_name = name_quote (name, 0);
      g_free (name);
@@ -64,7 +64,7 @@
      fh->u.fish.append = 0;
  
      /*
-@@ -626,15 +627,15 @@
+@@ -626,15 +626,15 @@
       * standard output (i.e. over the network).
       */
      offset = fish_command (me, FH_SUPER, WANT_STRING,
@@ -84,6 +84,14 @@
  		"echo '### 200'\n"
  		"else\n"
  		"echo '### 500'\n" 
+@@ -754,6 +754,7 @@
+ 	return -1; \
+     } \
+     rpath = name_quote (crpath, 0); \
++    rpath = unescape_string(rpath); \
+     g_free (mpath);
+ 
+ #define POSTFIX(flags) \
 @@ -764,7 +765,7 @@
  fish_chmod (struct vfs_class *me, const char *path, int mode)
  {
@@ -152,9 +160,11 @@
  	    "echo '### 000'\n",
  	    rpath, rpath);
      POSTFIX(OPT_FLUSH);
-@@ -874,8 +875,8 @@
+@@ -872,10 +873,9 @@
+     PREFIX
+ 
      (void) mode;
- 
+-
      g_snprintf(buf, sizeof(buf),
 -            "#MKD /%s\n"
 -	    "mkdir /%s 2>/dev/null\n"
@@ -163,7 +173,7 @@
  	    "echo '### 000'\n",
  	    rpath, rpath);
      POSTFIX(OPT_FLUSH);
-@@ -885,8 +886,8 @@
+@@ -885,8 +885,8 @@
  {
      PREFIX
      g_snprintf(buf, sizeof(buf),