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

[winnie at alioth.debian.org]

Author: winnie
Date: 2008-03-06 23:52:00 +0000 (Thu, 06 Mar 2008)
New Revision: 129

Added:
   trunk/debian/patches/65_error_on_copymove_over_fish.patch
Log:
First attempt to fix the reported issue


Added: trunk/debian/patches/65_error_on_copymove_over_fish.patch
===================================================================
--- trunk/debian/patches/65_error_on_copymove_over_fish.patch	                        (rev 0)
+++ trunk/debian/patches/65_error_on_copymove_over_fish.patch	2008-03-06 23:52:00 UTC (rev 129)
@@ -0,0 +1,44 @@
+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-03-07 00:50:36.000000000 +0100
++++ mc-4.6.2~pre1/vfs/fish.c	2008-03-07 00:50:20.000000000 +0100
+@@ -525,6 +525,7 @@
+ 	n = fish_command (me, super, WAIT_REPLY,
+ 		 "#STOR %lu \"/%s\"\n"
+ 		 "echo '### 001'\n"
++         "if dd if=/dev/zero of=\"/%s\" bs=1 count=1; then\n"
+ 		 "file=\"/%s\"\n"
+                  "res=`exec 3>&1\n"
+ 		 "(\n"
+@@ -541,14 +542,18 @@
+ 			"    n=`dd bs=256 count=$cnt | tee -a \"$file\" | wc -c`\n"
+ 			"    rest=`expr $rest - $n`\n"
+ 			"done\n"
+-		 "}; echo '### 200'\n",
+-		 (unsigned long) s.st_size, name,
++		    "}; echo '### 200'\n"
++         "else\n"
++            "echo '### 500'\n"
++         "fi\n"
++		 (unsigned long) s.st_size, name, name,
+ 		 quoted_name, (unsigned long) s.st_size,
+ 		 (unsigned long) s.st_size);
+     else
+ 	n = fish_command (me, super, WAIT_REPLY,
+ 		 "#STOR %lu \"/%s\"\n"
+ 		 "echo '### 001'\n"
++         "if dd if=/dev/zero of=\"/%s\" bs=1 count=1; then\n"
+ 		 "{\n"
+ 			"file=\"/%s\"\n"
+ 			"rest=%lu\n"
+@@ -559,7 +564,10 @@
+ 			"    rest=`expr $rest - $n`\n"
+ 			"done\n"
+ 		 "}; echo '### 200'\n",
+-		 (unsigned long) s.st_size, name,
++         "else\n"
++            "echo '### 500'\n"
++         "fi\n"
++		 (unsigned long) s.st_size, name, name,
+ 		 quoted_name, (unsigned long) s.st_size);
+ 
+     g_free (quoted_name);