Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
1dad5cda13 | |||
a1e80eb09a | |||
b9f7caabe1 |
4
Makefile
4
Makefile
@ -3,14 +3,14 @@ DESTDIR ?=
|
|||||||
PREFIX ?= /usr/local
|
PREFIX ?= /usr/local
|
||||||
|
|
||||||
# Build flags
|
# Build flags
|
||||||
FLAGS = -std=gnu99
|
OPTS = -std=gnu99
|
||||||
|
|
||||||
# Build rules
|
# Build rules
|
||||||
all: backly
|
all: backly
|
||||||
.PHONY: all install clean
|
.PHONY: all install clean
|
||||||
|
|
||||||
backly: backly.c Makefile
|
backly: backly.c Makefile
|
||||||
gcc $(FLAGS) -o backly backly.c
|
gcc $(OPTS) $(CFLAGS) -o backly backly.c
|
||||||
|
|
||||||
install: backly
|
install: backly
|
||||||
install -Dm 0755 backly $(DESTDIR)/$(PREFIX)/bin/backly
|
install -Dm 0755 backly $(DESTDIR)/$(PREFIX)/bin/backly
|
||||||
|
10
backly.c
10
backly.c
@ -259,7 +259,7 @@ void copyNew(char *src, int srcPrefix, char *dest, int destPrefix, int testMode)
|
|||||||
|
|
||||||
// Only copy file if it doesn't exist or has changed
|
// Only copy file if it doesn't exist or has changed
|
||||||
if (needToCopy == 1) {
|
if (needToCopy == 1) {
|
||||||
printf("+ %s 100.00%", itemSrc + srcPrefix);
|
printf("+ %s ", itemSrc + srcPrefix);
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
if (testMode == 0) {
|
if (testMode == 0) {
|
||||||
int pid = fork();
|
int pid = fork();
|
||||||
@ -267,11 +267,11 @@ void copyNew(char *src, int srcPrefix, char *dest, int destPrefix, int testMode)
|
|||||||
fprintf(stderr, "Could not fork: %s\n", strerror(errno));
|
fprintf(stderr, "Could not fork: %s\n", strerror(errno));
|
||||||
continue;
|
continue;
|
||||||
} else if (pid == 0) {
|
} else if (pid == 0) {
|
||||||
execlp("cp", "cp", "-f --preserve=timestamps", itemSrc, itemDest, (char *) NULL);
|
execlp("cp", "cp", "-f", "--preserve=timestamps", itemSrc, itemDest, (char *) NULL);
|
||||||
} else {
|
} else {
|
||||||
struct stat srcStat, destStat;
|
struct stat srcStat, destStat;
|
||||||
double pDone = 0;
|
double pDone = 0;
|
||||||
int numPrinted = 7;
|
int numPrinted = 0;
|
||||||
if (stat(itemSrc, &srcStat) != -1) {
|
if (stat(itemSrc, &srcStat) != -1) {
|
||||||
while (waitpid(pid, NULL, WNOHANG) == 0) {
|
while (waitpid(pid, NULL, WNOHANG) == 0) {
|
||||||
if (stat(itemDest, &destStat) == -1)
|
if (stat(itemDest, &destStat) == -1)
|
||||||
@ -285,6 +285,10 @@ void copyNew(char *src, int srcPrefix, char *dest, int destPrefix, int testMode)
|
|||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
for (int i = 0; i < numPrinted; i++)
|
||||||
|
printf("\b \b");
|
||||||
|
printf("100.00%%");
|
||||||
|
fflush(stdout);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
printf("\n");
|
printf("\n");
|
||||||
|
Reference in New Issue
Block a user