HuntnGather – Diff between revs 41 and 43

Subversion Repositories:

?pathlinks?

Rev 41 – Rev 45 – Go to most recent revision – Details – Blame – Last modification – View Log

 /*
+	*
 	* Converts a string to case.
+	*/
+#if defined ___AmigaOS___
+void StrUpr(UBYTE *s) {
-	*/
+#else
+void StrUpr(char *s) {
-void StrUpr(char *s) {
+#endif
 	while(*s != '\0') {
 #if defined ___AmigaOS___
 		*s = ToUpper(*s);
 #else
 	return line;
+}
 /*
-  *
+	*
-  * Delete a file.
+	* Delete a file.
-  */
+	*/
 #if defined ___AmigaOS___
 BOOL RemoveFile(char *name) {
 	return DeleteFile(name);
 /*
+	*
 	* Copies a file to another file by name.
 	*/
-void CopyFile(char *a, char *b) {
+void CopyLines(char *a, char *b) {
 #if defined ___AsyncIO___
 	struct AsyncFile *ap;
-	struct AsyncFile *bp;
-	LONG c;
+	struct AsyncFile *bp;
 #else
 	FILE *ap;
-	FILE *bp;
-	char c;
+	FILE *bp;
+#endif
-#endif
+	dbLine *line = NULL;
 	// Open database file for writing.
 #if defined ___AsyncIO___
 #endif
 		return;
-	}
+	}
-#if defined ___AsyncIO___
-	while(PROGRAM_RUN && (c = ReadCharAsync(ap)) != -1) {
-#else
 	while(PROGRAM_RUN && fscanf(ap, "%c", &c) == 1) {
-#endif
+	while(PROGRAM_RUN && (line = ReadLine(ap)) != NULL) {
 #if defined ___AmigaOS___
 		// Check if CTRL+C was pressed and abort the program.
    		if(SetSignal(0L, SIGBREAKF_CTRL_C) & SIGBREAKF_CTRL_C) {
 			PROGRAM_RUN = FALSE;
 			continue;
+		}
 #endif
-#endif
+#if defined ___AsyncIO___
-#if defined ___AsyncIO___
+		WriteAsync(bp, line->string, line->length);
-		if(WriteCharAsync(bp, (UBYTE)c) != 1) {
+		WriteAsync(bp, "\n", 1);
 #else
+		fprintf(bp, "%s\n", line->string);
-		if(fprintf(bp, "%c", c) != 1) {
+#endif
-#endif
+		free(line->string);
-			fprintf(stderr, "Could not write to file '%s'.\n", b);
+		free(line);
+		line = NULL;
+	}
+	if(line != NULL) {
+		free(line->string);
-			break;
+		free(line);
 		line = NULL;
+	}
 #endif
 #if defined ___AmigaOS___
 	ULONG size;
 	BOOL success;
 	UBYTE *pattern;
+	char *e = a;
+	char *n = b;
+#if defined ___NOCASE_FS___
+	StrUpr(e);
+	StrUpr(n);
+#endif
 	// "must be at least 2 times as large plus 2 bytes"
-	size = strlen(b) * 2 + 2;
+	size = strlen(n) * 2 + 2;
 	success = FALSE;
 	if(pattern = AllocVec(size, MEMF_ANY|MEMF_CLEAR)) {
-		switch(ParsePatternNoCase(b, pattern, (LONG)size)) {
+		switch(ParsePatternNoCase(n, pattern, (LONG)size)) {
 			case 1: // the pattern contains wildcards
-				success = MatchPatternNoCase(pattern, a);
+				success = MatchPatternNoCase(pattern, e);
 				break;
 			case 0: // no wildcards so fall back to exact name match
 #if defined ___NOCASE_FS___
-				success = (Strnicmp(a, b, StringLenMax(a, b)) == 0);
+				success = (Strnicmp(e, n, StringLenMax(e, n)) == 0);
 #else