use xfopen() in more places

xfopen()

- provides error details
- explains error on reading, or writing, or whatever operation
- has l10n support
- prints file name in the error

Some of these are missing in the places that are replaced with xfopen(),
which is a clear win. In some other places, it's just less code (not as
clearly a win as the previous case but still is).

The only slight regresssion is in remote-testsvn, where we don't report
the file class (marks files) in the error messages anymore. But since
this is a _test_ svn remote transport, I'm not too concerned.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/bisect.c b/bisect.c
index 08c9fb7266c3b2ff8b970c21d350be4adfe7b0fc..469a3e90614eea21f4778d092307b2506d60beff 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -438,10 +438,7 @@ static void read_bisect_paths(struct argv_array *array)
 {
        struct strbuf str = STRBUF_INIT;
        const char *filename = git_path_bisect_names();
 {
        struct strbuf str = STRBUF_INIT;
        const char *filename = git_path_bisect_names();

-       FILE *fp = fopen(filename, "r");
-
-       if (!fp)
-               die_errno(_("Could not open file '%s'"), filename);
+       FILE *fp = xfopen(filename, "r");

 
        while (strbuf_getline_lf(&str, fp) != EOF) {
                strbuf_trim(&str);
 
        while (strbuf_getline_lf(&str, fp) != EOF) {
                strbuf_trim(&str);

diff --git a/builtin/am.c b/builtin/am.c
index a95dd8b4e6c793d9e51658e2ccbe535cf5a5af45..f5dac7783e551c1dc7d3a23a39b5e8bdd8cbe0f0 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1275,12 +1275,8 @@ static int parse_mail(struct am_state *state, const char *mail)
                die("BUG: invalid value for state->scissors");
        }
 
                die("BUG: invalid value for state->scissors");
        }
 

-       mi.input = fopen(mail, "r");
-       if (!mi.input)
-               die("could not open input");
-       mi.output = fopen(am_path(state, "info"), "w");
-       if (!mi.output)
-               die("could not open output 'info'");
+       mi.input = xfopen(mail, "r");
+       mi.output = xfopen(am_path(state, "info"), "w");

        if (mailinfo(&mi, am_path(state, "msg"), am_path(state, "patch")))
                die("could not parse patch");
 
        if (mailinfo(&mi, am_path(state, "msg"), am_path(state, "patch")))
                die("could not parse patch");
 

diff --git a/builtin/commit.c b/builtin/commit.c
index 1d805f5da8abd1cfafc41c5c47fd048b2549fbf4..eda0d3231165b54a12339fe2550c1e6688fc3843 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1695,10 +1695,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
                if (!reflog_msg)
                        reflog_msg = "commit (merge)";
                pptr = commit_list_append(current_head, pptr);
                if (!reflog_msg)
                        reflog_msg = "commit (merge)";
                pptr = commit_list_append(current_head, pptr);

-               fp = fopen(git_path_merge_head(), "r");
-               if (fp == NULL)
-                       die_errno(_("could not open '%s' for reading"),
-                                 git_path_merge_head());
+               fp = xfopen(git_path_merge_head(), "r");

                while (strbuf_getline_lf(&m, fp) != EOF) {
                        struct commit *parent;
 
                while (strbuf_getline_lf(&m, fp) != EOF) {
                        struct commit *parent;
 

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index e0220630d00cf2c069ce1a43e9511df57685acd2..128b99e6daa46aa1bac48f52a3d5b226f274eb44 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -905,9 +905,7 @@ static void export_marks(char *file)
 static void import_marks(char *input_file)
 {
        char line[512];
 static void import_marks(char *input_file)
 {
        char line[512];

-       FILE *f = fopen(input_file, "r");
-       if (!f)
-               die_errno("cannot read '%s'", input_file);
+       FILE *f = xfopen(input_file, "r");

 
        while (fgets(line, sizeof(line), f)) {
                uint32_t mark;
 
        while (fgets(line, sizeof(line), f)) {
                uint32_t mark;

diff --git a/builtin/fsck.c b/builtin/fsck.c
index b5e13a45560f9338a65191c22d213f33052bf9b9..00beaaa4e6edc7d644f43a6503aa895eb6d934c4 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -280,8 +280,7 @@ static void check_unreachable_object(struct object *obj)
                                free(filename);
                                return;
                        }
                                free(filename);
                                return;
                        }

-                       if (!(f = fopen(filename, "w")))
-                               die_errno("Could not open '%s'", filename);
+                       f = xfopen(filename, "w");

                        if (obj->type == OBJ_BLOB) {
                                if (stream_blob_to_fd(fileno(f), &obj->oid, NULL, 1))
                                        die_errno("Could not write '%s'", filename);
                        if (obj->type == OBJ_BLOB) {
                                if (stream_blob_to_fd(fileno(f), &obj->oid, NULL, 1))
                                        die_errno("Could not write '%s'", filename);

diff --git a/builtin/merge.c b/builtin/merge.c
index 703827f00668ca0df807f35e300f0927d00075cd..65a15018585ace678ef344bf4f1282fb46a00cbc 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -839,9 +839,7 @@ static int suggest_conflicts(void)
        struct strbuf msgbuf = STRBUF_INIT;
 
        filename = git_path_merge_msg();
        struct strbuf msgbuf = STRBUF_INIT;
 
        filename = git_path_merge_msg();

-       fp = fopen(filename, "a");
-       if (!fp)
-               die_errno(_("Could not open '%s' for writing"), filename);
+       fp = xfopen(filename, "a");

 
        append_conflicts_hint(&msgbuf);
        fputs(msgbuf.buf, fp);
 
        append_conflicts_hint(&msgbuf);
        fputs(msgbuf.buf, fp);

diff --git a/builtin/pull.c b/builtin/pull.c
index dd1a4a94e41ed31617d31c80e097cbc044b3e3f3..589c25becf270d24140ba5d2ddaf0251746fa170 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -337,8 +337,7 @@ static void get_merge_heads(struct oid_array *merge_heads)
        struct strbuf sb = STRBUF_INIT;
        struct object_id oid;
 
        struct strbuf sb = STRBUF_INIT;
        struct object_id oid;
 

-       if (!(fp = fopen(filename, "r")))
-               die_errno(_("could not open '%s' for reading"), filename);
+       fp = xfopen(filename, "r");

        while (strbuf_getline_lf(&sb, fp) != EOF) {
                if (get_oid_hex(sb.buf, &oid))
                        continue;  /* invalid line: does not start with SHA1 */
        while (strbuf_getline_lf(&sb, fp) != EOF) {
                if (get_oid_hex(sb.buf, &oid))
                        continue;  /* invalid line: does not start with SHA1 */

diff --git a/diff.c b/diff.c
index 11eef1c85d6d766320bfa24b10483fbc0869efe1..b6597ce56889589f194256bb15b7f11f54584625 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -4071,9 +4071,7 @@ int diff_opt_parse(struct diff_options *options,
                DIFF_OPT_CLR(options, FUNCCONTEXT);
        else if ((argcount = parse_long_opt("output", av, &optarg))) {
                char *path = prefix_filename(prefix, optarg);
                DIFF_OPT_CLR(options, FUNCCONTEXT);
        else if ((argcount = parse_long_opt("output", av, &optarg))) {
                char *path = prefix_filename(prefix, optarg);

-               options->file = fopen(path, "w");
-               if (!options->file)
-                       die_errno("Could not open '%s'", path);
+               options->file = xfopen(path, "w");

                options->close_file = 1;
                if (options->use_color != GIT_COLOR_ALWAYS)
                        options->use_color = GIT_COLOR_NEVER;
                options->close_file = 1;
                if (options->use_color != GIT_COLOR_ALWAYS)
                        options->use_color = GIT_COLOR_NEVER;


@@ -4807,9 +4805,7 @@ void diff_flush(struct diff_options *options)
                 */
                if (options->close_file)
                        fclose(options->file);
                 */
                if (options->close_file)
                        fclose(options->file);

-               options->file = fopen("/dev/null", "w");
-               if (!options->file)
-                       die_errno("Could not open /dev/null");
+               options->file = xfopen("/dev/null", "w");

                options->close_file = 1;
                for (i = 0; i < q->nr; i++) {
                        struct diff_filepair *p = q->queue[i];
                options->close_file = 1;
                for (i = 0; i < q->nr; i++) {
                        struct diff_filepair *p = q->queue[i];

diff --git a/fast-import.c b/fast-import.c
index cf58f875b889eb0360df1f58cacf4f4017c6c10f..420b3a00d30c9f02a93527e41478cd326914ce54 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -3274,9 +3274,7 @@ static void option_export_pack_edges(const char *edges)
 {
        if (pack_edges)
                fclose(pack_edges);
 {
        if (pack_edges)
                fclose(pack_edges);

-       pack_edges = fopen(edges, "a");
-       if (!pack_edges)
-               die_errno("Cannot open '%s'", edges);
+       pack_edges = xfopen(edges, "a");

 }
 
 static int parse_one_option(const char *option)
 }
 
 static int parse_one_option(const char *option)

diff --git a/remote-testsvn.c b/remote-testsvn.c
index f87bf851ba75af9229b1a9171191673af330505b..50404ef3438f37ae33e3590f1e7205581087f75a 100644 (file)
--- a/remote-testsvn.c
+++ b/remote-testsvn.c
@@ -124,10 +124,8 @@ static int note2mark_cb(const unsigned char *object_sha1,
 static void regenerate_marks(void)
 {
        int ret;
 static void regenerate_marks(void)
 {
        int ret;

-       FILE *marksfile = fopen(marksfilename, "w+");
+       FILE *marksfile = xfopen(marksfilename, "w+");

 
 

-       if (!marksfile)
-               die_errno("Couldn't create mark file %s.", marksfilename);

        ret = for_each_note(NULL, 0, note2mark_cb, marksfile);
        if (ret)
                die("Regeneration of marks failed, returned %d.", ret);
        ret = for_each_note(NULL, 0, note2mark_cb, marksfile);
        if (ret)
                die("Regeneration of marks failed, returned %d.", ret);


@@ -148,9 +146,7 @@ static void check_or_regenerate_marks(int latestrev)
        marksfile = fopen(marksfilename, "r");
        if (!marksfile) {
                regenerate_marks();
        marksfile = fopen(marksfilename, "r");
        if (!marksfile) {
                regenerate_marks();

-               marksfile = fopen(marksfilename, "r");
-               if (!marksfile)
-                       die_errno("cannot read marks file %s!", marksfilename);
+               marksfile = xfopen(marksfilename, "r");

                fclose(marksfile);
        } else {
                strbuf_addf(&sb, ":%d ", latestrev);
                fclose(marksfile);
        } else {
                strbuf_addf(&sb, ":%d ", latestrev);