Changeset 21631 for trunk/src

Timestamp:

Apr 28, 2011, 10:59:02 PM (14 years ago)

Author:

dmik

Message:

minivcrt: Fixed _fullpath()/_wfullpath() which was broken in many regards (i.e. it would eat path components starting with "." and "..").

File:

• trunk/src/msvcrt/dir.c (modified) (4 diffs)

trunk/src/msvcrt/dir.c

@@ -572 +572 @@
 }
 
-/* INTERNAL: Helper for _fullpath. Modified PD code from 'snippets'. */
-static void msvcrt_fln_fix(char *path)
-{
-  int dir_flag = 0, root_flag = 0;
-  char *r, *p, *q, *s;
-
-  /* Skip drive */
-  if (NULL == (r = strrchr(path, ':')))
-    r = path;
-  else
-    ++r;
-
-  /* Ignore leading slashes */
-  while ('\\' == *r)
-    if ('\\' == r[1])
-      strcpy(r, &r[1]);
-    else
-    {
-      root_flag = 1;
-      ++r;
-    }
-
-  p = r; /* Change "\\" to "\" */
-  while (NULL != (p = strchr(p, '\\')))
-    if ('\\' ==  p[1])
-      strcpy(p, &p[1]);
-    else
-      ++p;
-
-  while ('.' == *r) /* Scrunch leading ".\" */
-  {
-    if ('.' == r[1])
-    {
-      /* Ignore leading ".." */
-      for (p = (r += 2); *p && (*p != '\\'); ++p)
-        ;
-    }
-    else
-    {
-      for (p = r + 1 ;*p && (*p != '\\'); ++p)
-        ;
-    }
-    strcpy(r, p + ((*p) ? 1 : 0));
-  }
-
-  while ('\\' == path[strlen(path)-1])   /* Strip last '\\' */
-  {
-    dir_flag = 1;
-    path[strlen(path)-1] = '\0';
-  }
-
-  s = r;
-
-  /* Look for "\." in path */
-
-  while (NULL != (p = strstr(s, "\\.")))
-  {
-    if ('.' == p[2])
-    {
-      /* Execute this section if ".." found */
-      q = p - 1;
-      while (q > r)           /* Backup one level           */
-      {
-        if (*q == '\\')
-          break;
-        --q;
-      }
-      if (q > r)
-      {
-        strcpy(q, p + 3);
-        s = q;
-      }
-      else if ('.' != *q)
-      {
-        strcpy(q + ((*q == '\\') ? 1 : 0),
-               p + 3 + ((*(p + 3)) ? 1 : 0));
-        s = q;
-      }
-      else  s = ++p;
-    }
-    else
-    {
-      /* Execute this section if "." found */
-      q = p + 2;
-      for ( ;*q && (*q != '\\'); ++q)
-        ;
-      strcpy (p, q);
-    }
-  }
-
-  if (root_flag)  /* Embedded ".." could have bubbled up to root  */
-  {
-    for (p = r; *p && ('.' == *p || '\\' == *p); ++p)
-      ;
-    if (r != p)
-      strcpy(r, p);
-  }
-
-  if (dir_flag)
-    strcat(path, "\\");
+static char *msvcrt_clean_path(char *path)
+{
+    char *cur, *sep, *next;
+
+    /* convert "/" => "\" */
+    cur = path;
+    while (*cur)
+    {
+        if (*cur == '/')
+            *cur = '\\';
+        ++cur;
+    }
+
+    cur = path;
+    while (*cur)
+    {
+        sep = strchr(cur, '\\');
+        if (!sep)
+            sep = cur + strlen(cur);
+
+        next = sep;
+        while (*next == '\\')
+            ++next;
+
+        if (sep - cur == 1 && *cur == '.')
+        {
+            /* eat "." */
+            strcpy(cur, next);
+        }
+        else if (sep - cur == 2 && cur[0] == '.' && cur[1] == '.')
+        {
+            /* go one level up if there is any */
+            if (cur - path > 1 && cur[-2] != ':')
+            {
+                cur -= 2;
+                while (cur > path && *cur != '\\')
+                    --cur;
+                if (*cur == '\\')
+                    ++cur;
+            }
+            strcpy(cur, next);
+        }
+        else if (next - sep > 1)
+        {
+            /* eat multiple "\\" */
+            cur = sep + 1;
+            strcpy(cur, next);
+        }
+        else
+        {
+            cur = next;
+        }
+    }
+
+    /* strip trailing '\' unless it indicates the root path */
+    if (cur - path > 1 && cur[-1] == '\\' && cur[-2] != ':')
+        *--cur = '\0';
+
+    return path;
 }
 
@@ -686 +645 @@
 
   if (!relPath || !*relPath)
-    return MSVCRT(_getcwd)(absPath, size);
+    return msvcrt_clean_path(MSVCRT(_getcwd)(absPath, size));
 
   if (size < 4)
@@ -711 +670 @@
   else
   {
+    if (!drive[0])
+    {
+      drive[0] = _getdrive();
+      drive[1] = ':';
+      drive[2] = '\0';
+    }
     strcpy(res,drive);
     strcat(res,dir);
@@ -718 +683 @@
   strcat(res, file);
   strcat(res, ext);
-  msvcrt_fln_fix(res);
+  msvcrt_clean_path(res);
 
   len = strlen(res);