HuntnGather – Diff between revs 22 and 23

Subversion Repositories:

?pathlinks?

Rev 22 – Rev 24 – Go to most recent revision – Details – Blame – Last modification – View Log

 	line = 0;
 	side = 0;
 	i = 0;
 	if(verbose) {
-		fprintf(stdout, "Sorting database: '%s'\n", dbFile);
+		fprintf(stdout, "Sorting temporary database file: '%s'\n", dbFile);
+	}
 #if defined ___AsyncIO___
 	while(run && (c = ReadCharAsync(fp)) != -1) {
 #else
 	// Sort the database.
 	qsort(database, line, sizeof(char *), compare);
 	// Write the database lines back to the database.
 #if defined ___AsyncIO___
-	if((fp = OpenAsync(dbFile, MODE_READ|MODE_WRITE, ASYNC_BUF)) == NULL) {
+	if((fp = OpenAsync(dbFile, MODE_WRITE, ASYNC_BUF)) == NULL) {
 #else
-	if((fp = fopen(dbFile, "w+")) == NULL) {
+	if((fp = fopen(dbFile, "w")) == NULL) {
 #endif
 		fprintf(stderr, "Unable to open gather database for writing.\n");
 		return;
+	}
+	for(i = 0; i < line; ++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 < line; ++i) {
+#endif
 #if defined ___AsyncIO___
 		WriteAsync(fp, database[i], (LONG)(strlen(database[i]) * sizeof(char)));
 		WriteAsync(fp, "\n", 1 * sizeof(char));
 	unsigned int size;
 	char *path;
 	char *subPath;
 #if defined ___AsyncIO___
-	if((fp = OpenAsync(dbFile, MODE_READ|MODE_WRITE, ASYNC_BUF)) == NULL) {
+	if((fp = OpenAsync(dbFile, MODE_WRITE, ASYNC_BUF)) == NULL) {
 #else
-	if((fp = fopen(dbFile, "w+")) == NULL) {
+	if((fp = fopen(dbFile, "w")) == NULL) {
 #endif
 		fprintf(stderr, "Unable to open gather database for writing.\n");
 		return;
+	}
 	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(SetSignal(0L, SIGBREAKF_CTRL_C) & SIGBREAKF_CTRL_C) {
+			run = FALSE;
-			run = FALSE;
+			continue;
+		}
 #endif
 		if((path = stringStackPop(dirStack)) == NULL) {
 		while(run && (dirEntry = readdir(dir)) != 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
 			size = sizeof(path) + sizeof(dirEntry->d_name) + 1;
 			switch(path[strlen(path) - 1]) {
 				case '/':
+}
 /*
+	*
-	* Gets the size of a database "dbFle".
+	* Gets the size of a file "dbFle".
+	*/
+int GetFileSize(char *dbFile) {
+#if defined ___AsyncIO___
+	struct AsyncFile *fp;
-	*/
+	LONG size;
-int GetDatabaseSize(char *dbFile) {
+#else
+	FILE *fp;
+	int size;
+#endif
-	FILE *fp;
+#if defined ___AsyncIO___
+	if((fp = OpenAsync(dbFile, MODE_READ, ASYNC_BUF)) == NULL) {
-	int size;
+#else
 	if((fp = fopen(dbFile, "r")) == NULL) {
-		fprintf(stderr, "Unable to open gather database for reading.\n");
+#endif
+		fprintf(stderr, "Unable to open gather database for reading.\n");
+		return 0;
+	}
-		fclose(fp);
+#if defined ___AsyncIO___
-		return 0;
+	SeekAsync(fp, 0, MODE_END);
+	size = SeekAsync(fp, 0, MODE_CURRENT);
+#else
+	fseek(fp, 0L, SEEK_END);
+	size = ftell(fp);
 #endif
+#if defined ___AsyncIO___
    CloseAsync(fp);
-	fseek(fp, 0L, SEEK_END);
+#else
-	size = ftell(fp);
+	fclose(fp);
 #endif
-	fclose(fp);
 	return size;
 }
 /*
+	*
-	* Counts the lines in a database file "dbFile".
+	* Counts the lines of a file.
 	*/
 		return 0;
+	}
 	lines = 0;
 #if defined ___AsyncIO___
-	while((c = ReadCharAsync(fp)) != -1) {
+	while(run && (c = ReadCharAsync(fp)) != -1) {
 #else
+	while(run && fscanf(fp, "%c", &c) == 1) {
+#endif
+#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;
 	while(fscanf(fp, "%c", &c) == 1) {
 #endif
 		switch(c) {
 			case '\n':
 				++lines;
 /*
+	*
 	* Creates "files" temporary filenames.
 	*/
-char **CreateTempFiles(int files) {
+char **CreateTemporaryFiles(int files) {
 	char **tmpNames;
 	int count;
-	tmpNames = malloc(files * sizeof(char *));
+	tmpNames = malloc(files * sizeof(*tmpNames));
 	if(verbose) {
 		fprintf(stdout, "Creating temporary files.\r");
+	}
 	count = files;
-	while(--count > -1) {
+	while(run && --count > -1) {
+#if defined ___AmigaOS___
-#if defined ___AmigaOS___
+		// Check if CTRL+C was pressed and abort the program.
-		// 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;
-			run = FALSE;
+			continue;
 /*
+	*
 	* Writes lines from the database "dbFile" to temporary filenames "tmpNames".
 	*/
-void WriteTempFiles(char *dbFile, char **tmpNames, int tmpFiles, int tmpLines, int total) {
+void WriteTemporaryFiles(char *dbFile, char **tmpNames, int tmpFiles, int tmpLines, int total) {
 #if defined ___AsyncIO___
 	struct AsyncFile *fp, *tp;
 	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 gather database '%s' for reading.\n", dbFile);
 		return;
+	}
 #if defined ___AsyncIO___
-	if((tp = OpenAsync(tmpNames[--tmpFiles], MODE_READ|MODE_WRITE, ASYNC_BUF)) == NULL) {
+	if((tp = OpenAsync(tmpNames[--tmpFiles], MODE_WRITE, ASYNC_BUF)) == NULL) {
 #else
-	if((tp = fopen(tmpNames[--tmpFiles], "w+")) == NULL) {
+	if((tp = fopen(tmpNames[--tmpFiles], "w")) == NULL) {
 #endif
 		fprintf(stderr, "Unable to open temporary file '%s' for writing.\n", tmpNames[tmpFiles]);
 		return;
 #endif
 #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
 		switch(c) {
 			case '\n':
 				// Increment the total written lines.
+					}
 					// Close the previous temporary file and write to the next temporary file.
 #if defined ___AsyncIO___
 					CloseAsync(tp);
-					if((tp = OpenAsync(tmpNames[--tmpFiles], MODE_READ|MODE_WRITE, ASYNC_BUF)) == NULL) {
+					if((tp = OpenAsync(tmpNames[--tmpFiles], MODE_WRITE, ASYNC_BUF)) == NULL) {
 #else
 					fclose(tp);
-					if((tp = fopen(tmpNames[--tmpFiles], "w+")) == NULL) {
+					if((tp = fopen(tmpNames[--tmpFiles], "w")) == NULL) {
 #endif
 						fprintf(stderr, "Unable to open temporary file '%s' for writing.\n", tmpNames[tmpFiles]);
 #if defined ___AsyncIO___
 						CloseAsync(tp);
+	*
 	* Skips a line in a database file "fp".
 	*/
 #if defined ___AsyncIO___
-void SkipDatabaseLine(struct AsyncFile *fp) {
+void SkipLine(struct AsyncFile *fp) {
 	LONG c;
-	while((c = ReadCharAsync(fp)) != -1) {
+	while(run && (c = ReadCharAsync(fp)) != -1) {
 #else
 void SkipDatabaseLine(FILE *fp) {
 	char c;
+	while(run && fscanf(fp, "%c", &c) == 1) {
+#endif
+#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;
 	while(fscanf(fp, "%c", &c) == 1) {
 #endif
 		switch(c) {
 			case '\n':
 				return;
 /*
+	*
 	* Reads a line from the database file "fp".
 	*/
 #if defined ___AsyncIO___
-char *ReadDatabaseLine(struct AsyncFile *fp) {
+char *ReadLine(struct AsyncFile *fp) {
 	LONG c;
 #else
-char *ReadDatabaseLine(FILE *fp) {
+char *ReadLine(FILE *fp) {
 	char c;
 #endif
 	char *line;
 	int line_size;
 	int i;
 #endif
 #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
 		switch(c) {
 			case '\n':
 				// Rewind the file by the number of read characters.
 	char *tmp;
 	char *min;
 	int count;
 #if defined ___AsyncIO___
-	if((fp = OpenAsync(dbFile, MODE_READ|MODE_WRITE, ASYNC_BUF)) == NULL) {
+	if((fp = OpenAsync(dbFile, MODE_WRITE, ASYNC_BUF)) == NULL) {
 #else
-	if((fp = fopen(dbFile, "w+")) == NULL) {
+	if((fp = fopen(dbFile, "w")) == NULL) {
 #endif
 		fprintf(stderr, "Unable to open gather database for writing.\n");
 		return;
 	while(run && --count > -1) {
 #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
 		// 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));
+		}
 		min = NULL;
 		for(i = 0; i < files; ++i) {
-			tmp = ReadDatabaseLine(tp[i]);
+			tmp = ReadLine(tp[i]);
 			if(tmp == NULL) {
 				continue;
+			}
 			if(min == NULL || strncmp(tmp, min, strlen(tmp)) < 0) {
+			}
 			free(tmp);
+		}
 		// Forward the file where the smallest line was found.
-		SkipDatabaseLine(tp[j]);
+		SkipLine(tp[j]);
 		// Write the smallest line.
 		if(min != NULL) {
+		}
+	}
 	// Write out any remaining contents from the temporary files.
 	for(i = 0; i < files; ++i) {
-		tmp = ReadDatabaseLine(tp[i]);
+		tmp = ReadLine(tp[i]);
 		if(tmp == NULL) {
 			continue;
+		}
 #if defined ___AsyncIO___
 	// Generate the database file.
 	UpdateDatabase(dbFile, stack, stats);
 	// Get the database metrics.
-	dbSize = GetDatabaseSize(dbFile);
+	dbSize = GetFileSize(dbFile);
-	dbLines = CountDatabaseLines(dbFile);
+	dbLines = GetFileLines(dbFile);
+	}
 	tmpLines = dbLines / tmpFiles;
 	// Create temporary files.
-	if((tmpNames = CreateTempFiles(tmpFiles)) == NULL) {
+	if((tmpNames = CreateTemporaryFiles(tmpFiles)) == NULL) {
 		fprintf(stderr, "Unable to create temporary files.\n");
 		return;
 	}
 	// Write "tmpLines" to temporary files in "tmpFiles" from "dbFile".
-	WriteTempFiles(dbFile, tmpNames, tmpFiles, tmpLines, dbLines);
+	WriteTemporaryFiles(dbFile, tmpNames, tmpFiles, tmpLines, dbLines);