Changeset 4700 for trunk/tools

Timestamp:

Nov 26, 2000, 12:26:40 PM (25 years ago)

Author:

bird

Message:

Added exclude file option, -x <file;file...>.

File:

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

trunk/tools/fastdep/fastdep.c

@@ -1 @@
-/* $Id: fastdep.c,v 1.23 2000-11-21 04:35:36 bird Exp $
+/* $Id: fastdep.c,v 1.24 2000-11-26 11:26:40 bird Exp $
  *
  * Fast dependents. (Fast = Quick and Dirty!)
@@ -99 +99 @@
     BOOL            fCheckCyclic;       /* allways check for cylic dependency before inserting an dependent. */
     BOOL            fCacheSearchDirs;   /* cache entire search dirs. */
+    const char *    pszExcludeFiles;    /* List of excluded files. */
 } OPTIONS, *POPTIONS;
 
@@ -314 +315 @@
     static char szInclude[32768] = ";";
     static char szExclude[32768] = ";";
+    static char szExcludeFiles[65536] = "";
 
     OPTIONS options =
@@ -329 +331 @@
         FALSE,           /* fAppend */
         TRUE,            /* fCheckCyclic */
-        TRUE             /* fCacheSearchDirs */
+        TRUE,            /* fCacheSearchDirs */
+        szExcludeFiles   /* pszExcludeFiles */
     };
 
@@ -401 +404 @@
                     else
                     {
-                        if (argi + 1 < argc)
-                            pszDepFile = argv[++argi];
+                        argi++;
+                        if (argi < argc)
+                            pszDepFile = argv[argi];
                         else
                         {
@@ -441 +445 @@
                     else
                     {
-                        psz = argv[argi+1];
-                        argi++;
+                        if (++argi >= argc)
+                        {
+                            fprintf(stderr, "syntax error! Option -e.\n");
+                            return 1;
+                        }
+                        psz = argv[argi];
                     }
                     /* check if enviroment variable */
@@ -478 +486 @@
                     else
                     {
-                        psz = argv[argi+1];
-                        argi++;
+                        if (++argi >= argc)
+                        {
+                            fprintf(stderr, "syntax error! Option -i.\n");
+                            return 1;
+                        }
+                        psz = argv[argi];
                     }
                     /* check if enviroment variable */
@@ -534 +546 @@
                         else
                         {
-                            strcpy(szObjectExt, argv[argi+1]);
-                            argi++;
+                            if (++argi >= argc)
+                            {
+                                fprintf(stderr, "syntax error! Option -obj.\n");
+                                return 1;
+                            }
+                            strcpy(szObjectExt, argv[argi]);
                         }
                         break;
@@ -551 +567 @@
                     else
                     {
-                        strcpy(szObjectDir, argv[argi+1]);
-                        argi++;
+                        if (++argi >= argc)
+                        {
+                            fprintf(stderr, "syntax error! Option -o.\n");
+                            return 1;
+                        }
+                        strcpy(szObjectDir, argv[argi]);
                     }
                     if (szObjectDir[0] != '\0'
@@ -567 +587 @@
                     else
                     {
-                        strcpy(szRsrcExt, argv[argi+1]);
-                        argi++;
+                        if (++argi >= argc)
+                        {
+                            fprintf(stderr, "syntax error! Option -r.\n");
+                            return 1;
+                        }
+                        strcpy(szRsrcExt, argv[argi]);
+                    }
+                    break;
+
+                case 'x':
+                case 'X': /* Exclude files */
+                    psz = &achBuffer[CCHMAXPATH+8];
+                    if (strlen(argv[argi]) > 2)
+                        strcpy(psz, &argv[argi][2]);
+                    else
+                    {
+                        if (++argi >= argc)
+                        {
+                            fprintf(stderr, "syntax error! Option -x.\n");
+                            return 1;
+                        }
+                        strcpy(psz, argv[argi]);
+                    }
+                    while (psz != NULL && *psz != ';')
+                    {
+                        char *  pszNext = strchr(psz, ';');
+                        int     cch = strlen(szExcludeFiles);
+                        if (pszNext)
+                            *pszNext++ = '\0';
+                        if (DosQueryPathInfo(psz, FIL_QUERYFULLNAME, &szExcludeFiles[cch], CCHMAXPATH))
+                        {
+                            fprintf(stderr, "error: Invalid exclude name\n");
+                            return -1;
+                        }
+                        strlwr(&szExcludeFiles[cch]);
+                        strcat(&szExcludeFiles[cch], ";");
+                        psz = pszNext;
                     }
                     break;
@@ -670 +725 @@
                      )
                 {
-                    char *psz;
-                    char  szSource[CCHMAXPATH];
+                    const char *    psz;
+                    char            szSource[CCHMAXPATH];
+                    BOOL            fExcluded;
 
                     /*
@@ -688 +744 @@
 
                     /*
+                     * Check if this is an excluded file.
+                     */
+                    fExcluded = FALSE;
+                    psz = options.pszExcludeFiles;
+                    while (*psz != '\0' && *psz != ';')
+                    {
+                        const char * pszNext = strchr(psz, ';');
+                        if (strlen(szSource) == pszNext - psz && strncmp(szSource, psz, pszNext - psz) == 0)
+                            fExcluded = TRUE;
+                        psz = pszNext + 1;
+                    }
+                    if (fExcluded)
+                        continue;
+
+                    /*
                      * Analyse the file.
                      */
@@ -729 +800 @@
         "Syntax: FastDep [-a<[+]|->] [-ca] [-cy<[+]|->] [-d <outputfn>]\n"
         "                [-e <excludepath>] [-eall<[+]|->] [-i <include>] [-n<[+]|->]\n"
-        "                [-o <objdir>] [-obr<[+]|->]  <files>\n"
+        "                [-o <objdir>] [-obr<[+]|->] [-x <f1[;f2]>] [-r <rsrcext>]\n"
+        "                <files> [more options [more files [...]]]\n"
         "    or\n"
         "        FastDep [options] @<parameterfile>\n"
@@ -756 +828 @@
         "   -obj[ ]<objext> Object extention.           Default: obj\n"
         "   -r[ ]<rsrcext>  Resource binary extention.  Default: res\n"
+        "   -x[ ]<f1[;f2]>  Files to exclude. Only exact filenames.\n"
         "   <files>         Files to scan. Wildchars are allowed.\n"
         "\n"
+        "Options and files could be mixed.\n"
         " copyright (c) 1999-2000 knut st. osmundsen (knut.stange.osmundsen@pmsc.no)\n",
         pszDefaultDepFile