D55109.diff
No OneTemporary
Actions

Size

966 B

Referenced Files

None

Subscribers

None

D55109.diff
View Options

	diff --git a/usr.bin/diff/diffreg_new.c b/usr.bin/diff/diffreg_new.c
	--- a/usr.bin/diff/diffreg_new.c
	+++ b/usr.bin/diff/diffreg_new.c
	@@ -158,6 +158,7 @@
	const struct diff_config *cfg;
	enum diffreg_algo algo;
	cap_rights_t rights_ro;
	+ int ret;

	algo = DIFFREG_ALGO_MYERS_THEN_MYERS_DIVIDE;

	@@ -219,12 +220,20 @@
	if (flags & D_PROTOTYPE)
	diff_flags \|= DIFF_FLAG_SHOW_PROTOTYPES;

	- if (diff_atomize_file(&left, cfg, f1, (uint8_t *)str1, st1.st_size, diff_flags)) {
	+ ret = diff_atomize_file(&left, cfg, f1, (uint8_t *)str1, st1.st_size,
	+ diff_flags);
	+ if (ret != DIFF_RC_OK) {
	+ warnc(ret, "%s", file1);
	rc = D_ERROR;
	+ status \|= 2;
	goto done;
	}
	- if (diff_atomize_file(&right, cfg, f2, (uint8_t *)str2, st2.st_size, diff_flags)) {
	+ ret = diff_atomize_file(&right, cfg, f2, (uint8_t *)str2, st2.st_size,
	+ diff_flags);
	+ if (ret != DIFF_RC_OK) {
	+ warnc(ret, "%s", file2);
	rc = D_ERROR;
	+ status \|= 2;
	goto done;
	}