Changeset 3134 for trunk/tools

Timestamp:

Mar 17, 2000, 5:26:32 AM (26 years ago)

Author:

bird

Message:

Two new options: -cy and -ca.
Optional cyclic dependancy check implemented.
The rules list is now a AVL tree.
All files but the object files are "normalized". Ie. fullnames and DOS
styled slashes.

File:

• trunk/tools/fastdep/fastdep.c (modified) (54 diffs)

trunk/tools/fastdep/fastdep.c

@@ -1 @@
-/* $Id: fastdep.c,v 1.11 2000-03-16 23:53:34 bird Exp $
+/* $Id: fastdep.c,v 1.12 2000-03-17 04:26:32 bird Exp $
  *
  * Fast dependents. (Fast = Quick and Dirty!)
@@ -23 +23 @@
 #include <string.h>
 #include <stdlib.h>
+#include <direct.h>
 
 #include "avl.h"
@@ -86 +87 @@
     const char *    pszObjectExt;
     const char *    pszObjectDir;
-    BOOL            fObjectDir;        /* replace object directory? */
+    BOOL            fObjectDir;         /* replace object directory? */
     const char *    pszRsrcExt;
     BOOL            fObjRule;
@@ -92 +93 @@
     BOOL            fSrcWhenObj;
     BOOL            fAppend;            /* append to the output file, not overwrite it. */
+    BOOL            fCheckCyclic;       /* allways check for cylic dependency before inserting an dependent. */
+    BOOL            fCacheSearchDirs;   /* cache entire search dirs. */
 } OPTIONS, *POPTIONS;
 
@@ -122 +125 @@
 typedef struct _DepRule
 {
+    AVLNODECORE      avlCore;
     char *           pszRule;          /* Pointer to rule name */
     int              cDeps;            /* Entries in the dependant array. */
     char **          papszDep;         /* Pointer to an array of pointers to dependants. */
-    struct _DepRule *pNext;            /* Pointer to the next rule */
 } DEPRULE, *PDEPRULE;
 
@@ -153 +156 @@
 /* file operations */
 static char *fileNormalize(char *pszFilename);
+static char *fileNormalize2(const char *pszFilename, char *pszBuffer);
        char *filePath(const char *pszFilename, char *pszBuffer);
 static char *filePathSlash(const char *pszFilename, char *pszBuffer);
@@ -167 +171 @@
 
 /* pathlist operations */
-static char *pathlistFindFile(const char *pszPathList, const char *pszFilename, char *pszBuffer);
+static char *pathlistFindFile(const char *pszPathList, const char *pszFilename, char *pszBuffer, POPTIONS pOptions);
 
 /* word operations */
@@ -189 +193 @@
 
 /* depend workers */
-static BOOL  depReadFile(const char *pszFilename);
+static BOOL  depReadFile(const char *pszFilename, POPTIONS pOptions);
 static BOOL  depWriteFile(const char *pszFilename);
 static void  depRemoveAll(void);
 static void *depAddRule(const char *pszRulePath, const char *pszName, const char *pszExt);
-static BOOL  depAddDepend(void *pvRule, const char *pszDep);
+static BOOL  depAddDepend(void *pvRule, const char *pszDep, BOOL fCheckCyclic);
 #if 0  /* not used */
 static BOOL  depCleanFile(const char *pszFilename);
 #endif
+static BOOL  depCheckCyclic(PDEPRULE pdepRule, const char *pszDep);
 
 
@@ -205 +210 @@
  * Pointer to the list of dependencies.
  */
-static PDEPRULE pdepList = NULL;
-static BOOL     fCacheSearchDirs = FALSE;
+static PDEPRULE pdepTree = NULL;
 
 
@@ -215 +219 @@
 static unsigned     cfcNodes = 0;
 static PFCACHEENTRY pfcDirTree = NULL;
+
+
+/*
+ * Current directory stuff
+ */
+static char     szCurDir[CCHMAXPATH];
+static int      aiSlashes[CCHMAXPATH];
+static int      cSlashes;
 
 
@@ -279 +291 @@
     int         rc   = 0;
     int         argi = 1;
+    int         i;
     const char *pszDepFile = pszDefaultDepFile;
 
@@ -299 +312 @@
         FALSE,           /* fNoObjectPath */
         TRUE,            /* fSrcWhenObj */
