Module Name: src
Committed By: sjg
Date: Thu Jun 25 15:45:37 UTC 2020
Modified Files:
src/usr.bin/make: meta.c
Log Message:
filemon_read: report error if lseek fails
Reviewed by: riastradh
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/usr.bin/make/meta.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.81 src/usr.bin/make/meta.c:1.82
--- src/usr.bin/make/meta.c:1.81 Fri Apr 3 03:32:28 2020
+++ src/usr.bin/make/meta.c Thu Jun 25 15:45:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.81 2020/04/03 03:32:28 sjg Exp $ */
+/* $NetBSD: meta.c,v 1.82 2020/06/25 15:45:37 sjg Exp $ */
/*
* Implement 'meta' mode.
@@ -170,14 +170,18 @@ filemon_read(FILE *mfp, int fd)
return 0;
}
/* rewind */
- (void)lseek(fd, (off_t)0, SEEK_SET);
-
- error = 0;
- fprintf(mfp, "\n-- filemon acquired metadata --\n");
+ if (lseek(fd, (off_t)0, SEEK_SET) < 0) {
+ error = errno;
+ warn("Could not rewind filemon");
+ fprintf(mfp, "\n");
+ } else {
+ error = 0;
+ fprintf(mfp, "\n-- filemon acquired metadata --\n");
- while ((n = read(fd, buf, sizeof(buf))) > 0) {
- if ((int)fwrite(buf, 1, n, mfp) < n)
- error = EIO;
+ while ((n = read(fd, buf, sizeof(buf))) > 0) {
+ if ((int)fwrite(buf, 1, n, mfp) < n)
+ error = EIO;
+ }
}
fflush(mfp);
if (close(fd) < 0)
