[Pkg-mc-commits] r103 - branch/new-utf8/debian/patches
winnie at alioth.debian.org
winnie at alioth.debian.org
Wed Feb 27 18:04:52 UTC 2008
Author: winnie
Date: 2008-02-27 18:04:51 +0000 (Wed, 27 Feb 2008)
New Revision: 103
Modified:
branch/new-utf8/debian/patches/35_fix_whitespace_via_fish.patch
Log:
the patch was incomplete.. sorry for that
Modified: branch/new-utf8/debian/patches/35_fix_whitespace_via_fish.patch
===================================================================
--- branch/new-utf8/debian/patches/35_fix_whitespace_via_fish.patch 2008-02-27 17:07:42 UTC (rev 102)
+++ branch/new-utf8/debian/patches/35_fix_whitespace_via_fish.patch 2008-02-27 18:04:51 UTC (rev 103)
@@ -1,36 +1,39 @@
-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 @@
+diff -u -w -r1.125 fish.c
+--- ./vfs/fish.c 2 Nov 2007 14:50:41 -0000 1.125
++++ ./vfs/fish.c 27 Feb 2008 18:04:03 -0000
+@@ -366,17 +366,17 @@
dir->timestamp.tv_sec += fish_directory_timeout;
quoted_path = name_quote (remote_path, 0);
fish_command (me, super, NONE,
- "#LIST /%s\n"
+- "if ls -1 /%s >/dev/null 2>&1 ;\n"
++ "#LIST \"/%s\"\n"
++ "if ls -1 \"/%s\" >/dev/null 2>&1 ;\n"
+ "then\n"
- "ls -lLan /%s 2>/dev/null | grep '^[^cbt]' | (\n"
-+ "#LIST \"/%s\"\n"
+ "ls -lQLan \"/%s\" 2>/dev/null | grep '^[^cbt]' | (\n"
"while read p l u g s m d y n; do\n"
- "echo \"P$p $u.$g\nS$s\nd$m $d $y\n:$n\n\"\n"
-+ "echo \"P$p $u.$g\nS$s\nd$m $d $y\n:$n\n\" | sed 's#\\\"##g' \n"
++ "echo \"P$p $u.$g\nS$s\nd$m $d $y\n:$n\n\"| sed 's#\\\"##g'\n"
"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"
++ "echo \"P$p $u.$g\nE$a$i\nd$m $d $y\n:$n\n\" | sed 's#\\\"##g'\n"
"done\n"
")\n"
- "echo '### 200'\n",
-@@ -523,9 +524,9 @@
+ "echo '### 200'\n"
+@@ -527,16 +527,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 +45,7 @@
"res=`exec 3>&1\n"
"(\n"
"head -c %lu -q - || echo DD >&3\n"
-@@ -547,10 +548,10 @@
+@@ -558,10 +558,10 @@
(unsigned long) s.st_size);
else
n = fish_command (me, super, WAIT_REPLY,
@@ -55,7 +58,7 @@
"rest=%lu\n"
"while [ $rest -gt 0 ]\n"
"do\n"
-@@ -616,7 +617,7 @@
+@@ -627,7 +627,7 @@
return 0;
quoted_name = name_quote (name, 0);
g_free (name);
@@ -64,7 +67,7 @@
fh->u.fish.append = 0;
/*
-@@ -626,15 +627,15 @@
+@@ -637,15 +637,15 @@
* standard output (i.e. over the network).
*/
offset = fish_command (me, FH_SUPER, WANT_STRING,
@@ -84,7 +87,15 @@
"echo '### 200'\n"
"else\n"
"echo '### 500'\n"
-@@ -764,7 +765,7 @@
+@@ -767,6 +767,7 @@
+ return -1; \
+ } \
+ rpath = name_quote (crpath, 0); \
++ rpath = unescape_string(rpath); \
+ g_free (mpath);
+
+ #define POSTFIX(flags) \
+@@ -777,7 +778,7 @@
fish_chmod (struct vfs_class *me, const char *path, int mode)
{
PREFIX
@@ -93,23 +104,23 @@
"chmod %4.4o \"/%s\" 2>/dev/null\n"
"echo '### 000'\n",
mode & 07777, rpath,
-@@ -799,11 +800,11 @@
+@@ -811,11 +812,11 @@
+ return fish_send_command(me, super2, buf, OPT_FLUSH); \
}
- #define XTEST if (bucket1 != bucket2) { ERRNOR (EXDEV, -1); }
--FISH_OP(rename, XTEST, "#RENAME /%s /%s\n"
-- "mv /%s /%s 2>/dev/null\n"
-+FISH_OP(rename, XTEST, "#RENAME \"/%s\" \"/%s\"\n"
-+ "mv \"/%s\" \"/%s\" 2>/dev/null\n"
- "echo '### 000'" )
--FISH_OP(link, XTEST, "#LINK /%s /%s\n"
-- "ln /%s /%s 2>/dev/null\n"
-+FISH_OP(link, XTEST, "#LINK \"/%s\" \"/%s\"\n"
-+ "ln \"/%s\" \"/%s\" 2>/dev/null\n"
- "echo '### 000'" )
+-FISH_OP(rename, "#RENAME /%s /%s\n"
+- "mv /%s /%s 2>/dev/null\n"
++FISH_OP(rename, "#RENAME \"/%s\" \"/%s\"\n"
++ "mv \"/%s\" \"/%s\" 2>/dev/null\n"
+ "echo '### 000'" )
+-FISH_OP(link, "#LINK /%s /%s\n"
+- "ln /%s /%s 2>/dev/null\n"
++FISH_OP(link, "#LINK \"/%s\" \"/%s\"\n"
++ "ln \"%s\" \"/%s\" 2>/dev/null\n"
+ "echo '### 000'" )
static int fish_symlink (struct vfs_class *me, const char *setto, const char *path)
-@@ -812,8 +813,8 @@
+@@ -824,8 +825,8 @@
PREFIX
qsetto = name_quote (setto, 0);
g_snprintf(buf, sizeof(buf),
@@ -120,7 +131,7 @@
"echo '### 000'\n",
qsetto, rpath, qsetto, rpath);
g_free (qsetto);
-@@ -838,16 +839,16 @@
+@@ -850,16 +851,16 @@
{
PREFIX
g_snprintf (buf, sizeof(buf),
@@ -141,7 +152,7 @@
"echo '### 000'\n",
sgroup, rpath,
sgroup, rpath);
-@@ -860,8 +861,8 @@
+@@ -872,8 +873,8 @@
{
PREFIX
g_snprintf(buf, sizeof(buf),
@@ -152,9 +163,11 @@
"echo '### 000'\n",
rpath, rpath);
POSTFIX(OPT_FLUSH);
-@@ -874,8 +875,8 @@
+@@ -884,10 +885,9 @@
+ PREFIX
+
(void) mode;
-
+-
g_snprintf(buf, sizeof(buf),
- "#MKD /%s\n"
- "mkdir /%s 2>/dev/null\n"
@@ -163,7 +176,7 @@
"echo '### 000'\n",
rpath, rpath);
POSTFIX(OPT_FLUSH);
-@@ -885,8 +886,8 @@
+@@ -897,8 +897,8 @@
{
PREFIX
g_snprintf(buf, sizeof(buf),
More information about the Pkg-mc-commits
mailing list