Changeset 2524 for branches

Timestamp:

Feb 5, 2006, 3:11:07 AM (20 years ago)

Author:

bird

Message:

#40: Fixed double slash preventing root directories from being opened.

Location:

branches/libc-0.6/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff)
• src/lib/sys/b_dir.c (modified) (2 diffs)

branches/libc-0.6/src/emx/ChangeLog.LIBC

@@ -12 +12 @@
         o #25: Ensure correct address length returns from recvmsg and recvfrom.
     - libc:
+        o #40: Fixed double slash preventing root directories from being opened.
         o #23: Fixed two incorrect EA size fields, now creating symlinks really works.
         o #21: Restrict reading and writing of UnixEAs to HPFS, JFS, FAT and RAMFS.

branches/libc-0.6/src/emx/src/lib/sys/b_dir.c

@@ -368 +368 @@
              */
             char   *psz = strchr(pszNativePath, '\0');
-            psz[0] = '/';
-            psz[1] = '*';
-            psz[2] = '\0';
+            if (psz[-1] != '/' && psz[-1] != '\\')
+            {
+                psz[0] = '/';
+                psz[1] = '*';
+                psz[2] = '\0';
+            }
+            else
+            {
+                psz[0] = '*';
+                psz[1] = '\0';
+            }
             bzero(Tmp.uBuf.pv, Tmp.cbBuf);
             FS_VAR_SAVE_LOAD();
@@ -380 +388 @@
                               &Tmp.cFiles,
                               Tmp.fType);
+            *psz = '\0';
             if (!rc)
             {