From 1ff0e9684bb83a8277ffe22ac125ce7e90f6702b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 16 Oct 2018 21:27:45 +0200 Subject: mountlist: Remove support for Cray with UNICOS 9. * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't define MOUNTED_LISTMNTENT. * lib/mountlist.c: Remove MOUNTED_LISTMNTENT case. --- lib/mountlist.c | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'lib/mountlist.c') diff --git a/lib/mountlist.c b/lib/mountlist.c index 9a94f42c79..bc86c18b45 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -95,10 +95,6 @@ # include #endif -#ifdef MOUNTED_LISTMNTENT /* (obsolete) Cray UNICOS 9 */ -# include -#endif - #ifdef MOUNTED_GETEXTMNTENT /* Solaris >= 8 */ # include #endif @@ -423,37 +419,6 @@ read_file_system_list (bool need_fs_type) struct mount_entry **mtail = &mount_list; (void) need_fs_type; -#ifdef MOUNTED_LISTMNTENT /* (obsolete) Cray UNICOS 9 */ - { - struct tabmntent *mntlist, *p; - struct mntent *mnt; - - /* the third and fourth arguments could be used to filter mounts, - but Crays doesn't seem to have any mounts that we want to - remove. Specifically, automount create normal NFS mounts. - */ - - if (listmntent (&mntlist, KMTAB, NULL, NULL) < 0) - return NULL; - for (p = mntlist; p; p = p->next) - { - mnt = p->ment; - me = xmalloc (sizeof *me); - me->me_devname = xstrdup (mnt->mnt_fsname); - me->me_mountdir = xstrdup (mnt->mnt_dir); - me->me_mntroot = NULL; - me->me_type = xstrdup (mnt->mnt_type); - me->me_type_malloced = 1; - 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 = -1; - *mtail = me; - mtail = &me->me_next; - } - freemntlist (mntlist); - } -#endif - #ifdef MOUNTED_GETMNTENT1 /* glibc, HP-UX, IRIX, Cygwin, Android, also (obsolete) 4.3BSD, SunOS */ { -- cgit v1.2.1