Adds argument parsing to asmsh + comments

src/asmsh.c

@@ -15,6 +15,7 @@
 */
 #include "config.h"
 #include <stdio.h>
+#include <getopt.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 
@@ -23,16 +24,73 @@
 #include "completion.h"
 #include "history.h"
 
+static struct option long_opts[] = {
+	{"debug", no_argument, 0, 'd'},
+	{"help", no_argument, 0, 'h'},
+	{0,0,0,0}
+};
+
+static const char *help_opts[] = {
+	"Enable debug output",
+	"Display this help",
+	NULL
+};
+
+void help(const char *argv0)
+{
+	printf("Usage : %s [OPTIONS] [FILENAME]\n", argv0);
+	for(size_t i=0; long_opts[i].name; i++)
+	{
+		const struct option *opt = &long_opts[i];
+		const char *help = help_opts[i];
+		printf("\t");
+		if(opt->val)
+		{
+			printf("-%c, ", opt->val);
+		}
+		printf("--%s%s\n",
+				opt->name,
+				opt->has_arg==0?"":(opt->has_arg==1?"arg":"[arg]"));
+		printf("\t\t%s\n", help);
+	}
+
+}
+
 int main(int argc, char *argv[], char *envp[])
 {
+	asmsh_loglevel_t loglevel = ASMSH_INFO;
+	int opt;
+
+	while((opt = getopt_long(argc, argv, "dh", long_opts, NULL)) != -1)
+	{
+		switch(opt)
+		{
+			case 'd':
+				loglevel = ASMSH_DEBUG;
+				break;
+			case 'h':
+				help(argv[0]);
+				return 0;
+			case '?':
+				help(argv[0]);
+				return 0;
+		}
+	}
+	if(optind < argc)
+	{
+		dprintf(2, "File execution not supported yet\n");
+		exit(1);
+	}
+
+
 	asmsh_logger_t *logger;
 	asmsh_t sh;
-	
+
 	int ret = 0;
 	char prompt[64];
 	bzero(prompt, sizeof(prompt));
 
-	logger = asmsh_logger_new(ASMSH_INFO);
+	logger = asmsh_logger_new(loglevel);
 	asmsh_logger_setup(logger);
 
 	if(asmsh_init(&sh, NULL))

src/shell.c

@@ -111,6 +111,8 @@ int asmsh_exec(asmsh_t *sh, const char *_cmd)
 		cmd = m_cmd;
 	}
 
+	asmsh_log_debug("%s", cmd);
+
 	int ret;
 	//lstrip whitespace
 	for(; *cmd && (*cmd == ' ' || *cmd == '\t'); cmd++);

src/shell.h

@@ -29,28 +29,49 @@ typedef struct asmsh_s asmsh_t;
 
 struct asmsh_s
 {
+	///! Compilation context
 	asmsh_asmc_ctx_t *cctx;
+	///! Child process environment
 	asmsh_env_t *env;
 
+	/** Stores the child process exec path
+	 * @warning Can be NULL if a temporary file is used
+	 * @deprecated
+	 */
 	char *child_path;
+	/** May store the last executed instruction ? not sure if used or not */
 	char *last_instr;
+	/** Last executed bytecode ? */
 	asmsh_bytecode_t last_bcode;
 
 };
 
+/** Initialize a shell environment
+ * @param asmsh_t* Pointer on the shell environment
+ * @param const char* The child process executable path (NULL is recommended
+ * in order to use the embed executable)
+ * @return 0 if no error else -1 and set errno
+ */
 int asmsh_init(asmsh_t *sh, const char *child_path);
+
+/** Free all ressources holded by a shell environment
+ * @param asmsh_t* Pointer on the shell environment
+ */
 void asmsh_cleanup(asmsh_t *sh);
 
-/** @return <0 on error 0 on ok 1 on exit */
+/** 
+ * @return <0 on error 0 on ok 1 on exit */
 int asmsh_exec(asmsh_t *sh, const char *cmd);
 
-/** Parse all symbols found in given command
+/** Replace all labels found in given command by their relative offset
  * @param asmsh_t* The shell
  * @param char The prefix character before a symbol name
  * @param const char* The string we want to parse
  * @param char* A pointer on a buffer large enough to store the parsed string
  * @param size_t The buffer size
  * @return 0 on error else return the needed buffer size
+ * @todo move in asm_env.*
+ * @todo Enhance !!! Add support for relative or absolute address replacement
  */
 size_t asmsh_parse_labels(asmsh_t *sh, char preffix, const char *cmd,
 		char *buf, size_t buf_sz);