Commit c4cd9c5b87f894217b6aee09f12884f3db44aaf4
2020-11-21T15:34:19
sync files from diff.git e4c510c1d83fe01247b6f59d855dffad81e4f26a
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99
diff --git a/lib/diff_output.c b/lib/diff_output.c
index ad654fe..e286c62 100644
--- a/lib/diff_output.c
+++ b/lib/diff_output.c
@@ -326,3 +326,21 @@ diff_output_info_free(struct diff_output_info *output_info)
ARRAYLIST_FREE(output_info->line_offsets);
free(output_info);
}
+
+const char *
+diff_output_get_label_left(const struct diff_input_info *info)
+{
+ if (info->flags & DIFF_INPUT_LEFT_NONEXISTENT)
+ return "/dev/null";
+
+ return info->left_path ? : "a";
+}
+
+const char *
+diff_output_get_label_right(const struct diff_input_info *info)
+{
+ if (info->flags & DIFF_INPUT_RIGHT_NONEXISTENT)
+ return "/dev/null";
+
+ return info->right_path ? : "b";
+}
diff --git a/lib/diff_output.h b/lib/diff_output.h
index e507bbb..6cd959e 100644
--- a/lib/diff_output.h
+++ b/lib/diff_output.h
@@ -18,6 +18,11 @@
struct diff_input_info {
const char *left_path;
const char *right_path;
+
+ /* Set by caller of diff_output_* functions. */
+ int flags;
+#define DIFF_INPUT_LEFT_NONEXISTENT 0x00000001
+#define DIFF_INPUT_RIGHT_NONEXISTENT 0x00000002
};
struct diff_output_info {
@@ -89,3 +94,6 @@ int diff_output_chunk_right_version(struct diff_output_info **output_info,
const struct diff_input_info *info,
const struct diff_result *result,
const struct diff_chunk_context *cc);
+
+const char *diff_output_get_label_left(const struct diff_input_info *info);
+const char *diff_output_get_label_right(const struct diff_input_info *info);
diff --git a/lib/diff_output_edscript.c b/lib/diff_output_edscript.c
index 677f5ba..1c9b6d1 100644
--- a/lib/diff_output_edscript.c
+++ b/lib/diff_output_edscript.c
@@ -139,8 +139,8 @@ diff_output_edscript(struct diff_output_info **output_info,
continue;
fprintf(dest, "Binary files %s and %s differ\n",
- info->left_path ? : "a",
- info->right_path ? : "b");
+ diff_output_get_label_left(info),
+ diff_output_get_label_right(info));
break;
}
diff --git a/lib/diff_output_unidiff.c b/lib/diff_output_unidiff.c
index 520dc91..0c30eea 100644
--- a/lib/diff_output_unidiff.c
+++ b/lib/diff_output_unidiff.c
@@ -235,7 +235,8 @@ output_unidiff_chunk(struct diff_output_info *outinfo, FILE *dest,
}
if (print_header && !(state->header_printed)) {
- rc = fprintf(dest, "--- %s\n", info->left_path ? : "a");
+ rc = fprintf(dest, "--- %s\n",
+ diff_output_get_label_left(info));
if (rc < 0)
return errno;
if (outinfo) {
@@ -246,7 +247,8 @@ output_unidiff_chunk(struct diff_output_info *outinfo, FILE *dest,
*offp = outoff;
}
- rc = fprintf(dest, "+++ %s\n", info->right_path ? : "b");
+ rc = fprintf(dest, "+++ %s\n",
+ diff_output_get_label_right(info));
if (rc < 0)
return errno;
if (outinfo) {
@@ -442,8 +444,8 @@ diff_output_unidiff(struct diff_output_info **output_info,
continue;
fprintf(dest, "Binary files %s and %s differ\n",
- info->left_path ? : "a",
- info->right_path ? : "b");
+ diff_output_get_label_left(info),
+ diff_output_get_label_right(info));
break;
}