components/mc/patches/infopanel-cant-statvfs.patch
branchs11-update
changeset 3691 baec2c9153f9
equal deleted inserted replaced
3683:7933c1b5b4f7 3691:baec2c9153f9
       
     1 Upstream bugId: #3277
       
     2 Synopsis: Info panel can't obtain file system statistics
       
     3 Bug record: https://www.midnight-commander.org/ticket/3277
       
     4 
       
     5 diff -Naur mc-4.8.13.old/src/filemanager/mountlist.c mc-4.8.13.new/src/filemanager/mountlist.c
       
     6 --- mc-4.8.13.old/src/filemanager/mountlist.c	2014-09-02 11:23:58.000000000 +0200
       
     7 +++ mc-4.8.13.new/src/filemanager/mountlist.c	2014-09-26 17:07:08.135044849 +0200
       
     8 @@ -999,9 +999,9 @@
       
     9          char *table = MNTTAB;
       
    10          FILE *fp;
       
    11          int ret;
       
    12 -        int lockfd;
       
    13  
       
    14  #if defined F_RDLCK && defined F_SETLKW
       
    15 +        int lockfd;
       
    16          /* MNTTAB_LOCK is a macro name of our own invention; it's not present in
       
    17             e.g. Solaris 2.6.  If the SVR4 folks ever define a macro
       
    18             for this file name, we should use their macro name instead.
       
    19 @@ -1056,8 +1056,10 @@
       
    20              ret = fclose (fp) == EOF ? errno : 0 < ret ? 0 : -1;
       
    21          }
       
    22  
       
    23 +#if defined F_RDLCK && defined F_SETLKW
       
    24          if (lockfd >= 0 && close (lockfd) != 0)
       
    25              ret = errno;
       
    26 +#endif
       
    27  
       
    28          if (ret >= 0)
       
    29          {