Makefile

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

README

@@ -1,8 +1,5 @@
-# backly
-
-A simple directory cloner
-
-## About backly
+About backly
+============
 
 backly is a simple rsync-like tool for recursively copying entire directories.
 The intended use case is for making verionless incremental backups; however, it
@@ -11,25 +8,31 @@ provided you have read access to the source and write access to the
 destination. Like rsync, backly uses a combination of file size and
 modification date to determine if it needs to be copied over.
 
-This program will **not** work properly if source is a subdirectory
+This program will not work properly if source is a subdirectory
 or destination or vice-versa.
 
-## Required packages
+
+Required packages
+=================
 
 backly does not depend on any packages other than what typically ships with any
 Linux distribution.
 
-## Installation
 
-The usual `make` and `make install` is sufficient for compiling and installing
-backly. The default prefix is `/usr/local`, which means the binary will be
-installed to `/usr/local/bin`. The prefix can be changed by setting it in the
-install command; for example, by running `make PREFIX=/usr install`.
+Installation
+============
 
-## How to report bugs?
+The usual 'make' and 'make install' is sufficient for compiling and installing
+backly. The default prefix /usr/local, which means the binary will be installed
+to /usr/local/bin. The prefix can be changed by setting it in the install
+command; for example, by running 'make PREFIX=/usr install'.
 
-Open an issue on the issue tracker.
+
+How to report bugs?
+===================
+
+Bugs should be reported to L. Bradley LaBoon <me@bradleylaboon.com>
 
 Please indicate what OS and architecture you are using, as well as output from
-the program showing the bug, if possible (hint: run backly with `--test` to
-avoid destroying any files that you care about).
+the program showing the bug, if possible (hint: run backly with --test to avoid
+destroying any files that you care about).

backly.c

@@ -37,12 +37,11 @@ void printHelp()
 {
 	printUsage(stdout);
 	printf("Turn destdir into a clone of srcdir.\n\n");
-
+	
 	printf("Options:\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(" --test\tRun in test mode.\n");
+	printf(" --help\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");
 }
@@ -54,13 +53,13 @@ void removeMissing(char *src, int srcPrefix, char *dest, int destPrefix, int tes
 		srcLen++;
 	while (dest[destLen])
 		destLen++;
-
+	
 	DIR *destDir = opendir(dest);
 	if (destDir == NULL) {
 		fprintf(stderr, "Could not open %s: %s\n", dest, strerror(errno));
 		return;
 	}
-
+	
 	// If the entire directory doesn't exist in src, remove it from dest
 	DIR *srcDir = opendir(src);
 	if (srcDir == NULL) {
@@ -89,24 +88,24 @@ void removeMissing(char *src, int srcPrefix, char *dest, int destPrefix, int tes
 		}
 	}
 	closedir(srcDir);
-
+	
 	// Look at each item in the folder
 	struct dirent *item;
 	while ((item = readdir(destDir)) != NULL) {
 		// Ignore . and .. references
 		if (strcmp(item->d_name, ".") == 0 || strcmp(item->d_name, "..") == 0)
 			continue;
-
+		
 		int itemLen = 0;
 		while (item->d_name[itemLen])
 			itemLen++;
-
+		
 		// +2 because a trailing slash might be added
 		char itemSrc[srcLen + itemLen + 2];
 		char itemDest[destLen + itemLen + 2];
 		sprintf(itemSrc, "%s%s", src, item->d_name);
 		sprintf(itemDest, "%s%s", dest, item->d_name);
-
+		
 		// Test if item is a directory
 		int itemIsDir = 1;
 		DIR *testDir = opendir(itemDest);
@@ -114,7 +113,7 @@ void removeMissing(char *src, int srcPrefix, char *dest, int destPrefix, int tes
 			itemIsDir = 0;
 		else if (testDir != NULL)
 			closedir(testDir);
-
+		
 		if (itemIsDir == 1) {
 			// If it's a directory, append trailing slashes and recurse
 			itemSrc[srcLen + itemLen] = '/';
@@ -151,7 +150,7 @@ void removeMissing(char *src, int srcPrefix, char *dest, int destPrefix, int tes
 			}
 		}
 	}
-
+	
 	closedir(destDir);
 	return;
 }
@@ -163,13 +162,13 @@ void copyNew(char *src, int srcPrefix, char *dest, int destPrefix, int testMode)
 		srcLen++;
 	while(dest[destLen])
 		destLen++;
-
+	
 	DIR *srcDir = opendir(src);
 	if (srcDir == NULL) {
 		fprintf(stderr, "Could not open %s: %s\n", src, strerror(errno));
 		return;
 	}
-
+	
 	// If the dest directory doesn't exist, create it
 	DIR *destDir = opendir(dest);
 	if (destDir == NULL) {
@@ -196,22 +195,22 @@ void copyNew(char *src, int srcPrefix, char *dest, int destPrefix, int testMode)
 		}
 	}
 	closedir(destDir);
-
+	
 	// Look at each item in the folder
 	struct dirent *item;
 	while ((item = readdir(srcDir)) != NULL) {
 		if (strcmp(item->d_name, ".") == 0 || strcmp(item->d_name, "..") == 0)
 			continue;
-
+		
 		int itemLen = 0;
 		while (item->d_name[itemLen])
 			itemLen++;
-
+		
 		char itemSrc[srcLen + itemLen + 2];
 		char itemDest[destLen + itemLen + 2];
 		sprintf(itemSrc, "%s%s", src, item->d_name);
 		sprintf(itemDest, "%s%s", dest, item->d_name);
-
+		
 		// Test if item is a directory
 		int itemIsDir = 1;
 		DIR *testDir = opendir(itemSrc);
@@ -219,7 +218,7 @@ void copyNew(char *src, int srcPrefix, char *dest, int destPrefix, int testMode)
 			itemIsDir = 0;
 		else if (testDir != NULL)
 			closedir(testDir);
-
+		
 		if (itemIsDir == 1) {
 			// If it's a directory, recurse
 			itemSrc[srcLen + itemLen] = '/';
@@ -240,7 +239,7 @@ void copyNew(char *src, int srcPrefix, char *dest, int destPrefix, int testMode)
 				}
 			} else {
 				fclose(destFile);
-
+				
 				// Check if file size or modified time is different
 				struct stat srcStat, destStat;
 				if (stat(itemSrc, &srcStat) == -1) {
@@ -251,13 +250,13 @@ void copyNew(char *src, int srcPrefix, char *dest, int destPrefix, int testMode)
 					fprintf(stderr, "Could not stat %s\n", itemDest);
 					continue;
 				}
-
+				
 				if (srcStat.st_size != destStat.st_size)
 					needToCopy = 1;
 				else if (srcStat.st_mtime > destStat.st_mtime)
 					needToCopy = 1;
 			}
-
+			
 			// Only copy file if it doesn't exist or has changed
 			if (needToCopy == 1) {
 				printf("+ %s ", itemSrc + srcPrefix);
@@ -268,7 +267,7 @@ 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", "-P", "--preserve=timestamps,links", itemSrc, itemDest, (char *) NULL);
+						execlp("cp", "cp", "-fp", itemSrc, itemDest, (char *) NULL);
 					} else {
 						struct stat srcStat, destStat;
 						double pDone = 0;
@@ -277,27 +276,22 @@ void copyNew(char *src, int srcPrefix, char *dest, int destPrefix, int testMode)
 							while (waitpid(pid, NULL, WNOHANG) == 0) {
 								if (stat(itemDest, &destStat) == -1)
 									continue;
-
+								
 								pDone = (double)destStat.st_size / (double)srcStat.st_size;
-
+								
 								for (int i = 0; i < numPrinted; i++)
 									printf("\b \b");
 								numPrinted = printf("%.2lf%%", pDone * 100);
 								fflush(stdout);
-								usleep(50000);
 							}
 						}
-						for (int i = 0; i < numPrinted; i++)
-							printf("\b \b");
-						printf("100.00%%");
-						fflush(stdout);
 					}
 				}
 				printf("\n");
 			}
 		}
 	}
