[PATCH 2/6] hurd: add symbolic name for the mtab translator

[Justus Winter]

* hurd/paths.h (_HURD_MTAB): New macro.
* procfs/rootdir.c (rootdir_mounts_get_translator): Use the new macro.
(rootdir_mounts_exists): Likewise.
---
 hurd/paths.h     | 2 ++
 procfs/rootdir.c | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/hurd/paths.h b/hurd/paths.h
index 4877132..92875b2 100644
--- a/hurd/paths.h
+++ b/hurd/paths.h
@@ -52,5 +52,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 
02139, USA.  */
 #define        _HURD_FIFO      _HURD "fifo" /* S_IFIFO */
 #define        _HURD_IFSOCK    _HURD "ifsock" /* S_IFSOCK */
 
+/* Symbolic names for all non-essential translators.  */
+#define _HURD_MTAB     _HURD "mtab"
 
 #endif /* hurd/paths.h */
diff --git a/procfs/rootdir.c b/procfs/rootdir.c
index e500c3a..f92e73d 100644
--- a/procfs/rootdir.c
+++ b/procfs/rootdir.c
@@ -408,9 +408,6 @@ rootdir_gc_fakeself (void *hook, char **contents, ssize_t 
*contents_len)
   return 0;
 }
 
-/* The mtab translator to use by default for the "mounts" node.  */
-#define MTAB_TRANSLATOR        "/hurd/mtab"
-
 static struct node *rootdir_mounts_node;
 static pthread_spinlock_t rootdir_mounts_node_lock =
   PTHREAD_SPINLOCK_INITIALIZER;
@@ -455,7 +452,7 @@ rootdir_mounts_make_node (void *dir_hook, const void 
*entry_hook)
 static error_t
 rootdir_mounts_get_translator (void *hook, char **argz, size_t *argz_len)
 {
-  static const char const mtab_argz[] = MTAB_TRANSLATOR "\0/";
+  static const char const mtab_argz[] = _HURD_MTAB "\0/";
 
   *argz = malloc (sizeof mtab_argz);
   if (! *argz)
@@ -471,7 +468,7 @@ rootdir_mounts_exists (void *dir_hook, const void 
*entry_hook)
 {
   static int translator_exists = -1;
   if (translator_exists == -1)
-    translator_exists = access (MTAB_TRANSLATOR, F_OK|X_OK) == 0;
+    translator_exists = access (_HURD_MTAB, F_OK|X_OK) == 0;
   return translator_exists;
 }
 
-- 
2.1.0