HuntnGather – Diff between revs 10 and 11

Subversion Repositories:

?pathlinks?

Rev 10 – Rev 13 – 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: Hunt 1.6 "__DATE__" by Wizardry and Steamworks";
+	"\0$VER: Hunt 1.7 "__DATE__" by Wizardry and Steamworks";
 #endif
 #if !defined TRUE
 #define TRUE 1;
 #endif
 #if !defined FALSE
+#define FALSE 0;
+#endif
 #define FALSE 0;
-#endif
+#define NAME_BUF 32
 #define PATH_BUF 128
 	*/
 char *strupr(char *str) {
 	char *up;
 	int i;
-	up = (char *) malloc((strlen(str) + 1) * sizeof(char));
+	up = malloc((strlen(str) + 1) * sizeof(char));
 	sprintf(up, "%s", str);
 	i = strlen(up);
 	* Search the database for a matching string.
 	*/
 void SearchDatabase(char *dbFile, char* need) {
 	FILE *fp;
 	char *name;
+	int name_size;
 	char *path;
+	int path_size;
 	char c;
 	int i;
 	int side;
 	int match;
 	int total;
 	if((fp = fopen(dbFile, "r")) == NULL) {
 		fprintf(stderr, "Unable to open gather database for reading.\n");
 		return;
+	}
+	name_size = NAME_BUF;
+	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));
 	i = 0;
 	side = 0;
 					fprintf(stdout, "%s\n", path);
 					match = FALSE;
+				}
 				if(name != NULL) {
 					free(name);
+					name_size = NAME_BUF;
-					name = (char *) malloc(sizeof(char));
+					name = malloc(name_size * sizeof(char));
+				}
 				--side;
 				i = 0;
 				break;
 			case '\t':
 				if(compare(name, need)) {
 					match = TRUE;
+				}
 				if(path != NULL) {
 					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 = 1.5 * name_size;
+							name = realloc(name, name_size * sizeof(char));
+						}
-						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 = 1.5 * path_size;
+							path = realloc(path, path_size * sizeof(char));
+						}
-						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;
 					default:
 						fprintf(stderr, "Database corrupted.\n");
 void Hunt(char *dbFile, char *need) {
 	// Search the database for the matching string.
 	SearchDatabase(dbFile, need);
+}
+void usage(char *name) {
+	fprintf(stdout, "Hunt & Gather - %s, a file index search tool.            \n", name);
+   fprintf(stdout, "                                                         \n");
+	fprintf(stdout, "SYNTAX: %s [-d DATABASE] PATTERN                         \n", name);
+   fprintf(stdout, "                                                         \n");
+	fprintf(stdout, "    -d DATABASE    A path to a database generated by the \n");
+	fprintf(stdout, "                   Gather tool that should be searched.  \n");
+   fprintf(stdout, "                                                         \n");
+	fprintf(stdout, "PATTERN is an AmigaOS DOS pattern to match file names.   \n");
+	fprintf(stdout, "                                                         \n");
+	fprintf(stdout, "(c) 2021 Wizardry and Steamworks, MIT.                   \n");
+}
 int main(int argc, char **argv) {
  	int option;
  	char *dbFile;
 		switch(option) {
 			case 'd':
 				dbFile = optarg;
 				break;
 			case 'h':
-				fprintf(stdout, "SYNTAX: %s [-d DATABASE] PATTERN\n", argv[0]);
+				usage(argv[0]);
 				return 0;
 			case '?':
-				fprintf(stderr, "Invalid option %c.\n", optopt);
+				fprintf(stderr, "Invalid option %c.\n", optopt);;
-				fprintf(stdout, "SYNTAX: %s [-d DATABASE] PATTERN\n", argv[0]);
 				return 1;
+		}
+	}
 	if(optind >= argc) {
-		fprintf(stdout, "SYNTAX: %s [-d DATABASE] PATTERN\n", argv[0]);
+		usage(argv[0]);
 		return 1;
+	}