[asterisk-commits] qwell: trunk r78181 - in /trunk: ./ main/config.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Aug  6 11:31:42 2007
New Revision: 78181

URL: http://svn.digium.com/view/asterisk?view=rev&rev=78181
Log:
Merged revisions 78180 via svnmerge from 
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

........

Modified:
    trunk/   (props changed)
    trunk/main/config.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/config.c
URL: http://svn.digium.com/view/asterisk/trunk/main/config.c?view=diff&rev=78181&r1=78180&r2=78181
==============================================================================
--- trunk/main/config.c (original)
+++ trunk/main/config.c Mon Aug  6 11:31:42 2007
@@ -851,9 +851,8 @@
 				
 				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) {