HuntnGather – Diff between revs 15 and 19

Subversion Repositories:

?pathlinks?

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

 #if !defined ___HAVE_GETOPT___
 #include "getopt.h"
+#endif
-#endif
+#define PROGRAM_VERSION "1.7.2"
 #if defined ___AmigaOS___
 /*************************************************************************/
 /*        Version string used for querrying the program version.         */
 /*************************************************************************/
 TEXT version_string[] =
-	"\0$VER: Hunt 1.7 "__DATE__" by Wizardry and Steamworks";
+	"\0$VER: Hunt " PROGRAM_VERSION " "__DATE__" by Wizardry and Steamworks";
 #endif
 int compare(char *name, char *need) {
 #if defined ___AmigaOS___
 	ULONG size;
 	int success;
 	UBYTE *pattern;
+	char *upe = name;
+	char *upn = need;
-#if !defined ___NOCASE_FS___
+#if defined ___NOCASE_FS___
-	strupr(need);
+	upe = strupr(upe);
-	strupr(name);
+	upn = strupr(upn);
+#endif
-#endif
 	// "must be at least 2 times as large plus 2 bytes"
-	size = strlen(need) * 3;
+	size = strlen(upn) * 2 + 2;
+	success = FALSE;
+	if(pattern = AllocVec(size, MEMF_ANY|MEMF_CLEAR)) {
+		switch(ParsePatternNoCase(upn, pattern, (LONG)size)) {
-	success = FALSE;
+			case 1: // the pattern contains wildcards
-	if(pattern = AllocVec(size, MEMF_ANY|MEMF_CLEAR)) {
+				success = MatchPatternNoCase(pattern, upe);
 		if(ParsePatternNoCase(need, pattern, (LONG)size) > 0) {
-			success = MatchPatternNoCase(pattern, name);
+				break;
 			case 0: // no wildcards so fall back to exact name match
-			FreeVec(pattern);
+				success = (strstr(upe, upn) != NULL);
-			return success;
+				break;
+		}
 		FreeVec(pattern);
+	}
-		FreeVec(pattern);
-	}
+	return success;
 #else
-	return success;
+	int success;
-#else
-	int success;
 	char *upe = name;
-	success = FALSE;
+	char *upn = need;
 		fprintf(stderr, "Unable to open gather database for reading.\n");
 		return;
+	}
 	name_size = NAME_BUF;
-	name = malloc(name_size * sizeof(char));
+	name = malloc(name_size * sizeof(*name));
 	path_size = PATH_BUF;
-	path = malloc(path_size * sizeof(char));
+	path = malloc(path_size * sizeof(*path));
 	i = 0;
 	side = 0;
 					match = FALSE;
+				}
 				if(name != NULL) {
 					free(name);
 					name_size = NAME_BUF;
-					name = malloc(name_size * sizeof(char));
+					name = malloc(name_size * sizeof(*name));
+				}
 				--side;
 				i = 0;
 				break;
 			case '\t':
 					match = TRUE;
+				}
 				if(path != NULL) {
 					free(path);
 					path_size = PATH_BUF;
-					path = malloc(path_size * sizeof(char));
+					path = malloc(path_size * sizeof(*name));
+				}
 				++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 = realloc(name, name_size * sizeof(*name));
+						}
-						//name = realloc(name, (i + 1 + 1) * sizeof(char));
+						//name = realloc(name, (i + 1 + 1) * sizeof(*name));
 						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 = realloc(path, path_size * sizeof(*path));
+						}
-						//path = realloc(path, (i + 1 + 1) * sizeof(char));
+						//path = realloc(path, (i + 1 + 1) * sizeof(*path));
 						path[i] = c;
 						path[i + 1] = '\0';
 						break;
 					default:
 						fprintf(stderr, "Database corrupted.\n");
 	SearchDatabase(dbFile, need);
+}
 void usage(char *name) {
+	fprintf(stdout, "Hunt & Gather - %s, a file index search tool.            \n", name);
-	fprintf(stdout, "Hunt & Gather - %s, a file index search tool.            \n", name);
+	fprintf(stdout, "Version: %s                                              \n", PROGRAM_VERSION);
    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");