Changeset 3213 for trunk/tools


Ignore:
Timestamp:
Mar 24, 2000, 2:50:36 AM (25 years ago)
Author:
bird
Message:

Input filename to pathlistFindFile2 has to be normalized!

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/tools/fastdep/fastdep.c

    r3191 r3213  
    1 /* $Id: fastdep.c,v 1.18 2000-03-22 13:16:24 bird Exp $
     1/* $Id: fastdep.c,v 1.19 2000-03-24 01:50:36 bird Exp $
    22 *
    33 * Fast dependents. (Fast = Quick and Dirty!)
    … …  
    101101 * Language specific analysis functions type.
    102102 */
    103 typedef int ( _FNLANG)  (const char *pszFilename, void *pvFile,
    104                          BOOL fHeader, POPTIONS pOptions);
     103typedef int ( _FNLANG)  (const char *pszFilename, const char *pszNormFilename,
     104                         void *pvFile, BOOL fHeader, POPTIONS pOptions);
    105105typedef _FNLANG    *PFNLANG;
    106106
    … …  
    145145static int makeDependent(const char *pszFilename, POPTIONS pOptions);
    146146
    147 int langC_CPP(const char *pszFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions);
    148 int langAsm(const char *pszFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions);
    149 int langRC(const char *pszFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions);
    150 int langCOBOL(const char *pszFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions);
     147int langC_CPP(const char *pszFilename, const char *pszNormFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions);
     148int langAsm(const char *pszFilename, const char *pszNormFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions);
     149int langRC(const char *pszFilename, const char *pszNormFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions);
     150int langCOBOL(const char *pszFilename, const char *pszNormFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions);
    151151
    152152
    … …  
    681681                    strcat(szSource, pfindbuf3->achName);
    682682                    strlwr(szSource);
     683                    fileNormalize(szSource);
    683684
    684685                    /*
    … …  
    799800        /* Found? */
    800801        if (pCfg->papszExts != NULL)
    801             rc = (*pCfg->pfn)(pszFilename, pvFile, fHeader, pOptions);
     802        {
     803            char szNormFile[CCHMAXPATH];
     804            fileNormalize2(pszFilename, szNormFile);
     805            rc = (*pCfg->pfn)(pszFilename, &szNormFile[0],  pvFile, fHeader, pOptions);
     806        }
    802807        else
    803808        {
    … …  
    821826 * @returns   0 on success.
    822827 *            !0 on error.
    823  * @param     pszFilename  Pointer to source filename. Correct case is assumed!
    824  * @param     pvFile       Pointer to file textbuffer.
    825  * @param     pOptions     Pointer to options struct.
     828 * @param     pszFilename      Pointer to source filename. Correct case is assumed!
     829 * @param     pszNormFilename  Pointer to normalized source filename.
     830 * @param     pvFile           Pointer to file textbuffer.
     831 * @param     pOptions         Pointer to options struct.
    826832 * @status    completely implemented.
    827833 * @author    knut st. osmundsen
    828834 */
    829 int langC_CPP(const char *pszFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions)
     835int langC_CPP(const char *pszFilename, const char *pszNormFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions)
    830836{
    831837    void *  pvRule;                     /* Handle to the current rule. */
    … …  
    865871        if (pOptions->fSrcWhenObj && pvRule)
    866872            depAddDepend(pvRule,
    867                          pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszFilename, pOptions) ?
    868                             fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer),
     873                         pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszNormFilename, pOptions) ?
     874                            fileName(pszFilename, szBuffer) : pszNormFilename,
    869875                         pOptions->fCheckCyclic);
    870876    }
    871877    else
    872         pvRule = depAddRule(pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszFilename, pOptions) ?
    873                             fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer), NULL, NULL);
     878        pvRule = depAddRule(pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszNormFilename, pOptions) ?
     879                            fileName(pszFilename, szBuffer) : pszNormFilename, NULL, NULL);
    874880
    875881    /* duplicate rule? */
    … …  
    11001106 * @returns   0 on success.
    11011107 *            !0 on error.
    1102  * @param     pszFilename  Pointer to source filename. Correct case is assumed!
    1103  * @param     pvFile       Pointer to file textbuffer.
    1104  * @param     pOptions     Pointer to options struct.
     1108 * @param     pszFilename      Pointer to source filename. Correct case is assumed!
     1109 * @param     pszNormFilename  Pointer to normalized source filename.
     1110 * @param     pvFile           Pointer to file textbuffer.
     1111 * @param     pOptions         Pointer to options struct.
    11051112 * @status    completely implemented.
    11061113 * @author    knut st. osmundsen
    11071114 */
    1108 int langAsm(const char *pszFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions)
     1115int langAsm(const char *pszFilename, const char *pszNormFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions)
    11091116{
    11101117    void *  pvRule;                     /* Handle to the current rule. */
    … …  
    11301137        if (pOptions->fSrcWhenObj && pvRule)
    11311138            depAddDepend(pvRule,
    1132                          pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszFilename, pOptions) ?
    1133                             fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer),
     1139                         pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszNormFilename, pOptions) ?
     1140                            fileName(pszFilename, szBuffer) : pszNormFilename,
    11341141                         pOptions->fCheckCyclic);
    11351142    }
    11361143    else
    1137         pvRule = depAddRule(pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszFilename, pOptions) ?
    1138                             fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer), NULL, NULL);
     1144        pvRule = depAddRule(pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszNormFilename, pOptions) ?
     1145                            fileName(pszFilename, szBuffer) : pszNormFilename, NULL, NULL);
    11391146
    11401147    /* duplicate rule? */
    … …  
    12181225 * @returns   0 on success.
    12191226 *            !0 on error.
    1220  * @param     pszFilename  Pointer to source filename. Correct case is assumed!
    1221  * @param     pvFile       Pointer to file textbuffer.
    1222  * @param     pOptions     Pointer to options struct.
     1227 * @param     pszFilename      Pointer to source filename. Correct case is assumed!
     1228 * @param     pszNormFilename  Pointer to normalized source filename.
     1229 * @param     pvFile           Pointer to file textbuffer.
     1230 * @param     pOptions         Pointer to options struct.
    12231231 * @status    completely implemented.
    12241232 * @author    knut st. osmundsen
    12251233 */
    1226 int langRC(const char *pszFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions)
     1234int langRC(const char *pszFilename, const char *pszNormFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions)
    12271235{
    12281236    void *  pvRule;                     /* Handle to the current rule. */
    … …  
    12481256        if (pOptions->fSrcWhenObj && pvRule)
    12491257            depAddDepend(pvRule,
    1250                          pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszFilename, pOptions) ?
     1258                         pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszNormFilename, pOptions) ?
    12511259                            fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer),
    12521260                         pOptions->fCheckCyclic);
    12531261    }
    12541262    else
    1255         pvRule = depAddRule(pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszFilename, pOptions) ?
    1256                             fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer), NULL, NULL);
     1263        pvRule = depAddRule(pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszNormFilename, pOptions) ?
     1264                            fileName(pszFilename, szBuffer) : pszNormFilename, NULL, NULL);
    12571265
    12581266    /* duplicate rule? */
    … …  
    13621370 * @returns   0 on success.
    13631371 *            !0 on error.
    1364  * @param     pszFilename  Pointer to source filename. Correct case is assumed!
    1365  * @param     pvFile       Pointer to file textbuffer.
    1366  * @param     pOptions     Pointer to options struct.
     1372 * @param     pszFilename      Pointer to source filename. Correct case is assumed!
     1373 * @param     pszNormFilename  Pointer to normalized source filename.
     1374 * @param     pvFile           Pointer to file textbuffer.
     1375 * @param     pOptions         Pointer to options struct.
    13671376 * @status    completely implemented.
    13681377 * @author    knut st. osmundsen
    13691378 */
    1370 int langCOBOL(const char *pszFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions)
     1379int langCOBOL(const char *pszFilename, const char *pszNormFilename, void *pvFile, BOOL fHeader, POPTIONS pOptions)
    13711380{
    13721381    void *  pvRule;                     /* Handle to the current rule. */
    … …  
    13921401        if (pOptions->fSrcWhenObj && pvRule)
    13931402            depAddDepend(pvRule,
    1394                          pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszFilename, pOptions) ?
     1403                         pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszNormFilename, pOptions) ?
    13951404                            fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer),
    13961405                         pOptions->fCheckCyclic);
    13971406    }
    13981407    else
    1399         pvRule = depAddRule(pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszFilename, pOptions) ?
    1400                             fileName(pszFilename, szBuffer) : fileNormalize2(pszFilename, szBuffer), NULL, NULL);
     1408        pvRule = depAddRule(pOptions->fExcludeAll || pathlistFindFile2(pOptions->pszExclude, pszNormFilename, pOptions) ?
     1409                            fileName(pszFilename, szBuffer) : pszNormFilename, NULL, NULL);
    14011410
    14021411    /* duplicate rule? */
    … …  
    20412050 *            FALSE: don't exist.
    20422051 * @param     pszPathList  Path list to search for filename.
    2043  * @parma     pszFilename  Filename to find.
     2052 * @parma     pszFilename  Filename to find. The filename should be normalized!
    20442053 * @param     pOptions     Pointer to options struct.
    20452054 * @status    completely implemented.
    … …  
    20632072     * Normalize the filename and get it's path.
    20642073     */
    2065     fileNormalize2(pszFilename, szBuffer);
    20662074    filePath(pszFilename, pszPathToFind);
    20672075
Note: See TracChangeset for help on using the changeset viewer.