move options handling to separate file to better support embedded implementations...

git-svn-id: svn://svn.berlios.de/openocd/trunk@334 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index f65a1d23460d492f087f35d524d5d1d97dd2a9f6..35695d69923573e672928b7c1fb6887474ff9957 100644 (file)
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(all_includes)
 METASOURCES = AUTO\r
 AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@\r
 noinst_LIBRARIES = libhelper.a\r
-libhelper_a_SOURCES = binarybuffer.c configuration.c log.c interpreter.c command.c time_support.c \\r
+libhelper_a_SOURCES = binarybuffer.c configuration.c options.c log.c interpreter.c command.c time_support.c \\r
        replacements.c fileio.c\r
 noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \\r
        interpreter.h time_support.h replacements.h fileio.h\r

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index d9300e9dcc54ccd2415d3fe4aa111bfa0db7a17f..0a7bf180147bda49b6e9656104ff26050ec0708e 100644 (file)
--- a/src/helper/configuration.c
+++ b/src/helper/configuration.c
@@ -28,7 +28,6 @@
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
-#include <getopt.h>\r
 #include <string.h>\r
 \r
 static size_t num_config_files;\r
@@ -37,21 +36,6 @@ static char** config_file_names;
 static size_t num_script_dirs;\r
 static char** script_search_dirs;\r
 \r
-static int help_flag;\r
-\r
-static struct option long_options[] =\r
-{\r
-       {"help",                        no_argument,    &help_flag, 1},\r
-\r
-       {"debug",                       optional_argument,      0, 'd'},\r
-       {"file",                        required_argument,      0, 'f'},\r
-       {"search",                      required_argument,      0, 's'},\r
-       {"log_output",          required_argument,      0, 'l'},\r
-       {"command",                     required_argument,      0, 'c'},\r
-       \r
-       {0, 0, 0, 0}\r
-};\r
-\r
 int configuration_output_handler(struct command_context_s *context, char* line)\r
 {\r
        INFO(line);\r
@@ -77,80 +61,6 @@ void add_config_file_name (const char *cfg)
        config_file_names[num_config_files] = NULL;\r
 }\r
 \r
