HuntnGather – Diff between revs 30 and 31

Subversion Repositories:

?pathlinks?

Rev 30 – Rev 32 – Go to most recent revision – Details – Blame – Last modification – View Log

 #if defined ___AsyncIO___
 #include <asyncio.h>
-#endif
-#include "StringStack.h"
+#endif
 #if !defined ___HAVE_GETOPT___
+#include "getopt.h"
+#endif
+#include "StringStack.h"
+// MemLib memory debugging.
+#if defined MWDEBUG
-#include "getopt.h"
+#include "memwatch.h"
 #endif
 #define PROGRAM_VERSION "1.7.4"
 /*
+	*
 	* Used for sorting database lines.
 	*/
 int QsortCompare(const void *a, const void *b) {
-	const char **p = (const char **)a;
-	const char **q = (const char **)b;
 #if defined ___AmigaOS___
+	return StrnCmp(
+		locale,
+		(STRPTR)(*(const char **)a),
-	return StrnCmp(locale, (STRPTR)*p, (STRPTR)*q, -1, SC_ASCII);
+		(STRPTR)*((const char **)b),
+		-1,
+		SC_ASCII
+	);
 #else
-	return strcmp(*p, *q);
+	return strcmp(*(const char **)a, *(const char **)b);
 #endif
+}
 /*
 	LONG c;
 #else
 char *PeekLine(FILE *fp) {
 	char c;
 #endif
-	char *line;
+	char *line = NULL;
+	char *real = NULL;
 	unsigned int size;
 	int i;
 	size = LINE_BUF;
 #endif
 				return line;
 			default:
 				if(strlen(line) == size) {
 					size = size * 1.5;
-					line = realloc(line, size * sizeof(*line));
+					real = realloc(line, size * sizeof(*line));
+					if(real == NULL) {
+						fprintf(stderr, "Memory reallocation failure.\n");
+						free(line);
+						return NULL;
+					}
+					line = real;
+				}
 				line[i] = c;
 				line[i + 1] = '\0';
 				break;
+		}
 		++i;
+	}
+	if(line != NULL) {
+		free(line);
+	}
 	return NULL;
+}
 	LONG c;
 #else
 char *ReadLine(FILE *fp) {
 	char c;
 #endif
-	char *line;
+	char *line = NULL;
+	char *real = NULL;
 	unsigned int size;
 	unsigned int i;
 	size = LINE_BUF;
 			case '\n':
 				return line;
 			default:
 				if(strlen(line) == size) {
 					size = size * 1.5;
-					line = realloc(line, size * sizeof(*line));
+					real = realloc(line, size * sizeof(*line));
+					if(real == NULL) {
+						fprintf(stderr, "Memory reallocation failure.\n");
+						free(line);
+						return NULL;
+					}
+					line = real;
+				}
 				line[i] = c;
 				line[i + 1] = '\0';
 				break;
+		}
 		++i;
+	}
+	if(line != NULL) {
+		free(line);
+	}
 	return NULL;
+}
 		rem = malloc(strlen(lines[i]) + 1);
 		sprintf(rem, "%s", lines[i]);
+	}
+	if(rem != NULL) {
+		free(rem);
+	}
 #if defined ___AsyncIO___
 	CloseAsync(fp);
 #else
 /*
+	*
 	* Create a database entry from a line of text.
 	*/
