test: do not LoadModule log_config_module unconditionally

diff --git a/rerere.c b/rerere.c
index 02931a151f1abe183763c9a1edb65ffd36d83bc3..713c6e16ac536eaa667cc9f22768670be129483c 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -12,15 +12,15 @@ static int rerere_autoupdate;
 
 static char *merge_rr_path;
 
-static const char *rr_path(const char *name, const char *file)
+const char *rerere_path(const char *hex, const char *file)
 {
-       return git_path("rr-cache/%s/%s", name, file);
+       return git_path("rr-cache/%s/%s", hex, file);
 }
 
-static int has_resolution(const char *name)
+int has_rerere_resolution(const char *hex)
 {
        struct stat st;
-       return !stat(rr_path(name, "postimage"), &st);
+       return !stat(rerere_path(hex, "postimage"), &st);
 }
 
 static void read_rr(struct string_list *rr)
@@ -70,6 +70,19 @@ static int write_rr(struct string_list *rr, int out_fd)
        return 0;
 }
 
+static void ferr_write(const void *p, size_t count, FILE *fp, int *err)
+{
+       if (!count || *err)
+               return;
+       if (fwrite(p, count, 1, fp) != 1)
+               *err = errno;
+}
+
+static inline void ferr_puts(const char *s, FILE *fp, int *err)
+{
+       ferr_write(s, strlen(s), fp, err);
+}
+
 static int handle_file(const char *path,
         unsigned char *sha1, const char *output)
 {
@@ -82,6 +95,7 @@ static int handle_file(const char *path,
        struct strbuf one = STRBUF_INIT, two = STRBUF_INIT;
        FILE *f = fopen(path, "r");
        FILE *out = NULL;
+       int wrerror = 0;
 
        if (!f)
                return error("Could not open %s", path);
@@ -118,11 +132,11 @@ static int handle_file(const char *path,
                        hunk_no++;
                        hunk = RR_CONTEXT;
                        if (out) {
-                               fputs("<<<<<<<\n", out);
-                               fwrite(one.buf, one.len, 1, out);
-                               fputs("=======\n", out);
-                               fwrite(two.buf, two.len, 1, out);
-                               fputs(">>>>>>>\n", out);
+                               ferr_puts("<<<<<<<\n", out, &wrerror);
+                               ferr_write(one.buf, one.len, out, &wrerror);
+                               ferr_puts("=======\n", out, &wrerror);
+                               ferr_write(two.buf, two.len, out, &wrerror);
+                               ferr_puts(">>>>>>>\n", out, &wrerror);
                        }
                        if (sha1) {
                                git_SHA1_Update(&ctx, one.buf ? one.buf : "",
@@ -139,7 +153,7 @@ static int handle_file(const char *path,
                else if (hunk == RR_SIDE_2)
                        strbuf_addstr(&two, buf);
                else if (out)
-                       fputs(buf, out);
+                       ferr_puts(buf, out, &wrerror);
                continue;
        bad:
                hunk = 99; /* force error exit */
@@ -149,8 +163,12 @@ static int handle_file(const char *path,
        strbuf_release(&two);
 
        fclose(f);
-       if (out)
-               fclose(out);
+       if (wrerror)
+               error("There were errors while writing %s (%s)",
+                     path, strerror(wrerror));
+       if (out && fclose(out))
+               wrerror = error("Failed to flush %s: %s",
+                               path, strerror(errno));
        if (sha1)
                git_SHA1_Final(sha1, &ctx);
        if (hunk != RR_CONTEXT) {
@@ -158,6 +176,8 @@ static int handle_file(const char *path,
                        unlink(output);
                return error("Could not parse conflict hunks in %s", path);
        }
+       if (wrerror)
+               return -1;
        return hunk_no;
 }
 
@@ -188,21 +208,25 @@ static int merge(const char *name, const char *path)
        mmbuffer_t result = {NULL, 0};
        xpparam_t xpp = {XDF_NEED_MINIMAL};
 
-       if (handle_file(path, NULL, rr_path(name, "thisimage")) < 0)
+       if (handle_file(path, NULL, rerere_path(name, "thisimage")) < 0)
                return 1;
 
-       if (read_mmfile(&cur, rr_path(name, "thisimage")) ||
-                       read_mmfile(&base, rr_path(name, "preimage")) ||
-                       read_mmfile(&other, rr_path(name, "postimage")))
+       if (read_mmfile(&cur, rerere_path(name, "thisimage")) ||
+                       read_mmfile(&base, rerere_path(name, "preimage")) ||
+                       read_mmfile(&other, rerere_path(name, "postimage")))
                return 1;
        ret = xdl_merge(&base, &cur, "", &other, "",
                        &xpp, XDL_MERGE_ZEALOUS, &result);
        if (!ret) {
                FILE *f = fopen(path, "w");
                if (!f)
-                       return error("Could not write to %s", path);
-               fwrite(result.ptr, result.size, 1, f);
-               fclose(f);
+                       return error("Could not open %s: %s", path,
+                                    strerror(errno));
+               if (fwrite(result.ptr, result.size, 1, f) != 1)
+                       error("Could not write %s: %s", path, strerror(errno));
+               if (fclose(f))
+                       return error("Writing %s failed: %s", path,
+                                    strerror(errno));
        }
 
        free(cur.ptr);
@@ -266,8 +290,8 @@ static int do_plain_rerere(struct string_list *rr, int fd)
                        hex = xstrdup(sha1_to_hex(sha1));
                        string_list_insert(path, rr)->util = hex;
                        if (mkdir(git_path("rr-cache/%s", hex), 0755))
-                               continue;;
-                       handle_file(path, NULL, rr_path(hex, "preimage"));
+                               continue;
+                       handle_file(path, NULL, rerere_path(hex, "preimage"));
                        fprintf(stderr, "Recorded preimage for '%s'\n", path);
                }
        }
@@ -283,7 +307,7 @@ static int do_plain_rerere(struct string_list *rr, int fd)
                const char *path = rr->items[i].string;
                const char *name = (const char *)rr->items[i].util;
 
-               if (has_resolution(name)) {
+               if (has_rerere_resolution(name)) {
                        if (!merge(name, path)) {
                                if (rerere_autoupdate)
                                        string_list_insert(path, &update);
@@ -302,7 +326,7 @@ static int do_plain_rerere(struct string_list *rr, int fd)
                        continue;
 
                fprintf(stderr, "Recorded resolution for '%s'.\n", path);
-               copy_file(rr_path(name, "postimage"), path, 0666);
+               copy_file(rerere_path(name, "postimage"), path, 0666);
        mark_resolved:
                rr->items[i].util = NULL;
        }