Changeset 6141 for trunk/tools

Timestamp:

Jul 2, 2001, 8:21:02 PM (24 years ago)

Author:

bird

Message:

Quotes. Trim preprocessed lines. Read fixes. Empty dependant check. File header.

File:

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

trunk/tools/fastdep/fastdep.c

@@ -1 @@
-/* $Id: fastdep.c,v 1.27 2001-06-07 00:35:42 bird Exp $
+/* $Id: fastdep.c,v 1.28 2001-07-02 18:21:02 bird Exp $
  *
  * Fast dependents. (Fast = Quick and Dirty!)
@@ -215 +215 @@
 INLINE char *trim(char *psz);
 INLINE char *trimR(char *psz);
+INLINE char *trimQuotes(char *psz);
 
 /* preprocessors */
@@ -787 +788 @@
                      * Make full path.
                      */
-                    if ((psz = strrchr(argv[argi], '\\')) || (psz = strrchr(argv[argi], '/')))
+                    if ((psz = strrchr(argv[argi], '\\')) || (psz = strrchr(argv[argi], '/')) || (*(psz = &argv[argi][1]) == ':'))
                     {
                         strncpy(szSource, argv[argi], psz - argv[argi] + 1);
@@ -2768 +2769 @@
 
 /**
+ * Trims any quotes of a possibly quoted string.
+ * @returns   Pointer to the string passed in.
+ * @param     psz   Pointer to the string which is to be quote-trimmed.
+ * @status    completely implmented.
+ * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ */
+INLINE char *trimQuotes(char *psz)
+{
+    int i;
+    if (psz == NULL)
+        return NULL;
+
+    if (*psz == '\"' || *psz == '\'')
+        psz++;
+    i = strlen(psz) - 1;
+    if (psz[i] == '\"' || psz[i] == '\'')
+        psz[i] = '\0';
+
+    return psz;
+}
+
+
+/**
  * C/C++ preprocess a single line. Assumes that we're not starting
  * with at comment.
@@ -2829 +2853 @@
      */
     psz--;
-    while (psz >= pszOut && *psz == ' ' && *psz == '\t')
+    while (psz >= pszOut && (*psz == ' ' || *psz == '\t'))
         psz--;
     psz[1] = '\0';
@@ -2981 +3005 @@
 
     /* get the filedate and subtract one month from it. */
-    if (!DosQueryPathInfo(pszFilename, FIL_STANDARD, &fst3, sizeof(fst3)))
+    if (!DosQueryPathInfo((PSZ)pszFilename, FIL_STANDARD, &fst3, sizeof(fst3)))
     {
         if (fst3.fdateLastWrite.month <= 1)
@@ -3027 +3051 @@
         cch = strlen(psz);
         if (cch == 0)
+        {
+            fMoreDeps = FALSE;
+            continue;
+        }
+
+        if (*psz == '#')
             continue;
 
@@ -3044 +3074 @@
                 {
                     static FDATE FileDate = {0,0,0};
+                    char *pszCont = strchr(&psz[i], '\\');
+                    fMoreDeps = pszCont != NULL && pszCont[1] == '\0';
+
                     psz[i] = '\0';
-                    pvRule = depAddRule(trimR(psz), NULL, NULL, FileDate);
+                    pvRule = depAddRule(trimQuotes(trimR(psz)), NULL, NULL, FileDate);
                     ((PDEPRULE)pvRule)->fUpdated = FALSE;
                     psz += i + 1;
                     cch -= i + 1;
-                    fMoreDeps = TRUE;
                     break;
                 }
@@ -3070 +3102 @@
             if (pvRule != NULL)
             {
-                psz = trim(psz);
+                psz = trimQuotes(trim(psz));
                 if (*psz != '\0')
                     depAddDepend(pvRule, psz, options.fCheckCyclic);
@@ -3099 +3131 @@
         int         iBuffer = 0;
         int         cch;
+
+        /*
+         * Write warning on top of file.
+         */
+        fputs("#\n"
+              "# This file was automatically generated by FastDep.\n"
+              "# FastDep was written by knut st. osmundsen, and it's GPL software.\n"
+              "#\n"
+              "# THIS FILE SHOULD   N O T   BE EDITED MANUALLY!!!\n"
+              "#\n"
+              "# (As this may possibly make it unreadable for fastdep\n"
+              "#  and ruin the caching methods of FastDep.)\n"
+              "#\n"
+              "\n",
+              phFile);
+
 
         /* @@@PH 2001-03-01
@@ -3147 +3195 @@
         while (pdep != NULL)
         {
+            int fQuoted = strpbrk(pdep->pszRule, " \t") != NULL; /* TODO/BUGBUG/FIXME: are there more special chars to look out for?? */
+
             /* Write rule. Flush the buffer first if necessary. */
             cch = strlen(pdep->pszRule);
-            if (iBuffer + cch + 2 >= sizeof(szBuffer))
+            if (iBuffer + cch + fQuoted * 2 + 2 >= sizeof(szBuffer))
             {
                 fwrite(szBuffer, iBuffer, 1, phFile);
                 iBuffer = 0;
             }
+            if (fQuoted) szBuffer[iBuffer++] = '"';
             strcpy(szBuffer + iBuffer, pdep->pszRule);
             iBuffer += cch;
+            if (fQuoted) szBuffer[iBuffer++] = '"';
             strcpy(szBuffer + iBuffer++, ":");
 
@@ -3165 +3217 @@
                 {
                     /* flush buffer? */
-                    if (iBuffer + strlen(*ppsz) + 20 >= sizeof(szBuffer))
+                    fQuoted = strpbrk(*ppsz, " \t") != NULL; /* TODO/BUGBUG/FIXME: are there more special chars to look out for?? */
+                    cch = strlen(*ppsz);
+                    if (iBuffer + cch + fQuoted * 2 + 20 >= sizeof(szBuffer))
                     {
                         fwrite(szBuffer, iBuffer, 1, phFile);
                         iBuffer = 0;
                     }
-                    iBuffer += sprintf(szBuffer + iBuffer, " \\\n    %s", *ppsz);
+                    strcpy(szBuffer + iBuffer, " \\\n    ");
+                    iBuffer += 7;
+                    if (fQuoted) szBuffer[iBuffer++] = '"';
+                    strcpy(szBuffer + iBuffer, *ppsz);
+                    iBuffer += cch;
+                    if (fQuoted) szBuffer[iBuffer++] = '"';
 
                     /* next dependant */
@@ -3291 +3350 @@
          * Reuse the node in the tree.
          */
-        PDEPRULE    pOld = (PDEPRULE)(void*)AVLGet((PPAVLNODECORE)(void*)&pdepTree, pNew->avlCore.Key);
+        PDEPRULE    pOld = (PDEPRULE)AVLGet((PPAVLNODECORE)(void*)&pdepTree, pNew->avlCore.Key);
         assert(pOld);
         free(pNew);
@@ -3298 +3357 @@
 
         pOld->fUpdated = TRUE;
-        if (!options.fForceScan && *(PUSHORT)(void*)&FileDate < *(PUSHORT)(void*)&options.fDepDate)
+        if (!options.fForceScan && *(PUSHORT)&FileDate < *(PUSHORT)&options.fDepDate)
             return NULL;
 
@@ -3327 +3386 @@
 {
     PDEPRULE pdep = (PDEPRULE)pvRule;
+
+    if (pszDep[0] == '\0')
+    {
+        fprintf(stderr, "warning-internal: empty dependancy filename to '%s'. Ignored.\n",
+                pdep->pszRule);
+        /* __interrupt(3); */
+        return FALSE;
+    }
 
     if (fCheckCyclic && depCheckCyclic(pdep, pszDep))