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

[winnie at alioth.debian.org]

Author: winnie
Date: 2008-02-27 16:00:48 +0000 (Wed, 27 Feb 2008)
New Revision: 90

Modified:
   trunk/debian/patches/62_dont_hang_on_errors.patch
Log:
Only include the absolute necessary things


Modified: trunk/debian/patches/62_dont_hang_on_errors.patch
===================================================================
--- trunk/debian/patches/62_dont_hang_on_errors.patch	2008-02-27 15:50:22 UTC (rev 89)
+++ trunk/debian/patches/62_dont_hang_on_errors.patch	2008-02-27 16:00:48 UTC (rev 90)
@@ -1,6 +1,7 @@
---- 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 @@
+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 16:52:15.000000000 +0100
++++ mc-4.6.2~pre1/vfs/fish.c	2008-02-27 16:56:23.000000000 +0100
+@@ -618,16 +618,28 @@
      g_free (name);
      name = quoted_name;
      fh->u.fish.append = 0;
@@ -31,17 +32,3 @@
      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;
- }