HuntnGather – Diff between revs 8 and 9

Subversion Repositories:

?pathlinks?

Rev 8 – Rev 10 – 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.5 "__DATE__" by Wizardry and Steamworks";
+	"\0$VER: Hunt 1.6 "__DATE__" by Wizardry and Steamworks";
 #endif
 #if !defined TRUE
 #define TRUE 1;
 	upe = strupr(need);
 	upn = strupr(name);
+	size = strlen(upe) * 3;
-	size = strlen(upe) * 3;
+	success = FALSE;
 	if(pattern = AllocVec(size, MEMF_ANY|MEMF_CLEAR)) {
+		if(ParsePatternNoCase(upe, pattern, (LONG)size) > 0) {
+			success = MatchPatternNoCase(pattern, upn);
 		if(ParsePatternNoCase(upe, pattern, (LONG)size) > 0) {
-			success = MatchPatternNoCase(pattern, upn);
+			FreeVec(pattern);
+			free(upe);
-			FreeMem(pattern, size);
+			free(upn);
-			return success;
+			return success;
+		}
 		FreeMem(pattern, size);
+		FreeVec(pattern);
+	}
+	free(upe);
+	free(upn);
+	return success;
-	}
+#else
+	char *upn, *upe;
+	int success = FALSE;
 	upe = strupr(need);
-	success = strstr(upn, upe) != NULL;
+	upn = strupr(name);
 	free(upn);
 		return;
+	}
 	name = (char *) malloc(sizeof(char));
+	path = (char *) malloc(sizeof(char));
 	path = (char *) malloc(sizeof(char));
 	i = 0;
 	side = 0;
 	match = FALSE;
+	total = 0;
 	total = 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) {
 				++i;
 				break;
+		}
+	}
+	free(name);
+	free(path);
 	fclose(fp);
+}