-        FALSE            /* fAppend */
+        FALSE,           /* fAppend */
+        TRUE,            /* fCheckCyclic */
+        TRUE             /* fCacheSearchDirs */
     };
 
@@ -310 +325 @@
     }
 
+    /*
+     * Initiate current directory stuff
+     */
+    if (_getcwd(szCurDir, sizeof(szCurDir)) == NULL)
+    {
+        fprintf(stderr, "fatal error: failed to get current directory\n");
+        return -88;
+    }
+    strlwr(szCurDir);
+    for (i = 0, cSlashes; szCurDir[i] != '\0'; i++)
+    {
+        if (szCurDir[i] == '/')
+            szCurDir[i] = '\\';
+        if (szCurDir[i] == '\\')
+            aiSlashes[cSlashes++] = i;
+    }
+    if (szCurDir[i-1] != '\\')
+    {
+        aiSlashes[cSlashes] = i;
+        szCurDir[i++] = '\\';
+        szCurDir[i] = '\0';
+    }
+
+    /*
+     * parse arguments
+     */
     while (argi < argc)
     {
@@ -340 +381 @@
 
                     /* if dependencies are generated we'll flush them to the old filename */
-                    if (pdepList != NULL && pszOld != pszDepFile)
+                    if (pdepTree != NULL && pszOld != pszDepFile)
                     {
                         if (!depWriteFile(pszOld))
@@ -348 +389 @@
                     break;
                 }
+
+                case 'C': /* forced directory cache  'ca' or cylic check 'cy'*/
+                case 'c':
+                    if (argv[argi][2] == 'a' || argv[argi][2] == 'A')
+                        options.fCacheSearchDirs = TRUE;
+                    else if ((argv[argi][2] == 'y' || argv[argi][2] == 'Y'))
+                        options.fCheckCyclic = argv[argi][3] != '-';
+                    break;
 
                 case 'E': /* list of paths. If a file is found in one of these directories the */
@@ -470 +519 @@
              * before starting adding new dependencies.
              */
-            if (pdepList == NULL && options.fAppend)
-                depReadFile(pszDepFile);
+            if (pdepTree == NULL && options.fAppend)
+                depReadFile(pszDepFile, &options);
 
             /*
@@ -479 +528 @@
                                 FILE_READONLY |  FILE_HIDDEN | FILE_SYSTEM | FILE_ARCHIVED,
                                 pfindbuf3, sizeof(achBuffer), &cFiles, FIL_STANDARD);
-            if (!fCacheSearchDirs)
-                fCacheSearchDirs = cFiles > 25;
+            if (!options.fCacheSearchDirs)
+                options.fCacheSearchDirs = cFiles > 25;
             while (ulRc == NO_ERROR)
             {
@@ -539 +588 @@
 {
     printf(
-        "FastDep v0.1\n"
-        "Quick and dirty dependant scanner. Creates a makefile readable depend file.\n"
+        "FastDep v0.2\n"
+        "Quick and dirty dependency scanner. Creates a makefile readable depend file.\n"
         "\n"
-        "Syntax: FastDep [-a<[+]|->] [-d <outputfn>] [-e <excludepath>] [-eall<[+]|->]\n"
-        "                [-i <include>] [-n<[+]|->] [-o <objdir>] [-obr<[+]|->] <files>\n"
+        "Syntax: FastDep [-a<[+]|->] [-ca] [-cy<[+]|->] [-d <outputfn>]\n"
+        "                [-e <excludepath>] [-eall<[+]|->] [-i <include>] [-n<[+]|->]\n"
+        "                [-o <objdir>] [-obr<[+]|->]  <files>\n"
         "\n"
         "   -a<[+]|->       Append to the output file. Default: Overwrite.\n"
+        "   -ca             Force search directory caching.\n"
+        "                   Default: cache if more that 25 files are to be searched.\n"
+        "                            (more than 25 in the first file expression.)\n"
+        "   -cy<[+]|->      Check for cylic dependencies. Default: -cy-\n"
         "   -d <outputfn>   Output filename. Default: %s\n"
         "   -e excludepath  Exclude paths. If a filename is found in any\n"
@@ -565 +619 @@
         "   -r[ ]<rsrcext>  Resource binary extention.  Default: res\n"
         "   <files>         Files to scan. Wildchars are allowed.\n"
-        "\n",
+        "\n"
+        " copyright (c) 1999-2000 knut st. osmundsen (knut.stange.osmundsen@pmsc.no)\n",
         pszDefaultDepFile
         );
@@ -676 +731 @@
 
         if (pOptions->fSrcWhenObj && pvRule)
-            depAddDepend(pvRule, pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : pszFilename);
+            depAddDepend(pvRule,
+                         pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer),
+                         pOptions->fCheckCyclic);
     }
     else
-        pvRule = depAddRule(pszFilename, NULL, NULL);
+        pvRule = depAddRule(pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer), NULL, NULL);
 
     /* duplicate rule? */
@@ -773 +830 @@
 
                     /* find include file! */
-                    psz = pathlistFindFile(pOptions->pszInclude, szFullname, szBuffer);
+                    psz = pathlistFindFile(pOptions->pszInclude, szFullname, szBuffer, pOptions);
                     if (psz == NULL)
-                        psz = pathlistFindFile(getenv("INCLUDE"), szFullname, szBuffer);
+                        psz = pathlistFindFile(getenv("INCLUDE"), szFullname, szBuffer, pOptions);
 
                     /* did we find the include? */
@@ -782 +839 @@
                         char    szBuffer2[CCHMAXPATH];
                         if (pOptions->fExcludeAll ||
-                            pathlistFindFile(pOptions->pszExclude, szFullname, szBuffer2) != NULL
+                            pathlistFindFile(pOptions->pszExclude, szFullname, szBuffer2, pOptions) != NULL
                             )
-                            depAddDepend(pvRule, szFullname);
+                            depAddDepend(pvRule, szFullname, pOptions->fCheckCyclic);
                         else
-                            depAddDepend(pvRule, szBuffer);
+                            depAddDepend(pvRule, szBuffer, pOptions->fCheckCyclic);
                     }
                     else
