mirrors/make-dfsg
1
0
Fork 0
mirror of https://salsa.debian.org/srivasta/make-dfsg.git synced 2024-12-26 05:57:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

(do_define): Call collapse_continuations on each line before all else.

Browse source
This commit is contained in:
Roland McGrath 1994-05-05 08:15:00 +00:00
parent ec505152e0
commit 65d0cd98a9
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
read.c
View file

@ -811,12 +811,13 @@ do_define (name, namelen, origin, lineno, infile, filename)
{
lineno += nlines;
nlines = readline (&lb, infile, filename, lineno);
p = next_token (lb.buffer);
collapse_continuations (lb.buffer);
p = next_token (lb.buffer);
if ((p[5] == '\0' || isblank (p[5])) && !strncmp (p, "endef", 5))
{
p += 5;
collapse_continuations (p);
remove_comments (p);
if (*next_token (p) != '\0')
makefile_error (filename, lineno,
@ -833,7 +834,7 @@ do_define (name, namelen, origin, lineno, infile, filename)
}
else
{
unsigned int len = strlen (p);
unsigned int len = strlen (lb.buffer);
/* Increase the buffer size if necessary. */
if (idx + len + 1 > length)
@ -842,7 +843,7 @@ do_define (name, namelen, origin, lineno, infile, filename)
definition = (char *) xrealloc (definition, length + 1);
}
bcopy (p, &definition[idx], len);
bcopy (lb.buffer, &definition[idx], len);
idx += len;
/* Separate lines with a newline. */
definition[idx++] = '\n';