Skip to content

[switch_utils.c] fix switch_cut_path() function for both slash and back slash in path #770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sunlin7 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[switch_utils.c] fix switch_cut_path() function for both slash and back slash in path #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions src/switch_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2841,21 +2841,19 @@ SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char

SWITCH_DECLARE(const char *) switch_cut_path(const char *in)
{
const char *p, *ret = in;
const char delims[] = "/\\";
const char *i;

if (in) {
for (i = delims; *i; i++) {
p = in;
while ((p = strchr(p, *i)) != 0) {
ret = ++p;
}
}
return ret;
} else {
const char *p = in, *ret = in;

if (NULL == in) {
return NULL;
}
while ((p = strchr(ret, '/')) != NULL) {
ret = ++p;
}
while ((p = strchr(ret, '\\')) != NULL) {
ret = ++p;
}

return ret;
}

SWITCH_DECLARE(switch_status_t) switch_string_match(const char *string, size_t string_len, const char *search, size_t search_len)
Expand Down
6 changes: 6 additions & 0 deletions tests/unit/switch_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ FST_TEST_BEGIN(benchmark)
switch_url_encode(s, encoded, sizeof(encoded));
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "encoded: [%s]\n", encoded);
fst_check_string_equals(encoded, "%26bry%C3%A4n%23!%E6%9D%9C%E9%87%91%E6%88%BF");

switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "check the switch_cut_path\n");
fst_check_string_equals(switch_cut_path("switch-cut-path"), "switch-cut-path");
fst_check_string_equals(switch_cut_path("switch/cut-path"), "cut-path");
fst_check_string_equals(switch_cut_path("switch/cut\\path"), "path");
fst_check_string_equals(switch_cut_path("switch\\cut/path"), "path");
}
FST_TEST_END()

Expand Down