[Pkg-mc-commits] r102 - trunk/debian/proposed-patches

[winnie at alioth.debian.org]

Author: winnie
Date: 2008-02-27 17:07:42 +0000 (Wed, 27 Feb 2008)
New Revision: 102

Removed:
   trunk/debian/proposed-patches/27_dont_hang_on_errors.patch
   trunk/debian/proposed-patches/fix-01-copymove.patch
Log:
one is used now as patch.. 
the other one belongs only into the newutf8 branch


Deleted: trunk/debian/proposed-patches/27_dont_hang_on_errors.patch
===================================================================
--- trunk/debian/proposed-patches/27_dont_hang_on_errors.patch	2008-02-27 17:04:45 UTC (rev 101)
+++ trunk/debian/proposed-patches/27_dont_hang_on_errors.patch	2008-02-27 17:07:42 UTC (rev 102)
@@ -1,47 +0,0 @@
---- mc-4.6.2~pre1/vfs/fish.c	2007/09/25 15:33:38	1.121
-+++ mc-4.6.2~pre1/vfs/fish.c	2007/10/26 13:46:42	1.123
-@@ -619,25 +619,39 @@
-     g_free (name);
-     name = quoted_name;
-     fh->u.fish.append = 0;
-+
-+    /*
-+     * Check whether the remote file is readable by using `dd' to copy 
-+     * a single byte from the remote file to /dev/null. If `dd' completes
-+     * with exit status of 0 use `cat' to send the file contents to the
-+     * standard output (i.e. over the network).
-+     */
-     offset = fish_command (me, FH_SUPER, WANT_STRING,
- 		"#RETR /%s\n"
-+		"if dd if=/%s of=/dev/null bs=1 count=1 2>/dev/null ;\n"
-+		"then\n"
- 		"ls -ln /%s 2>/dev/null | (\n"
- 		  "read p l u g s r\n"
- 		  "echo \"$s\"\n"
- 		")\n"
- 		"echo '### 100'\n"
- 		"cat /%s\n"
--		"echo '### 200'\n", 
--		name, name, name );
-+		"echo '### 200'\n"
-+		"else\n"
-+		"echo '### 500'\n" 
-+		"fi\n",
-+		name, name, name, name );
-     g_free (name);
-     if (offset != PRELIM) ERRNOR (E_REMOTE, 0);
-     fh->linear = LS_LINEAR_OPEN;
-     fh->u.fish.got = 0;
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 || (defined _LARGE_FILES && _LARGE_FILES)
--    if (sscanf( reply_str, "%llu", &fh->u.fish.total )!=1)
-+    errno = 0;
-+#if SIZEOF_OFF_T == SIZEOF_LONG
-+    fh->u.fish.total = strtol (reply_str, NULL, 10);
- #else
--    if (sscanf( reply_str, "%u", &fh->u.fish.total )!=1)
-+    fh->u.fish.total = strtoll (reply_str, NULL, 10);
- #endif
-+    if (errno != 0)
- 	ERRNOR (E_REMOTE, 0);
-     return 1;
- }

Deleted: trunk/debian/proposed-patches/fix-01-copymove.patch
===================================================================
--- trunk/debian/proposed-patches/fix-01-copymove.patch	2008-02-27 17:04:45 UTC (rev 101)
+++ trunk/debian/proposed-patches/fix-01-copymove.patch	2008-02-27 17:07:42 UTC (rev 102)
@@ -1,55 +0,0 @@
-diff -rupbBN mc.orig/src/file.c mc/src/file.c
---- mc.orig/src/file.c	2007-11-16 10:15:44.000000000 +0100
-+++ mc/src/file.c	2007-11-22 16:08:31.000000000 +0100
-@@ -172,7 +172,8 @@ static const char *
- do_transform_source (FileOpContext *ctx, const char *source)
- {
-     size_t j, len;
--    char *fnsource = (char*) x_basename (source);
-+    const char *fnsource = x_basename (source);
-+    char *fnsource_fixed = g_strdup (fnsource);
-     int next_reg;
-     enum CaseConvs case_conv = NO_CONV;
-     static char fntarget[MC_MAXPATHLEN];
-@@ -181,14 +182,16 @@ do_transform_source (FileOpContext *ctx,
-     char *actual;
-     size_t remain;
- 
--    str_fix_string (fnsource);
- 
--    len = strlen (fnsource);
--    j = re_match (&ctx->rx, fnsource, len, 0, &ctx->regs);
-+    str_fix_string (fnsource_fixed);
-+
-+    len = strlen (fnsource_fixed);
-+    j = re_match (&ctx->rx, fnsource_fixed, len, 0, &ctx->regs);
-     if (j != len) {
- 	transform_error = FILE_SKIP;
- 	return NULL;
-     }
-+    g_free (fnsource_fixed);
-     
-     actual = fntarget;
-     remain = sizeof (fntarget);
-@@ -236,10 +239,19 @@ do_transform_source (FileOpContext *ctx,
- 		return NULL;
- 	    }
- 	    for (fn = fnsource + ctx->regs.start[next_reg]; 
--                        fn < fnsource + ctx->regs.end[next_reg] && remain > 1; 
--                        str_next_char (&fn))
-+                 fn < fnsource + ctx->regs.end[next_reg] && remain > 1; ) {
-+		
-+                if (str_is_valid_char (fn, -1) == 1) {
- 		convert_case (fn, &case_conv, &actual, &remain);
-+                    str_next_char (&fn);
-+                } else {
-+                    actual[0] = fn[0];
-+                    actual++;
-+                    remain--;
-+                    fn++;
-+                }
-             
-+            }
- 	    next_reg++;
- 	    break;
-