HuntnGather – Diff between revs 4 and 5

Subversion Repositories:

?pathlinks?

Rev 4 – Rev 8 – Go to most recent revision – Details – Blame – Last modification – View Log

 #include <sys/stat.h>
 #include <proto/dos.h>
 #include <proto/exec.h>
-#if defined ___AmigaOS___
+#if !defined ___HAVE_GETOPT___
+#include "getopt.h"
+#endif
+#if defined ___AmigaOS___
+#include <dos/dos.h>
+#include <dos/rdargs.h>
+#define TEMPLATE "D=Database/K,P=Pattern/A/F"
+#define OPT_DATABASE 0
+#define OPT_PATTERN 1
+#define OPT_COUNT 2
+LONG result[OPT_COUNT];
+/*************************************************************************/
+/*        Version string used for querrying the program version.         */
+/*************************************************************************/
+TEXT version_string[] =
-#include "getopt.h"
+	"\0$VER: Hunt 1.4 "__DATE__" by Wizardry and Steamworks";
 #endif
 #if !defined TRUE
 #define TRUE 1;
 #endif
-#if !defined FALSE
-#define FALSE 0;
-#endif
-#define DEFAULT_DATABASE_FILE "S:gather.db"
-/*************************************************************************/
+#if !defined FALSE
-/*        Version string used for querrying the program version.         */
+#define FALSE 0;
-/*************************************************************************/
+#endif
 TEXT version_string[] =
 	// Search the database for the matching string.
 	SearchDatabase(dbFile, need);
+}
+int main(int argc, char **argv) {
+#if defined ___AmigaOS___
+   struct RDArgs *rdargs;
+   struct stat statPath;
+	UBYTE *dbFile;
+	UBYTE *argPattern;
+	dbFile = DEFAULT_DATABASE_FILE;
+	argPattern = NULL;
+	if(rdargs = (struct RDArgs *) AllocDosObject(DOS_RDARGS, NULL)) {
+		if(ReadArgs(TEMPLATE, result, rdargs) == NULL) {
+			FreeArgs(rdargs);
+			FreeDosObject(DOS_RDARGS, rdargs);
+			return 1;
+		}
+		if(result[OPT_DATABASE] != NULL) {
+			dbFile = (UBYTE *) result[OPT_DATABASE];
+		}
+		argPattern = (UBYTE *) result[OPT_PATTERN];
+		FreeArgs(rdargs);
+		FreeDosObject(DOS_RDARGS, rdargs);
+	}
+	stat(dbFile, &statPath);
+	if(!S_ISREG(statPath.st_mode)) {
+		fprintf(stderr, "Database file '%s' is not a file.\n", dbFile);
+		return 1;
+	}
+	Hunt(dbFile, argPattern);
-int main(int argc, char **argv) {
+#else
  	int option;
  	char *dbFile;
  	struct stat path;
 		return 1;
+	}
 	stat(dbFile, &path);
 	if(!S_ISREG(path.st_mode)) {
-		fprintf(stderr, "%s is not a file.\n", dbFile);
+		fprintf(stderr, "Database file '%s' is not a file.\n", dbFile);
 		return 1;
+	}
 	Hunt(dbFile, argv[optind]);
-	Hunt(dbFile, argv[optind]);
+#endif