Changeset 3264 for trunk

Timestamp:

May 1, 2007, 4:30:37 PM (18 years ago)

Author:

bird

Message:

Two driveletter cases we share with cygwin.

Location:

trunk/essentials/app-shells/bash/lib/sh

Files:

• pathcanon.c (modified) (2 diffs)
• pathphys.c (modified) (2 diffs)

trunk/essentials/app-shells/bash/lib/sh/pathcanon.c

@@ -114 +114 @@
 
   /* POSIX.2 says to leave a leading `//' alone.  On cygwin, we skip over any
-     leading `x:' (dos drive name). */
+     leading `x:' (dos drive name). (Ditto on OS/2. --bird) */
   if (rooted = ROOTEDPATH(path))
     {
       stub_char = DIRSEP;
-#if defined (__CYGWIN__)
+#if defined (__CYGWIN__) || defined (__OS2__)
       base = (ISALPHA((unsigned char)result[0]) && result[1] == ':') ? result + 3 : result + 1;
 #else
@@ -129 +129 @@
     {
       stub_char = '.';
-#if defined (__CYGWIN__)
+#if defined (__CYGWIN__) || defined (__OS2__)
       base = (ISALPHA((unsigned char)result[0]) && result[1] == ':') ? result + 2 : result;
 #else

trunk/essentials/app-shells/bash/lib/sh/pathphys.c

@@ -105 +105 @@
 
   /* POSIX.2 says to leave a leading `//' alone.  On cygwin, we skip over any
-     leading `x:' (dos drive name). */
-#if defined (__CYGWIN__)
+     leading `x:' (dos drive name). (Ditto for OS/2. --bird) */
+#if defined (__CYGWIN__) || defined (__OS2__)
   qbase = (ISALPHA((unsigned char)workpath[0]) && workpath[1] == ':') ? workpath + 3 : workpath + 1;
 #else
@@ -215 +215 @@
               q = result;
               /* Duplicating some code here... */
-#if defined (__CYGWIN__)
+#if defined (__CYGWIN__) || defined (__OS2__)
               qbase = (ISALPHA((unsigned char)workpath[0]) && workpath[1] == ':') ? workpath + 3 : workpath + 1;
 #else