Commit Graph

5 Commits

Author SHA1 Message Date
Andrew Borodin
099052efc7 Sync with gnulib 0a6dafee2bb8f69a931345a1f67d835ee5062967
Avoid needless check on GNU/Linux.

* m4.include/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Omit STAT_STATFS3_OSF1 check
on GNU/Linux systems, since it can't possibly work.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 11:52:52 +04:00
Andrew Borodin
37873e6df4 Sync with gnulib b1fac377605c0eef8844fc8d3818d360f37d6fa4:
fs usage: fix block size returned on older Linux 2.6.

* src/filemanager/mountlist.c: Fall back to (struct statfs).f_frsize
which is available since Linux 2.6.
* m4.include/fsusage.m4 (STAT_STATFS2_FRSIZE): Always define
when the member is available so it can be used as a fallback.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 11:52:52 +04:00
Andrew Borodin
4db9168a93 Ticket #2906: crash on Solaris while trying to copy a file.
Sync with gnulib c25bdbae48977a527dff69150f59fb0746d31b51:
fs usage: check for GNU/Linux statvfs problem dynamically.

* src/filemanager/mountlist.c [STAT_STATVFS && __linux__ && (__GLIBC__||__UCLIBC__)]:
Define STAT_STATFS2_BSIZE too, since in this case the code now
checks dynamically whether statvfs is reliable, falling back on
Linux-style statfs otherwise.
(statvfs_works): New function, for dynamically testing statvfs.
(get_fs_usage) [STAT_STATVFS]: Use it.
* src/filemanager/filegui.c (filegui__check_attrs_on_fs): apply the same
statvfs_works function.
* m4.include/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Remove static check for
statvfs on GNU/Linux hosts, since it's now done dynamically.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 11:52:52 +04:00
Andrew Borodin
e3b36c8b3d Ticket #2845: code cleanup before 4.8.4 release.
Sync with gnulib 06b335ade65c8fe60fee8b9e18b670bb54ed924a:

Write "Mac OS X" instead of "MacOS X".

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-17 17:04:05 +04:00
Andrew Borodin
e7e3a119b4 src/filemanager/mountlist.c and related m4 macros: sync with gnulib.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-10-28 11:26:54 +04:00