Changeset 1329 for trunk/src/win32k/fastdep.c

Timestamp:

Oct 17, 1999, 4:03:29 AM (26 years ago)

Author:

bird

Message:

Bugfixing in fastdep.c.
Corrected ilib3 and enabled a copy statement in the makefile.

Location:

trunk/src/win32k

Files:

• . (modified) (1 prop)
• fastdep.c (modified) (11 diffs)

trunk/src/win32k

@@ -1 +1 @@
 makefile.inc
 .depend
+list
+object

@@ -1 +1 @@
 makefile.inc
 .depend
+list
+object

trunk/src/win32k/fastdep.c

@@ -32 +32 @@
     BOOL            fObjRule;
     BOOL            fNoObjectPath;
+    BOOL            fSrcWhenObj;
 } OPTIONS, *POPTIONS;
 
@@ -90 +91 @@
         szObjectDir,     /* pszObjectDir */
         TRUE,            /* fObjRule */
-        FALSE            /* fNoObjectPath */
+        FALSE,           /* fNoObjectPath */
+        TRUE             /* fSrcWhenObj */
     };
 
@@ -191 +193 @@
             {   /* not a parameter! */
                 ULONG        ulRc;
-                FILEFINDBUF3 filebuf;
+                FILEFINDBUF3 filebuf = {0};
                 HDIR         hDir = HDIR_CREATE;
                 ULONG        ulFound = 1;
@@ -198 +200 @@
                                     FILE_READONLY |  FILE_HIDDEN | FILE_SYSTEM | FILE_ARCHIVED,
                                     &filebuf, sizeof(FILEFINDBUF3), &ulFound, FIL_STANDARD);
-                while (rc == NO_ERROR && ulFound == 1)
+                while (ulRc == NO_ERROR)
                 {
                     char *psz;
                     char  szSource[CCHMAXPATH];
-                    char  szObjectDirTmp[CCHMAXPATH];
 
                     if ((psz = strrchr(argv[argi], '\\')) || (psz = strrchr(argv[argi], '/')))
@@ -208 +209 @@
                         strncpy(szSource, argv[argi], psz - argv[argi] + 1);
                         szSource[psz - argv[argi] + 1]  = '\0';
-                        if (szObjectDir[0] == '\0')
-                        {
-                            strncpy(szObjectDirTmp, argv[argi], psz - argv[argi] + 1);
-                            szObjectDirTmp[psz - argv[argi] + 1]  = '\0';
-                        }
                     }
                     else
                         szSource[0]  = '\0';
-                    if (szObjectDir[0] != '\0')
-                    {
-                        int i;
-                        strcpy(szObjectDirTmp, szObjectDir);
-                        i = strlen(szObjectDirTmp);
-                        if (szObjectDirTmp[i - 1] == '\\' || szObjectDirTmp[i - 1] == '/')
-                            szObjectDirTmp[i - 1] = '\0';
-                    }
 
                     strcat(szSource, filebuf.achName);
@@ -330 +318 @@
                 else
                     strcat(szObj, ".obj");
-                fprintf(phDep, "%s:%-*s", szObj,
-                        strlen(szObj) > 19 ? 0 : 19 - strlen(szObj), "");
+                fprintf(phDep, "%s:", szObj);
+
+                if (pOptions->fSrcWhenObj)
+                    fprintf(phDep, " \\\n%6s %s", "", pszFilename);
             }
             else
-                fprintf(phDep, "%s:%-*s", pszFilename,
-                        strlen(pszFilename) > 19 ? 0 : 19 - strlen(pszFilename), "");
+                fprintf(phDep, "%s:", pszFilename);
         }
         else
-            fprintf(phDep, "%s:%-*s", pszFilename,
-                    strlen(pszFilename) > 19 ? 0 : 19 - strlen(pszFilename), "");
+            fprintf(phDep, "%s:", pszFilename);
 
         /*******************/
@@ -352 +340 @@
                 int cbLen;
                 int i = 0;
-                int f = 0;
                 iLine++;
 
                 cbLen = strlen(szBuffer);
-                while (i + 9 < cbLen
-                       && !(f = (strncmp(&szBuffer[i], "#include", 8) == 0
-                                 || strncmp(&szBuffer[i], "RCINCLUDE", 9) == 0)
-                            )
-                      )
+                while (i + 9 < cbLen && (szBuffer[i] == ' ' || szBuffer[i] == '\t'))
                     i++;
 
                 /* Found include! */
-                if (f)
+                if (strncmp(&szBuffer[i], "#include", 8) == 0 || strncmp(&szBuffer[i], "RCINCLUDE", 9) == 0)
                 {
+                    int f = 0;
+
                     /* extract info between "" or <> */
-                    f = 0;
                     while (i < cbLen && !(f = (szBuffer[i] == '"' || szBuffer[i] == '<')))
                         i++;
@@ -401 +385 @@
                                     )
                                     strcpy(szBuffer, szFullname);
-                                if (fwrite(" ", 1, 1, phDep) != 1) /* blank */
-                                    fprintf(stderr, "fwrite failed 1!\n");
-                                if (fwrite(szBuffer, strlen(szBuffer), 1, phDep) != 1)
-                                    fprintf(stderr, "fwrite failed 2!\n");
+                                fprintf(phDep, " \\\n%6.s %s", "", szBuffer);
                             }
                             else
@@ -422 +403 @@
     }
     else
+    {
+        fprintf(stderr, "failed to open '%s'\n", pszFilename);
         return -1;
+    }
 
     return 0;
@@ -479 +463 @@
                             FILE_READONLY |  FILE_HIDDEN | FILE_SYSTEM | FILE_ARCHIVED,
                             &filebuf, sizeof(FILEFINDBUF3), &ulFound, FIL_STANDARD);
-        if (ulRc == NO_ERROR && ulFound == 1)
+        if (ulRc == NO_ERROR)
         {
             strcpy(pszFilename, szFileTmpIn);
@@ -688 +672 @@
                               &cFiles, FIL_STANDARD);
             DosFindClose(hDir);
-            if (rc == NO_ERROR && cFiles == 1UL)
+            if (rc == NO_ERROR)
             {
                 strncpy(pszBuffer, psz, pszNext - psz);

@@ -1 +1 @@
 makefile.inc
 .depend
+list
+object