X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-merge-file.c;h=58deb62ac08507901c40e89aec0cea7fcdc78f1e;hb=a5e407988b35b7353bd03c770afc647670c25981;hp=41fb92edfbd0512542f277b7e7e4af30e25283be;hpb=ba1f5f353775ddbf97bc0d543888783630693023;p=git.git

diff --git a/builtin-merge-file.c b/builtin-merge-file.c
index 41fb92edf..58deb62ac 100644
--- a/builtin-merge-file.c
+++ b/builtin-merge-file.c
@@ -1,42 +1,34 @@
+#include "builtin.h"
 #include "cache.h"
 #include "xdiff/xdiff.h"
+#include "xdiff-interface.h"
 
 static const char merge_file_usage[] =
-"git merge-file [-L name1 [-L orig [-L name2]]] file1 orig_file file2";
+"git merge-file [-p | --stdout] [-q | --quiet] [-L name1 [-L orig [-L name2]]] file1 orig_file file2";
 
-static int read_file(mmfile_t *ptr, const char *filename)
+int cmd_merge_file(int argc, const char **argv, const char *prefix)
 {
-	struct stat st;
-	FILE *f;
-
-	if (stat(filename, &st))
-		return error("Could not stat %s", filename);
-	if ((f = fopen(filename, "rb")) == NULL)
-		return error("Could not open %s", filename);
-	ptr->ptr = xmalloc(st.st_size);
-	if (fread(ptr->ptr, st.st_size, 1, f) != 1)
-		return error("Could not read %s", filename);
-	fclose(f);
-	ptr->size = st.st_size;
-	return 0;
-}
-
-int cmd_merge_file(int argc, char **argv, char **envp)
-{
-	char *names[3];
+	const char *names[3];
 	mmfile_t mmfs[3];
 	mmbuffer_t result = {NULL, 0};
 	xpparam_t xpp = {XDF_NEED_MINIMAL};
-	int ret = 0, i = 0;
+	int ret = 0, i = 0, to_stdout = 0;
 
 	while (argc > 4) {
-		if (!strcmp(argv[1], "-L")) {
+		if (!strcmp(argv[1], "-L") && i < 3) {
 			names[i++] = argv[2];
-			argc -= 2;
-			argv += 2;
-			continue;
-		}
-		usage(merge_file_usage);
+			argc--;
+			argv++;
+		} else if (!strcmp(argv[1], "-p") ||
+				!strcmp(argv[1], "--stdout"))
+			to_stdout = 1;
+		else if (!strcmp(argv[1], "-q") ||
+				!strcmp(argv[1], "--quiet"))
+			freopen("/dev/null", "w", stderr);
+		else
+			usage(merge_file_usage);
+		argc--;
+		argv++;
 	}
 
 	if (argc != 4)
@@ -45,9 +37,13 @@ int cmd_merge_file(int argc, char **argv, char **envp)
 	for (; i < 3; i++)
 		names[i] = argv[i + 1];
 
-	for (i = 0; i < 3; i++)
-		if (read_file(mmfs + i, argv[i + 1]))
+	for (i = 0; i < 3; i++) {
+		if (read_mmfile(mmfs + i, argv[i + 1]))
 			return -1;
+		if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size))
+			return error("Cannot merge binary files: %s\n",
+					argv[i + 1]);
+	}
 
 	ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2],
 			&xpp, XDL_MERGE_ZEALOUS, &result);
@@ -56,8 +52,8 @@ int cmd_merge_file(int argc, char **argv, char **envp)
 		free(mmfs[i].ptr);
 
 	if (ret >= 0) {
-		char *filename = argv[1];
-		FILE *f = fopen(filename, "wb");
+		const char *filename = argv[1];
+		FILE *f = to_stdout ? stdout : fopen(filename, "wb");
 
 		if (!f)
 			ret = error("Could not open %s for writing", filename);