@@ -939 +996 @@
 
         if (pOptions->fSrcWhenObj && pvRule)
-            depAddDepend(pvRule, pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : pszFilename);
+            depAddDepend(pvRule,
+                         pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer),
+                         pOptions->fCheckCyclic);
     }
     else
-        pvRule = depAddRule(pszFilename, NULL, NULL);
+        pvRule = depAddRule(pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer), NULL, NULL);
 
     /* duplicate rule? */
@@ -996 +1055 @@
 
             /* find include file! */
-            psz = pathlistFindFile(pOptions->pszInclude, szFullname, szBuffer);
+            psz = pathlistFindFile(pOptions->pszInclude, szFullname, szBuffer, pOptions);
             if (psz == NULL)
-                psz = pathlistFindFile(getenv("INCLUDE"), szFullname, szBuffer);
+                psz = pathlistFindFile(getenv("INCLUDE"), szFullname, szBuffer, pOptions);
 
             /* Did we find the include? */
@@ -1005 +1064 @@
                 char szBuffer2[CCHMAXPATH];
                 if (pOptions->fExcludeAll ||
-                    pathlistFindFile(pOptions->pszExclude, szFullname, szBuffer2) != NULL
+                    pathlistFindFile(pOptions->pszExclude, szFullname, szBuffer2, pOptions) != NULL
                     )
-                    depAddDepend(pvRule, szFullname);
+                    depAddDepend(pvRule, szFullname, pOptions->fCheckCyclic);
                 else
-                    depAddDepend(pvRule, szBuffer);
+                    depAddDepend(pvRule, szBuffer, pOptions->fCheckCyclic);
             }
             else
@@ -1055 +1114 @@
 
         if (pOptions->fSrcWhenObj && pvRule)
-            depAddDepend(pvRule, pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : pszFilename);
+            depAddDepend(pvRule,
+                         pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer),
+                         pOptions->fCheckCyclic);
     }
     else
-        pvRule = depAddRule(pszFilename, NULL, NULL);
+        pvRule = depAddRule(pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer), NULL, NULL);
 
     /* duplicate rule? */
@@ -1114 +1175 @@
 
             /* find include file! */
-            psz = pathlistFindFile(pOptions->pszInclude, szFullname, szBuffer);
+            psz = pathlistFindFile(pOptions->pszInclude, szFullname, szBuffer, pOptions);
             if (psz == NULL)
-                psz = pathlistFindFile(getenv("INCLUDE"), szFullname, szBuffer);
+                psz = pathlistFindFile(getenv("INCLUDE"), szFullname, szBuffer, pOptions);
 
             /* did we find the include? */
