bundle, fast-import: detect write failure
I noticed some unchecked writes. This fixes them. * bundle.c (create_bundle): Die upon write failure. * fast-import.c (keep_pack): Die upon write or close failure. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jim Meyering committed
Jan 10, 2008 at 09:54 UTC
95693d45ee1c1d4b76cac672636cf31229186a18
2 files changed
+6
-5
bundle.c
+3
-3
@@ -320,9 +320,9 @@ int create_bundle(struct bundle_header *header, const char *path,
320
for (i = 0; i < revs.pending.nr; i++) {
321
struct object *object = revs.pending.objects[i].item;
322
if (object->flags & UNINTERESTING)
323
- write(rls.in, "^", 1);
324
- write(rls.in, sha1_to_hex(object->sha1), 40);
325
- write(rls.in, "\n", 1);
323
+ write_or_die(rls.in, "^", 1);
324
+ write_or_die(rls.in, sha1_to_hex(object->sha1), 40);
325
+ write_or_die(rls.in, "\n", 1);
326
}
327
if (finish_command(&rls))
328
return error ("pack-objects died");
fast-import.c
+3
-2
@@ -878,8 +878,9 @@ static char *keep_pack(char *curr_index_name)
878
keep_fd = open(name, O_RDWR|O_CREAT|O_EXCL, 0600);
879
if (keep_fd < 0)
880
die("cannot create keep file");
881
- write(keep_fd, keep_msg, strlen(keep_msg));
882
- close(keep_fd);
881
+ write_or_die(keep_fd, keep_msg, strlen(keep_msg));
882
+ if (close(keep_fd))
883
+ die("failed to write keep file");
884
885
snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
886
get_object_directory(), sha1_to_hex(pack_data->sha1));