Move sys_readlink() to libreplace.

diff --git a/lib/replace/README b/lib/replace/README
index 8dcc1006258582d1b745f7e87ffb55beb90f1881..ed0b866e85721adacca7b88d3bebbcd8845ed1d7 100644 (file)
--- a/lib/replace/README
+++ b/lib/replace/README
@@ -66,6 +66,7 @@ freeifaddrs
 utime
 utimes
 link
+readlink
 
 Types:
 bool

diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
index b58575d33d0b13caa5a34bc90b20a1c719843775..64df4ec57593b7b14f069566e63402fadc7f54cd 100644 (file)
--- a/lib/replace/libreplace.m4
+++ b/lib/replace/libreplace.m4
@@ -108,7 +108,7 @@ AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
 AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
 AC_CHECK_FUNCS(waitpid strlcpy strlcat initgroups memmove strdup)
 AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp)
-AC_CHECK_FUNCS(isatty chown link)
+AC_CHECK_FUNCS(isatty chown link readlink)
 AC_HAVE_DECL(setresuid, [#include <unistd.h>])
 AC_HAVE_DECL(setresgid, [#include <unistd.h>])
 AC_HAVE_DECL(errno, [#include <errno.h>])

diff --git a/lib/replace/replace.c b/lib/replace/replace.c
index adf79321073a1a86a36ae04c5a61ffcc25d3bc37..00a205d4723deca3e738d7379ec110d1aa561417 100644 (file)
--- a/lib/replace/replace.c
+++ b/lib/replace/replace.c
@@ -635,3 +635,10 @@ int rep_link(const char *oldpath, const char *newpath)
 }
 #endif
 
+#ifndef HAVE_READLINK
+int rep_readlink(const char *path, char *buf, size_t bufsiz)
+{
+       errno = ENOSYS;
+       return -1;
+}
+#endif

diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index 7d8bbec18ffb65cb76a4a417ca6f969f8d86493a..fe01a8613e6bb82c994475813fd1323e91e46383 100644 (file)
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -225,6 +225,11 @@ int rep_chown(const char *path, uid_t uid, gid_t gid);
 int rep_link(const char *oldpath, const char *newpath);
 #endif
 
+#ifndef HAVE_READLINK
+#define readlink rep_readlink
+int rep_readlink(const char *path, char *buf, size_t bufsize);
+#endif
+
 #ifndef HAVE_SETLINEBUF
 #define setlinebuf rep_setlinebuf
 void rep_setlinebuf(FILE *);

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 14d0c2e8dd31b199d19b8ad716952ab7eb058f58..a731e9ef48bac21241cfa931ec0e2cbd4a246be5 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1005,7 +1005,6 @@ int sys_waitpid(pid_t pid,int *status,int options);
 char *sys_getwd(char *s);
 int sys_symlink(const char *oldpath, const char *newpath);
 int sys_readlink(const char *path, char *buf, size_t bufsiz);
-int sys_link(const char *oldpath, const char *newpath);
 int sys_lchown(const char *fname,uid_t uid,gid_t gid);
 int sys_chroot(const char *dname);
 void set_effective_capability(enum smbd_capability capability);

diff --git a/source3/lib/system.c b/source3/lib/system.c
index cb3551c11e4e2b450f112f7889109bd343834d8d..ac64954107473d64063d66507bedc63f2c640223 100644 (file)
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -594,20 +594,6 @@ int sys_symlink(const char *oldpath, const char *newpath)
 #endif
 }
 
-/*******************************************************************
-system wrapper for readlink
-********************************************************************/
-
-int sys_readlink(const char *path, char *buf, size_t bufsiz)
-{
-#ifndef HAVE_READLINK
-       errno = ENOSYS;
-       return -1;
-#else
-       return readlink(path, buf, bufsiz);
-#endif
-}
-
 /*******************************************************************
  Wrapper for lchown.
 ********************************************************************/