diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-04 00:17:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-04 00:17:27 -0800 |
| commit | 3afaa72d7d4e52d5fa1bc19abb68301f2b09aca6 (patch) | |
| tree | 27ced0c124fc0bcf1869cdd2bbe84394f219114d /diff-lib.c | |
| parent | 5332b2af104180b8135e0b3528ace7596cb9ba09 (diff) | |
| download | git-3afaa72d7d4e52d5fa1bc19abb68301f2b09aca6.tar.gz | |
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-lib.c')
| -rw-r--r-- | diff-lib.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/diff-lib.c b/diff-lib.c index 226f09c72b..470ad656a8 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -38,7 +38,7 @@ static int queue_diff(struct diff_options *o, if (name1) { if (!strcmp(name1, "-")) - mode1 = 0644; + mode1 = ntohl(create_ce_mode(0666)); else if (stat(name1, &st)) return error("Could not access '%s'", name1); else @@ -46,7 +46,7 @@ static int queue_diff(struct diff_options *o, } if (name2) { if (!strcmp(name2, "-")) - mode2 = 0644; + mode2 = ntohl(create_ce_mode(0666)); else if (stat(name2, &st)) return error("Could not access '%s'", name2); else @@ -260,9 +260,15 @@ int setup_diff_no_index(struct rev_info *revs, revs->diffopt.paths = xcalloc(2, sizeof(char*)); for (i = 0; i < 2; i++) { - const char *p; - p = prefix_filename(prefix, len, argv[argc - 2 + i]); - revs->diffopt.paths[i] = xstrdup(p); + const char *p = argv[argc - 2 + i]; + /* + * stdin should be spelled as '-'; if you have + * path that is '-', spell it as ./-. + */ + p = (strcmp(p, "-") + ? xstrdup(prefix_filename(prefix, len, p)) + : p); + revs->diffopt.paths[i] = p; } } else |