Remove special handling of script search path on Windows

[fw/openocd] / src / helper / options.c

diff --git a/src/helper/options.c b/src/helper/options.c
index 98cd634bc2cd3c4613c3dbfddcdede1b68451dc0..00f1dbed600dc2e0c55b4841503eae2eae0c0100 100644 (file)
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -18,7 +18,7 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -52,70 +52,79 @@ int configuration_output_handler(struct command_context *context, const char *li
        return ERROR_OK;
 }
 
+#ifdef _WIN32
+static char *find_suffix(const char *text, const char *suffix)
+{
+       size_t text_len = strlen(text);
+       size_t suffix_len = strlen(suffix);
+
+       if (suffix_len == 0)
+               return (char *)text + text_len;
+
+       if (suffix_len > text_len || strncmp(text + text_len - suffix_len, suffix, suffix_len) != 0)
+               return NULL; /* Not a suffix of text */
+
+       return (char *)text + text_len - suffix_len;
+}
+#endif
+
 static void add_default_dirs(void)
 {
+       const char *run_prefix;
+       char *path;
+
 #ifdef _WIN32
-       /* Add the parent of the directory where openocd.exe resides to the
-        * config script search path.
-        * Directory layout:
-        * bin\openocd.exe
-        * lib\openocd
-        */
-       {
-               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.
-                */
-               *strrchr(strExePath, '\\') = 0;
-               strcat(strExePath, "\\..");
-               add_script_search_dir(strExePath);
-       }
-       /*
-        * Add support for the default (as of 20091118) layout when
-        * using autotools and cygwin/MinGW to build native binary.
-        * Path separator is converted to UNIX style so that MinGW is
-        * pleased.
-        *
-        * bin/openocd.exe
-        * share/openocd/scripts/interface/dummy.cfg
-        * share/openocd/scripts/target/at91eb40a.cfg
-        */
-       {
-               char strExePath[MAX_PATH];
-               char *p;
-               GetModuleFileName(NULL, strExePath, MAX_PATH);
-               *strrchr(strExePath, '\\') = 0;
-               strcat(strExePath, "/../share/"PACKAGE "/scripts");
-               for (p = strExePath; *p; p++) {
-                       if (*p == '\\')
-                               *p = '/';
-               }
-               add_script_search_dir(strExePath);
+       char strExePath[MAX_PATH];
+       GetModuleFileName(NULL, strExePath, MAX_PATH);
+
+       /* Strip executable file name, leaving path */
+       *strrchr(strExePath, '\\') = '\0';
+
+       /* Convert path separators to UNIX style, should work on Windows also. */
+       for (char *p = strExePath; *p; p++) {
+               if (*p == '\\')
+                       *p = '/';
        }
+
+       char *end_of_prefix = find_suffix(strExePath, BINDIR);
+       if (end_of_prefix != NULL)
+               *end_of_prefix = '\0';
+
+       run_prefix = strExePath;
 #else
+       run_prefix = "";
+#endif
+
+       LOG_DEBUG("bindir=%s", BINDIR);
+       LOG_DEBUG("pkgdatadir=%s", PKGDATADIR);
+       LOG_DEBUG("run_prefix=%s", run_prefix);
+
        /*
         * 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.
         */
-
        const char *home = getenv("HOME");
 
        if (home) {
-               char *path;
-
                path = alloc_printf("%s/.openocd", home);
-
                if (path) {
                        add_script_search_dir(path);
                        free(path);
                }
        }
 
-       add_script_search_dir(PKGDATADIR "/site");
-       add_script_search_dir(PKGDATADIR "/scripts");
-#endif
+       path = alloc_printf("%s%s%s", run_prefix, PKGDATADIR, "/site");
+       if (path) {
+               add_script_search_dir(path);
+               free(path);
+       }
+
+       path = alloc_printf("%s%s%s", run_prefix, PKGDATADIR, "/scripts");
+       if (path) {
+               add_script_search_dir(path);
+               free(path);
+       }
 }
 
 int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[])