Added --noremove option

Makefile

@@ -3,14 +3,14 @@ DESTDIR ?=
 PREFIX ?= /usr/local
 
 # Build flags
-FLAGS = -std=gnu99
+OPTS = -std=gnu99
 
 # Build rules
 all: backly
 .PHONY: all install clean
 
 backly: backly.c Makefile
-	gcc $(FLAGS) -o backly backly.c
+	gcc $(OPTS) $(CFLAGS) -o backly backly.c
 
 install: backly
 	install -Dm 0755 backly $(DESTDIR)/$(PREFIX)/bin/backly

backly.c

@@ -39,8 +39,9 @@ void printHelp()
 	printf("Turn destdir into a clone of srcdir.\n\n");
 
 	printf("Options:\n");
-	printf(" --test\tRun in test mode.\n");
-	printf(" --help\tPrint this help and quit.\n\n");
+	printf(" --test\t\tRun in test mode\n");
+	printf(" --noremove\tDon't remove any files in destdir\n");
+	printf(" --help\t\tPrint this help and quit\n\n");
 
 	printf("Report bugs to L. Bradley LaBoon <me@bradleylaboon.com>\n");
 	printf("backly home page: <http://git.bradleylaboon.com/backly.git>\n");
@@ -259,7 +260,7 @@ void copyNew(char *src, int srcPrefix, char *dest, int destPrefix, int testMode)
 
 			// Only copy file if it doesn't exist or has changed
 			if (needToCopy == 1) {
-				printf("+ %s 100.00%%", itemSrc + srcPrefix);
+				printf("+ %s ", itemSrc + srcPrefix);
 				fflush(stdout);
 				if (testMode == 0) {
 					int pid = fork();
@@ -267,11 +268,11 @@ void copyNew(char *src, int srcPrefix, char *dest, int destPrefix, int testMode)
 						fprintf(stderr, "Could not fork: %s\n", strerror(errno));
 						continue;
 					} else if (pid == 0) {
-						execlp("cp", "cp", "-f", "--preserve=timestamps", itemSrc, itemDest, (char *) NULL);
+						execlp("cp", "cp", "-f", "-P", "--preserve=timestamps,links", itemSrc, itemDest, (char *) NULL);
 					} else {
 						struct stat srcStat, destStat;
 						double pDone = 0;
-						int numPrinted = 7;
+						int numPrinted = 0;
 						if (stat(itemSrc, &srcStat) != -1) {
 							while (waitpid(pid, NULL, WNOHANG) == 0) {
 								if (stat(itemDest, &destStat) == -1)
@@ -285,6 +286,10 @@ void copyNew(char *src, int srcPrefix, char *dest, int destPrefix, int testMode)
 								fflush(stdout);
 							}
 						}
+						for (int i = 0; i < numPrinted; i++)
+							printf("\b \b");
+						printf("100.00%%");
+						fflush(stdout);
 					}
 				}
 				printf("\n");
@@ -299,7 +304,7 @@ void copyNew(char *src, int srcPrefix, char *dest, int destPrefix, int testMode)
 int main(int argc, char **argv)
 {
 	int srcArg = 0, destArg = 0;
-	int testMode = 0;
+	int testMode = 0, remove = 1;
 
 	// Parse arguments
 	for (int i = 1; i < argc; i++) {
@@ -309,6 +314,8 @@ int main(int argc, char **argv)
 		} else if (strcmp(argv[i], "--test") == 0) {
 			testMode = 1;
 			printf("***Operating in test mode.***\n");
+		} else if (strcmp(argv[i], "--noremove") == 0) {
+			remove = 0;
 		} else if (srcArg == 0) {
 			srcArg = i;
 		} else {
@@ -358,6 +365,7 @@ int main(int argc, char **argv)
 	closedir(dir);
 
 	// Remove files from the destination that don't exist in the source
+	if (remove)
 		removeMissing(srcDir, strlen(srcDir), destDir, strlen(destDir), testMode);
 
 	// Copy new files and overwrite existing files if different