From 9a39351d928d4647d153a4006d9dc6471581333d Mon Sep 17 00:00:00 2001 From: sgerwk Date: Wed, 7 Jun 2017 13:30:05 +0200 Subject: [PATCH 1/2] fix starting time of reading --- f3read.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/f3read.c b/f3read.c index 125df69..ab7deec 100644 --- a/f3read.c +++ b/f3read.c @@ -134,7 +134,7 @@ static void validate_file(const char *path, int number, int final_errno; struct timeval t1, t2; /* Progress time. */ - struct timeval pt1 = { .tv_sec = -1000, .tv_usec = 0 }; + struct timeval pt1; *ptr_ok = *ptr_corrupted = *ptr_changed = *ptr_overwritten = 0; @@ -164,6 +164,8 @@ static void validate_file(const char *path, int number, /* Obtain initial time. */ assert(!gettimeofday(&t1, NULL)); + pt1 = t1; + pt1.tv_sec -= 1000; /* Help the kernel to help us. */ assert(!posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL)); From 1526d8a99635e95f1e6b46c7a337586581ed0273 Mon Sep 17 00:00:00 2001 From: sgerwk Date: Wed, 7 Jun 2017 13:47:46 +0200 Subject: [PATCH 2/2] add DESTDIR to Makefile --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index ce54842..9f73167 100644 --- a/Makefile +++ b/Makefile @@ -12,15 +12,15 @@ all: $(TARGETS) extra: $(EXTRA_TARGETS) install: all - $(INSTALL) -d $(PREFIX)/bin - $(INSTALL) -oroot -groot -m755 $(TARGETS) $(PREFIX)/bin - $(INSTALL) -d $(PREFIX)/share/man/man1 - $(INSTALL) -oroot -groot -m644 f3read.1 $(PREFIX)/share/man/man1 - $(LN) -sf f3read.1 $(PREFIX)/share/man/man1/f3write.1 + $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin + $(INSTALL) -oroot -groot -m755 $(TARGETS) $(DESTDIR)$(PREFIX)/bin + $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/man/man1 + $(INSTALL) -oroot -groot -m644 f3read.1 $(DESTDIR)$(PREFIX)/share/man/man1 + $(LN) -sf f3read.1 $(DESTDIR)$(PREFIX)/share/man/man1/f3write.1 install-extra: extra - $(INSTALL) -d $(PREFIX)/bin - $(INSTALL) -oroot -groot -m755 $(EXTRA_TARGETS) $(PREFIX)/bin + $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin + $(INSTALL) -oroot -groot -m755 $(EXTRA_TARGETS) $(DESTDIR)$(PREFIX)/bin f3write: utils.o f3write.o $(CC) -o $@ $^ $(LDFLAGS) -lm