components/mc/patches/infopanel-cant-statvfs.patch
author John Beck <John.Beck@Oracle.COM>
Fri, 06 Feb 2015 16:50:21 -0800
branchs11-update
changeset 3796 82cd21906ac2
parent 3691 baec2c9153f9
permissions -rw-r--r--
20494432 skip Python test_gdb for version 3.4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3691
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
     1
Upstream bugId: #3277
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
     2
Synopsis: Info panel can't obtain file system statistics
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
     3
Bug record: https://www.midnight-commander.org/ticket/3277
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
     4
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
     5
diff -Naur mc-4.8.13.old/src/filemanager/mountlist.c mc-4.8.13.new/src/filemanager/mountlist.c
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
     6
--- mc-4.8.13.old/src/filemanager/mountlist.c	2014-09-02 11:23:58.000000000 +0200
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
     7
+++ mc-4.8.13.new/src/filemanager/mountlist.c	2014-09-26 17:07:08.135044849 +0200
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
     8
@@ -999,9 +999,9 @@
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
     9
         char *table = MNTTAB;
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    10
         FILE *fp;
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    11
         int ret;
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    12
-        int lockfd;
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    13
 
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    14
 #if defined F_RDLCK && defined F_SETLKW
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    15
+        int lockfd;
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    16
         /* MNTTAB_LOCK is a macro name of our own invention; it's not present in
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    17
            e.g. Solaris 2.6.  If the SVR4 folks ever define a macro
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    18
            for this file name, we should use their macro name instead.
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    19
@@ -1056,8 +1056,10 @@
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    20
             ret = fclose (fp) == EOF ? errno : 0 < ret ? 0 : -1;
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    21
         }
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    22
 
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    23
+#if defined F_RDLCK && defined F_SETLKW
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    24
         if (lockfd >= 0 && close (lockfd) != 0)
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    25
             ret = errno;
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    26
+#endif
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    27
 
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    28
         if (ret >= 0)
baec2c9153f9 19702624 Update Midnight Commander
Milan Cermak <Milan.Cermak@oracle.com>
parents:
diff changeset
    29
         {