From d1907a0d4879cf57e3a4d967ddafc82abe9d39db Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 10 Sep 2015 12:20:41 +0200 Subject: [PATCH] tester.c: fix resource directory path --- mediastreamer2 | 2 +- tester/liblinphone_tester.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mediastreamer2 b/mediastreamer2 index 93cf916ac..e9b2d8d4e 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 93cf916ac44dea93db7744b1d66ea3655c8345d9 +Subproject commit e9b2d8d4e1ce790f72b1c02c3d3242651f22672d diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c index 1c542d736..e5bc8cd89 100644 --- a/tester/liblinphone_tester.c +++ b/tester/liblinphone_tester.c @@ -196,12 +196,12 @@ int main (int argc, char *argv[]) liblinphone_tester_init(NULL); - if (strstr(argv[0], ".libs") && argv[0][0] == '/') { - char res_dir[128] = {0}; - // this allows to launch liblinphone_tester from outside of tester directory - strncpy(res_dir, argv[0], strstr(argv[0], ".libs")-argv[0]); - bc_tester_set_resource_dir_prefix(res_dir); - bc_tester_set_writable_dir_prefix(res_dir); + // this allows to launch liblinphone_tester from outside of tester directory + if (strstr(argv[0], ".libs")) { + char* prefix = ms_strdup_printf("%s%s", argv[0][0]=='/'?"":"./", strstr(argv[0], ".libs")); + bc_tester_set_resource_dir_prefix(prefix); + bc_tester_set_writable_dir_prefix(prefix); + ms_free(prefix); } for(i = 1; i < argc; ++i) {