diff options
| author | Michael I. Bushnell <mib@gnu.org> | 1994-07-15 19:46:44 +0000 |
|---|---|---|
| committer | Michael I. Bushnell <mib@gnu.org> | 1994-07-15 19:46:44 +0000 |
| commit | cdefc6bd46136142353ef0fc0b57f0e1671b6ca9 (patch) | |
| tree | bd09d1e4123421c5af6e634e18ef101be5c9fd5a | |
| parent | 0e3aec043b41d12ae2f51979672cf8691fb59e90 (diff) | |
Formerly file-get-trans.c.~10~
| -rw-r--r-- | libdiskfs/file-get-trans.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/libdiskfs/file-get-trans.c b/libdiskfs/file-get-trans.c index 617be529..a2971364 100644 --- a/libdiskfs/file-get-trans.c +++ b/libdiskfs/file-get-trans.c @@ -45,11 +45,19 @@ diskfs_S_file_get_translator (struct protid *cred, if (len > *translen) vm_allocate (mach_task_self (), (vm_address_t *)trans, len, 1); bcopy (_HURD_SYMLINK, *trans, sizeof _HURD_SYMLINK); - error = diskfs_node_rdwr (np, *trans + sizeof _HURD_SYMLINK, - 0, np->dn_stat.st_size, 0, cred, &amt); + + if (diskfs_read_symlink_hook) + error = (*diskfs_read_symlink_hook) (np, + *trans + sizeof _HURD_SYMLINK); + if (!diskfs_read_symlink_hook || error == EINVAL) + { + error = diskfs_node_rdwr (np, *trans + sizeof _HURD_SYMLINK, + 0, np->dn_stat.st_size, 0, cred, &amt); + if (!error) + assert (amt == np->dn_stat.st_size); + } if (!error) { - assert (amt == np->dn_stat.st_size); (*trans)[sizeof _HURD_SYMLINK + np->dn_stat.st_size] = '\0'; *translen = len; } @@ -73,7 +81,7 @@ diskfs_S_file_get_translator (struct protid *cred, buflen++; /* terminating nul */ if (buflen > *translen) - vm_allocate (mach_task_self (), (vm_address_t) trans, len, 1); + vm_allocate (mach_task_self (), (vm_address_t) trans, buflen, 1); bcopy (buf, *trans, buflen); *translen = buflen; error = 0; @@ -84,7 +92,7 @@ diskfs_S_file_get_translator (struct protid *cred, len = sizeof _HURD_FIFO; if (len > *translen) - vm_allocate (mach_task_self (), (vm_address_t) trans, len, 1); + vm_allocate (mach_task_self (), (vm_address_t *) trans, len, 1); bcopy (_HURD_FIFO, *trans, sizeof _HURD_FIFO); *translen = len; error = 0; @@ -95,7 +103,7 @@ diskfs_S_file_get_translator (struct protid *cred, len = sizeof _HURD_IFSOCK; if (len > *translen) - vm_allocate (mach_task_self (), (vm_address_t) trans, len, 1); + vm_allocate (mach_task_self (), (vm_address_t *) trans, len, 1); bcopy (_HURD_IFSOCK, *trans, sizeof _HURD_IFSOCK); *translen = len; error = 0; |