#include "configuration.h"
#include "log.h"
+// @todo the inclusion of server.h here is a layering violation
#include "server.h"
#include <getopt.h>
#ifdef _WIN32
/* Add the parent of the directory where openocd.exe resides to the
* config script search path.
- * Directory layout:
+ * Directory layout:
* bin\openocd.exe
* lib\openocd
* event\at91eb40a_reset.cfg
char strExePath [MAX_PATH];
GetModuleFileName (NULL, strExePath, MAX_PATH);
/* Either this code will *always* work or it will SEGFAULT giving
- * excellent information on the culprit.
+ * excellent information on the culprit.
*/
- *strrchr(strExePath, '\\')=0;
+ *strrchr(strExePath, '\\') = 0;
strcat(strExePath, "\\..");
add_script_search_dir(strExePath);
}
char strExePath [MAX_PATH];
char *p;
GetModuleFileName (NULL, strExePath, MAX_PATH);
- *strrchr(strExePath, '\\')=0;
+ *strrchr(strExePath, '\\') = 0;
strcat(strExePath, "/../lib/"PACKAGE);
- for(p=strExePath; *p; p++) {
- if(*p == '\\')
+ for (p = strExePath; *p; p++) {
+ if (*p == '\\')
*p = '/';
}
add_script_search_dir(strExePath);
}
#else
- /* Add dir for openocd supplied scripts last so that user can over
- ride those scripts if desired. */
- add_script_search_dir(PKGDATADIR);
- add_script_search_dir(PKGLIBDIR);
+ /*
+ * The directory containing OpenOCD-supplied scripts should be
+ * listed last in the built-in search order, so the user can
+ * override these scripts with site-specific customizations.
+ */
+ /// @todo Implement @c add_script_search_dir("${HOME}/.openocd").
+ add_script_search_dir(PKGDATADIR "/site");
+ add_script_search_dir(PKGDATADIR "/scripts");
#endif
return ERROR_OK;
}
char command_buffer[128];
while (1)
- {
+ {
/* getopt_long stores the option index here. */
int option_index = 0;
-
+
c = getopt_long(argc, argv, "hvd::l:f:s:c:p", long_options, &option_index);
-
+
/* Detect the end of the options. */
if (c == -1)
break;
-
+
switch (c)
{
case 0:
{
snprintf(command_buffer, 128, "log_output %s", optarg);
command_run_line(cmd_ctx, command_buffer);
- }
+ }
break;
case 'c': /* --command | -c */
if (optarg)
{
add_config_command(optarg);
- }
+ }
break;
case 'p': /* --pipe | -p */
#if BUILD_ECOSBOARD == 1
LOG_OUTPUT("--command | -c\trun <command>\n");
LOG_OUTPUT("--pipe | -p\tuse pipes for gdb communication\n");
exit(-1);
- }
+ }
if (version_flag)
{
// It is not an error to request the VERSION number.
exit(0);
}
-
+
return ERROR_OK;
}