summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-04 08:17:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-04 08:17:27 (GMT)
commit3afaa72d7d4e52d5fa1bc19abb68301f2b09aca6 (patch)
tree27ced0c124fc0bcf1869cdd2bbe84394f219114d /diff.c
parent5332b2af104180b8135e0b3528ace7596cb9ba09 (diff)
downloadgit-3afaa72d7d4e52d5fa1bc19abb68301f2b09aca6.zip
git-3afaa72d7d4e52d5fa1bc19abb68301f2b09aca6.tar.gz
git-3afaa72d7d4e52d5fa1bc19abb68301f2b09aca6.tar.bz2
diff-ni: fix the diff with standard input
The earlier commit to read from stdin was full of problems, and this corrects them. - The mode bits should have been set to satisify S_ISREG(); we forgot to the S_IFREG bits and hardcoded 0644; - We did not give escape hatch to name a path whose name is really "-". Allow users to say "./-" for that; - Use of xread() was not prepared to see short read (e.g. reading from tty) nor handing read errors. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c45
1 files changed, 29 insertions, 16 deletions
diff --git a/diff.c b/diff.c
index 81be6ad..9e276e5 100644
--- a/diff.c
+++ b/diff.c
@@ -1364,6 +1364,32 @@ static struct sha1_size_cache *locate_size_cache(unsigned char *sha1,
return e;
}
+static int populate_from_stdin(struct diff_filespec *s)
+{
+#define INCREMENT 1024
+ char *buf;
+ unsigned long size;
+ int got;
+
+ size = 0;
+ buf = NULL;
+ while (1) {
+ buf = xrealloc(buf, size + INCREMENT);
+ got = xread(0, buf + size, INCREMENT);
+ if (!got)
+ break; /* EOF */
+ if (got < 0)
+ return error("error while reading from stdin %s",
+ strerror(errno));
+ size += got;
+ }
+ s->should_munmap = 0;
+ s->data = buf;
+ s->size = size;
+ s->should_free = 1;
+ return 0;
+}
+
/*
* While doing rename detection and pickaxe operation, we may need to
* grab the data for the blob (or file) for our own in-core comparison.
@@ -1389,22 +1415,9 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
char *buf;
unsigned long size;
- if (!strcmp(s->path, "-")) {
-#define INCREMENT 1024
- int i = INCREMENT;
- size = 0;
- buf = NULL;
- while (i == INCREMENT) {
- buf = xrealloc(buf, size + INCREMENT);
- i = xread(0, buf + size, INCREMENT);
- size += i;
- }
- s->should_munmap = 0;
- s->data = buf;
- s->size = size;
- s->should_free = 1;
- return 0;
- }
+ if (!strcmp(s->path, "-"))
+ return populate_from_stdin(s);
+
if (lstat(s->path, &st) < 0) {
if (errno == ENOENT) {
err_empty: