HuntnGather – Diff between revs 23 and 24

Subversion Repositories:

?pathlinks?

Rev 23 – Rev 26 – Go to most recent revision – Details – Blame – Last modification – View Log

 #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 gather database for reading.\n");
+		fprintf(stderr, "Unable to open '%s' for reading.\n", dbFile);
 		return;
+	}
 	database = malloc(sizeof(*database));
 	line = 0;
 	side = 0;
 	i = 0;
 	if(verbose) {
-		fprintf(stdout, "Sorting temporary database file: '%s'\n", dbFile);
+		fprintf(stdout, "Sorting '%s'\n", dbFile);
+	}
 #if defined ___AsyncIO___
 	while(run && (c = ReadCharAsync(fp)) != -1) {
 #else
 	while(run && fscanf(fp, "%c", &c) == 1) {
 						//path = realloc(path, (i + 1 + 1) * sizeof(char));
 						path[i] = c;
 						path[i + 1] = '\0';
 						break;
 					default:
-						fprintf(stderr, "Database corrupted: %d\n", side);
+						fprintf(stderr, "File '%s' is corrupted.\n", dbFile);
 						break;
+				}
 				++i;
 				break;
+		}
 #if defined ___AsyncIO___
 	if((fp = OpenAsync(dbFile, MODE_WRITE, ASYNC_BUF)) == NULL) {
 #else
 	if((fp = fopen(dbFile, "w")) == NULL) {
 #endif
-		fprintf(stderr, "Unable to open gather database for writing.\n");
+		fprintf(stderr, "Unable to open '%s' for writing.\n", dbFile);
 		return;
+	}
 	for(i = 0; i < line; ++i) {
 /*
+	*
 	* Updates a database file "dbFile".
 	*/
-void UpdateDatabase(char *dbFile, stringStack *dirStack, stats *stats) {
+void CollectFiles(char *dbFile, stringStack *dirStack, stats *stats) {
 #if defined ___AsyncIO___
 	struct AsyncFile *fp;
 #else
 	FILE *fp;
 #if defined ___AsyncIO___
 	if((fp = OpenAsync(dbFile, MODE_WRITE, ASYNC_BUF)) == NULL) {
 #else
 	if((fp = fopen(dbFile, "w")) == NULL) {
 #endif
-		fprintf(stderr, "Unable to open gather database for writing.\n");
+		fprintf(stderr, "Unable to open '%s' for writing.\n", dbFile);
 		return;
+	}
+	if(verbose) {
+		fprintf(stdout, "Collecting files...\r");
+	}
 	while(run && !stringStackIsEmpty(dirStack)) {
 #if defined ___AmigaOS___
 		// Check if CTRL+C was pressed and abort the program.
 		if(SetSignal(0L, SIGBREAKF_CTRL_C) & SIGBREAKF_CTRL_C) {
 		if((path = stringStackPop(dirStack)) == NULL) {
 			return;
+		}
+		if((dir = opendir(path)) == NULL) {
-		if((dir = opendir(path)) == NULL) {
+			fprintf(stderr, "Unable to open '%s' for reading.\n", path);
 			return;
+		}
 #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 gather database for reading.\n");
+		fprintf(stderr, "Unable to open '%s' for reading.\n", dbFile);
 		return 0;
+	}
 #if defined ___AsyncIO___
 /*
+	*
 	* Counts the lines of a file.
 	*/
-int GetFileLines(char *dbFile) {
+int CountFileLines(char *dbFile) {
 #if defined ___AsyncIO___
 	struct AsyncFile *fp;
 	LONG c;
 #else
 #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 gather database for reading.\n");
+		fprintf(stderr, "Unable to open '%s' for reading.\n", dbFile);
 		return 0;
+	}
 	lines = 0;
 	int count;
 	tmpNames = malloc(files * sizeof(*tmpNames));
 	if(verbose) {
-		fprintf(stdout, "Creating temporary files.\r");
+		fprintf(stdout, "Creating temporary files...\r");
+	}
 			continue;
+		}
 #endif
 		tmpNames[count] = tmpnam(NULL);
+		// Remove file to ensure that the file is empty.
+		remove(tmpNames[count]);
 		if(verbose) {
 			fprintf(stdout, "Creating temporary files: %d%%\r", 100 - (int)(((float)count / files) * 100.0));
+		}
 #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 gather database '%s' for reading.\n", dbFile);
+		fprintf(stderr, "Unable to open '%s' for reading.\n", dbFile);
 		return;
+	}
 #if defined ___AsyncIO___
 	if((tp = OpenAsync(tmpNames[--tmpFiles], MODE_WRITE, ASYNC_BUF)) == NULL) {
 #else
 	if((tp = fopen(tmpNames[--tmpFiles], "w")) == NULL) {
 #endif
+		fprintf(stderr, "Unable to open '%s' for writing.\n", tmpNames[tmpFiles]);
+#if defined ___AsyncIO___
+		CloseAsync(fp);
+#else
+		fclose(fp);
-		fprintf(stderr, "Unable to open temporary file '%s' for writing.\n", tmpNames[tmpFiles]);
+#endif
 		return;
+	}
 	if(verbose) {
-		fprintf(stdout, "Writing to temporary files.\r");
+		fprintf(stdout, "Writing to temporary files...\r");
+	}
 #if defined ___AsyncIO___
 				if(WriteCharAsync(tp, (UBYTE)c) != 1) {
 #else
 				if(fprintf(tp, "%c", c) != 1) {
 #endif
-					fprintf(stderr, "Unable to write to temporary file '%s'.\n", tmpNames[tmpFiles]);
+					fprintf(stderr, "Unable to write to '%s'.\n", tmpNames[tmpFiles]);
 #if defined ___AsyncIO___
 					CloseAsync(tp);
 					CloseAsync(fp);
 #else
 					fclose(tp);
 					if((tp = OpenAsync(tmpNames[--tmpFiles], MODE_WRITE, ASYNC_BUF)) == NULL) {
 #else
 					fclose(tp);
 					if((tp = fopen(tmpNames[--tmpFiles], "w")) == NULL) {
 #endif
-						fprintf(stderr, "Unable to open temporary file '%s' for writing.\n", tmpNames[tmpFiles]);
+						fprintf(stderr, "Unable to open '%s' for writing.\n", tmpNames[tmpFiles]);
 #if defined ___AsyncIO___
-						CloseAsync(tp);
 						CloseAsync(fp);
 #else
-						fclose(tp);
 						fclose(fp);
 #endif
+						return;
+					}
 					lines = 0;
 					break;
+				}
 				break;
 #if defined ___AsyncIO___
 				if(WriteCharAsync(tp, (UBYTE)c) != 1) {
 #else
 				if(fprintf(tp, "%c", c) != 1) {
 #endif
-					fprintf(stderr, "Unable to write to temporary file '%s'.\n", tmpNames[tmpFiles]);
+					fprintf(stderr, "Unable to write to '%s'.\n", tmpNames[tmpFiles]);
 #if defined ___AsyncIO___
 					CloseAsync(tp);
 					CloseAsync(fp);
 #else
 					fclose(tp);
+				}
 				break;
+		}
+	}
+	if(verbose) {
+		fprintf(stdout, "\n");
 	fprintf(stdout, "\n");
 #if defined ___AsyncIO___
 	CloseAsync(tp);
 #endif
+}
 /*
 	*
-	* Skips a line in a database file "fp".
+	* Skips a line in a file.
 	*/
 #if defined ___AsyncIO___
+	}
+}
 /*
 	*
-	* Reads a line from the database file "fp".
+	* Reads a line from a file.
 	*/
 #if defined ___AsyncIO___
 char *ReadLine(struct AsyncFile *fp) {
 	LONG c;
 /*
+	*
 	* Merges temporary files "tmpNames" into a database "dbFile".
 	*/
-void MergeDatabase(char *dbFile, char **tmpNames, int files, int lines) {
+void MergeTemporaryFiles(char *dbFile, char **tmpNames, int files, int lines) {
 #if defined ___AsyncIO___
 	struct AsyncFile *fp;
 	struct AsyncFile **tp;
 #else
 #if defined ___AsyncIO___
 	if((fp = OpenAsync(dbFile, MODE_WRITE, ASYNC_BUF)) == NULL) {
 #else
 	if((fp = fopen(dbFile, "w")) == NULL) {
 #endif
-		fprintf(stderr, "Unable to open gather database for writing.\n");
+		fprintf(stderr, "Unable to open '%s' for writing.\n", dbFile);
 		return;
+	}
 	// Allocate as many file pointers as temporary files.
 #if defined ___AsyncIO___
 		if((tp[i] = OpenAsync(tmpNames[i], MODE_READ, ASYNC_BUF)) == NULL) {
 #else
 		if((tp[i] = fopen(tmpNames[i], "r")) == NULL) {
 #endif
-			fprintf(stderr, "Unable to open temporary file '%s' for reading.\n", tmpNames[i]);
+			fprintf(stderr, "Unable to open '%s' for reading.\n", tmpNames[i]);
 			// Close all temporary files.
-			--i;
-			while(i >= 0) {
+			while(--i > -1) {
 #if defined ___AsyncIO___
 				CloseAsync(tp[i]);
 #else
 				fclose(tp[i]);
 #endif
+			}
+#if defined ___AsyncIO___
+			CloseAsync(fp);
+#else
+			fclose(fp);
+#endif
 			return;
+		}
+	}
 	if(verbose) {
-		fprintf(stdout, "Merging all database lines in temporary files.\r");
+		fprintf(stdout, "Merging all files...\r");
+	}
 	count = lines;
 			continue;
+		}
 #endif
 		// Find the smallest line in all temporary files.
 		if(verbose) {
-			fprintf(stdout, "Merging all database lines in temporary files: %d%%.\r", 100 - (int)(((float)count / lines) * 100.0));
+			fprintf(stdout, "Merging all files: %d%%.\r", 100 - (int)(((float)count / lines) * 100.0));
+		}
 		min = NULL;
 		for(i = 0; i < files; ++i) {
 			free(min);
+		}
+	}
 	// Write out any remaining contents from the temporary files.
+	for(i = 0; run && i < files; ++i) {
+#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;
+		}
-	for(i = 0; i < files; ++i) {
+#endif
 		tmp = ReadLine(tp[i]);
 		if(tmp == NULL) {
 			continue;
+		}
 		fprintf(fp, "%s\n", tmp);
 #endif
 		free(tmp);
+	}
-	// Close and delete all temporary files.
+	// Close all temporary files.
 	for(i = 0; i < files; ++i) {
 #if defined ___AsyncIO___
 		CloseAsync(tp[i]);
 #else
 		fclose(tp[i]);
-#endif
-		// Delete temporary file.
-		remove(tmpNames[i]);
+#endif
+	}
 	if(verbose) {
 #endif
+}
 /*
+	*
+	* Deletes temporary files.
+	*/
+void DeleteTemporaryFiles(char **tmpNames, int tmpFiles) {
+	int i = tmpFiles;
+	if(verbose) {
+		fprintf(stdout, "Deleting temporary files...\r");
+	}
+	do {
+		remove(tmpNames[i]);
+	} while(--i > -1);
+	if(verbose) {
+		fprintf(stdout, "\n");
+	}
+}
+/*
+	*
 	* Indexes a "path" by creating a database "dbFile".
 	*/
 void Gather(char *dbFile, char *path) {
 	stringStack *stack = stringStackCreate(1);
 	// Push the first path onto the stack.
 	stringStackPush(stack, path);
 	// Generate the database file.
-	UpdateDatabase(dbFile, stack, stats);
+	CollectFiles(dbFile, stack, stats);
 	// Get the database metrics.
 	dbSize = GetFileSize(dbFile);
-	dbLines = GetFileLines(dbFile);
+	dbLines = CountFileLines(dbFile);
 	if((tmpNames = CreateTemporaryFiles(tmpFiles)) == NULL) {
 		fprintf(stderr, "Unable to create temporary files.\n");
 		return;
+	}
-	// Write "tmpLines" to temporary files in "tmpFiles" from "dbFile".
+	// Write "tmpLines" to temporary files in "tmpNames" from "dbFile".
 	WriteTemporaryFiles(dbFile, tmpNames, tmpFiles, tmpLines, dbLines);
 	// Sort the temporary files.
-	for(i = 0; i < tmpFiles; ++i) {
+	for(i = 0; run && i < tmpFiles; ++i) {
+		SortDatabase(tmpNames[i]);
-		SortDatabase(tmpNames[i]);
+	}
+	// Merge all the temporary files to the database file.
+	MergeTemporaryFiles(dbFile, tmpNames, tmpFiles, dbLines);
 	// Remove all temporary files.
-	MergeDatabase(dbFile, tmpNames, tmpFiles, dbLines);
+	DeleteTemporaryFiles(tmpNames, tmpFiles);
+}
 		fprintf(stderr, "Path '%s' is not a directory.\n", argv[optind]);
 		return 1;
+	}
 	if(verbose) {
-   	fprintf(stdout, "Gathering to database file: %s\n", dbFile);
+   	fprintf(stdout, "Gathering to %s\n", dbFile);
+	}