kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 03:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

config.c: retain leading whitespace before comments

Browse Source 
Configurations loaded with the ast_config_load2() API and later written
out with ast_config_text_file_save2() will have any leading whitespace
stripped away.  The APIs should make reasonable efforts to maintain the
content and formatting of the configuration files.

This change retains any leading whitespace from comment lines that start
with a ";".

Resolves: https://github.com/asterisk/asterisk/issues/970
(cherry picked from commit 4528f5f25a)
This commit is contained in:
Allan Nathanson
2024-10-30 16:52:41 -04:00
committed by Asterisk Development Team
parent 32bf6bbf13
commit 6e114c7869
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/config.c
View File

@@ -2469,6 +2469,18 @@ static struct ast_config *config_text_file_load(const char *database, const char
if (!comment) {
/* If ; is found, and we are not nested in a comment,
we immediately stop all comment processing */
while ((comment_p > new_buf) && isspace(*(comment_p - 1))) {
/* To preserve comment formatting we want to include any
whitespace before the ";" */
comment_p--;
}
if ((comment_p != new_buf) && (*comment_p == ' ') && (*(comment_p + 1) == ' ')) {
/* If the comment (w/whitespace) does not start in column 1
then, when written out, the preceeding variable/value will
be separated from the comment by two spaces. To preserve
comment formatting we should also take this into account. */
comment_p += 2;
}
if (ast_test_flag(&flags, CONFIG_FLAG_WITHCOMMENTS)) {
CB_ADD(&lline_buffer, comment_p);
}