version 1.47, 2000/06/23 16:20:01 |
version 1.48, 2000/06/23 16:21:43 |
|
|
Boolean freeIt; |
Boolean freeIt; |
char *result; |
char *result; |
|
|
result=Var_Parse(cp, VAR_CMD, TRUE, &length, &freeIt); |
result=Var_Parse(cp, NULL, TRUE, &length, &freeIt); |
|
|
if (freeIt) { |
if (freeIt) { |
free(result); |
free(result); |
|
|
* went well and FAILURE if there was an error in the |
* went well and FAILURE if there was an error in the |
* specification. On error, line should remain untouched. |
* specification. On error, line should remain untouched. |
*/ |
*/ |
if (Arch_ParseArchive(&line, &targets, VAR_CMD) != SUCCESS) { |
if (Arch_ParseArchive(&line, &targets, NULL) != SUCCESS) { |
Parse_Error (PARSE_FATAL, |
Parse_Error (PARSE_FATAL, |
"Error in archive specification: \"%s\"", line); |
"Error in archive specification: \"%s\"", line); |
return; |
return; |
|
|
* expansion */ |
* expansion */ |
|
|
Lst_Init(&sources); |
Lst_Init(&sources); |
if (Arch_ParseArchive(&line, &sources, VAR_CMD) != SUCCESS) { |
if (Arch_ParseArchive(&line, &sources, NULL) != SUCCESS) { |
Parse_Error (PARSE_FATAL, |
Parse_Error (PARSE_FATAL, |
"Error in source archive spec \"%s\"", line); |
"Error in source archive spec \"%s\"", line); |
return; |
return; |
|
|
* expansion on the whole thing. The resulting string will need |
* expansion on the whole thing. The resulting string will need |
* freeing when we're done, so set freeCmd to TRUE. |
* freeing when we're done, so set freeCmd to TRUE. |
*/ |
*/ |
cp = Var_Subst(cp, VAR_CMD, TRUE); |
cp = Var_Subst(cp, NULL, TRUE); |
freeCmd = TRUE; |
freeCmd = TRUE; |
} |
} |
|
|
|
|
* Substitute for any variables in the file name before trying to |
* Substitute for any variables in the file name before trying to |
* find the thing. |
* find the thing. |
*/ |
*/ |
file = Var_Subst(file, VAR_CMD, FALSE); |
file = Var_Subst(file, NULL, FALSE); |
|
|
/* |
/* |
* Now we know the file's name and its search path, we attempt to |
* Now we know the file's name and its search path, we attempt to |
|
|
* Substitute for any variables in the file name before trying to |
* Substitute for any variables in the file name before trying to |
* find the thing. |
* find the thing. |
*/ |
*/ |
file = Var_Subst(file, VAR_CMD, FALSE); |
file = Var_Subst(file, NULL, FALSE); |
|
|
/* |
/* |
* Now we know the file's name, we attempt to find the durn thing. |
* Now we know the file's name, we attempt to find the durn thing. |
|
|
#endif |
#endif |
ParseFinishLine(); |
ParseFinishLine(); |
|
|
cp = Var_Subst(line, VAR_CMD, TRUE); |
cp = Var_Subst(line, NULL, TRUE); |
free (line); |
free (line); |
line = cp; |
line = cp; |
|
|