Changeset 3191 for trunk/tools

Timestamp:

Mar 22, 2000, 2:16:24 PM (25 years ago)

Author:

bird

Message:

-I and -E may now take one environment variable in enclosed in %s as arguments.
This is done since CMD.EXE don't expand env.vars like 4OS2 does.

File:

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

trunk/tools/fastdep/fastdep.c

@@ -1 @@
-/* $Id: fastdep.c,v 1.17 2000-03-21 13:16:18 bird Exp $
+/* $Id: fastdep.c,v 1.18 2000-03-22 13:16:24 bird Exp $
  *
  * Fast dependents. (Fast = Quick and Dirty!)
@@ -301 +301 @@
     int         i;
     char *      psz;
+    char *      psz2;
     const char *pszDepFile = pszDefaultDepFile;
     char        achBuffer[4096];
@@ -433 +434 @@
                     /* path or path list */
                     if (strlen(argv[argi]) > 2)
-                        strcat(szExclude, &argv[argi][2]);
+                        psz = &argv[argi][2];
                     else
                     {
-                        strcat(szExclude, argv[argi+1]);
+                        psz = argv[argi+1];
                         argi++;
                     }
-                    strlwr(szExclude);
-                    if (szExclude[strlen(szExclude)-1] != ';')
-                        strcat(szExclude, ";");
+                    /* check if enviroment variable */
+                    if (*psz == '%')
+                    {
+                        psz2 = strdup(psz+1);
+                        if (psz2 != NULL && *psz2 != '\0')
+                        {
+                            if (psz2[strlen(psz2)-1] == '%')
+                                psz2[strlen(psz2)-1] = '\0';
+                            psz = getenv(psz2);
+                            free(psz2);
+                            if (psz == NULL)
+                                break;
+                        }
+                        else
+                        {
+                            fprintf(stderr, "error: -E% is not an valid argument!\n");
+                            return -1;
+                        }
+                    }
+                    if (psz != NULL)
+                    {
+                        strcat(szExclude, psz);
+                        strlwr(szExclude);
+                        if (szExclude[strlen(szExclude)-1] != ';')
+                            strcat(szExclude, ";");
+                    }
                     break;
 
@@ -447 +471 @@
                 case 'i':
                     if (strlen(argv[argi]) > 2)
-                        strcat(szInclude, &argv[argi][2]);
+                        psz = &argv[argi][2];
                     else
                     {
-                        strcat(szInclude, argv[argi+1]);
+                        psz = argv[argi+1];
                         argi++;
                     }
-                    strlwr(szInclude);
-                    if (szInclude[strlen(szInclude)-1] != ';')
-                        strcat(szInclude, ";");
+                    /* check if enviroment variable */
+                    if (*psz == '%')
+                    {
+                        psz2 = strdup(psz+1);
+                        if (psz2 != NULL && *psz2 != '\0')
+                        {
+                            if (psz2[strlen(psz2)-1] == '%')
+                                psz2[strlen(psz2)-1] = '\0';
+                            psz = getenv(psz2);
+                            free(psz2);
+                            if (psz == NULL)
+                                break;
+                        }
+                        else
+                        {
+                            fprintf(stderr, "error: -I% is not an valid argument!\n");
+                            return -1;
+                        }
+                    }
+                    if (psz != NULL)
+                    {
+                        strcat(szInclude, psz);
+                        strlwr(szInclude);
+                        if (szInclude[strlen(szInclude)-1] != ';')
+                            strcat(szInclude, ";");
+                    }
                     break;