2 files changed, 40 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 240fd8fb9a7..1dff4e4a61b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-06  Eli Zaretskii  <eliz@gnu.org>
 
+        * msdos.c (careadlinkat, careadlinkatcwd): MS-DOS replacements.
+
         * w32.c (careadlinkat, careadlinkatcwd): New always-fail stubs.
 
 2011-04-06  Paul Eggert  <eggert@cs.ucla.edu>
diff --git a/src/msdos.c b/src/msdos.c
index b0bf5c4fdd9..e02e64b9ece 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -81,6 +81,9 @@ extern int spawnve (int, const char *, char *const [], char *const []);
 #include <signal.h>
 #include "syssignal.h"
 
+#include "careadlinkat.h"
+#include "allocator.h"
+
 #ifndef SYSTEM_MALLOC
 
 #ifdef GNU_MALLOC
@@ -3933,6 +3936,41 @@ readlink (const char *name, char *dummy1, size_t dummy2)
 }
 #endif
 
+char *
+careadlinkat (int fd, char const *filename,
+              char *buffer, size_t buffer_size,
+              struct allocator const *alloc,
+              ssize_t (*preadlinkat) (int, char const *, char *, size_t))
+{
+  if (!buffer)
+    {
+      /* We don't support the fancy auto-allocation feature.  */
+      if (!buffer_size)
+        errno = ENOSYS;
+      else
+        errno = EINVAL;
+      buffer = NULL;
+    }
+  else
+    {
+      ssize_t len = preadlinkat (fd, filename, buffer, buffer_size);
+
+      if (len < 0 || len == buffer_size)
+        buffer = NULL;
+      else
+        buffer[len + 1] = '\0';
+    }
+  return buffer;
+}
+
+ssize_t
+careadlinkatcwd (int fd, char const *filename, char *buffer,
+                 size_t buffer_size)
+{
+  (void) fd;
+  return readlink (filename, buffer, buffer_size);
+}
+
 
 #if __DJGPP__ == 2 && __DJGPP_MINOR__ < 2