Changeset 3232 for trunk/essentials/app-shells/bash/general.c

Timestamp:

Apr 29, 2007, 10:43:43 PM (18 years ago)

Author:

bird

Message:

Applied Brendan's patches.

File:

• trunk/essentials/app-shells/bash/general.c (modified) (2 diffs)

trunk/essentials/app-shells/bash/general.c

@@ -663 +663 @@
      are handled OK by the `else' part of the if statement; an empty
      string is returned in that case. */
+#ifndef __OS2__
   if (i && string[i] == ':')
     i++;
@@ -668 +669 @@
   for (start = i; string[i] && string[i] != ':'; i++)
     ;
+
+#else /* __OS2__ */
+  if (i && (string[i] == ':' || string[i] ==';'))
+    i++;
+
+  /* In OS/2, interpret either `:' or `;' as separator, except when 
+     the `:' looks like part of a drive letter. */
+  for (start = i;; i++)
+    {
+      if (!string[i]) 
+          break;
+      if (string[i] == ';') 
+          break;
+      if (string[i] != ':') 
+          continue;
+      if (i - start != 1) 
+          break;
+      if (!isalpha (string[i - 1])) 
+          break;
+    }
+#endif /* __OS2__ */
 
   *p_index = i;