有没有办法让 diff 返回被比较文件的文件名以及输出，例如:

代替:

17c17
<     free ((qu -> vals) - 1);
---
>     free (qu -> vals);

我正在寻找:

17c17
file1.c
<     free ((qu -> vals) - 1);
---
file2.c
>     free (qu -> vals);

这可能吗？

谢谢

最佳答案

-u 开关确实包含文件名:

#!/bin/bash

echo "    free ((qu -> vals) - 1);" > file1.c
echo "    free (qu -> vals);" > file2.c

diff -u file1.c file2.c

输出:

--- file1.c 2014-03-13 17:46:43.000000000 -0500
+++ file2.c 2014-03-13 17:46:43.000000000 -0500
@@ -1 +1 @@
-    free ((qu -> vals) - 1);
+    free (qu -> vals);

https://stackoverflow.com/questions/22391512/