-int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[])\r
-{\r
-       int c;\r
-       char command_buffer[128];\r
-\r
-       while (1)\r
-       {       \r
-               /* getopt_long stores the option index here. */\r
-               int option_index = 0;\r
-               \r
-               c = getopt_long(argc, argv, "hd::l:f:s:c:", long_options, &option_index);\r
-               \r
-               /* Detect the end of the options. */\r
-               if (c == -1)\r
-                       break;\r
-               \r
-               switch (c)\r
-               {\r
-                       case 0:\r
-                               break;\r
-                       case 'h':       /* --help | -h */\r
-                               help_flag = 1;\r
-                               break;\r
-                       case 'f':       /* --file | -f */\r
-                               snprintf(command_buffer, 128, "script %s", optarg);\r
-                               add_config_file_name(command_buffer);\r
-                               break;\r
-                       case 's':       /* --search | -s */\r
-                               add_script_search_dir(optarg);\r
-                               break;\r
-                       case 'd':       /* --debug | -d */\r
-                               if (optarg)\r
-                                       snprintf(command_buffer, 128, "debug_level %s", optarg);\r
-                               else\r
-                                       snprintf(command_buffer, 128, "debug_level 3");\r
-                               command_run_line(cmd_ctx, command_buffer);\r
-                               break;\r
-                       case 'l':       /* --log_output | -l */\r
-                               if (optarg)\r
-                               {\r
-                                       snprintf(command_buffer, 128, "log_output %s", optarg);\r
-                                       command_run_line(cmd_ctx, command_buffer);\r
-                               }       \r
-                               break;\r
-                       case 'c':       /* --command | -c */\r
-                               if (optarg)\r
-                               {\r
-                                       add_config_file_name(optarg);\r
-                               }       \r
-                               break;\r
-                               \r
-               }\r
-       }\r
-\r
-       if (help_flag)\r
-       {\r
-               printf("Open On-Chip Debugger\n(c) 2005 by Dominic Rath\n\n");\r
-               printf("--help       | -h\tdisplay this help\n");\r
-               printf("--file       | -f\tuse configuration file <name>\n");\r
-               printf("--search     | -s\tdir to search for config files and scripts.\n");\r
-               printf("--debug      | -d\tset debug level <0-3>\n");\r
-               printf("--log_output | -l\tredirect log output to file <name>\n");\r
-               printf("--command    | -c\trun <command>\n");\r
-               exit(-1);\r
-       }       \r
-\r
-       /* Add dir for openocd supplied scripts last so that user can over\r
-          ride those scripts if desired. */\r
-       add_script_search_dir(PKGDATADIR);\r
-       add_script_search_dir(PKGLIBDIR);\r
-\r
-       return ERROR_OK;\r
-}\r
-\r
 FILE *open_file_from_path (command_context_t *cmd_ctx, char *file, char *mode)\r
 {\r
        FILE *fp = NULL;\r

diff --git a/src/helper/options.c b/src/helper/options.c
new file mode 100644 (file)
index 0000000..908748d
--- /dev/null
+++ b/src/helper/options.c
@@ -0,0 +1,123 @@
+/***************************************************************************\r
+ *   Copyright (C) 2004, 2005 by Dominic Rath                              *\r
+ *   Dominic.Rath@gmx.de                                                   *\r
+ *                                                                         *\r
+ *   This program is free software; you can redistribute it and/or modify  *\r
+ *   it under the terms of the GNU General Public License as published by  *\r
+ *   the Free Software Foundation; either version 2 of the License, or     *\r
+ *   (at your option) any later version.                                   *\r
+ *                                                                         *\r
+ *   This program is distributed in the hope that it will be useful,       *\r
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *\r
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *\r
+ *   GNU General Public License for more details.                          *\r
+ *                                                                         *\r
+ *   You should have received a copy of the GNU General Public License     *\r
+ *   along with this program; if not, write to the                         *\r
+ *   Free Software Foundation, Inc.,                                       *\r
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *\r
+ ***************************************************************************/\r
+#ifdef HAVE_CONFIG_H\r
+#include "config.h"\r
+#endif\r
+\r
+#include "types.h"\r
+#include "command.h"\r
+#include "configuration.h"\r
+#include "log.h"\r
+\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <getopt.h>\r
+#include <string.h>\r
+\r
+\r
+static int help_flag;\r
+\r
+static struct option long_options[] =\r
+{\r
+       {"help",                        no_argument,    &help_flag, 1},\r
+\r
+       {"debug",                       optional_argument,      0, 'd'},\r
+       {"file",                        required_argument,      0, 'f'},\r
+       {"search",                      required_argument,      0, 's'},\r
+       {"log_output",          required_argument,      0, 'l'},\r
+       {"command",                     required_argument,      0, 'c'},\r
+       \r
+       {0, 0, 0, 0}\r
+};\r
+\r
+\r
+int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[])\r
+{\r
+       int c;\r
+       char command_buffer[128];\r
+\r
+       while (1)\r
+       {       \r
+               /* getopt_long stores the option index here. */\r
+               int option_index = 0;\r
+               \r
+               c = getopt_long(argc, argv, "hd::l:f:s:c:", long_options, &option_index);\r
+               \r
+               /* Detect the end of the options. */\r
+               if (c == -1)\r
+                       break;\r
+               \r
+               switch (c)\r
+               {\r
+                       case 0:\r
+                               break;\r
+                       case 'h':       /* --help | -h */\r
+                               help_flag = 1;\r
+                               break;\r
+                       case 'f':       /* --file | -f */\r
+                               snprintf(command_buffer, 128, "script %s", optarg);\r
+                               add_config_file_name(command_buffer);\r
+                               break;\r
+                       case 's':       /* --search | -s */\r
+                               add_script_search_dir(optarg);\r
+                               break;\r
+                       case 'd':       /* --debug | -d */\r
+                               if (optarg)\r
+                                       snprintf(command_buffer, 128, "debug_level %s", optarg);\r
+                               else\r
+                                       snprintf(command_buffer, 128, "debug_level 3");\r
+                               command_run_line(cmd_ctx, command_buffer);\r
+                               break;\r
+                       case 'l':       /* --log_output | -l */\r
+                               if (optarg)\r
+                               {\r
+                                       snprintf(command_buffer, 128, "log_output %s", optarg);\r
+                                       command_run_line(cmd_ctx, command_buffer);\r
+                               }       \r
+                               break;\r
+                       case 'c':       /* --command | -c */\r
+                               if (optarg)\r
+                               {\r
+                                       add_config_file_name(optarg);\r
+                               }       \r
+                               break;\r
+                               \r
+               }\r
+       }\r
+\r
+       if (help_flag)\r
+       {\r
+               printf("Open On-Chip Debugger\n(c) 2005 by Dominic Rath\n\n");\r
+               printf("--help       | -h\tdisplay this help\n");\r
+               printf("--file       | -f\tuse configuration file <name>\n");\r
+               printf("--search     | -s\tdir to search for config files and scripts.\n");\r
+               printf("--debug      | -d\tset debug level <0-3>\n");\r
+               printf("--log_output | -l\tredirect log output to file <name>\n");\r
+               printf("--command    | -c\trun <command>\n");\r
+               exit(-1);\r
+       }       \r
+\r
+       /* Add dir for openocd supplied scripts last so that user can over\r
+          ride those scripts if desired. */\r
+       add_script_search_dir(PKGDATADIR);\r
+       add_script_search_dir(PKGLIBDIR);\r
+\r
+       return ERROR_OK;\r
+}\r