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

winnie at alioth.debian.org winnie at alioth.debian.org
Wed Feb 27 16:15:45 UTC 2008 

Author: winnie
Date: 2008-02-27 16:15:44 +0000 (Wed, 27 Feb 2008)
New Revision: 92

Modified:
   trunk/debian/patches/63_fix_whitespace_via_fish.patch
Log:
Fix whitespace issue


Modified: trunk/debian/patches/63_fix_whitespace_via_fish.patch
===================================================================
--- trunk/debian/patches/63_fix_whitespace_via_fish.patch	2008-02-27 16:05:00 UTC (rev 91)
+++ trunk/debian/patches/63_fix_whitespace_via_fish.patch	2008-02-27 16:15:44 UTC (rev 92)
@@ -1,11 +1,7 @@
-Index: fish.c
-===================================================================
-RCS file: /cvsroot/mc/mc/vfs/fish.c,v
-retrieving revision 1.125
-diff -u -r1.125 fish.c
---- fish.c	2 Nov 2007 14:50:41 -0000	1.125
-+++ fish.c	27 Feb 2008 13:02:12 -0000
-@@ -96,6 +96,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;
  }
  
@@ -13,31 +9,28 @@
  /* 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)
  {
-@@ -366,17 +367,17 @@
+@@ -364,15 +365,15 @@
      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"
-@@ -534,9 +535,9 @@
+ 	    "echo '### 200'\n",
+@@ -523,9 +524,9 @@
      /* FIXME: File size is limited to ULONG_MAX */
      if (!fh->u.fish.append)
  	n = fish_command (me, super, WAIT_REPLY,
@@ -49,7 +42,7 @@
                   "res=`exec 3>&1\n"
  		 "(\n"
  		   "head -c %lu -q - || echo DD >&3\n"
-@@ -558,10 +559,10 @@
+@@ -547,10 +548,10 @@
  		 (unsigned long) s.st_size);
      else
  	n = fish_command (me, super, WAIT_REPLY,
@@ -62,7 +55,7 @@
  			"rest=%lu\n"
  			"while [ $rest -gt 0 ]\n"
  			"do\n"
-@@ -627,7 +628,7 @@
+@@ -616,7 +617,7 @@
  	return 0;
      quoted_name = name_quote (name, 0);
      g_free (name);
@@ -71,7 +64,7 @@
      fh->u.fish.append = 0;
  
      /*
-@@ -637,15 +638,15 @@
+@@ -626,15 +627,15 @@
       * standard output (i.e. over the network).
       */
      offset = fish_command (me, FH_SUPER, WANT_STRING,
@@ -91,7 +84,7 @@
  		"echo '### 200'\n"
  		"else\n"
  		"echo '### 500'\n" 
-@@ -777,7 +778,7 @@
+@@ -764,7 +765,7 @@
  fish_chmod (struct vfs_class *me, const char *path, int mode)
  {
      PREFIX
@@ -100,23 +93,23 @@
  				 "chmod %4.4o \"/%s\" 2>/dev/null\n"
  				 "echo '### 000'\n", 
  	    mode & 07777, rpath,
-@@ -811,11 +812,11 @@
-     return fish_send_command(me, super2, buf, OPT_FLUSH); \
+@@ -799,11 +800,11 @@
  }
  
--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'" )
+ #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'" )
  
  static int fish_symlink (struct vfs_class *me, const char *setto, const char *path)
-@@ -824,8 +825,8 @@
+@@ -812,8 +813,8 @@
      PREFIX
      qsetto = name_quote (setto, 0);
      g_snprintf(buf, sizeof(buf),
@@ -127,7 +120,7 @@
  	    "echo '### 000'\n",
  	    qsetto, rpath, qsetto, rpath);
      g_free (qsetto);
-@@ -850,16 +851,16 @@
+@@ -838,16 +839,16 @@
      {
  	PREFIX
  	g_snprintf (buf, sizeof(buf),
@@ -148,7 +141,7 @@
  	    "echo '### 000'\n", 
  	    sgroup, rpath,
  	    sgroup, rpath);
-@@ -872,8 +873,8 @@
+@@ -860,8 +861,8 @@
  {
      PREFIX
      g_snprintf(buf, sizeof(buf),
@@ -159,7 +152,7 @@
  	    "echo '### 000'\n",
  	    rpath, rpath);
      POSTFIX(OPT_FLUSH);
-@@ -886,8 +887,8 @@
+@@ -874,8 +875,8 @@
      (void) mode;
  
      g_snprintf(buf, sizeof(buf),
@@ -170,7 +163,7 @@
  	    "echo '### 000'\n",
  	    rpath, rpath);
      POSTFIX(OPT_FLUSH);
-@@ -897,8 +898,8 @@
+@@ -885,8 +886,8 @@
  {
      PREFIX
      g_snprintf(buf, sizeof(buf),

More information about the Pkg-mc-commits mailing list