On Tue, 7 Aug 2007, Steffen Prohaska wrote:
>
> Is there any chance that patches would be accepted that try to
> do so? Even if they add "b" to fopen and O_BINARY to open, which
> both are useless on Unix?
I certainly don't think it would be wrong to add O_BINARY to the open()
parameters (and "b" to fopen() and friends), if it makes a difference.
Add a
#ifndef O_BINARY
#define O_BINARY 0
#endif
and it should be harmless anywhere else.
So if you're willing to test, and extend on this, maybe something like
this gets you started (I think the main issue will be the object files,
no?)
Linus
---
diff --git a/sha1_file.c b/sha1_file.c
index aca741b..0f613c0 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -23,6 +23,10 @@
#endif
#endif
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
#ifdef NO_C99_FORMAT
#define SZ_FMT "lu"
#else
@@ -444,7 +448,7 @@ static int check_packed_git_idx(const char *path, struct packed_git *p)
struct pack_idx_header *hdr;
size_t idx_size;
uint32_t version, nr, i, *index;
- int fd = open(path, O_RDONLY);
+ int fd = open(path, O_BINARY | O_RDONLY);
struct stat st;
if (fd < 0)
@@ -631,7 +635,7 @@ static int open_packed_git_1(struct packed_git *p)
if (!p->index_data && open_pack_index(p))
return error("packfile %s index unavailable", p->pack_name);
- p->pack_fd = open(p->pack_name, O_RDONLY);
+ p->pack_fd = open(p->pack_name, O_BINARY | O_RDONLY);
if (p->pack_fd < 0 || fstat(p->pack_fd, &st))
return -1;
@@ -983,12 +987,12 @@ static void *map_sha1_file(const unsigned char *sha1, unsigned long *size)
return NULL;
}
- fd = open(filename, O_RDONLY | sha1_file_open_flag);
+ fd = open(filename, O_BINARY | O_RDONLY | sha1_file_open_flag);
if (fd < 0) {
/* See if it works without O_NOATIME */
switch (sha1_file_open_flag) {
default:
- fd = open(filename, O_RDONLY);
+ fd = open(filename, O_BINARY | O_RDONLY);
if (fd >= 0)
break;
/* Fallthrough */
@@ -2023,6 +2027,12 @@ int move_temp_to_file(const char *tmpfile, const char *filename)
return 0;
}
+static void close_or_die(int fd, const char *file)
+{
+ if (close(fd))
+ die("unable to close %s (%s)", file, strerror(errno));
+}
+
static int write_buffer(int fd, const void *buf, size_t len)
{
if (write_in_full(fd, buf, len) < 0)
@@ -2059,7 +2069,7 @@ int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned cha
hashcpy(returnsha1, sha1);
if (has_sha1_file(sha1))
return 0;
- fd = open(filename, O_RDONLY);
+ fd = open(filename, O_BINARY | O_RDONLY);
if (fd >= 0) {
/*
* FIXME!!! We might do collision checking here, but we'd
@@ -2112,11 +2122,9 @@ int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned cha
size = stream.total_out;
- if (write_buffer(fd, compressed, size) < 0)
- die("unable to write sha1 file");
+ write_or_die(fd, compressed, size);
fchmod(fd, 0444);
- if (close(fd))
- die("unable to write sha1 file");
+ close_or_die(fd, "sha1 file");
free(compressed);
return move_temp_to_file(tmpfile, filename);
@@ -2229,8 +2237,7 @@ int write_sha1_from_fd(const unsigned char *sha1, int fd, char *buffer,
SHA1_Update(&c, discard, sizeof(discard) -
stream.avail_out);
} while (stream.avail_in && ret == Z_OK);
- if (write_buffer(local, buffer, *bufposn - stream.avail_in) < 0)
- die("unable to write sha1 file");
+ write_or_die(local, buffer, *bufposn - stream.avail_in);
memmove(buffer, buffer + *bufposn - stream.avail_in,
stream.avail_in);
*bufposn = stream.avail_in;
@@ -2251,8 +2258,7 @@ int write_sha1_from_fd(const unsigned char *sha1, int fd, char *buffer,
inflateEnd(&stream);
fchmod(local, 0444);
- if (close(local) != 0)
- die("unable to write sha1 file");
+ close_or_die(local, "sha1 file");
SHA1_Final(real_sha1, &c);
if (ret != Z_STREAM_END) {
unlink(tmpfile);
@@ -2412,7 +2418,7 @@ int index_path(unsigned char *sha1, const char *path, struct stat *st, int write
switch (st->st_mode & S_IFMT) {
case S_IFREG:
- fd = open(path, O_RDONLY);
+ fd = open(path, O_BINARY | O_RDONLY);
if (fd < 0)
return error("open(\"%s\"): %s", path,
strerror(errno));
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
