Merged revisions 78180 via svnmerge from
authorJason Parker <jparker@digium.com>
Mon, 6 Aug 2007 16:31:42 +0000 (16:31 +0000)
committerJason Parker <jparker@digium.com>
Mon, 6 Aug 2007 16:31:42 +0000 (16:31 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #9938)
........
r78180 | qwell | 2007-08-06 11:30:51 -0500 (Mon, 06 Aug 2007) | 5 lines

Fix an issue with using UpdateConfig (manager action) where escaped semicolons
 in a config would be converted to just semicolons (\; to ;)

Issue 9938

........

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

main/config.c

index 4ce7779..7c9106c 100644 (file)
@@ -851,9 +851,8 @@ static struct ast_config *config_text_file_load(const char *database, const char
                                
                                while ((comment_p = strchr(new_buf, COMMENT_META))) {
                                        if ((comment_p > new_buf) && (*(comment_p-1) == '\\')) {
-                                               /* Yuck, gotta memmove */
-                                               memmove(comment_p - 1, comment_p, strlen(comment_p) + 1);
-                                               new_buf = comment_p;
+                                               /* Escaped semicolons aren't comments. */
+                                               new_buf = comment_p + 1;
                                        } else if (comment_p[1] == COMMENT_TAG && comment_p[2] == COMMENT_TAG && (comment_p[3] != '-')) {
                                                /* Meta-Comment start detected ";--" */
                                                if (comment < MAX_NESTED_COMMENTS) {