dilim/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2026-08-10 17:14:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

* function.c (func_file): Support reading from files.

Browse Source 
* NEWS: Add information about reading files.
* make.texi (File Function): Describe reading files.
* tests/scripts/functions/file: Test new features for $(file ...)
This commit is contained in:
Paul Smith
2016-03-19 17:26:08 -04:00
parent fc2ddebdae
commit 2b9dd215d5
4 changed files with 127 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
function.c
View File

@@ -2208,27 +2208,67 @@ func_file (char *o, char **argv, const char *funcname UNUSED)
}
fn = next_token (fn);
fp = fopen (fn, mode);
if (fn[0] == '\0')
O (fatal, *expanding_var, _("file: missing filename"));
ENULLLOOP (fp, fopen (fn, mode));
if (fp == NULL)
{
const char *err = strerror (errno);
OSS (fatal, reading_file, _("open: %s: %s"), fn, err);
}
OSS (fatal, reading_file, _("open: %s: %s"), fn, strerror (errno));
if (argv[1])
{
int l = strlen (argv[1]);
int nl = l == 0 || argv[1][l-1] != '\n';
if (fputs (argv[1], fp) == EOF || (nl && fputc ('\n', fp) == EOF))
{
const char *err = strerror (errno);
OSS (fatal, reading_file, _("write: %s: %s"), fn, err);
}
OSS (fatal, reading_file, _("write: %s: %s"), fn, strerror (errno));
}
fclose (fp);
if (fclose (fp))
OSS (fatal, reading_file, _("close: %s: %s"), fn, strerror (errno));
}
else if (fn[0] == '<')
{
char *preo = o;
FILE *fp;
fn = next_token (++fn);
if (fn[0] == '\0')
O (fatal, *expanding_var, _("file: missing filename"));
if (argv[1])
O (fatal, *expanding_var, _("file: too many arguments"));
ENULLLOOP (fp, fopen (fn, "r"));
if (fp == NULL)
{
if (errno == ENOENT)
return o;
OSS (fatal, reading_file, _("open: %s: %s"), fn, strerror (errno));
}
while (1)
{
char buf[1024];
size_t l = fread (buf, 1, sizeof (buf), fp);
if (l > 0)
o = variable_buffer_output (o, buf, l);
if (ferror (fp))
if (errno != EINTR)
OSS (fatal, reading_file, _("read: %s: %s"), fn, strerror (errno));
if (feof (fp))
break;
}
if (fclose (fp))
OSS (fatal, reading_file, _("close: %s: %s"), fn, strerror (errno));
/* Remove trailing newline. */
if (o > preo && o[-1] == '\n')
if (--o > preo && o[-1] == '\r')
--o;
}
else
OS (fatal, reading_file, _("Invalid file operation: %s"), fn);
OS (fatal, *expanding_var, _("file: invalid file operation: %s"), fn);
return o;
}