diff options
| author | Flavio Cruz <flaviocruz@gmail.com> | 2016-01-13 00:58:59 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-01-13 00:58:59 +0100 |
| commit | 076957fe8c12344ddae2fa4b966c7be9be232654 (patch) | |
| tree | da32c0b3738f6acc2e05d708d9236d62069fd8ff /libnetfs | |
| parent | 1a7e27057ed5974be103c60afecdc8aae691584f (diff) | |
Fix O_DIRECTORY lookup on trivial translators
* libdiskfs/dir-lookup.c (diskfs_S_dir_lookup): If mustbedir, make sure
entry is a directory by retrying "/", or starting the translator and
retrying "/".
* libnetfs/dir-lookup.c (netfs_S_dir_lookup): Likewise.
Diffstat (limited to 'libnetfs')
| -rw-r--r-- | libnetfs/dir-lookup.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/libnetfs/dir-lookup.c b/libnetfs/dir-lookup.c index 8b8cd6ec..1fefd3ff 100644 --- a/libnetfs/dir-lookup.c +++ b/libnetfs/dir-lookup.c @@ -128,7 +128,9 @@ netfs_S_dir_lookup (struct protid *diruser, *do_retry = FS_RETRY_REAUTH; *retry_port = diruser->po->shadow_root_parent; *retry_port_type = MACH_MSG_TYPE_COPY_SEND; - if (! lastcomp) + if (lastcomp && mustbedir) /* Trailing slash. */ + strcpy (retry_name, "/"); + else if (!lastcomp) strcpy (retry_name, nextname); error = 0; pthread_mutex_unlock (&dnp->lock); @@ -142,7 +144,9 @@ netfs_S_dir_lookup (struct protid *diruser, *do_retry = FS_RETRY_REAUTH; *retry_port = diruser->po->root_parent; *retry_port_type = MACH_MSG_TYPE_COPY_SEND; - if (!lastcomp) + if (lastcomp && mustbedir) /* Trailing slash. */ + strcpy (retry_name, "/"); + else if (!lastcomp) strcpy (retry_name, nextname); error = 0; pthread_mutex_unlock (&dnp->lock); @@ -194,7 +198,7 @@ netfs_S_dir_lookup (struct protid *diruser, if (error) goto out; - if ((((flags & O_NOTRANS) == 0) || !lastcomp) + if ((((flags & O_NOTRANS) == 0) || !lastcomp || mustbedir) && ((np->nn_translated & S_IPTRANS) || S_ISFIFO (np->nn_translated) || S_ISCHR (np->nn_translated) @@ -288,10 +292,16 @@ netfs_S_dir_lookup (struct protid *diruser, if (error != ENOENT) { *retry_port_type = MACH_MSG_TYPE_MOVE_SEND; - if (!lastcomp && !error) + if (!error) { - strcat (retry_name, "/"); - strcat (retry_name, nextname); + char *end = strchr (retry_name, '\0'); + if (mustbedir) + *end++ = '/'; /* Trailing slash. */ + else if (!lastcomp) { + if (end != retry_name) + *end++ = '/'; + strcpy (end, nextname); + } } if (register_translator) |