mirrors/make-dfsg
1
0
Fork 0
mirror of https://salsa.debian.org/srivasta/make-dfsg.git synced 2025-01-31 00:53:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Formerly main.c.~88~

Browse source
This commit is contained in:
Roland McGrath 1993-06-08 00:08:45 +00:00
parent f6b549870a
commit f4fac65746
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
main.c
View file

@ -203,7 +203,7 @@ static unsigned int inf_jobs = 0;
double max_load_average = -1.0; double max_load_average = -1.0;
double default_load_average = -1.0; double default_load_average = -1.0;
/* List of directories given with -c switches. */ /* List of directories given with -C switches. */
static struct stringlist *directories = 0; static struct stringlist *directories = 0;
@ -369,6 +369,13 @@ static struct file *
enter_command_line_file (name) enter_command_line_file (name)
char *name; char *name;
{ {
if (name[0] == '~')
{
char *expanded = tilde_expand (name);
if (expanded != 0)
name = expanded; /* Memory leak; I don't care. */
}
/* This is also done in parse_file_seq, so this is redundant /* This is also done in parse_file_seq, so this is redundant
for names read from makefiles. It is here for names passed for names read from makefiles. It is here for names passed
on the command line. */ on the command line. */
@ -627,8 +634,16 @@ main (argc, argv, envp)
for (i = 0; directories->list[i] != 0; ++i) for (i = 0; directories->list[i] != 0; ++i)
{ {
char *dir = directories->list[i]; char *dir = directories->list[i];
if (dir[0] == '~')
{
char *expanded = tilde_expand (dir);
if (expanded != 0)
dir = expanded;
}
if (chdir (dir) < 0) if (chdir (dir) < 0)
pfatal_with_name (dir); pfatal_with_name (dir);
if (dir != directories->list[i])
free (dir);
} }
/* Figure out the level of recursion. */ /* Figure out the level of recursion. */
@ -986,7 +1001,7 @@ main (argc, argv, envp)
/* These names might have changed. */ /* These names might have changed. */
register unsigned int i, j = 0; register unsigned int i, j = 0;
for (i = 1; i < argc; ++i) for (i = 1; i < argc; ++i)
if (!strcmp (argv[i], "-f")) if (!strcmp (argv[i], "-f")) /* XXX */
{ {
char *p = &argv[i][2]; char *p = &argv[i][2];
if (*p == '\0') if (*p == '\0')