-
+	
 	closedir(srcDir);
 	return;
 }
@@ -305,8 +299,8 @@ 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, remove = 1;
-
+	int testMode = 0;
+	
 	// Parse arguments
 	for (int i = 1; i < argc; i++) {
 		if (strcmp(argv[i], "--help") == 0) {
@@ -315,41 +309,39 @@ 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 {
 			destArg = i;
 		}
 	}
-
+	
 	if (srcArg == 0 || destArg == 0) {
 		printUsage(stderr);
 		fprintf(stderr, "Run 'backly --help' for more information.\n");
 		exit(1);
 	}
-
+	
 	// Determine argument lengths
 	int srcLen = 0, destLen = 0;
 	while (argv[srcArg][srcLen])
 		srcLen++;
 	while (argv[destArg][destLen])
 		destLen++;
-
+	
 	// Add trailing slashes to directory arguments if necessary
 	char srcDir[srcLen + 2], destDir[destLen + 2];
-
+	
 	if (argv[srcArg][srcLen - 1] == '/')
 		sprintf(srcDir, "%s", argv[srcArg]);
 	else
 		sprintf(srcDir, "%s/", argv[srcArg]);
-
+	
 	if (argv[destArg][destLen - 1] == '/')
 		sprintf(destDir, "%s", argv[destArg]);
 	else
 		sprintf(destDir, "%s/", argv[destArg]);
-
+	
 	// Check if directories exist and can be accessed
 	DIR *dir = opendir(srcDir);
 	if (dir == NULL) {
@@ -357,20 +349,19 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 	closedir(dir);
-
+	
 	dir = opendir(destDir);
 	if (dir == NULL) {
 		fprintf(stderr, "Could not open destination: %s\n", strerror(errno));
 		exit(1);
 	}
 	closedir(dir);
-
+	
 	// Remove files from the destination that don't exist in the source
-	if (remove)
-		removeMissing(srcDir, strlen(srcDir), destDir, strlen(destDir), testMode);
-
+	removeMissing(srcDir, strlen(srcDir), destDir, strlen(destDir), testMode);
+	
 	// Copy new files and overwrite existing files if different
 	copyNew(srcDir, strlen(srcDir), destDir, strlen(destDir), testMode);
-
+	
 	return 0;
 }