X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Foptions.c;h=94f1063e43f4898cda8497270515d817309fffc9;hb=e224fa1ef2afade7451d36f8643f8ab8f9f8fb76;hp=3caf9f628b91cdfb7f28e208e5e4f54843cfc023;hpb=a78a174393ff9c8dbc0d5212576507f25d7e9bf1;p=emu8051.git

diff --git a/src/options.c b/src/options.c
index 3caf9f6..94f1063 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1,21 +1,12 @@
 /*
- * Processing command-line options and arguments.
+ * options.c -- functions for processing command-line options and arguments
  *
- * Copyright (C) 1999 Hugo Villeneuve <hugo@hugovil.com>
+ * Copyright (C) 2011 Hugo Villeneuve <hugo@hugovil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #if HAVE_CONFIG_H
@@ -25,6 +16,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <argp.h>
 
 #if STDC_HEADERS
 #  include <string.h>
@@ -35,97 +27,97 @@
 #include "common.h"
 #include "options.h"
 
-static char *hex_file;
+const char *argp_program_version = PACKAGE_VERSION;
+const char *argp_program_bug_address = PACKAGE_BUGREPORT;
 
-/*
- * Return the hex file name
- */
-char *
-get_hex_filename(void)
+#define PACKAGE_DOC_LENGTH 128
+
+/* Program documentation. */
+static char str_doc[PACKAGE_DOC_LENGTH];
+
+/* How many arguments we accept. */
+#define ARGS_COUNT 1
+
+/* A description of the arguments we accept. */
+static const char args_doc[] = "[FILENAME]";
+
+/* The options we understand. */
+static struct argp_option argp_options[] = {
+	{"debug",    'd', "level",   0,  "Produce debugging output" },
+	{ 0 }
+};
+
+struct options_t options;
+
+const char *
+get_package_description(void)
 {
-	return hex_file;
+	return "Emulator for 8051 family microcontrollers";
 }
 
-/*******************************************************************************
- * Display the help message and exit
- ******************************************************************************/
 static void
-DisplayUsage( void )
+decode_debug_option(char *arg, struct argp_state *state)
 {
-  printf( COMMAND_LINE_OPTIONS );
-}
+	char *endptr;
+	int log_level;
 
+	log_level = strtol(arg, &endptr, 0);
 
-/*******************************************************************************
- * Display version information and exit
- ******************************************************************************/
-static void
-DisplayVersion( void )
-{
-  printf( "\n" );
-  printf( "  %s, version %s\n", PACKAGE, VERSION );
-  printf( "  Written by Jonathan St-André, Pascal Fecteau and Hugo Villeneuve\n\n" );
-}
+	if (*endptr != '\0') {
+		log_fail_no_exit("Invalid log level");
+		argp_usage(state);
+	}
 
+	if (log_level > LOG_LEVEL_DEBUG) {
+		log_fail_no_exit("Invalid log level");
+		argp_usage(state);
+	}
 
-static void
-InvalidOption( const char *message, /*@null@*/ const char *string )
-{
-  if( string == NULL ) {
-    fprintf(stderr, "%s: %s\n", PACKAGE, message );
-  }
-  else {
-    fprintf(stderr, "%s: %s %s\n", PACKAGE, message, string );
-  }
+	log_set_level(log_level);
+}
 
-  fprintf(stderr, "Try `%s -h' for more information.\n", PACKAGE );
+/* Parse a single option. */
+static error_t
+parse_opt(int key, char *arg, struct argp_state *state)
+{
+	switch (key) {
+	case 'd':
+		decode_debug_option(arg, state);
+		break;
+	case ARGP_KEY_ARG:
+		if (state->arg_num >= ARGS_COUNT) {
+			/* Too many arguments. */
+			argp_usage(state);
+		}
+
+		options.filename = arg;
+		break;
+	case ARGP_KEY_END:
+		if (state->arg_num < ARGS_COUNT) {
+			/* Not enough arguments, but the filename is optional.
+			   So no error. */
+		}
+		break;
+	default:
+		return ARGP_ERR_UNKNOWN;
+	}
 
-  exit( EXIT_FAILURE );
+	return 0;
 }
 
+/* Our argp parser. */
+static struct argp argp = { argp_options, parse_opt, args_doc, str_doc };
 
-/*******************************************************************************
- * Initializes the different options passed as arguments on the command line.
- ******************************************************************************/
+/* Initializes the different options passed as arguments on the command line. */
 void
-ParseCommandLineOptions( int argc, char *argv[] )
+parse_command_line_options(int argc, char *argv[])
 {
-  int i;
-  char *token;
-
-  for( i = 1; i < argc; i++ ) {
-    token = argv[i];
-    switch( token[0] ) {
-    case '-':
-      /* Processing options names */
-      switch( token[1] ) {
-      case 'h':
-	if( strlen( &token[1] ) == 1 ) {
-	  DisplayUsage();
-	  exit( EXIT_SUCCESS );
-	}
-	InvalidOption( "invalid option", token );
-	break;
-      case 'v' :
-	if( STREQ( "version", &token[1] ) ) {
-	  DisplayVersion();
-	  exit( EXIT_SUCCESS );
-	}
-	else {
-	  InvalidOption( "invalid option", token );
-	}
-	break;
-      default:
-	InvalidOption( "invalid option", token );
-	break;
-      } /* end switch( token[1] ) */
-      break;
-    default:
-      /* Processing options arguments */
-      /* Must be the filename... */
-      hex_file = token;
-      break;
-    } /* end switch( token[0] ) */
-  } /* end for */
-  
+	snprintf(str_doc, PACKAGE_DOC_LENGTH, "%s -- %s", PACKAGE_NAME,
+		 get_package_description());
+
+	/* Setting default values. */
+	options.filename = NULL;
+
+	/* Parse our arguments. */
+	argp_parse(&argp, argc, argv, 0, 0, NULL);
 }