mirror of
https://github.com/darlinghq/darling-gnudiff.git
synced 2024-11-23 12:19:39 +00:00
Update Source To gnudiff-25.40.1
This commit is contained in:
parent
fd7f9c4c59
commit
fdedbd49f0
0
diffutils/config/config.rpath
Executable file → Normal file
0
diffutils/config/config.rpath
Executable file → Normal file
0
diffutils/config/depcomp
Executable file → Normal file
0
diffutils/config/depcomp
Executable file → Normal file
0
diffutils/config/install-sh
Executable file → Normal file
0
diffutils/config/install-sh
Executable file → Normal file
0
diffutils/config/mdate-sh
Executable file → Normal file
0
diffutils/config/mdate-sh
Executable file → Normal file
0
diffutils/config/missing
Executable file → Normal file
0
diffutils/config/missing
Executable file → Normal file
0
diffutils/config/mkinstalldirs
Executable file → Normal file
0
diffutils/config/mkinstalldirs
Executable file → Normal file
0
diffutils/configure
vendored
Executable file → Normal file
0
diffutils/configure
vendored
Executable file → Normal file
0
diffutils/exgettext
Executable file → Normal file
0
diffutils/exgettext
Executable file → Normal file
@ -795,26 +795,19 @@ build_script (struct file_data const filevec[])
|
||||
return script;
|
||||
}
|
||||
|
||||
/* If CHANGES, briefly report that two files differed.
|
||||
Return 2 if trouble, CHANGES otherwise. */
|
||||
static int
|
||||
briefly_report (int changes, struct file_data const filevec[])
|
||||
{
|
||||
if (changes)
|
||||
{
|
||||
/* If CHANGES, briefly report that two files differed.*/
|
||||
static void briefly_report(int changes, struct file_data const filevec[]) {
|
||||
if (changes) {
|
||||
char const *label0 = file_label[0] ? file_label[0] : filevec[0].name;
|
||||
char const *label1 = file_label[1] ? file_label[1] : filevec[1].name;
|
||||
|
||||
if (brief)
|
||||
if (brief) {
|
||||
message("Files %s and %s differ\n", label0, label1);
|
||||
else
|
||||
{
|
||||
}
|
||||
else {
|
||||
message("Binary files %s and %s differ\n", label0, label1);
|
||||
changes = 2;
|
||||
}
|
||||
}
|
||||
|
||||
return changes;
|
||||
}
|
||||
|
||||
/* Report the differences of two files. */
|
||||
@ -887,7 +880,7 @@ diff_2_files (struct comparison *cmp)
|
||||
}
|
||||
}
|
||||
|
||||
changes = briefly_report (changes, cmp->file);
|
||||
briefly_report (changes, cmp->file);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -980,7 +973,7 @@ diff_2_files (struct comparison *cmp)
|
||||
changes = (script != 0);
|
||||
|
||||
if (brief)
|
||||
changes = briefly_report (changes, cmp->file);
|
||||
briefly_report (changes, cmp->file);
|
||||
else
|
||||
{
|
||||
if (changes | !no_diff_means_no_output)
|
||||
|
Loading…
Reference in New Issue
Block a user