@@ -1123 +1184 @@
                 char szBuffer2[CCHMAXPATH];
                 if (pOptions->fExcludeAll ||
-                    pathlistFindFile(pOptions->pszExclude, szFullname, szBuffer2) != NULL
+                    pathlistFindFile(pOptions->pszExclude, szFullname, szBuffer2, pOptions) != NULL
                     )
-                    depAddDepend(pvRule, szFullname);
+                    depAddDepend(pvRule, szFullname, pOptions->fCheckCyclic);
                 else
-                    depAddDepend(pvRule, szBuffer);
+                    depAddDepend(pvRule, szBuffer, pOptions->fCheckCyclic);
             }
             else
@@ -1173 +1234 @@
 
         if (pOptions->fSrcWhenObj && pvRule)
-            depAddDepend(pvRule, pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : pszFilename);
+            depAddDepend(pvRule,
+                         pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer),
+                         pOptions->fCheckCyclic);
     }
     else
-        pvRule = depAddRule(pszFilename, NULL, NULL);
+        pvRule = depAddRule(pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer), NULL, NULL);
 
     /* duplicate rule? */
@@ -1264 +1327 @@
 
             /* find include file! */
-            psz = pathlistFindFile(pOptions->pszInclude, szFullname, szBuffer);
+            psz = pathlistFindFile(pOptions->pszInclude, szFullname, szBuffer, pOptions);
 
             /* did we find the include? */
@@ -1271 +1334 @@
                 char szBuffer2[CCHMAXPATH];
                 if (pOptions->fExcludeAll ||
-                    pathlistFindFile(pOptions->pszExclude, szFullname, szBuffer2) != NULL
+                    pathlistFindFile(pOptions->pszExclude, szFullname, szBuffer2, pOptions) != NULL
                     )
-                    depAddDepend(pvRule, szFullname);
+                    depAddDepend(pvRule, szFullname, pOptions->fCheckCyclic);
                 else
-                    depAddDepend(pvRule, szBuffer);
+                    depAddDepend(pvRule, szBuffer, pOptions->fCheckCyclic);
             }
             else
@@ -1322 +1385 @@
 
 /**
- * Normalizes the path slashes for the filename.
+ * Normalizes the path slashes for the filename. It will partially expand paths too.
  * @returns   pszFilename
- * @param     pszFilename  Pointer to filename string.
+ * @param     pszFilename  Pointer to filename string. Not empty string!
+ *                         Much space to play with.
  */
 char *fileNormalize(char *pszFilename)
@@ -1330 +1394 @@
     char *psz = pszFilename;
 
+    /* correct slashes */
     while ((pszFilename = strchr(pszFilename, '//')) != NULL)
         *pszFilename++ = '\\';
 
+    /* expand path? */
+    pszFilename = psz;
+    if (pszFilename[1] != ':')
+    {   /* relative path */
+        int     iSlash;
+        char    szFile[CCHMAXPATH];
+        char *  psz = szFile;
+
+        strcpy(szFile, pszFilename);
+        iSlash = *psz == '\\' ? 0 : cSlashes;
+        while (*psz != '\0')
+        {
+            if (*psz == '.' && psz[1] == '.'  && psz[2] == '\\')
+            {   /* up one directory */
+                if (iSlash > 0)
+                    iSlash--;
+                psz += 3;
+            }
+            else if (*psz == '.' && psz[1] == '\\')
+            {   /* no change */
+                psz += 2;
+            }
+            else
+            {   /* completed expantion! */
+                strncpy(pszFilename, szCurDir, aiSlashes[iSlash]+1);
+                strcpy(pszFilename + aiSlashes[iSlash]+1, psz);
+                break;
+            }
+        }
+    }
+    /* else: assume full path */
+
     return psz;
 }
