From 93f790dc7c26e41ea70245249a1894998aecb3a8 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 21 Oct 2018 12:43:43 +0300 Subject: [PATCH] Sync with gnulib e96dcbcbc5142bd04c6c2e9e4595d9bea910fb3b. * m4.include/gnulib/fsusage.m4: (gl_FILE_SYSTEM_USAGE): Don't define STAT_STATFS2_FS_DATA. * m4.include/gnulib/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't define MOUNTED_GETMNT. * src/filemanager/filegui.c: remove Ultrix related includes. * src/filemanager/mountlist.c: Remove STAT_STATFS2_FS_DATA case. Remove MOUNTED_GETMNT case. * lib/tty/tty-internal.h: remove Ultrix-related define. * src/vfs/smbfs/helpers/include/includes.h: Likewize * doc/FAQ: Update OS list. * doc/INSTALL: Likewize. Signed-off-by: Andrew Borodin --- doc/FAQ | 1 - doc/INSTALL | 1 - lib/tty/tty-internal.h | 4 -- m4.include/gnulib/fsusage.m4 | 35 ----------------- m4.include/gnulib/ls-mntd-fs.m4 | 18 --------- src/filemanager/filegui.c | 6 --- src/filemanager/mountlist.c | 50 ------------------------ src/vfs/smbfs/helpers/include/includes.h | 4 -- 8 files changed, 119 deletions(-) diff --git a/doc/FAQ b/doc/FAQ index dd08ef906..ae456f986 100644 --- a/doc/FAQ +++ b/doc/FAQ @@ -127,7 +127,6 @@ Frequently Asked Questions * sparc-linux-linux2.x * sparc64-linux-linux2.1 * mips-sgi-irix5.x, 6.x - * mips-dec-ultrix4.3 * sparc-sun-sunos4.1 * sparc-sun-solaris2.3, 2.4, 2.5 * sparc-sun-netbsd1.0 diff --git a/doc/INSTALL b/doc/INSTALL index 8007c69c7..d4cad5062 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -324,7 +324,6 @@ i386-*-linux sparc-*-linux alpha-*-linux powerpc-*-linux -mips-dec-ultrix4.3 mips-dec-{open,net}bsd1.0 mips-sgi-irix5.2 mips-sgi-irix5.3 diff --git a/lib/tty/tty-internal.h b/lib/tty/tty-internal.h index 77f0062c1..ee50159dd 100644 --- a/lib/tty/tty-internal.h +++ b/lib/tty/tty-internal.h @@ -11,15 +11,11 @@ /*** typedefs(not structures) and defined constants **********************************************/ /* Taken from S-Lang's slutty.c */ -#ifdef ultrix /* Ultrix gets _POSIX_VDISABLE wrong! */ -#define NULL_VALUE -1 -#else #ifdef _POSIX_VDISABLE #define NULL_VALUE _POSIX_VDISABLE #else #define NULL_VALUE 255 #endif -#endif /*** enums ***************************************************************************************/ diff --git a/m4.include/gnulib/fsusage.m4 b/m4.include/gnulib/fsusage.m4 index ecf1cc57e..6c104fc5a 100644 --- a/m4.include/gnulib/fsusage.m4 +++ b/m4.include/gnulib/fsusage.m4 @@ -263,41 +263,6 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1]; fi fi - if test $ac_fsusage_space = no; then - # Ultrix - AC_CACHE_CHECK([for two-argument statfs with struct fs_data (Ultrix)], - [fu_cv_sys_stat_fs_data], - [AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include -#ifdef HAVE_SYS_PARAM_H -#include -#endif -#ifdef HAVE_SYS_MOUNT_H -#include -#endif -#ifdef HAVE_SYS_FS_TYPES_H -#include -#endif - int - main () - { - struct fs_data fsd; - /* Ultrix's statfs returns 1 for success, - 0 for not mounted, -1 for failure. */ - return statfs (".", &fsd) != 1; - }]])], - [fu_cv_sys_stat_fs_data=yes], - [fu_cv_sys_stat_fs_data=no], - [fu_cv_sys_stat_fs_data=no]) - ]) - if test $fu_cv_sys_stat_fs_data = yes; then - ac_fsusage_space=yes - AC_DEFINE([STAT_STATFS2_FS_DATA], [1], - [Define if statfs takes 2 args and the second argument has - type struct fs_data. (Ultrix)]) - fi - fi - AS_IF([test $ac_fsusage_space = yes], [$1], [$2]) ]) diff --git a/m4.include/gnulib/ls-mntd-fs.m4 b/m4.include/gnulib/ls-mntd-fs.m4 index e35e5da70..298d5cb54 100644 --- a/m4.include/gnulib/ls-mntd-fs.m4 +++ b/m4.include/gnulib/ls-mntd-fs.m4 @@ -310,24 +310,6 @@ int getmntinfo (struct statfs **, int); fi fi - if test -z "$ac_list_mounted_fs"; then - # (obsolete) Ultrix. - AC_CACHE_CHECK([for getmnt function], - [fu_cv_sys_mounted_getmnt], - [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ -#include -#include ]])], - [fu_cv_sys_mounted_getmnt=yes], - [fu_cv_sys_mounted_getmnt=no]) - ]) - if test $fu_cv_sys_mounted_getmnt = yes; then - ac_list_mounted_fs=found - AC_DEFINE([MOUNTED_GETMNT], [1], - [Define if there is a function named getmnt for reading the list of - mounted file systems. (Ultrix)]) - fi - fi - if test -z "$ac_list_mounted_fs"; then # Haiku, also (obsolete) BeOS. AC_CHECK_FUNCS([next_dev fs_stat_dev]) diff --git a/src/filemanager/filegui.c b/src/filemanager/filegui.c index 91ddeb1b1..9f7139189 100644 --- a/src/filemanager/filegui.c +++ b/src/filemanager/filegui.c @@ -78,12 +78,6 @@ /* NetBSD 1.5.2 needs these, for the declaration of struct statfs. */ #include #include -#if defined HAVE_NFS_NFS_CLNT_H && defined HAVE_NFS_VFS_H -/* Ultrix 4.4 needs these for the declaration of struct statfs. */ -#include -#include -#include -#endif #elif defined HAVE_OS_H /* Haiku, also (obsolete) BeOS */ #include #endif diff --git a/src/filemanager/mountlist.c b/src/filemanager/mountlist.c index 6f3ed25db..8508cbd96 100644 --- a/src/filemanager/mountlist.c +++ b/src/filemanager/mountlist.c @@ -101,11 +101,6 @@ #include #endif -#ifdef MOUNTED_GETMNT /* (obsolete) Ultrix */ -#include -#include -#endif - #ifdef MOUNTED_FS_STAT_DEV /* Haiku, also (obsolete) BeOS */ #include #include @@ -807,36 +802,6 @@ read_file_system_list (void) } #endif /* MOUNTED_GETMNTINFO2 */ -#ifdef MOUNTED_GETMNT /* (obsolete) Ultrix */ - { - int offset = 0; - int val; - struct fs_data fsd; - - while (TRUE) - { - errno = 0; - val = getmnt (&offset, &fsd, sizeof (fsd), NOSTAT_MANY, (char *) NULL); - if (val < 0) - goto free_then_fail; - if (val == 0) - break; - - me = g_malloc (sizeof (*me)); - me->me_devname = g_strdup (fsd.fd_req.devname); - me->me_mountdir = g_strdup (fsd.fd_req.path); - me->me_mntroot = NULL; - me->me_type = gt_names[fsd.fd_req.fstype]; - me->me_type_malloced = 0; - me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); - me->me_remote = ME_REMOTE (me->me_devname, me->me_type); - me->me_dev = fsd.fd_req.dev; - - mount_list = g_slist_prepend (mount_list, me); - } - } -#endif /* MOUNTED_GETMNT. */ - #if defined MOUNTED_FS_STAT_DEV /* Haiku, also (obsolete) BeOS */ { /* The next_dev() and fs_stat_dev() system calls give the list of @@ -1418,21 +1383,6 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp) : PROPAGATE_ALL_ONES (fsd.f_bsize); /* *INDENT-ON* */ -#elif defined STAT_STATFS2_FS_DATA /* Ultrix */ - - struct fs_data fsd; - - if (statfs (file, &fsd) != 1) - return -1; - - fsp->fsu_blocksize = 1024; - fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.fd_req.btot); - fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.fd_req.bfree); - fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.fd_req.bfreen); - fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.fd_req.bfreen) != 0; - fsp->fsu_files = PROPAGATE_ALL_ONES (fsd.fd_req.gtot); - fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.fd_req.gfree); - #elif defined STAT_STATFS3_OSF1 /* OSF/1 */ struct statfs fsd; diff --git a/src/vfs/smbfs/helpers/include/includes.h b/src/vfs/smbfs/helpers/include/includes.h index 4a363ed0e..9cce9309d 100644 --- a/src/vfs/smbfs/helpers/include/includes.h +++ b/src/vfs/smbfs/helpers/include/includes.h @@ -540,10 +540,6 @@ #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) #endif -#if defined(HAVE_CRYPT16) && defined(HAVE_GETAUTHUID) -#define ULTRIX_AUTH 1 -#endif - #ifndef HAVE_INITGROUPS int initgroups (char *name, gid_t id); #endif