pack-objects: only throw away data during memory pressure

diff --git a/config.c b/config.c
index 80db92990aa9e51fe5eccac6e734b5570c51a12f..e799f40db74fd1f40849dcec21e997f165a52e35 100644 (file)
--- a/config.c
+++ b/config.c
@@ -13,6 +13,7 @@
 static FILE *config_file;
 static const char *config_file_name;
 static int config_linenr;
+static int config_file_eof;
 static int zlib_compression_seen;
 
 static int get_next_char(void)
@@ -34,7 +35,7 @@ static int get_next_char(void)
                if (c == '\n')
                        config_linenr++;
                if (c == EOF) {
-                       config_file = NULL;
+                       config_file_eof = 1;
                        c = '\n';
                }
        }
@@ -118,7 +119,7 @@ static int get_value(config_fn_t fn, char *name, unsigned int len)
        /* Get the full name */
        for (;;) {
                c = get_next_char();
-               if (c == EOF)
+               if (config_file_eof)
                        break;
                if (!iskeychar(c))
                        break;
@@ -182,7 +183,7 @@ static int get_base_var(char *name)
 
        for (;;) {
                int c = get_next_char();
-               if (c == EOF)
+               if (config_file_eof)
                        return -1;
                if (c == ']')
                        return baselen;
@@ -205,8 +206,7 @@ static int git_parse_file(config_fn_t fn)
        for (;;) {
                int c = get_next_char();
                if (c == '\n') {
-                       /* EOF? */
-                       if (!config_file)
+                       if (config_file_eof)
                                return 0;
                        comment = 0;
                        continue;
@@ -469,6 +469,7 @@ int git_config_from_file(config_fn_t fn, const char *filename)
                config_file = f;
                config_file_name = filename;
                config_linenr = 1;
+               config_file_eof = 0;
                ret = git_parse_file(fn);
                fclose(f);
                config_file_name = NULL;
@@ -700,12 +701,17 @@ static ssize_t find_beginning_of_line(const char* contents, size_t size,
        size_t equal_offset = size, bracket_offset = size;
        ssize_t offset;
 
+contline:
        for (offset = offset_-2; offset > 0
                        && contents[offset] != '\n'; offset--)
                switch (contents[offset]) {
                        case '=': equal_offset = offset; break;
                        case ']': bracket_offset = offset; break;
                }
+       if (offset > 0 && contents[offset-1] == '\\') {
+               offset_ = offset;
+               goto contline;
+       }
        if (bracket_offset < equal_offset) {
                *found_bracket = 1;
                offset = bracket_offset+1;
@@ -918,6 +924,9 @@ int git_config_set_multivar(const char* key, const char* value,
                                        contents, contents_sz,
                                        store.offset[i]-2, &new_line);
 
+                       if (copy_end > 0 && contents[copy_end-1] != '\n')
+                               new_line = 1;
+
                        /* write the first part of the config */
                        if (copy_end > copy_begin) {
                                if (write_in_full(fd, contents + copy_begin,
@@ -951,14 +960,12 @@ int git_config_set_multivar(const char* key, const char* value,
                munmap(contents, contents_sz);
        }
 
-       if (close(fd) || commit_lock_file(lock) < 0) {
+       if (commit_lock_file(lock) < 0) {
                fprintf(stderr, "Cannot commit config file!\n");
                ret = 4;
                goto out_free;
        }
 
-       /* fd is closed, so don't try to close it below. */
-       fd = -1;
        /*
         * lock is committed, so don't try to roll it back below.
         * NOTE: Since lockfile.c keeps a linked list of all created
@@ -969,8 +976,6 @@ int git_config_set_multivar(const char* key, const char* value,
        ret = 0;
 
 out_free:
-       if (0 <= fd)
-               close(fd);
        if (lock)
                rollback_lock_file(lock);
        free(config_filename);
@@ -1068,7 +1073,7 @@ int git_config_rename_section(const char *old_name, const char *new_name)
        }
        fclose(config_file);
  unlock_and_out:
-       if (close(out_fd) || commit_lock_file(lock) < 0)
+       if (commit_lock_file(lock) < 0)
                        ret = error("Cannot commit config file!");
  out:
        free(config_filename);