HuntnGather – Diff between revs 24 and 26

Subversion Repositories:

?pathlinks?

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

 #include <ctype.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/stat.h>
 #if defined ___AmigaOS___
+#include <proto/dos.h>
+#include <proto/exec.h>
-#include <proto/dos.h>
+#include <proto/utility.h>
-#include <proto/exec.h>
+#endif
 #if defined ___AsyncIO___
 #include <asyncio.h>
 #endif
 #if !defined ___HAVE_GETOPT___
 #include "getopt.h"
 #endif
 	int success;
 	UBYTE *pattern;
 	char *e = a;
 	char *n = b;
-#if defined ___NOCASE_FS___
-	e = strupr(e);
-	n = strupr(n);
-#endif
 	// "must be at least 2 times as large plus 2 bytes"
 	size = strlen(n) * 2 + 2;
 			case 1: // the pattern contains wildcards
 				success = MatchPatternNoCase(pattern, e);
 				break;
+			case 0: // no wildcards so fall back to exact name match
+#if defined ___NOCASE_FS___
+				success = Strnicmp(e, n, (LONG)strlen(n)) == 0;
-			case 0: // no wildcards so fall back to exact name match
+#else
+				success = StrnCmp(e, n, (LONG)strlen(n)) == 0;
-				success = (strstr(e, n) != NULL);
+#endif
 				break;
 #if defined ___NOCASE_FS___
 	e = strupr(e);
 	n = strupr(n);
 #endif
+	// search for substring
-	success = (strstr(e, n) != NULL);
+	success = strstr(e, n) != NULL;
 	return success;
 #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;
-			break;
+			continue;
+		}
 #endif
 		switch(c) {
 					case 0:
 						if(strlen(name) == name_size) {
 							name_size = 1.5 * name_size;
 							name = realloc(name, name_size * sizeof(*name));
+						}
-						//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(*path));
+						}
-						//path = realloc(path, (i + 1 + 1) * sizeof(*path));
 						path[i] = c;
 						path[i + 1] = '\0';
 						break;
 					default:
 						fprintf(stderr, "Database corrupted.\n");
  	int option;
  	char *dbFile;
  	struct stat path;
+	// Bind handler to SIGINT.
-	// Bind handler to SIGINT.
+#if !defined ___AmigaOS___
+ 	signal(SIGINT, SignalHandler);
- 	signal(SIGINT, SignalHandler);
+#endif
 	dbFile = DEFAULT_DATABASE_FILE;
 	while((option = getopt(argc, argv, "hd:")) != -1) {
 		return 1;
+	}
 	stat(dbFile, &path);
 	if(!S_ISREG(path.st_mode)) {
-		fprintf(stderr, "Database file '%s' is not a file.\n", dbFile);
+		fprintf(stderr, "'%s' is not a file.\n", dbFile);
 		return 1;
+	}