INTEGRATION: CWS dmake412_DEV300 (1.5.2); FILE MERGED

2008/01/07 06:07:15 vq 1.5.2.1: #i84800# Do not collaps the foo/.. entries if foo is '.' or '..'.

1 files changed, 17 insertions, 2 deletions

diff --git a/dmake/path.c b/dmake/path.c
index 3dd21616b3dc..d5dea553afb6 100644
--- a/dmake/path.c
+++ b/dmake/path.c
@@ -1,4 +1,4 @@
-/* RCS  $Id: path.c,v 1.5 2007-10-15 15:40:58 ihi Exp $
+/* RCS  $Id: path.c,v 1.6 2008-03-05 18:29:34 kz Exp $
 --
 -- SYNOPSIS
 --      Pathname manipulation code
@@ -171,6 +171,7 @@ char *path;
    register char *q;
    char *tpath;
    int hasdriveletter = 0;
+   int delentry;
 
    DB_ENTER( "Clean_path" );
 
@@ -218,6 +219,7 @@ char *path;
    while( *q ) {
       char *t;
 
+      /* p is NULL or greater than q. */
       p=strchr(q, *DirSepStr);
       if( !p ) break;
 
@@ -245,7 +247,20 @@ char *path;
       t=strchr(p+1, *DirSepStr);
       if( !t ) break;
 
-      if ( !(p-q == 2 && strncmp(q,"..",2) == 0)
+      /* Collaps this only if foo is neither '.' nor '..'. */
+      switch( p-q ) {
+     case 2:
+        delentry = !((q[0] == '.') && (q[1] == '.'));
+        break;
+     case 1:
+        delentry = !(q[0] == '.');
+        break;
+     default:
+        delentry = TRUE;
+        break;
+      }
+
+      if ( delentry
        && (t-p-1 == 2 && strncmp(p+1,"..",2) == 0) ) {
      /* Skip one (or possible more) DirSepStr. */
      do {