+
+
+/**
+ * Normalizes the path slashes for the filename. It will partially expand paths too.
+ * @returns   pszFilename
+ * @param     pszFilename  Pointer to filename string. Not empty string!
+ *                         Much space to play with.
+ * @param     pszBuffer    Pointer to output buffer.
+ */
+char *fileNormalize2(const char *pszFilename, char *pszBuffer)
+{
+    char    *psz = pszBuffer;
+
+    /* expand path? */
+    if (pszFilename[1] != ':')
+    {   /* relative path */
+        int     iSlash;
+
+        iSlash = *pszFilename == '\\' || *pszFilename == '/' ? 0 : cSlashes;
+        while (*pszFilename != '\0')
+        {
+            if (*pszFilename == '.' && pszFilename[1] == '.'  && (pszFilename[2] == '\\' || pszFilename[1] == '/'))
+            {   /* up one directory */
+                if (iSlash > 0)
+                    iSlash--;
+                pszFilename += 3;
+            }
+            else if (*pszFilename == '.' && (pszFilename[1] == '\\' || pszFilename[1] == '/'))
+            {   /* no change */
+                pszFilename += 2;
+            }
+            else
+            {   /* completed expantion! */
+                strncpy(pszBuffer, szCurDir, aiSlashes[iSlash]+1);
+                strcpy(pszBuffer + aiSlashes[iSlash]+1, pszFilename);
+                break;
+            }
+        }
+    }
+    /* else: assume full path */
+
+    /* correct slashes */
+    while ((pszBuffer = strchr(pszBuffer, '//')) != NULL)
+        *pszBuffer++ = '\\';
+
+    return psz;
+}
+
 
 /**
@@ -1593 +1738 @@
             else
                 cfcNodes++;
-            _heap_check();
         }
 
@@ -1641 +1785 @@
  * @parma     pszFilename  Filename to find.
  * @parma     pszBuffer    Ouput Buffer.
+ * @param     pOptions     Pointer to options struct.
  * @status    completely implemented.
  * @author    knut st. osmundsen
  * @remark    need substantial optimizations. 95% of execution is spend here.
  */
-static char *pathlistFindFile(const char *pszPathList, const char *pszFilename, char *pszBuffer)
+static char *pathlistFindFile(const char *pszPathList, const char *pszFilename, char *pszBuffer, POPTIONS pOptions)
 {
     const char *psz = pszPathList;
@@ -1665 +1810 @@
         {
             APIRET          rc;
-            char            szFile[CCHMAXPATH];
 
             /* make search statment */
-            strncpy(szFile, psz, pszNext - psz);
-            szFile[pszNext - psz] = '\0';
-            if (szFile[pszNext - psz - 1] != '\\' && szFile[pszNext - psz - 1] != '/')
-                strcpy(&szFile[pszNext - psz], "\\");
-            strcat(szFile, pszFilename);
-            strlwr(szFile); /* to speed up AVL tree search we'll lowercase all names. */
-            fileNormalize(szFile);
+            strncpy(pszBuffer, psz, pszNext - psz);
+            pszBuffer[pszNext - psz] = '\0';
+            if (pszBuffer[pszNext - psz - 1] != '\\' && pszBuffer[pszNext - psz - 1] != '/')
+                strcpy(&pszBuffer[pszNext - psz], "\\");
+            strcat(pszBuffer, pszFilename);
+            strlwr(pszBuffer); /* to speed up AVL tree search we'll lowercase all names. */
+            fileNormalize(pszBuffer);
 
             /*
@@ -1680 +1824 @@
              *   Search cache first
              */
-            if (!filecacheFind(szFile))
+            if (!filecacheFind(pszBuffer))
             {
                 char szDir[CCHMAXPATH];
 
-                filePathSlash(szFile, szDir);
-                if (filecacheIsDirCached(szDir))
-                    rc = ERROR_FILE_NOT_FOUND;
-                else
+                filePathSlash(pszBuffer, szDir);
+                if (!filecacheIsDirCached(szDir))
                 {
                     /*
@@ -1693 +1835 @@
                      * add the directory to the cache and search it.
                      */
-                    if (fCacheSearchDirs && filecacheAddDir(szDir))
-                        rc = filecacheFind(szFile) ? NO_ERROR : ERROR_FILE_NOT_FOUND;
+                    if (pOptions->fCacheSearchDirs && filecacheAddDir(szDir))
+                    {
+                        if (filecacheFind(pszBuffer))
+                            return pszBuffer;
+                    }
                     else
                     {
@@ -1700 +1845 @@
 
                         /* ask the OS */
-                        rc = DosQueryPathInfo(szFile, FIL_STANDARD, &fsts3, sizeof(fsts3));
+                        rc = DosQueryPathInfo(pszBuffer, FIL_STANDARD, &fsts3, sizeof(fsts3));
                         if (rc == NO_ERROR)
                         {   /* add file to cache. */
-                            filecacheAddFile(szFile);
+                            filecacheAddFile(pszBuffer);
+                            return pszBuffer;
                         }
                     }
@@ -1709 +1855 @@
             }
             else
-                rc = NO_ERROR;
-
-            /* did we find it? */
-            if (rc == NO_ERROR)
-            {
-                strncpy(pszBuffer, psz, pszNext - psz);
-                pszBuffer[pszNext - psz] = '\0';
-                if (pszBuffer[pszNext - psz - 1] != '\\' && pszBuffer[pszNext - psz - 1] != '/')
-                    strcpy(&pszBuffer[pszNext - psz], "\\");
-                strcat(pszBuffer, pszFilename);
-                break;
-            }
+                return pszBuffer;
         }
 
@@ -1729 +1864 @@
     }
 
-    return *pszBuffer == '\0' ? NULL : pszBuffer;
+    return NULL;
 }
 
