[sr-dev] git:master:e956ae7b: pv: support all spaces separator for {s.select}

Module: kamailio Branch: master Commit: e956ae7b83971c50cbdf1a4db8db9929f02e3b19 URL: https://github.com/kamailio/kamailio/commit/e956ae7b83971c50cbdf1a4db8db992… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2024-06-25T11:03:01+02:00 pv: support all spaces separator for {s.select} --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/e956ae7b83971c50cbdf1a4db8db992… Patch: https://github.com/kamailio/kamailio/commit/e956ae7b83971c50cbdf1a4db8db992… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index dcf5479a105..b0eba93eed8 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -256,7 +256,8 @@ int tr_eval_string( for(i = 0; i < val->rs.len; i++) { if(val->rs.s[i] == '\r' || val->rs.s[i] == '\n') { c = 1; - } else if(c != 0 && (val->rs.s[i] == ' ' || val->rs.s[i] == '\t')) { + } else if(c != 0 + && (val->rs.s[i] == ' ' || val->rs.s[i] == '\t')) { if(c == 1) { _tr_buffer[j] = ' '; j++; @@ -284,7 +285,8 @@ int tr_eval_string( for(i = 0; i < val->rs.len; i++) { if(val->rs.s[i] == '\r' || val->rs.s[i] == '\n') { c = 1; - } else if(c != 0 && (val->rs.s[i] == ' ' || val->rs.s[i] == '\t')) { + } else if(c != 0 + && (val->rs.s[i] == ' ' || val->rs.s[i] == '\t')) { c = 2; } else { _tr_buffer[j] = val->rs.s[i]; @@ -816,6 +818,9 @@ int tr_eval_string( case 't': c = '\t'; break; + case 's': + c = ' '; + break; default: LM_ERR("invalid select escape char (cfg line: %d)\n", get_cfg_crt_line()); @@ -832,7 +837,10 @@ int tr_eval_string( i = -i; i--; while(p >= val->rs.s) { - if(*p == c) { + if(((c == 1) + && (*p == ' ' || *p == '\t' || *p == '\n' + || *p == '\r')) + || (*p == c)) { if(i == 0) break; s = p - 1; @@ -850,7 +858,10 @@ int tr_eval_string( s = val->rs.s; p = s; while(p < val->rs.s + val->rs.len) { - if(*p == c) { + if(((c == 1) + && (*p == ' ' || *p == '\t' || *p == '\n' + || *p == '\r')) + || (*p == c)) { if(i == 0) break; s = p + 1;