#if defined(PLATFORM_MACOSX)
static char *main_data_binary_subdir = NULL;
+ static char *main_data_files_subdir = NULL;
if (main_data_binary_subdir == NULL)
{
program.program_title, MAC_APP_BINARY_SUBDIR);
}
- // cut relative path to Mac OS X application binary directory from path
+ if (main_data_files_subdir == NULL)
+ {
+ main_data_files_subdir = checked_malloc(strlen(program.program_title) + 1 +
+ strlen("app") + 1 +
+ strlen(MAC_APP_FILES_SUBDIR) + 1);
+
+ sprintf(main_data_files_subdir, "%s.app/%s",
+ program.program_title, MAC_APP_FILES_SUBDIR);
+ }
+
if (strSuffix(main_data_path, main_data_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(main_data_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';
+ // 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, main_data_files_subdir);
+
+ free(main_data_path_old);
+ }
#endif
return main_data_path;
options.execute_command = NULL;
options.special_flags = NULL;
+ options.mytapes = FALSE;
options.serveronly = FALSE;
options.network = FALSE;
options.verbose = FALSE;
if (option_arg == next_option)
options_left++;
}
+ else if (strncmp(option, "-mytapes", option_len) == 0)
+ {
+ options.mytapes = TRUE;
+ }
else if (strncmp(option, "-network", option_len) == 0)
{
options.network = TRUE;
if (strEqual((*node_first)->key, key))
{
- checked_free((*node_first)->key);
+ // after first recursion, (*node_first)->prev->next == *node_first,
+ // so *node_first would be overwritten with (*node_first)->next
+ // => use a copy of *node_first (and later of (*node_first)->next)
+ ListNode *node = *node_first;
+ ListNode *node_next = node->next;
+
+ checked_free(node->key);
if (destructor_function)
- destructor_function((*node_first)->content);
+ destructor_function(node->content);
- if ((*node_first)->next)
- (*node_first)->next->prev = (*node_first)->prev;
+ if (node->prev)
+ node->prev->next = node->next;
- checked_free(*node_first);
+ if (node->next)
+ node->next->prev = node->prev;
- *node_first = (*node_first)->next;
+ checked_free(node);
+
+ // after removing node, set list pointer to next valid list node
+ // (this is important if the first node of the list was deleted)
+ *node_first = node_next;
}
else
+ {
deleteNodeFromList(&(*node_first)->next, key, destructor_function);
+ }
}
ListNode *getNodeFromKey(ListNode *node_first, char *key)
return getStringCat2(map_token_prefix[i][1], &token[len_token_prefix]);
}
+ // change tokens containing ".gfx" by moving the "gfx" part to the very left
+ char *gfx_substring = ".gfx";
+ char *gfx_prefix = "gfx.";
+ if (strstr(token, gfx_substring) != NULL)
+ {
+ char *token_prefix = getStringCopy(token);
+ char *token_gfx_pos = strstr(token_prefix, gfx_substring);
+ char *token_suffix = &token_gfx_pos[strlen(gfx_substring)];
+ char *mapped_token;
+
+ // cut off token string at ".gfx" substring position
+ *token_gfx_pos = '\0';
+
+ // put together prefix "gfx." and token prefix and suffix without ".gfx"
+ mapped_token = getStringCat3(gfx_prefix, token_prefix, token_suffix);
+
+ free(token_prefix);
+
+ return mapped_token;
+ }
+
return NULL;
}
char **ignore_tokens,
int num_file_list_entries)
{
+ SetupFileHash *ignore_tokens_hash;
struct FileInfo *file_list;
int num_file_list_entries_found = 0;
int num_suffix_list_entries = 0;
int list_pos;
int i, j;
+ /* create hash from list of tokens to be ignored (for quick access) */
+ ignore_tokens_hash = newSetupFileHash();
+ for (i = 0; ignore_tokens[i] != NULL; i++)
+ setHashEntry(ignore_tokens_hash, ignore_tokens[i], "");
+
file_list = checked_calloc(num_file_list_entries * sizeof(struct FileInfo));
for (i = 0; suffix_list[i].token != NULL; i++)
}
/* the following tokens are no file definitions, but other config tokens */
- for (j = 0; ignore_tokens[j] != NULL; j++)
- if (strEqual(config_list[i].token, ignore_tokens[j]))
- is_file_entry = FALSE;
+ if (getHashEntry(ignore_tokens_hash, config_list[i].token) != NULL)
+ is_file_entry = FALSE;
if (is_file_entry)
{
Error(ERR_EXIT, "please fix");
}
+ freeSetupFileHash(ignore_tokens_hash);
+
return file_list;
}
}
END_HASH_ITERATION(valid_file_hash_tmp, itr)
- /* free temporary hash used for iteration */
+ /* free temporary hash used for iteration */
freeSetupFileHash(valid_file_hash_tmp);
/* read parameters for all known config file tokens */