mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 20:04:50 +00:00
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
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user