From 8e3c26e98bcf30dd73a8c64bb9aab08e2f32c1f8 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Fri, 19 Dec 2014 00:12:07 +0100 Subject: Avoid ./ components in mtab output * libdiskfs/dir-lookup.c (diskfs_S_dir_lookup): Match "." path as being the root directory. * libnetfs/dir-lookup.c (netfs_S_dir_lookup): Likewise. --- libdiskfs/dir-lookup.c | 4 ++-- libnetfs/dir-lookup.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libdiskfs/dir-lookup.c b/libdiskfs/dir-lookup.c index e2287451..f3364cd6 100644 --- a/libdiskfs/dir-lookup.c +++ b/libdiskfs/dir-lookup.c @@ -327,7 +327,7 @@ diskfs_S_dir_lookup (struct protid *dircred, translator_path[end - path_start] = '\0'; } - if (dircred->po->path == NULL) + if (dircred->po->path == NULL || !strcmp (dircred->po->path,".")) /* dircred is the root directory. */ complete_path = translator_path; else @@ -528,7 +528,7 @@ diskfs_S_dir_lookup (struct protid *dircred, if (! error) { free (newpi->po->path); - if (dircred->po->path == NULL) + if (dircred->po->path == NULL || !strcmp (dircred->po->path,".")) { /* dircred is the root directory. */ newpi->po->path = relpath; diff --git a/libnetfs/dir-lookup.c b/libnetfs/dir-lookup.c index 77cbbbd6..7ca526b7 100644 --- a/libnetfs/dir-lookup.c +++ b/libnetfs/dir-lookup.c @@ -310,7 +310,7 @@ netfs_S_dir_lookup (struct protid *diruser, translator_path[end - filename_start] = '\0'; } - if (diruser->po->path == NULL) + if (diruser->po->path == NULL || !strcmp (diruser->po->path,".")) /* diruser is the root directory. */ complete_path = translator_path; else @@ -444,7 +444,7 @@ netfs_S_dir_lookup (struct protid *diruser, } free (newpi->po->path); - if (diruser->po->path == NULL) + if (diruser->po->path == NULL || !strcmp (diruser->po->path,".")) { /* diruser is the root directory. */ newpi->po->path = relpath; -- cgit v1.2.3