HuntnGather – Diff between revs 10 and 11

Subversion Repositories:

?pathlinks?

Rev 10 – Rev 12 – Go to most recent revision – Details – Blame – Last modification – View Log

 #if defined ___AmigaOS___
 /*************************************************************************/
 /*        Version string used for querrying the program version.         */
 /*************************************************************************/
 TEXT version_string[] =
-	"\0$VER: Gather 1.5 "__DATE__" by Wizardry and Steamworks";
+	"\0$VER: Gather 1.7 "__DATE__" by Wizardry and Steamworks";
 #endif
 #if !defined TRUE
 #define TRUE 1;
 #if !defined FALSE
 #define FALSE 0;
 #endif
+#define MAX_MEM 262144
+#define NAME_BUF 32
+#define PATH_BUF 128
-#define MAX_MEM 262144
+#define LINE_BUF 256
 #define DEFAULT_DATABASE_FILE "S:gather.db"
 typedef struct {
 	char **database;
 	char c;
 	int i;
 	int side;
 	unsigned int line;
+	int name_size;
+	int path_size;
 	// Open database file for reading.
 	if((fp = fopen(dbFile, "r")) == NULL) {
 		fprintf(stderr, "Unable to open gather database for reading.\n");
 		return;
 	}
+	database = malloc(sizeof(char *));
+	name_size = NAME_BUF;
-	database = (char **) malloc(sizeof(char *));
+	name = malloc(name_size * sizeof(char));
-	name = (char *) malloc(sizeof(char));
+	path_size = PATH_BUF;
-	path = (char *) malloc(sizeof(char));
+	path = malloc(path_size * sizeof(char));
 	line = 0;
 	side = 0;
+		}
 #endif
 		switch(c) {
 			case '\n':
 				// Load up the name and path into the database variable.
-				database = (char **) realloc(database, (line + 1) * sizeof(char *));
+				database = realloc(database, (line + 1) * sizeof(char *));
-				database[line] = (char *) malloc((strlen(name) + strlen(path) + 1 + 1) * sizeof(char));
+				database[line] = malloc((strlen(name) + strlen(path) + 1 + 1) * sizeof(char));
 				sprintf(database[line], "%s\t%s", name, path);
 				++line;
+				free(name);
-				free(name);
+				name_size = NAME_BUF;
-				name = (char *) malloc(sizeof(char));
+				name = malloc(name_size * sizeof(char));
 				--side;
 				i = 0;
 				break;
+			case '\t':
-			case '\t':
+				free(path);
-				free(path);
+				path_size = PATH_BUF;
-				path = (char *) malloc(sizeof(char));
+				path = malloc(path_size * sizeof(char));
 				++side;
 				i = 0;
 				break;
 			default:
+				switch(side) {
+					case 0:
+					   if(strlen(name) == name_size) {
+					   	name_size = name_size * 1.5;
-				switch(side) {
+					   	name = realloc(name, name_size * sizeof(char));
 					case 0:
-						name = (char *) realloc(name, (i + 1 + 1) * sizeof(char));
+						//name = realloc(name, (i + 1 + 1) * sizeof(char));
 						name[i] = c;
 						name[i + 1] = '\0';
+						break;
+					case 1:
+						if(strlen(path) == path_size) {
+							path_size = path_size * 1.5;
-						break;
+							path = realloc(path, path_size * sizeof(char));
 					case 1:
-						path = (char *) realloc(path, (i + 1 + 1) * sizeof(char));
+						//path = realloc(path, (i + 1 + 1) * sizeof(char));
 						path[i] = c;
 						path[i + 1] = '\0';
 						break;
 #endif
 			size = sizeof(path) + sizeof(dirEntry->d_name) + 1;
 			switch(path[strlen(path) - 1]) {
 				case '/':
 	 			case ':': // This is a drive path.
-	 				subPath = (char *) malloc(size);
+	 				subPath = malloc(size);
 	 				sprintf(subPath, "%s%s", path, dirEntry->d_name);
 	 				break;
 	 			default:
-	 				subPath = (char *) malloc(size + 1);
+	 				subPath = malloc(size + 1);
 	 				sprintf(subPath, "%s/%s", path, dirEntry->d_name);
 	 				break;
+			}
 			stat(subPath, &dirStat);
 			if(S_ISDIR(dirStat.st_mode)) {
 	*/
 char **CreateTempFiles(int files) {
 	char **tmpNames;
 	int count;
-	tmpNames = (char **) malloc(files * sizeof(char *));
+	tmpNames = malloc(files * sizeof(char *));
 	if(verbose) {
 	* Reads a line from the database file "fp".
 	*/
 char *ReadDatabaseLine(FILE *fp) {
 	char c;
 	char *line;
+	int line_size;
-	int chars;
+	int i;
+	line_size = LINE_BUF;
-	line = (char *) malloc(sizeof(char));
+	line = malloc(line_size * sizeof(char));
-	chars = 0;
+	i = 0;
 	while(run && fscanf(fp, "%c", &c) == 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;
+		}
 #endif
 		switch(c) {
 			case '\n':
 				// Rewind the file by the number of read characters.
-				fseek(fp, -(chars + 1), SEEK_CUR);
+				fseek(fp, -(i + 1), SEEK_CUR);
+				return line;
+			default:
+				if(strlen(line) == line_size) {
+					line_size = line_size * 1.5;
-				return line;
+					line = realloc(line, line_size * sizeof(char));
-			default:
+				}
-				line = (char *) realloc(line, (chars + 1 + 1) * sizeof(char));
+				//line = realloc(line, (chars + 1 + 1) * sizeof(char));
-				line[chars] = c;
+				line[i] = c;
-				line[chars + 1] = '\0';
+				line[i + 1] = '\0';
 				break;
+		}
-		++chars;
+		++i;
+	}
 		fprintf(stderr, "Unable to open gather database for writing.\n");
 		return;
+	}
 	// Allocate as many file pointers as temporary files.
-	tp = (FILE **) malloc(files * sizeof(FILE *));
+	tp = malloc(files * sizeof(FILE *));
 	// Open all temporary files for reading.
 	for(i = 0; i < files; ++i) {
 			if(tmpMin == NULL || strcmp(tmp, tmpMin) < 0) {
 				if(tmpMin != NULL) {
 					// Free previous instance.
 					free(tmpMin);
+				}
-				tmpMin = (char *) malloc((strlen(tmp) + 1) * sizeof(char));
+				tmpMin = malloc((strlen(tmp) + 1) * sizeof(char));
 				sprintf(tmpMin, "%s", tmp);
 				// Remember the index of the file where the smallest entry has been found.
 				idxMin = i;
 				free(tmp);
 				continue;
+	}
 	MergeDatabase(dbFile, tmpNames, tmpFiles, dbLines);
+}
+void usage(char *name) {
+	fprintf(stdout, "Hunt & Gather - %s, a file index generating tool.        \n", name);
+   fprintf(stdout, "                                                         \n");
+	fprintf(stdout, "SYNTAX: %s [-q] DATABASE                                 \n", name);
+	fprintf(stdout, "                                                         \n");
+	fprintf(stdout, "    -q             Do not print out any messages.        \n");
+   fprintf(stdout, "                                                         \n");
+	fprintf(stdout, "DATABASE is a path to where the indexed results will be  \n");
+	fprintf(stdout, "stored for searching with the Hunt tool.                 \n");
+	fprintf(stdout, "                                                         \n");
+	fprintf(stdout, "(c) 2021 Wizardry and Steamworks, MIT.                   \n");
+}
 /*
+	*
 	* Main entry point.
 				break;
 			case 'q':
 				verbose = FALSE;
 				break;
 			case 'h':
-				fprintf(stdout, "SYNTAX: %s [-q] [-d DATABASE] DIRECTORY\n", argv[0]);
+				usage(argv[0]);
 				return 0;
 			case '?':
 				fprintf(stderr, "Invalid option %ct.\n", optopt);
-				fprintf(stdout, "SYNTAX: %s [-q] [-d DATABASE] DIRECTORY\n", argv[0]);
 				return 1;
+		}
+	}
 	if(optind >= argc) {
-		fprintf(stdout, "SYNTAX: %s [-q] [-d DATABASE] DIRECTORY\n", argv[0]);
+		usage(argv[0]);
 		return 1;
+	}
-   stat(argv[optind], &dirStat);
-	if(!S_ISDIR(dirStat.st_mode)) {
+   stat(argv[optind], &dirStat);
-		fprintf(stderr, "Path '%s' is not a directory.\n", argv[optind]);
+	if(!S_ISDIR(dirStat.st_mode)) {
-		fprintf(stdout, "SYNTAX: %s [-q] [-d DATABASE] DIRECTORY\n", argv[0]);
+		fprintf(stderr, "Path '%s' is not a directory.\n", argv[optind]);
 		return 1;