return basepath;
}
-static char *getProgramMainDataPath()
-{
- char *main_data_path = getStringCopy(program.command_basepath);
-
-#if defined(PLATFORM_MACOSX)
- if (strSuffix(main_data_path, MAC_APP_BINARY_SUBDIR))
- {
- char *main_data_path_old = main_data_path;
-
- // cut relative path to Mac OS X application binary directory from path
- main_data_path[strlen(main_data_path) -
- strlen(MAC_APP_BINARY_SUBDIR)] = '\0';
-
- // cut trailing path separator from path (but not if path is root directory)
- if (strSuffix(main_data_path, "/") && !strEqual(main_data_path, "/"))
- main_data_path[strlen(main_data_path) - 1] = '\0';
-
- // replace empty path with current directory
- if (strEqual(main_data_path, ""))
- main_data_path = ".";
-
- // add relative path to Mac OS X application resources directory to path
- main_data_path = getPath2(main_data_path, MAC_APP_FILES_SUBDIR);
-
- free(main_data_path_old);
- }
-#endif
-
- return main_data_path;
-}
-
/* ------------------------------------------------------------------------- */
/* various string functions */
void (*print_usage_function)(void),
void (*print_version_function)(void))
{
- char *ro_base_path = RO_BASE_PATH;
- char *rw_base_path = RW_BASE_PATH;
+ char *ro_base_path = getProgramMainDataPath(argv[0], RO_BASE_PATH);
+ char *rw_base_path = getProgramMainDataPath(argv[0], RW_BASE_PATH);
char **argvplus = checked_calloc((argc + 1) * sizeof(char **));
char **options_left = &argvplus[1];
while (argc--)
argvplus[argc] = argv[argc];
- /* if the program is configured to start from current directory (default),
- determine program package directory from program binary (some versions
- of KDE/Konqueror and Mac OS X (especially "Mavericks") apparently do not
- set the current working directory to the program package directory) */
-
- if (strEqual(ro_base_path, "."))
- ro_base_path = getProgramMainDataPath();
- if (strEqual(rw_base_path, "."))
- rw_base_path = getProgramMainDataPath();
-
/* initialize global program options */
options.server_host = NULL;
options.server_port = 0;