diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 03:42:27 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 03:42:27 +0100 |
commit | a6d537bb6cec25eb27cf8884ca5e3362a86818b3 (patch) | |
tree | acac8aa6554cd6910ec00716b2b3e40bbe4b4fe4 /source3 | |
parent | 38d67363aca81b970717c58b07e04396ae9dfd9f (diff) | |
download | samba-a6d537bb6cec25eb27cf8884ca5e3362a86818b3.tar.gz samba-a6d537bb6cec25eb27cf8884ca5e3362a86818b3.tar.bz2 samba-a6d537bb6cec25eb27cf8884ca5e3362a86818b3.zip |
Move sys_realpath() to libreplace.
Diffstat (limited to 'source3')
-rw-r--r-- | source3/include/proto.h | 1 | ||||
-rw-r--r-- | source3/lib/system.c | 15 | ||||
-rw-r--r-- | source3/modules/vfs_default.c | 2 |
3 files changed, 1 insertions, 17 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 5104910e99..e8b25667ab 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1000,7 +1000,6 @@ long sys_telldir(SMB_STRUCT_DIR *dirp); void sys_rewinddir(SMB_STRUCT_DIR *dirp); int sys_closedir(SMB_STRUCT_DIR *dirp); int sys_mknod(const char *path, mode_t mode, SMB_DEV_T dev); -char *sys_realpath(const char *path, char *resolved_path); int sys_waitpid(pid_t pid,int *status,int options); char *sys_getwd(char *s); int sys_chroot(const char *dname); diff --git a/source3/lib/system.c b/source3/lib/system.c index 27722fcab2..da2797322a 100644 --- a/source3/lib/system.c +++ b/source3/lib/system.c @@ -538,21 +538,6 @@ int sys_mknod(const char *path, mode_t mode, SMB_DEV_T dev) } /******************************************************************* - Wrapper for realpath. -********************************************************************/ - -char *sys_realpath(const char *path, char *resolved_path) -{ -#if defined(HAVE_REALPATH) - return realpath(path, resolved_path); -#else - /* As realpath is not a system call we can't return ENOSYS. */ - errno = EINVAL; - return NULL; -#endif -} - -/******************************************************************* The wait() calls vary between systems ********************************************************************/ diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 13c2770208..d972828ba9 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -909,7 +909,7 @@ static char *vfswrap_realpath(vfs_handle_struct *handle, const char *path, char char *result; START_PROFILE(syscall_realpath); - result = sys_realpath(path, resolved_path); + result = realpath(path, resolved_path); END_PROFILE(syscall_realpath); return result; } |