Changeset 326 in kBuild for trunk

Timestamp:

Oct 15, 2005 12:43:02 AM (19 years ago)

Author:

bird

Message:

Corrected bug in line skipping where two lines would be skipped. Corrected slashes on win32.

Location:

trunk

Files:

• kBuild/bin/x86.win32/kDepPre.exe (modified) ( previous)
• src/kDepPre/kDepPre.c (modified) (4 diffs)

trunk/src/kDepPre/kDepPre.c

@@ -211 +211 @@
 #ifdef __WIN32__
         {
+        char *psz;
         char szFilename[_MAX_PATH + 1];
         if (_fullpath(szFilename, pDep->szFilename, sizeof(szFilename)))
             w32_fixcase(szFilename);
+        psz = szFilename;
+        while ((psz = strchr(psz, '\\')) != NULL)
+            *psz++ = '/';
         fprintf(pOutput, " \\\n\t%s", szFilename);
         }
@@ -387 +391 @@
              */
             case C_SKIP_LINE:
-#           if 0
-                for (;;)
-                {
-                    if (!fgets(szBuf, sizeof(szBuf), pInput))
-                    {
-                        enmMode = C_EOF;
-                        break;
-                    }
-                    ch = szBuf[strlen(szBuf) - 1];
+                do
+                {
                     if (    ch == '\r'
                         ||  ch == '\n')
                         break;
-                }
-#           else
-                while ((ch = FGETC(pInput)) != EOF)
-                    if (    ch == '\r'
-                        ||  ch == '\n')
-                        break;
-#           endif
+                } while ((ch = FGETC(pInput)) != EOF);
                 enmMode = C_DISCOVER;
                 break;
@@ -613 +604 @@
             if (!pOutput)
             {
-                fprintf(stderr, "%s: error: Failed to open input file '%s'.\n", argv[0], argv[i]);
+                fprintf(stderr, "%s: error: Failed to open optput file '%s'.\n", argv[0], argv[i]);
                 return 1;
             }
@@ -643 +634 @@
     if (!pOutput)
     {
-        fprintf(stderr, "%s: syntax error: No input!\n", argv[0]);
+        fprintf(stderr, "%s: syntax error: No output!\n", argv[0]);
         return 1;
     }