mirrors/tar
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/tar.git synced 2026-09-24 09:04:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix reporting of hardlink mismatch during compare

Browse Source 
* src/common.h (quote_n_colon): New prototype.
* src/misc.c (quote_n_colon): New function.
* src/compare.c (report_difference, diff_link): Use quote_n_colon.

* tests/difflink.at: New file.
* tests/Makefile.am: Add difflink.at
* tests/testsuite.at: Likewise.
This commit is contained in:
Sergey Poznyakoff
2017-11-09 09:55:43 +02:00
parent dee7e3f16e
commit 1bf590ab2d
6 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compare.c
+5 -2
View File
@@ -51,6 +51,8 @@ diff_init (void)
read_directory_file ();
}
enum { QUOTE_ARG, QUOTE_NAME };
/* Sigh about something that differs by writing a MESSAGE to stdlis,
given MESSAGE is nonzero. Also set the exit status if not already. */
void
@@ -60,7 +62,7 @@ report_difference (struct tar_stat_info *st, const char *fmt, ...)
{
va_list ap;
fprintf (stdlis, "%s: ", quotearg_colon (st->file_name));
fprintf (stdlis, "%s: ", quote_n_colon (QUOTE_NAME, st->file_name));
va_start (ap, fmt);
vfprintf (stdlis, fmt, ap);
va_end (ap);
@@ -263,7 +265,8 @@ diff_link (void)
&& !sys_compare_links (&file_data, &link_data))
report_difference (&current_stat_info,
_("Not linked to %s"),
quote (current_stat_info.link_name));
quote_n_colon (QUOTE_ARG,
current_stat_info.link_name));
}
#ifdef HAVE_READLINK