mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Sync with gnulib 23671eec22f5221a2dff50942f24c41bcf9caeaf.

Browse Source 
fsusage, mountlist: Remove support for Dynix/ptx.

* m4.include/gnulib/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Update comments.
* m4.include/gnulib/ls-mntd-fs.m4 (AC_FUNC_GETMNTENT): Don't test for
  libseq.
  (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't test for MNTTABNAME.
* lib/stat-size.h: Don't mention the Sequent bug.
* src/filemanager/mountlist.c: Don't test for MNTTABNAME. Remove
  _SEQUENT_ case

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2018-10-21 12:24:15 +03:00
parent 0f3d0ea511
commit 654b58d2b5
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/stat-size.h
View File

@ -66,8 +66,7 @@
st_blocks ((statbuf).st_size) : 0) st_blocks ((statbuf).st_size) : 0)
#endif #endif
#else #else
/* Some systems, like Sequents, return st_blksize of 0 on pipes. /* When running 'rsh hpux11-system cat any-file', cat would
Also, when running 'rsh hpux11-system cat any-file', cat would
determine that the output stream had an st_blksize of 2147421096. determine that the output stream had an st_blksize of 2147421096.
Conversely st_blksize can be 2 GiB (or maybe even larger) with XFS Conversely st_blksize can be 2 GiB (or maybe even larger) with XFS
on 64-bit hosts. Somewhat arbitrarily, limit the "optimal" block on 64-bit hosts. Somewhat arbitrarily, limit the "optimal" block

2
m4.include/gnulib/fsusage.m4
View File

@ -224,7 +224,7 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1];
if test $fu_cv_sys_stat_statfs4 = yes; then if test $fu_cv_sys_stat_statfs4 = yes; then
ac_fsusage_space=yes ac_fsusage_space=yes
AC_DEFINE([STAT_STATFS4], [1], AC_DEFINE([STAT_STATFS4], [1],
[Define if statfs takes 4 args. (SVR3, Dynix, old Irix)]) [Define if statfs takes 4 args. (SVR3, old Irix)])
fi fi
fi fi

11
m4.include/gnulib/ls-mntd-fs.m4
View File

@ -19,8 +19,8 @@ dnl
AC_DEFUN([AC_FUNC_GETMNTENT], AC_DEFUN([AC_FUNC_GETMNTENT],
[ [
# getmntent is in the standard C library on UNICOS, in -lsun on Irix 4, # getmntent is in the standard C library on UNICOS, in -lsun on Irix 4,
# -lseq on Dynix/PTX, -lgen on Unixware. # -lseq on Unixware.
AC_SEARCH_LIBS([getmntent], [sun seq gen]) AC_SEARCH_LIBS([getmntent], [sun gen])
AC_CHECK_FUNCS([getmntent]) AC_CHECK_FUNCS([getmntent])
]) ])
@ -120,7 +120,7 @@ yes
# Determine whether it's the one-argument variant or the two-argument one. # Determine whether it's the one-argument variant or the two-argument one.
if test -z "$ac_list_mounted_fs"; then if test -z "$ac_list_mounted_fs"; then
# glibc, HP-UX, IRIX, Cygwin, Android, also (obsolete) 4.3BSD, SunOS, Dynix. # glibc, HP-UX, IRIX, Cygwin, Android, also (obsolete) 4.3BSD, SunOS.
AC_CACHE_CHECK([for one-argument getmntent function], AC_CACHE_CHECK([for one-argument getmntent function],
[fu_cv_sys_mounted_getmntent1], [fu_cv_sys_mounted_getmntent1],
[AC_COMPILE_IFELSE( [AC_COMPILE_IFELSE(
@ -136,9 +136,6 @@ yes
# if defined MNT_MNTTAB /* HP-UX. */ # if defined MNT_MNTTAB /* HP-UX. */
# define MOUNTED MNT_MNTTAB # define MOUNTED MNT_MNTTAB
# endif # endif
# if defined MNTTABNAME /* Dynix. */
# define MOUNTED MNTTABNAME
# endif
#endif #endif
]], ]],
[[struct mntent *mnt = 0; char *table = MOUNTED; [[struct mntent *mnt = 0; char *table = MOUNTED;
@ -152,7 +149,7 @@ yes
AC_DEFINE([MOUNTED_GETMNTENT1], [1], AC_DEFINE([MOUNTED_GETMNTENT1], [1],
[Define if there is a function named getmntent for reading the list [Define if there is a function named getmntent for reading the list
of mounted file systems, and that function takes a single argument. of mounted file systems, and that function takes a single argument.
(4.3BSD, SunOS, HP-UX, Dynix, Irix)]) (4.3BSD, SunOS, HP-UX, Irix)])
AC_CHECK_FUNCS([hasmntopt]) AC_CHECK_FUNCS([hasmntopt])
fi fi
fi fi

13
src/filemanager/mountlist.c
View File

@ -80,7 +80,7 @@
#endif #endif
#ifdef MOUNTED_GETMNTENT1 /* glibc, HP-UX, IRIX, Cygwin, Android, #ifdef MOUNTED_GETMNTENT1 /* glibc, HP-UX, IRIX, Cygwin, Android,
also (obsolete) 4.3BSD, SunOS, Dynix */ also (obsolete) 4.3BSD, SunOS */
#include <mntent.h> #include <mntent.h>
#include <sys/types.h> #include <sys/types.h>
#ifndef MOUNTED #ifndef MOUNTED
@ -90,9 +90,6 @@
#ifdef MNT_MNTTAB /* HP-UX. */ #ifdef MNT_MNTTAB /* HP-UX. */
#define MOUNTED MNT_MNTTAB #define MOUNTED MNT_MNTTAB
#endif #endif
#ifdef MNTTABNAME /* Dynix. */
#define MOUNTED MNTTABNAME
#endif
#endif #endif
#endif #endif
@ -632,7 +629,7 @@ read_file_system_list (void)
#endif #endif
#ifdef MOUNTED_GETMNTENT1 /* glibc, HP-UX, IRIX, Cygwin, Android, #ifdef MOUNTED_GETMNTENT1 /* glibc, HP-UX, IRIX, Cygwin, Android,
also (obsolete) 4.3BSD, SunOS, Dynix */ also (obsolete) 4.3BSD, SunOS */
{ {
FILE *fp; FILE *fp;
@ -1489,11 +1486,7 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize); fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
#elif defined STAT_STATFS4 /* SVR3, Dynix, old Irix */ #elif defined STAT_STATFS4 /* SVR3, old Irix */
#if !defined _SEQUENT_
#define f_bavail f_bfree
#endif
struct statfs fsd; struct statfs fsd;