-dbEntry* CreateDataseEntry(char *line) {
+dbEntry* CreateDatabaseEntry(char *line) {
 	dbEntry *entry;
 	char *ptr;
 	unsigned int side;
 	unsigned int i;
 	if((entry = malloc(1 * sizeof(*entry))) == NULL) {
 		fprintf(stderr, "Memory allocation failure.\n");
 		return NULL;
+	}
-	if((entry->name = malloc(strlen(line) * sizeof(*entry->name))) == NULL) {
+	if((entry->name = malloc((strlen(line) + 1) * sizeof(*entry->name))) == NULL) {
 		fprintf(stderr, "Memory allocation failure.\n");
 		return NULL;
 	}
-	if((entry->path = malloc(strlen(line) * sizeof(*entry->path))) == NULL) {
+	if((entry->path = malloc((strlen(line) + 1) * sizeof(*entry->path))) == NULL) {
 		fprintf(stderr, "Memory allocation failure.\n");
 		return NULL;
+	}
 	for(ptr = line, side = 0, i = 0, j = 0; run && *ptr != '\0'; ++ptr) {
 #if defined ___AmigaOS___
 		// Check if CTRL+C was pressed and abort the program.
-   	if(SetSignal(0L, SIGBREAKF_CTRL_C) & SIGBREAKF_CTRL_C) {
+   		if(SetSignal(0L, SIGBREAKF_CTRL_C) & SIGBREAKF_CTRL_C) {
 			run = FALSE;
 			continue;
 #else
 	FILE *fp;
 #endif
 	dbArray *array;
 	dbEntry *entry;
-	char *line;
+	char *line = NULL;
+	char *real = NULL;
 	unsigned int count;
-	if((array = malloc(1 * sizeof(*array))) == NULL) {
-		fprintf(stderr, "Memory allocation failure.\n");
-		return NULL;
-	}
 	// Open database file for reading.
 #if defined ___AsyncIO___
 	if((fp = OpenAsync(dbFile, MODE_READ, ASYNC_BUF)) == NULL) {
 #else
 	if((fp = fopen(dbFile, "r")) == NULL) {
 #endif
 		fprintf(stderr, "Unable to open '%s' for reading.\n", dbFile);
 		return NULL;
+	}
+	if((array = malloc(1 * sizeof(*array))) == NULL) {
+		fprintf(stderr, "Memory allocation failure.\n");
+#if defined ___AsyncIO___
+		CloseAsync(fp);
+#else
+		fclose(fp);
+#endif
+		return NULL;
+	}
 	count = 0;
 	while(run && (line = ReadLine(fp)) != NULL) {
 #if defined ___AmigaOS___
 		// Check if CTRL+C was pressed and abort the program.
    	if(SetSignal(0L, SIGBREAKF_CTRL_C) & SIGBREAKF_CTRL_C) {
 			run = FALSE;
 			continue;
 		}
 #endif
+		if((entry = CreateDatabaseEntry(line)) == NULL) {
-		if((entry = CreateDataseEntry(line)) == NULL) {
+			fprintf(stderr, "Unable to create database entry.\n");
-			fprintf(stderr, "Unable to create database entry.\n");
+			free(line);
 #if defined ___AsyncIO___
 			CloseAsync(fp);
 #else
 			fclose(fp);
 #endif
 			return NULL;
 		}
+		// Load up the name and path into the database variable.
+		real = realloc(array->database, (count + 1) * sizeof(*array->database));
+		if(real == NULL) {
+			fprintf(stderr, "Memory reallocation failure.\n");
+			free(entry->name);
+			free(entry->path);
+			free(entry);
+			free(line);
+#if defined ___AsyncIO___
+			CloseAsync(fp);
+#else
+			fclose(fp);
+#endif
+			return NULL;
+		}
-		// Load up the name and path into the database variable.
+		array->database = real;
+		if((array->database[count] = malloc((strlen(entry->name) + strlen(entry->path) + 1 + 1) * sizeof(*array->database[count]))) == NULL) {
-		array->database = realloc(array->database, (count + 1) * sizeof(*array->database));
+			fprintf(stderr, "Memory allocation failure.\n");
-		if((array->database[count] = malloc((strlen(entry->name) + strlen(entry->path) + 1 + 1) * sizeof(*array->database[count]))) == NULL) {
+			free(entry->name);
-			fprintf(stderr, "Memory allocation failure.\n");
+			free(entry->path);
 			free(entry);
 			free(line);
 		free(entry);
 		free(line);
+	}
+	if(line != NULL) {
+		free(line);
+	}
 #if defined ___AsyncIO___
 	CloseAsync(fp);
 #else
 	DIR *dir;
 	struct dirent *entry;
 	struct stat dirStat;
 #endif
 	stringStack *stack;
-	stats *stats;
+	stats *stats = NULL;
 	int i;
 	char *path;
 	char *sub;
-	// Initialize metrics.
- 	if((stats = malloc(sizeof(*stats))) == NULL) {
- 		fprintf(stderr, "Memory allocation failure.\n");
- 		return NULL;
- 	}
- 	stats->dirs = 0;
- 	stats->files = 0;
 #if defined ___AsyncIO___
 	if((fp = OpenAsync(dbFile, MODE_APPEND, ASYNC_BUF)) == NULL) {
 #else
 	if((fp = fopen(dbFile, "a")) == NULL) {
 #endif
 		fprintf(stderr, "Unable to open '%s' for writing.\n", dbFile);
-		return stats;
+		return NULL;
+	}
 	if(verbose) {
+		fprintf(stdout, "Collecting files...\r");
+	}
+	// Initialize metrics.
+ 	if((stats = malloc(sizeof(*stats))) == NULL) {
+ 		fprintf(stderr, "Memory allocation failure.\n");
+#if defined ___AsyncIO___
+		CloseAsync(fp);
+#else
+		fclose(fp);
+#endif
+ 		return NULL;
+ 	}
-		fprintf(stdout, "Collecting files...\r");
+ 	stats->dirs = 0;
  	stats->files = 0;
 	// Push the first path onto the stack.
 	stack = stringStackCreate(count);
 		while(run && ExNext(lockp, FIBp)) {
 			// Check if CTRL+C was pressed and abort the program.
 			if(SetSignal(0L, SIGBREAKF_CTRL_C) & SIGBREAKF_CTRL_C) {
-				run = FALSE;
-				FreeDosObject(DOS_FIB, FIBp);
-				UnLock(lockp);
-				free(path);
+				run = FALSE;
-				break;
+				continue;
+			}
 #else
 	struct AsyncFile **tp;
 #else
 	FILE *fp;
 	FILE **tp;
 #endif
-	int i;
+	unsigned int i;
-	int j;
+	unsigned int j;
 	char *tmp;
 	char *rem;
 	char *min;
 	int count;
 #else
 	FILE *fp;
 	FILE *tp;
 #endif
 	char *line;
+	unsigned int lines;
 	int i;
 	dbEntry *entry;
 	// Open database file for reading.
 #endif
 		return;
+	}
+	if(verbose) {
+		fprintf(stdout, "Removing lines...\r");
+	}
 	lines = 0;
 	while(run && (line = ReadLine(fp)) != NULL) {
 #if defined ___AmigaOS___
 		// Check if CTRL+C was pressed and abort the program.
    	if(SetSignal(0L, SIGBREAKF_CTRL_C) & SIGBREAKF_CTRL_C) {
 			run = FALSE;
 			continue;
 		}
 #endif
+		if((entry = CreateDatabaseEntry(line)) == NULL) {
-		if((entry = CreateDataseEntry(line)) == NULL) {
+			fprintf(stderr, "Unable to create database entry.\n");
-			fprintf(stderr, "Unable to create database entry.\n");
+			free(line);
+			continue;
 			continue;
+		for(i = 0; i < count; ++i) {
+			if(PathCompare(entry->path, paths[i]) == TRUE) {
+				++lines;
+				if(verbose) {
-		for(i = 0; i < count; ++i) {
+					fprintf(stdout, "Removing lines: %d\r", lines);
 			if(PathCompare(entry->path, paths[i]) == TRUE) {
 				continue;
+			}
 #if defined ___AsyncIO___
 			fprintf(tp, "%s\n", line);
 #endif
 			break;
+		}
+		free(entry->name);
 		free(entry->path);
+		free(entry);
 		free(entry);
 		free(line);
+	}
+	if(verbose) {
+		fprintf(stdout, "\n");
+	}
 #if defined ___AsyncIO___
 	// Write "tmpLines" to temporary files in "tmpNames" from "dbFile".
 	WriteTemporaryFiles(dbFile, tmpNames, tmpFiles, tmpLines, dbLines);
 	// Sort the temporary files.
-	for(i = 0; run && i < tmpFiles; ++i) {
+	for(i = 0; i < tmpFiles; ++i) {
 		SortDatabase(tmpNames[i]);
+	}
 	// Merge all the temporary files to the database file.
+	MergeTemporaryFiles(dbFile, tmpNames, tmpFiles, dbLines);
 	MergeTemporaryFiles(dbFile, tmpNames, tmpFiles, dbLines);
 	// Remove all temporary files.
-	// Remove all temporary files.
+	RemoveFiles(tmpNames, tmpFiles);
 	RemoveFiles(tmpNames, tmpFiles);
 	// Overwrite the database file with the filtered paths.
 	CopyFile(tmpName, dbFile);
+	// Remove temporary file.
+	if(RemoveFile(tmpName) == FALSE) {
+		fprintf(stderr, "Temporary file could not be removed.\n");
-	// Remove temporary file.
+		return;
 	RemoveFile(tmpName);
+}
 	// Go through all supplied arguments and add paths to search.
 	if((paths = malloc((argc - optind) * sizeof(*paths))) == NULL) {
 		fprintf(stderr, "Memory allocation failure.\n");
 		return 1;
+	}
+	count = 0;
-	for(i = optind, count = 0; i < argc; ++i, ++count) {
+	for(i = optind, count = 0; i < argc; ++i) {
 		if((path = PathToAbsolute(argv[i])) == NULL) {
 			fprintf(stderr, "Absolute path for '%s' failed to resolve.\n", argv[optind]);
 			continue;
+		}
 			fprintf(stderr, "Memory allocation failure.");
 			return 1;
+		}
+		sprintf(paths[count], "%s", path);
-		sprintf(paths[count], "%s", path);
+		++count;
 #if defined ___AmigaOS___
 		UnLock(lock);
 		FreeDosObject(DOS_FIB, FIB);
 #endif
+		free(path);
+	}
+	if(count == 0) {
+		fprintf(stderr, "No valid paths are available.\n");
-		free(path);
+		free(paths);
 		return 1;
+	}
 	if(verbose) {
    		fprintf(stdout, "Gathering to: '%s'\n", dbFile);
-	}
+	}
 #if defined ___AmigaOS___
-	locale = OpenLocale(NULL);
+#if defined ___AmigaOS___
-#endif
+	locale = OpenLocale(NULL);
 #endif
- 	// Gather.
+ 	switch(operation) {
+ 		case CREATE:
+ 			if(verbose) {
- 	switch(operation) {
+ 				fprintf(stdout, "Removing '%s' and creating a new database.\n", dbFile);
  		case CREATE:
- 			if(verbose) {
+ 			if(RemoveFile(dbFile) == FALSE) {
- 				fprintf(stdout, "Removing '%s' and creating a new database.\n", dbFile);
+ 				fprintf(stderr, "File '%s' could not be removed.\n", dbFile);
  				break;
  				fprintf(stdout, "Removing files from database...\n");
+ 			}
  			RemoveDatabaseFiles(dbFile, paths, count);
  			break;
  		default:
+ 			fprintf(stderr, "Unknown operation.\n");
  			break;
+ 	}
 #if defined ___AmigaOS___
 	CloseLocale(locale);
 #endif
+ 	free(paths);
+#if defined MWDEBUG
+ 	/* Generate a memory usage report */
  	MWReport("At end of main()", MWR_FULL);
- 	free(paths);
+#endif