Commit 50f15104 by Richard Stallman

(do_include): For "..." case, leave fend pointing at terminating 0.

Distinct error msgs for empty file name and for bad syntax.

From-SVN: r3880
parent 2e2863d4
...@@ -3820,7 +3820,7 @@ get_filename: ...@@ -3820,7 +3820,7 @@ get_filename:
goto fail; goto fail;
} }
} }
*fend++ = 0; *fend = 0;
/* We have "filename". Figure out directory this source /* We have "filename". Figure out directory this source
file is coming from and put it on the front of the list. */ file is coming from and put it on the front of the list. */
...@@ -3877,8 +3877,8 @@ get_filename: ...@@ -3877,8 +3877,8 @@ get_filename:
default: default:
fail: fail:
if (retried) { if (retried) {
fend = fbeg; error ("`#%s' expects \"FILENAME\" or <FILENAME>", keyword->name);
break; return 0;
} else { } else {
trybuf = expand_to_temp_buffer (buf, limit, 0, 0); trybuf = expand_to_temp_buffer (buf, limit, 0, 0);
buf = (U_CHAR *) alloca (trybuf.bufp - trybuf.buf + 1); buf = (U_CHAR *) alloca (trybuf.bufp - trybuf.buf + 1);
...@@ -3908,7 +3908,7 @@ get_filename: ...@@ -3908,7 +3908,7 @@ get_filename:
if (flen == 0) if (flen == 0)
{ {
error ("`#%s' expects \"fname\" or <fname>", keyword->name); error ("empty file name in `#%s'", keyword->name);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment