Don't use a dereferencing operator when incrementing the pointer here.

[reactos.git] / reactos / tools / rbuild / directory.cpp

diff --git a/reactos/tools/rbuild/directory.cpp b/reactos/tools/rbuild/directory.cpp
index c45a33d..d0346d9 100644 (file)
--- a/reactos/tools/rbuild/directory.cpp
+++ b/reactos/tools/rbuild/directory.cpp
@@ -197,7 +197,7 @@ Directory::EscapeSpaces ( const string& path )
                        newpath = newpath + "\\ ";
                else
                        newpath = newpath + *p;
-               *p++;
+               p++;
        }
        return newpath;
 }
@@ -211,18 +211,22 @@ Directory::CreateRule ( FILE* f,
 
        if ( escapedName.size() > 0 )
        {
-               fprintf ( f,
-                       "%s%c%s: | %s\n",
-                       parent.c_str (),
-                       cSep,
-                       escapedName.c_str (),
-                       parent.c_str () );
-
-               fprintf ( f,
-                       "\t$(ECHO_MKDIR)\n" );
-
-               fprintf ( f,
-                       "\t${mkdir} $@\n" );
+               if ( ! (escapedName == "tools" &&
+                    ( parent == "$(OUTPUT)" || parent == "$(INTERMEDIATE)" ) ) )
+               {
+                       fprintf ( f,
+                               "%s%c%s: | %s\n",
+                               parent.c_str (),
+                               cSep,
+                               escapedName.c_str (),
+                               parent.c_str () );
+
+                       fprintf ( f,
+                               "\t$(ECHO_MKDIR)\n" );
+
+                       fprintf ( f,
+                               "\t${mkdir} $@\n" );
+               }
 
                path = parent + sSep + escapedName;
        }
@@ -236,3 +240,10 @@ Directory::CreateRule ( FILE* f,
                i->second->CreateRule ( f, path );
        }
 }
+
+Directory::~Directory()
+{
+       std::map<std::string, Directory*>::iterator theIterator;
+       for ( theIterator = subdirs.begin (); theIterator != subdirs.end (); theIterator++ )
+               delete theIterator->second;
+}