HuntnGather – Diff between revs 16 and 19

Subversion Repositories:

?pathlinks?

Rev 16 – Rev 23 – Go to most recent revision – Details – Blame – Last modification – View Log

 #include <dirent.h>
 #include <signal.h>
 #include <sys/types.h>
+#include <sys/stat.h>
-#include <sys/stat.h>
+#include <sys/syslimits.h>
 #include <proto/dos.h>
 #include <proto/exec.h>
 #include "StringStack.h"
+#if !defined ___HAVE_GETOPT___
 #include "getopt.h"
-#if !defined ___HAVE_GETOPT___
+#endif
 #include "getopt.h"
-#endif
+#define PROGRAM_VERSION "1.7.2"
 #if defined ___AmigaOS___
 /*************************************************************************/
 /*        Version string used for querrying the program version.         */
 /*************************************************************************/
 TEXT version_string[] =
 	if((fp = fopen(dbFile, "r")) == NULL) {
 		fprintf(stderr, "Unable to open gather database for reading.\n");
 		return;
+	}
-	database = malloc(sizeof(char *));
+	database = malloc(sizeof(*database));
 	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));
 	line = 0;
 	side = 0;
 	i = 0;
+		}
 #endif
 		switch(c) {
 			case '\n':
 				// Load up the name and path into the database variable.
-				database = realloc(database, (line + 1) * sizeof(char *));
+				database = realloc(database, (line + 1) * sizeof(*database));
-				database[line] = malloc((strlen(name) + strlen(path) + 1 + 1) * sizeof(char));
+				database[line] = malloc((strlen(name) + strlen(path) + 1 + 1) * sizeof(*database[line]));
 				sprintf(database[line], "%s\t%s", name, path);
 				++line;
 				free(name);
 				name_size = NAME_BUF;
-				name = malloc(name_size * sizeof(char));
+				name = malloc(name_size * sizeof(*name));
 				--side;
 				i = 0;
 				break;
 			case '\t':
 				free(path);
 				path_size = PATH_BUF;
-				path = malloc(path_size * sizeof(char));
+				path = malloc(path_size * sizeof(*path));
 				++side;
 				i = 0;
 				break;
 			default:
 				switch(side) {
 					case 0:
 					   if(strlen(name) == name_size) {
 					   	name_size = name_size * 1.5;
-					   	name = realloc(name, name_size * sizeof(char));
+					   	name = realloc(name, name_size * sizeof(*name));
+					   }
 						//name = realloc(name, (i + 1 + 1) * sizeof(char));
 						name[i] = c;
 						name[i + 1] = '\0';
 						break;
 					case 1:
 						if(strlen(path) == path_size) {
 							path_size = path_size * 1.5;
-							path = realloc(path, path_size * sizeof(char));
+							path = realloc(path, path_size * sizeof(*path));
+						}
 						//path = realloc(path, (i + 1 + 1) * sizeof(char));
 						path[i] = c;
 		// Check if CTRL+C was pressed and abort the program.
 		if(SetSignal(0L, SIGBREAKF_CTRL_C) & SIGBREAKF_CTRL_C) {
 			run = FALSE;
+		}
 #endif
-		if((path = stringStackPop(dirStack)) == NULL ||
+		if((path = stringStackPop(dirStack)) == NULL) {
-			strlen(path) == 0) {
 			return;
+		}
 		if((dir = opendir(path)) == NULL) {
 	FILE *fp;
 	int size;
 	if((fp = fopen(dbFile, "r")) == NULL) {
+		fprintf(stderr, "Unable to open gather database for reading.\n");
-		fprintf(stderr, "Unable to open gather database for reading.\n");
+		fclose(fp);
 		return 0;
+	}
 	int lines;
 	char c;
 	if((fp = fopen(dbFile, "r")) == NULL) {
+		fprintf(stderr, "Unable to open gather database for reading.\n");
-		fprintf(stderr, "Unable to open gather database for reading.\n");
+		fclose(fp);
 		return 0;
+	}
 		return;
+	}
 	if((tp = fopen(tmpNames[--tmpFiles], "w+")) == NULL) {
+		fprintf(stderr, "Unable to open temporary file '%s' for writing.\n", tmpNames[tmpFiles]);
-		fprintf(stderr, "Unable to open temporary file '%s' for writing.\n", tmpNames[tmpFiles]);
+		fclose(fp);
 		return;
+	}
+				}
 				// Write the newline character back.
 				if(fprintf(tp, "%c", c) != 1) {
+					fprintf(stderr, "Unable to write to temporary file '%s'.\n", tmpNames[tmpFiles]);
-					fprintf(stderr, "Unable to write to temporary file '%s'.\n", tmpNames[tmpFiles]);
+					fclose(tp);
 					fclose(fp);
 					return;
+				}
 				// Switch to the next temporary file.
 					// Close the previous temporary file and write to the next temporary file.
 					fclose(tp);
 					if((tp = fopen(tmpNames[--tmpFiles], "w+")) == NULL) {
+						fprintf(stderr, "Unable to open temporary file '%s' for writing.\n", tmpNames[tmpFiles]);
-						fprintf(stderr, "Unable to open temporary file '%s' for writing.\n", tmpNames[tmpFiles]);
+						fclose(tp);
 						fclose(fp);
+					}
 					lines = 0;
 					break;
 	char *line;
 	int line_size;
 	int i;
 	line_size = LINE_BUF;
-	line = malloc(line_size * sizeof(char));
+	line = malloc(line_size * sizeof(*line));
 	i = 0;
 	while(run && fscanf(fp, "%c", &c) == 1) {
 				fseek(fp, -(i + 1), SEEK_CUR);
 				return line;
 			default:
 				if(strlen(line) == line_size) {
 					line_size = line_size * 1.5;
-					line = realloc(line, line_size * sizeof(char));
+					line = realloc(line, line_size * sizeof(*line));
+				}
 				//line = realloc(line, (chars + 1 + 1) * sizeof(char));
 				line[i] = c;
 				line[i + 1] = '\0';
 				break;
 		fprintf(stderr, "Unable to open gather database for writing.\n");
 		return;
+	}
 	// Allocate as many file pointers as temporary files.
-	tp = malloc(files * sizeof(FILE *));
+	tp = malloc(files * sizeof(*tp));
 	// Open all temporary files for reading.
 	for(i = 0; i < files; ++i) {
 			if(min == NULL || strncmp(tmp, min, strlen(tmp)) < 0) {
 				if(min != NULL) {
 					// Free previous instance.
 					free(min);
+				}
-				min = malloc((strlen(tmp) + 1) * sizeof(char));
+				min = malloc((strlen(tmp) + 1) * sizeof(*min));
 				sprintf(min, "%s", tmp);
 				// Remember the index of the file where the smallest entry has been found.
 				j = i;
 				free(tmp);
 				continue;
 	MergeDatabase(dbFile, tmpNames, tmpFiles, dbLines);
+}
 void usage(char *name) {
+	fprintf(stdout, "Hunt & Gather - %s, a file index generating tool.        \n", name);
-	fprintf(stdout, "Hunt & Gather - %s, a file index generating tool.        \n", name);
+	fprintf(stdout, "Version: %s                                              \n", PROGRAM_VERSION);
    fprintf(stdout, "                                                         \n");
 	fprintf(stdout, "SYNTAX: %s [-q] DATABASE                                 \n", name);
 	fprintf(stdout, "                                                         \n");
 	fprintf(stdout, "    -q             Do not print out any messages.        \n");
 	* Main entry point.
 	*/
 int main(int argc, char **argv) {
 	int option;
 	char *dbFile;
+	char *path;
 	struct stat dirStat;
+#if defined ___AmigaOS___
+	BPTR lock;
+#endif
 	// Bind handler to SIGINT.
  	signal(SIGINT, SignalHandler);
 	if(optind >= argc) {
 		usage(argv[0]);
 		return 1;
+	}
+#if defined ___AmigaOS___
+	path = malloc(PATH_MAX * sizeof(*path));
+	lock = Lock(argv[optind], SHARED_LOCK);
+	NameFromLock(lock, path, PATH_MAX);
+	UnLock(lock);
+#else
+	path = realpath(argv[optind], NULL);
+#endif
-   stat(argv[optind], &dirStat);
+   stat(path, &dirStat);
 	if(!S_ISDIR(dirStat.st_mode)) {
 		fprintf(stderr, "Path '%s' is not a directory.\n", argv[optind]);
 		return 1;
+	}
 	if(verbose) {
    	fprintf(stdout, "Gathering to database file: %s\n", dbFile);
 	}
+ 	// Gather.
  	Gather(dbFile, path);
  	// Gather.