Merged revisions 202753 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r202753 | rbrindley | 2009-06-23 16:25:17 -0500 (Tue, 23 Jun 2009) | 9 lines

  If we delete the info, lets also delete the lines

  (closes issue 0014509)
  Reported by: timeshell
  Patches:
        20090504__bug14509.diff.txt uploaded by tilghman (license 14)
  Tested by: awk, timeshell
........

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

diff --git a/main/config.c b/main/config.c
index fdc1e7a4fd86ef4f0ca19a28668214026faab81b..a1cc003b601b6e0f6d0e1889c1d0523991797703 100644 (file)
--- a/main/config.c
+++ b/main/config.c
@@ -737,6 +737,14 @@ int ast_variable_update(struct ast_category *category, const char *variable,
        
                newer->next = cur->next;
                newer->object = cur->object || object;
+
+               /* Preserve everything */
+               newer->lineno = cur->lineno;
+               newer->blanklines = cur->blanklines;
+               newer->precomments = cur->precomments; cur->precomments = NULL;
+               newer->sameline = cur->sameline; cur->sameline = NULL;
+               newer->trailing = cur->trailing; cur->trailing = NULL;
+
                if (prev)
                        prev->next = newer;
                else
@@ -1551,11 +1559,22 @@ static void insert_leading_blank_lines(FILE *fp, struct inclfile *fi, struct ast
           the ;! header comments were not also deleted in the process */
        if (lineno - precomment_lines - fi->lineno < 0) { /* insertions can mess up the line numbering and produce negative numbers that mess things up */
                return;
-       }
-       for (i=fi->lineno; i<lineno - precomment_lines; i++) {
-               fprintf(fp,"\n");
-       }
-       fi->lineno = lineno+1; /* Advance the file lineno */
+       } else if (lineno == 0) {
+               /* Line replacements also mess things up */
+               return;
+       } else if (lineno - precomment_lines - fi->lineno < 5) {
+               /* Only insert less than 5 blank lines; if anything more occurs,
+                * it's probably due to context deletion. */
+               for (i = fi->lineno; i < lineno - precomment_lines; i++) {
+                       fprintf(fp, "\n");
+               }
+       } else {
+               /* Deletion occurred - insert a single blank line, for separation of
+                * contexts. */
+               fprintf(fp, "\n");
+       }
+ 
+       fi->lineno = lineno + 1; /* Advance the file lineno */
 }
 
 int config_text_file_save(const char *configfile, const struct ast_config *cfg, const char *generator)