From a405fc138596f552581d2011fd6de02d5c8186c4 Mon Sep 17 00:00:00 2001
From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
Date: Wed, 17 Nov 2021 01:05:54 +0100
Subject: Sync with the latest Gnulib code (1a268176f)
---
gl/mountlist.h | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
(limited to 'gl/mountlist.h')
diff --git a/gl/mountlist.h b/gl/mountlist.h
index 55877e23..fbad1246 100644
--- a/gl/mountlist.h
+++ b/gl/mountlist.h
@@ -1,6 +1,6 @@
/* mountlist.h -- declarations for list of mounted file systems
- Copyright (C) 1991-1992, 1998, 2000-2005, 2009-2013 Free Software
+ Copyright (C) 1991-1992, 1998, 2000-2005, 2009-2021 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -14,7 +14,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see . */
+ along with this program. If not, see . */
#ifndef MOUNTLIST_H_
# define MOUNTLIST_H_
@@ -27,15 +27,18 @@ struct mount_entry
{
char *me_devname; /* Device node name, including "/dev/". */
char *me_mountdir; /* Mount point directory name. */
+ char *me_mntroot; /* Directory on filesystem of device used */
+ /* as root for the (bind) mount. */
char *me_type; /* "nfs", "4.2", etc. */
dev_t me_dev; /* Device number of me_mountdir. */
unsigned int me_dummy : 1; /* Nonzero for dummy file systems. */
- unsigned int me_remote : 1; /* Nonzero for remote fileystems. */
+ unsigned int me_remote : 1; /* Nonzero for remote file systems. */
unsigned int me_type_malloced : 1; /* Nonzero if me_type was malloced. */
struct mount_entry *me_next;
};
-struct mount_entry *read_file_system_list (bool need_fs_type);
+struct mount_entry *read_file_system_list (bool need_fs_type)
+ _GL_ATTRIBUTE_MALLOC;
void free_mount_entry (struct mount_entry *entry);
#endif
--
cgit v1.2.3-74-g34f1