TheCloud/f3
1
0
Fork 0
mirror of https://github.com/AltraMayor/f3.git synced 2025-09-15 10:07:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #61 from sgerwk/master

Browse Source 
Fix starting time in f3read, and adding DESTDIR variable to Makefile
This commit is contained in:
Michel Machado 2017-06-10 09:44:28 -04:00 committed by GitHub
commit abd7ae0785
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -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

4
f3read.c
View File

@ -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));