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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@272921 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/config.c b/main/config.c
index 7d2af29c6524912b21003275863e7ba4857dbfdf..4a7bad894af5db715245a78ce98352d12c200634 100644 (file)
--- a/main/config.c
+++ b/main/config.c
@@ -726,20 +726,13 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
                        if (c) {
                                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++;
+                               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';
                                        }