projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: improve doc of g_file_equal()
[platform/upstream/glib.git]
/
gio
/
gunixmounts.c
diff --git
a/gio/gunixmounts.c
b/gio/gunixmounts.c
index
03f1720
..
4999354
100644
(file)
--- a/
gio/gunixmounts.c
+++ b/
gio/gunixmounts.c
@@
-15,9
+15,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
@@
-31,11
+29,8
@@
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
#endif
#endif
-#endif
-#ifdef HAVE_POLL_H
+#ifdef HAVE_POLL
#include <poll.h>
#endif
#include <stdio.h>
#include <poll.h>
#endif
#include <stdio.h>
@@
-84,9
+79,9
@@
static const char *_resolve_dev_root (void);
*
* Routines for managing mounted UNIX mount points and paths.
*
*
* Routines for managing mounted UNIX mount points and paths.
*
- * Note that
<filename><gio/gunixmounts.h></filename> belongs to the
- *
UNIX-specific GIO interfaces, thus you have to use the
- *
<filename>gio-unix-2.0.pc</filename> pkg-config
file when using it.
+ * Note that
`<gio/gunixmounts.h>` belongs to the UNIX-specific GIO
+ *
interfaces, thus you have to use the `gio-unix-2.0.pc` pkg-config
+ * file when using it.
*/
/*
*/
/*
@@
-222,8
+217,7
@@
is_in (const char *value, const char *set[])
/**
* g_unix_is_mount_path_system_internal:
/**
* g_unix_is_mount_path_system_internal:
- * @mount_path: a mount path, e.g. <filename>/media/disk</filename>
- * or <filename>/usr</filename>
+ * @mount_path: a mount path, e.g. `/media/disk` or `/usr`
*
* Determines if @mount_path is considered an implementation of the
* OS. This is primarily used for hiding mountable and mounted volumes
*
* Determines if @mount_path is considered an implementation of the
* OS. This is primarily used for hiding mountable and mounted volumes
@@
-243,22
+237,31
@@
g_unix_is_mount_path_system_internal (const char *mount_path)
"/", /* we already have "Filesystem root" in Nautilus */
"/bin",
"/boot",
"/", /* we already have "Filesystem root" in Nautilus */
"/bin",
"/boot",
+ "/compat/linux/proc",
+ "/compat/linux/sys",
"/dev",
"/etc",
"/home",
"/lib",
"/lib64",
"/dev",
"/etc",
"/home",
"/lib",
"/lib64",
+ "/libexec",
"/live/cow",
"/live/image",
"/media",
"/mnt",
"/opt",
"/live/cow",
"/live/image",
"/media",
"/mnt",
"/opt",
+ "/rescue",
"/root",
"/sbin",
"/srv",
"/tmp",
"/usr",
"/root",
"/sbin",
"/srv",
"/tmp",
"/usr",
+ "/usr/X11R6",
"/usr/local",
"/usr/local",
+ "/usr/obj",
+ "/usr/ports",
+ "/usr/src",
+ "/usr/xobj",
"/var",
"/var/crash",
"/var/local",
"/var",
"/var/crash",
"/var/local",
@@
-299,8
+302,11
@@
guess_system_internal (const char *mountpoint,
"devfs",
"devpts",
"ecryptfs",
"devfs",
"devpts",
"ecryptfs",
+ "fdescfs",
"kernfs",
"linprocfs",
"kernfs",
"linprocfs",
+ "mfs",
+ "nullfs",
"proc",
"procfs",
"ptyfs",
"proc",
"procfs",
"ptyfs",
@@
-418,7
+424,7
@@
_g_get_unix_mounts (void)
mount_entry = g_new0 (GUnixMountEntry, 1);
mount_entry->mount_path = g_strdup (mntent->mnt_dir);
mount_entry = g_new0 (GUnixMountEntry, 1);
mount_entry->mount_path = g_strdup (mntent->mnt_dir);
- if (
strcmp
(mntent->mnt_fsname, "/dev/root") == 0)
+ if (
g_strcmp0
(mntent->mnt_fsname, "/dev/root") == 0)
mount_entry->device_path = g_strdup (_resolve_dev_root ());
else
mount_entry->device_path = g_strdup (mntent->mnt_fsname);
mount_entry->device_path = g_strdup (_resolve_dev_root ());
else
mount_entry->device_path = g_strdup (mntent->mnt_fsname);