commit-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[hurd] 09/64: Fix recording complete path of passive relative translator


From: Samuel Thibault
Subject: [hurd] 09/64: Fix recording complete path of passive relative translators
Date: Wed, 10 Dec 2014 15:17:03 +0000

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch upstream
in repository hurd.

commit 9a56d8f0803d40dacb92eb366b534bbbd5438096
Author: Samuel Thibault <address@hidden>
Date:   Fri Nov 21 02:52:18 2014 +0100

    Fix recording complete path of passive relative translators
    
    * libnetfs/dir-lookup.c (netfs_S_dir_lookup): Prepend current path to
    the relative path before recording the active translator.
---
 libnetfs/dir-lookup.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/libnetfs/dir-lookup.c b/libnetfs/dir-lookup.c
index 99a8746..2d3da94 100644
--- a/libnetfs/dir-lookup.c
+++ b/libnetfs/dir-lookup.c
@@ -297,6 +297,7 @@ netfs_S_dir_lookup (struct protid *diruser,
              if (register_translator)
                {
                  char *translator_path = strdupa (relpath);
+                 char *complete_path;
                  if (nextname != NULL)
                    {
                      /* This was not the last path component.
@@ -309,9 +310,17 @@ netfs_S_dir_lookup (struct protid *diruser,
                      translator_path[end - filename_start] = '\0';
                    }
 
+                 if (diruser->po->path == NULL)
+                     /* diruser is the root directory.  */
+                     complete_path = translator_path;
+                 else
+                     asprintf (&complete_path, "%s/%s", diruser->po->path, 
translator_path);
+
                  error = fshelp_set_active_translator (&newpi->pi,
-                                                       translator_path,
+                                                       complete_path,
                                                        np->transbox.active);
+                 if (complete_path != translator_path)
+                   free(complete_path);
                  if (error)
                    {
                      ports_port_deref (newpi);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git



reply via email to

[Prev in Thread] Current Thread [Next in Thread]