1 files changed, 10 insertions, 1 deletions

diff --git a/lib-src/etags.c b/lib-src/etags.c
index e640fcdfeee..f4fea9ff1dd 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -3148,13 +3148,21 @@ etags_getcwd ()
 char *
 etags_getcwd ()
 {
-  FILE *pipe;
   char *buf;
   int bufsize = 256;
 
+#ifdef HAVE_GETCWD
   do
     {
       buf = xnew (bufsize, char);
+      bufsize *= 2;
+    }
+  while (getcwd (buf, bufsize / 2) == NULL);
+#else
+  do
+    {
+      FILE *pipe;
+      buf = xnew (bufsize, char);
 
       pipe = (FILE *) popen ("pwd 2>/dev/null", "r");
       if (pipe == NULL)
@@ -3172,6 +3180,7 @@ etags_getcwd ()
       bufsize *= 2;
 
     } while (buf[strlen (buf) - 1] != '\n');
+#endif
 
   buf[strlen (buf) - 1] = '\0';
   return buf;