HuntnGather – Diff between revs 37 and 38

Subversion Repositories:

?pathlinks?

Rev 37 – Rev 39 – Go to most recent revision – Details – Blame – Last modification – View Log

 ///////////////////////////////////////////////////////////////////////////
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
-#include <string.h>
+#include <ctype.h>
 #if !defined ___AmigaOS___
 #include <dirent.h>
 #include <sys/stat.h>
 #include <signal.h>
 	LONG p = strlen(a);
 	LONG q = strlen(b);
 #else
 int StrlenMax(char *a, char *b) {
 	int q = strlen(a);
-	int p = strien(b);
+	int p = strlen(b);
 #endif
 	return p > q ? p : q;
+}
 #if defined ___AmigaOS___
 LONG StringLenMin(char *a, char *b) {
 	LONG p = strlen(a);
 	LONG q = strlen(b);
 #else
-int StrlenMax(char *a, char *b) {
+int StrlenMin(char *a, char *b) {
 	int q = strlen(a);
-	int p = strien(b);
+	int p = strlen(b);
 #endif
 	return p > q ? q : p;
+}
 	if(Examine(lock, FIB) == FALSE) {
 		fprintf(stderr, "Path '%s' could not be examined.\n", path);
 		UnLock(lock);
+		FreeDosObject(DOS_FIB, FIB);
-		FreeDosObject(DOS_FIB, FIB);
+		FIB = NULL;
 		return UNKNOWN;
+	}
 	if(FIB->fib_DirEntryType < 0) {
+		UnLock(lock);
-		UnLock(lock);
+		FreeDosObject(DOS_FIB, FIB);
-		FreeDosObject(DOS_FIB, FIB);
+		FIB = NULL;
 		return REGULAR;
 #else
 	stat(path, &dirStat);
+	}
 #if defined ___AmigaOS___
 	UnLock(lock);
+	FreeDosObject(DOS_FIB, FIB);
-	FreeDosObject(DOS_FIB, FIB);
+	FIB = NULL;
 #endif
+	}
 #if defined ___AsyncIO___
 	while(PROGRAM_RUN && (c = ReadCharAsync(fp)) != -1) {
 #else
-	while(run && fscanf(fp, "%c", &c) == 1) {
+	while(PROGRAM_RUN && fscanf(fp, "%c", &c) == 1) {
 #endif
 #if defined ___AmigaOS___
 		// Check if CTRL+C was pressed and abort the program.
 		if(SetSignal(0L, SIGBREAKF_CTRL_C) & SIGBREAKF_CTRL_C) {
 /*
+	*
 	* Create multiple temporary files and return their names.
 	*/
-char **CreateTemporaryFiles(int files) {
+VECTOR *CreateTemporaryFiles(int files) {
+	VECTOR *tmpNames;
+	if((tmpNames = malloc(1 * sizeof(*tmpNames))) == NULL) {
-	char **tmpNames;
+		fprintf(stderr, "Memory allocation failure.\n");
+		return NULL;
-	int count;
+	}
-	if((tmpNames = malloc(files * sizeof(*tmpNames))) == NULL) {
+	if((tmpNames->array = malloc(files * sizeof(*tmpNames->array))) == NULL) {
 		fprintf(stderr, "Memory allocation failure.\n");
 		return NULL;
+	}
 	if(PROGRAM_VERBOSE) {
 		fprintf(stdout, "Creating temporary files...\r");
+	}
-	count = files;
+	tmpNames->length = 0;
-	while(PROGRAM_RUN && --count > -1) {
+	while(PROGRAM_RUN && --files > -1) {
 #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;
 			continue;
 #endif
-#endif
+		tmpNames[files] = CreateTemporaryFile();
-		tmpNames[count] = CreateTemporaryFile();
+		++tmpNames->length;
 				return;
+		}
+	}
+}
 /*
 	*
-	* Peeks at a line from a file.
+	* Peeks for the next line in a file.
 	*/
 #if defined ___AsyncIO___
-char *PeekLine(struct AsyncFile *fp) {
-	LONG c;
+dbLine *PeekLine(struct AsyncFile *fp) {
 #else
-char *PeekLine(FILE *fp) {
-	char c;
+dbLine *PeekLine(FILE *fp) {
-#endif
-	char *line = NULL;
-	char *real = NULL;
+#endif
-	int size;
-	int i;
+	dbLine *line;
-	size = LINE_BUF;
-	if((line = malloc(size * sizeof(*line))) == NULL) {
+	// Read the next line.
-		fprintf(stderr, "Memory allocation failure.\n");
+	if((line = ReadLine(fp)) == NULL) {
-		return NULL;
-	}
-	i = 0;
-#if defined ___AsyncIO___
-	while(PROGRAM_RUN && (c = ReadCharAsync(fp)) != -1) {
-#else
-	while(PROGRAM_RUN && fscanf(fp, "%c", &c) == 1) {
-#endif
-#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
+		return NULL;
 		switch(c) {
-			case '\n':
-				// Rewind the file by the number of read characters.
+	// Rewind the file by the number of read characters.
+#if defined ___AsyncIO___
-#if defined ___AsyncIO___
+	if(SeekAsync(fp, -(line->length + 1), MODE_CURRENT) == -1) {
+		fprintf(stderr, "Could not seek in file.\n");
-				if(SeekAsync(fp, -(i + 1), MODE_CURRENT) == -1) {
+		free(line->string);
-					fprintf(stderr, "Could not seek in file.\n");
+		free(line);
-					free(line);
+		line = NULL;
-					return NULL;
+		return NULL;
+	}
+#else
-#else
+	if(fseek(fp, -(line->length + 1), SEEK_CUR) != 0) {
+		fprintf(stderr, "Could not seek in file.\n");
-				if(fseek(fp, -(i + 1), SEEK_CUR) != 0) {
+		free(line->string);
-					fprintf(stderr, "Could not seek in file.\n");
+		free(line);
-					free(line);
+		line = NULL;
-					return NULL;
-				}
-#endif
-				return line;
-			default:
-				if(strlen(line) == size) {
-					size = size * 1.5;
-					real = realloc(line, size * sizeof(*line));
-					if(real == NULL) {
-						fprintf(stderr, "Memory reallocation failure.\n");
-						free(line);
-						return NULL;
-					}
-					line = real;
-				}
-				line[i] = c;
-				line[i + 1] = '\0';
-				break;
-		}
-		++i;
-	}
-	if(line != NULL) {
+		return NULL;
 		free(line);
 #endif
-	return NULL;
+	return line;
+}
 /*
+	*
-	* Read a line from a file.
+	* Reads the next line in a file.
 	*/
 #if defined ___AsyncIO___
-char *ReadLine(struct AsyncFile *fp) {
+dbLine *ReadLine(struct AsyncFile *fp) {
-	LONG c;
-#else
-char *ReadLine(FILE *fp) {
-	char c;
+	LONG c;
-#endif
-	char *line = NULL;
-	char *real = NULL;
-	int size;
-	int i;
+#else
-	size = LINE_BUF;
+dbLine *ReadLine(FILE *fp) {
-	if((line = malloc(size * sizeof(*line))) == NULL) {
+	char c;
-		fprintf(stderr, "Memory allocation failure.\n");
+#endif
-		return NULL;
+	int i;
 			continue;
+		}
 #endif
 		switch(c) {
 			case '\n':
-				return line;
-			default:
-				if(strlen(line) == size) {
+				// Rewind the file by the number of read characters.
-					size = size * 1.5;
+#if defined ___AsyncIO___
-					real = realloc(line, size * sizeof(*line));
+				if(SeekAsync(fp, -(i + 1), MODE_CURRENT) == -1) {
-					if(real == NULL) {
-						fprintf(stderr, "Memory reallocation failure.\n");
+					fprintf(stderr, "Could not seek in file.\n");
-						free(line);
+					fprintf(stderr, "index at: %d\n", i);
-						return NULL;
+					return NULL;
+				}
+#else
+				if(fseek(fp, -(i + 1), SEEK_CUR) != 0) {
+					fprintf(stderr, "Could not seek in file.\n");
-					line = real;
+					return NULL;
+				}
-				line[i] = c;
+#endif
-				line[i + 1] = '\0';
-				break;
+				goto LINE;
+		}
 		++i;
+	}
+LINE:
+	if(i == 0) {
+		return NULL;
+	}
+	if((line = malloc(1 * sizeof(*line))) == NULL) {
+		fprintf(stderr, "Memory allocation error.\n");
+		return NULL;
+	}
+	if((line->string = malloc((i + 1) * sizeof(*line->string))) == NULL) {
-	if(line != NULL) {
+		fprintf(stderr, "Memory allocation error.\n");
+		free(line);
+		line = NULL;
-		free(line);
+		return NULL;
+	}
+#if defined ___AsyncIO___
+	if(ReadAsync(fp, line->string, i) != i) {
+#else
+	if(fread(line->string, sizeof(char), i, fp) != i) {
+#endif
+		fprintf(stderr, "Unable to read line.\n");
+		free(line->string);
 		free(line);
 		line = NULL;
+		return NULL;
+	}
+// Clear newline.
+#if defined ___AsyncIO___
+	ReadCharAsync(fp);
+#else
+	fgetc(fp);
+#endif
+	line->length = i;
-	return NULL;
+	return line;
+}
 /*
+  *
 	fclose(ap);
 	fclose(bp);
 #endif
+}
 /*
+	*
 	* Create a database entry from a line of text.
 	*/
-dbEntry* CreateDatabaseEntry(char *line) {
+dbEntry* CreateDatabaseEntry(dbLine *line) {
 	dbEntry *entry;
 	char *ptr;
 	int side;
 	int i;
 	if((entry = malloc(1 * sizeof(*entry))) == NULL) {
 		fprintf(stderr, "Memory allocation failure.\n");
 		return NULL;
+	}
-	if((entry->name = malloc((strlen(line) + 1) * sizeof(*entry->name))) == NULL) {
+	if((entry->name = malloc((line->length + 1) * sizeof(*entry->name))) == NULL) {
 		fprintf(stderr, "Memory allocation failure.\n");
 		return NULL;
 	}
-	if((entry->path = malloc((strlen(line) + 1) * sizeof(*entry->path))) == NULL) {
+	if((entry->path = malloc((line->length + 1) * sizeof(*entry->path))) == NULL) {
 		fprintf(stderr, "Memory allocation failure.\n");
 		return NULL;
+	}
-	for(ptr = line, side = 0, i = 0, j = 0; PROGRAM_RUN && *ptr != '\0'; ++ptr) {
+	for(ptr = line->string, side = 0, i = 0, j = 0; PROGRAM_RUN && *ptr != '\0'; ++ptr) {
 #if defined ___AmigaOS___
 		// Check if CTRL+C was pressed and abort the program.
+	}
 	return entry;
-}
+}
 /*
 	* Compare two strings.
 	*/
 				break;
+		}
 		FreeVec(pattern);
-		FreeVec(pattern);
+		pattern = NULL;
+	}
 	char *n = b;
 	success = FALSE;
 #if defined ___NOCASE_FS___
-	e = StrUpr(e);
+	StrUpr(e);
-	n = StrUpr(n);
+	StrUpr(n);
 #endif