@@ -1971 +2106 @@
  * Appends a depend file to the internal file.
  */
-static BOOL  depReadFile(const char *pszFilename)
+static BOOL  depReadFile(const char *pszFilename, POPTIONS pOptions)
 {
     void *pvFile;
@@ -2059 +2194 @@
                 psz = trim(psz);
                 if (*psz != '\0')
-                    depAddDepend(pvRule, psz);
+                    depAddDepend(pvRule, psz, pOptions->fCheckCyclic);
             }
         }
@@ -2081 +2216 @@
     if (phFile != NULL)
     {
-        char     szBuffer[4096];
-        int      iBuffer = 0;
-        int      cch;
-        PDEPRULE pdep = pdepList;
-
+        AVLENUMDATA EnumData;
+        PDEPRULE    pdep;
+        char        szBuffer[4096];
+        int         iBuffer = 0;
+        int         cch;
+
+        pdep = (PDEPRULE)(void*)AVLBeginEnumTree((PPAVLNODECORE)(void*)&pdepTree, &EnumData, TRUE);
         while (pdep != NULL)
         {
@@ -2128 +2265 @@
 
             /* next rule */
-            pdep = pdep->pNext;
+            pdep = (PDEPRULE)(void*)AVLGetNextNode(&EnumData);
         }
 
@@ -2143 +2280 @@
 
 /**
- * Removes all entries in the list of dependencies. (pdepList)
+ * Removes all nodes in the tree of dependencies. (pdepTree)
  */
 static void  depRemoveAll(void)
 {
-    while (pdepList != NULL)
-    {
-        register PDEPRULE pdepToBeFree = pdepList;
-        /* next */
-        pdepList = pdepToBeFree->pNext;
-
+    AVLENUMDATA EnumData;
+    PDEPRULE    pdep;
+
+    pdep = (PDEPRULE)(void*)AVLBeginEnumTree((PPAVLNODECORE)(void*)&pdepTree, &EnumData, TRUE);
+    while (pdep != NULL)
+    {
         /* free this */
-        if (pdepToBeFree->papszDep != NULL)
+        if (pdep->papszDep != NULL)
         {
-            char ** ppsz = pdepToBeFree->papszDep;
+            char ** ppsz = pdep->papszDep;
             while (*ppsz != NULL)
                 free(*ppsz++);
-            free(pdepToBeFree->papszDep);
+            free(pdep->papszDep);
         }
-        free(pdepToBeFree);
-    }
+        free(pdep);
+
+        /* next */
+        pdep = (PDEPRULE)(void*)AVLGetNextNode(&EnumData);
+    }
+    pdepTree = NULL;
 }
 
@@ -2179 +2320 @@
 {
     char     szRule[CCHMAXPATH*2];
-    PDEPRULE pdepPrev = NULL;
-    PDEPRULE pdep = pdepList;
     PDEPRULE pNew;
     int      cch;
@@ -2199 +2338 @@
     }
 
-    /* find location */
-    while (pdep != NULL && stricmp(pdep->pszRule, szRule) < 0)
-    {
-        pdepPrev = pdep;
-        pdep = pdep->pNext;
-    }
-
-    /* check if matching rule name */
-    if (pdep != NULL && stricmp(pdep->pszRule, szRule) == 0)
-        return NULL;
 
     /*
@@ -2216 +2345 @@
     pNew = malloc(sizeof(DEPRULE) + cch + 1);
     if (pNew == NULL)
+    {
+        fprintf(stderr, "error: out of memory. (line=%d)\n", __LINE__);
         return NULL;
+    }
     pNew->pszRule = (char*)(void*)(pNew + 1);
     strcpy(pNew->pszRule, szRule);
     pNew->cDeps = 0;
     pNew->papszDep = NULL;
-
-    /* link in module (before pdep) */
-    pNew->pNext = pdep;
-    if (pdepPrev == NULL)
-        pdepList = pNew;
-    else
-        pdepPrev->pNext = pNew;
-
-    _heap_check();
+    pNew->avlCore.Key = pNew->pszRule;
+
+    /* Insert rule */
+    if (!AVLInsert((PPAVLNODECORE)(void*)&pdepTree, &pNew->avlCore))
+    {   /* rule existed - return NULL */
+        free(pNew);
+        return NULL;
+    }
+
     return pNew;
 }
