From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 15 Mar 2000 11:36:20 +0000 (+0000)
Subject: (username_completion_function) [__GO32__]: Don't bypass getpw* calls.
X-Git-Tag: gdb_5_0-2000-04-10-branchpoint~277
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd0040c11f57567dc452ce86dd209e2d3bc2ab36;p=platform%2Fupstream%2Fbinutils.git

(username_completion_function) [__GO32__]: Don't bypass getpw* calls.
(filename_completion_function): Handle drive-relative file names d:foo.
---

diff --git a/readline/complete.c b/readline/complete.c
index 714a2bf..1188120 100644
--- a/readline/complete.c
+++ b/readline/complete.c
@@ -1407,9 +1407,9 @@ username_completion_function (text, state)
      char *text;
      int state;
 {
-#if defined (__GO32__) || defined (__WIN32__) || defined (__OPENNT)
+#if defined (__WIN32__) || defined (__OPENNT)
   return (char *)NULL;
-#else /* !__GO32__ */
+#else /* !__WIN32__ && !__OPENNT */
   static char *username = (char *)NULL;
   static struct passwd *entry;
   static int namelen, first_char, first_char_loc;
@@ -1499,6 +1499,14 @@ filename_completion_function (text, state)
 	  strcpy (filename, ++temp);
 	  *temp = '\0';
 	}
+#if defined (__WIN32__) || defined (__OPENNT) || defined (__MSDOS__)
+      /* Handle the drive-relative names "d:foo/bar".  */
+      else if (dirname[1] == ':')
+	{
+	  strcpy (filename, dirname + 2);
+	  dirname[2] = '\0';
+	}
+#endif
       else
 	{
 	  dirname[0] = '.';