diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-28 21:46:46 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-28 21:46:46 +0000 |
commit | afe4b277bf32e0873c2b7829d9f78280b62310a2 (patch) | |
tree | a07d39f92a79c419d9da6e4cff223bc8bdc699f6 /main | |
parent | 1ad5c926effa8d4eb7c427fa3985c172c86200b6 (diff) |
Merged revisions 272923 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r272923 | tilghman | 2010-06-28 16:42:52 -0500 (Mon, 28 Jun 2010) | 19 lines
Merged revisions 272921-272922 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r272921 | tilghman | 2010-06-28 16:29:27 -0500 (Mon, 28 Jun 2010) | 8 lines
Change the way that we read include files, to accommodate for changes in GCC 4.4.
(closes issue #17472)
Reported by: seandarcy
Patches:
config2.patch uploaded by nivan (license 1066)
Tested by: nivan
........
r272922 | tilghman | 2010-06-28 16:38:49 -0500 (Mon, 28 Jun 2010) | 2 lines
Also trim trailing blanks on #includes
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272924 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/config.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/main/config.c b/main/config.c index eb2ec169d..7eb10bde4 100644 --- a/main/config.c +++ b/main/config.c @@ -1023,12 +1023,13 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat, if (*c) { *c = '\0'; /* Find real argument */ - c = ast_skip_blanks(c + 1); + c = ast_strip(c + 1); if (!(*c)) { c = NULL; } - } else + } else { c = NULL; + } if (!strcasecmp(cur, "include")) { do_include = 1; } else if (!strcasecmp(cur, "exec")) { @@ -1052,20 +1053,14 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat, cur = c; /* Strip off leading and trailing "'s and <>'s */ - if (*c == '"') { - /* Dequote */ - while (*c) { - if (*c == '"') { - strcpy(c, c + 1); /* SAFE */ - c--; - } else if (*c == '\\') { - strcpy(c, c + 1); /* SAFE */ - } - c++; + /* Dequote */ + if ((*c == '"') || (*c == '<')) { + char quote_char = *c; + if (quote_char == '<') { + quote_char = '>'; } - } else if (*c == '<') { - /* C-style include */ - if (*(c + strlen(c) - 1) == '>') { + + if (*(c + strlen(c) - 1) == quote_char) { cur++; *(c + strlen(c) - 1) = '\0'; } |