From: Tilghman Lesher Date: Thu, 25 Oct 2007 22:53:06 +0000 (+0000) Subject: Backport alternate encoding of newline delimiters from trunk to 1.4, as approved... X-Git-Tag: 1.4.14~100 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ee24bef92fd32b93539adbf0ef188fc53636bb8;p=thirdparty%2Fasterisk.git Backport alternate encoding of newline delimiters from trunk to 1.4, as approved by Russell Reported by blitzrage Closes issue #10903 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@87067 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/funcs/func_cut.c b/funcs/func_cut.c index a8b8c81528..09340cac5a 100644 --- a/funcs/func_cut.c +++ b/funcs/func_cut.c @@ -145,7 +145,21 @@ static int cut_internal(struct ast_channel *chan, char *data, char *buffer, size return ERROR_NOMEM; } - d = args.delimiter[0] ? args.delimiter[0] : '-'; + if (args.delimiter[0] == '\\') { + if (args.delimiter[1] == 'n') + d = '\n'; + else if (args.delimiter[1] == 't') + d = '\t'; + else if (args.delimiter[1] == 'r') + d = '\r'; + else if (args.delimiter[1]) + d = args.delimiter[1]; + else + d = '-'; + } else if (args.delimiter[0]) + d = args.delimiter[0]; + else + d = '-'; /* String form of the delimiter, for use with strsep(3) */ snprintf(ds, sizeof(ds), "%c", d);