* etags.c (etags_getcwd): Undo the /bin/pwd change. It may raise

	compatibility problems.

diff --git a/lib-src/etags.c b/lib-src/etags.c
index f83a646..15648bb 100644 (file)
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -32,7 +32,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  *     Francesco Potorti` (pot@cnuce.cnr.it) is the current maintainer.
  */
 
-char pot_etags_version[] = "@(#) pot revision number is 11.28";
+char pot_etags_version[] = "@(#) pot revision number is 11.29";
 
 #define        TRUE    1
 #define        FALSE   0
@@ -3661,8 +3661,8 @@ concat (s1, s2, s3)
    guess buffer size in advance. */
 char *
 etags_getcwd ()
-{
 #ifdef DOS_NT
+{
   char *p, path[MAXPATHLEN + 1]; /* Fixed size is safe on MSDOS.  */
 
   getwd (path);
@@ -3674,8 +3674,9 @@ etags_getcwd ()
       *p++ = tolower (*p);
 
   return strdup (path);
-#else /* not DOS_NT */
-#if HAVE_GETCWD
+}
+#elif HAVE_GETCWD /* not DOS_NT */
+{
   int bufsize = 200;
   char *path = xnew (bufsize, char);
 
@@ -3688,20 +3689,21 @@ etags_getcwd ()
     }
 
   return path;
+}
 #else /* not DOS_NT and not HAVE_GETCWD */
+{
   struct linebuffer path;
   FILE *pipe;
 
   initbuffer (&path);
-  pipe = (FILE *) popen ("/bin/pwd 2>/dev/null", "r");
+  pipe = (FILE *) popen ("pwd 2>/dev/null", "r");
   if (pipe == NULL || readline_internal (&path, pipe) == 0)
-    pfatal ("/bin/pwd");
+    pfatal ("pwd");
   pclose (pipe);
 
   return path.buffer;
-#endif /* not HAVE_GETCWD */
-#endif /* not DOS_NT */
 }
+#endif /* not DOS_NT and not HAVE_GETCWD */
 
 /* Return a newly allocated string containing the filename
    of FILE relative to the absolute directory DIR (which