@@ -2237 +2369 @@
 /**
  * Adds a dependant to a rule.
- * @returns   Successindicator.
- * @param     pvRule   Rule handle.
- * @param     pszDep   Pointer to dependant name
- */
-static BOOL  depAddDepend(void *pvRule, const char *pszDep)
+ * @returns   Successindicator. TRUE = success.
+ *            FALSE = cyclic or out of memory.
+ * @param     pvRule        Rule handle.
+ * @param     pszDep        Pointer to dependant name
+ * @param     fCheckCyclic  When set we'll check that we're not creating an cyclic dependency.
+ */
+static BOOL  depAddDepend(void *pvRule, const char *pszDep, BOOL fCheckCyclic)
 {
     PDEPRULE pdep = (PDEPRULE)pvRule;
+
+    if (fCheckCyclic && depCheckCyclic(pdep, pszDep))
+    {
+        fprintf(stderr, "warning: Cylic dependancy caused us to ignore '%s' in rule '%s'.\n",
+                pszDep, pdep->pszRule);
+        return FALSE;
+    }
 
     /* allocate more array space */
@@ -2252 +2393 @@
         {
             pdep->cDeps = 0;
+            fprintf(stderr, "error: out of memory, (line=%d)\n", __LINE__);
             return FALSE;
         }
@@ -2258 +2400 @@
     /* allocate string space and copy pszDep */
     if ((pdep->papszDep[pdep->cDeps] = malloc(strlen(pszDep) + 1)) == NULL)
+    {
+        fprintf(stderr, "error: out of memory, (line=%d)\n", __LINE__);
         return FALSE;
+    }
     strcpy(pdep->papszDep[pdep->cDeps], pszDep);
 
@@ -2265 +2410 @@
 
     /* successful! */
-    _heap_check();
     return TRUE;
 }
 
+
+/**
+ * Checks if adding this dependent will create a cylic dependency.
+ * @returns   TRUE: Cyclic.
+ *            FALSE: Non-cylic.
+ * @param     pdepRule  Rule pszDep is to be inserted in.
+ * @param     pszDep    Depend name.
+ */
+static BOOL depCheckCyclic(PDEPRULE pdepRule, const char *pszDep)
+{
+    #define DEPTH 32
+    char *   pszRule = pdepRule->pszRule;
+    char **  appsz[DEPTH];
+    PDEPRULE pdep;
+    int      i;
+
+    /* find rule for the dep. */
+    if ((pdep = (PDEPRULE)(void*)AVLGet((PPAVLNODECORE)(void*)&pdepTree, pszDep)) == NULL
+        || pdep->papszDep == NULL)
+        return FALSE; /* no rule, or no dependents, not cyclic */
+
+    i = 0;
+    appsz[0] = pdep->papszDep;
+    while (i >= 0)
+    {
+        register char **  ppsz = appsz[i];
+
+        while (*ppsz != NULL)
+        {
+            /* check if equal to the main rule */
+            if (strcmp(pszRule, *ppsz) == 0)
+                return TRUE;
+
+            /* push onto stack (ppsz is incremented in this test!) */
+            if ((pdep = (PDEPRULE)(void*)AVLGet((PPAVLNODECORE)(void*)&pdepTree, *ppsz++)) != NULL
+                && pdep->papszDep != NULL)
+            {
+                appsz[i++] = ppsz; /* save next */
+                ppsz = pdep->papszDep; /* start processing new node */
+            }
+        }
+
+        /* pop stack */
+        i--;
+    }
+
+    return FALSE;
+}
 
 
@@ -2275 +2467 @@
  */
 #include <os2.h>
-
-
-
+#ifdef OLEMANN
+#include "olemann.h"
+#endif
+
+
+