summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-02-25 22:36:31 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-04 08:20:31 (GMT)
commit0c725f1bd938fa2b626e910773e622a385daced2 (patch)
treed44a9208e852d6379861c7956b8d2a565055250a
parent3afaa72d7d4e52d5fa1bc19abb68301f2b09aca6 (diff)
downloadgit-0c725f1bd938fa2b626e910773e622a385daced2.zip
git-0c725f1bd938fa2b626e910773e622a385daced2.tar.gz
git-0c725f1bd938fa2b626e910773e622a385daced2.tar.bz2
diff --no-index: support /dev/null as filename
This allows us to create "new file" and "delete file" patches. It also cleans up the code. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--diff-lib.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/diff-lib.c b/diff-lib.c
index 470ad65..5e6bca5 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -30,28 +30,28 @@ static int read_directory(const char *path, struct path_list *list)
return 0;
}
+static int get_mode(const char *path, int *mode)
+{
+ struct stat st;
+
+ if (!path || !strcmp(path, "/dev/null"))
+ *mode = 0;
+ else if (!strcmp(path, "-"))
+ *mode = ntohl(create_ce_mode(0666));
+ else if (stat(path, &st))
+ return error("Could not access '%s'", path);
+ else
+ *mode = st.st_mode;
+ return 0;
+}
+
static int queue_diff(struct diff_options *o,
const char *name1, const char *name2)
{
- struct stat st;
int mode1 = 0, mode2 = 0;
- if (name1) {
- if (!strcmp(name1, "-"))
- mode1 = ntohl(create_ce_mode(0666));
- else if (stat(name1, &st))
- return error("Could not access '%s'", name1);
- else
- mode1 = st.st_mode;
- }
- if (name2) {
- if (!strcmp(name2, "-"))
- mode2 = ntohl(create_ce_mode(0666));
- else if (stat(name2, &st))
- return error("Could not access '%s'", name2);
- else
- mode2 = st.st_mode;
- }
+ if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
+ return -1;
if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2))
return error("file/directory conflict: %s, %s", name1, name2);