Date: Tue, 27 Oct 2020 13:57:24 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Kyle Evans <kevans@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r367076 - head/usr.bin/diff Message-ID: <20201027125724.onnk46ruaqyqyizk@ivaldir.net> In-Reply-To: <202010271227.09RCRQEN018075@repo.freebsd.org> References: <202010271227.09RCRQEN018075@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Tue, Oct 27, 2020 at 12:27:26PM +0000, Kyle Evans wrote: > Author: kevans > Date: Tue Oct 27 12:27:26 2020 > New Revision: 367076 > URL: https://svnweb.freebsd.org/changeset/base/367076 > > Log: > diff: don't force the format to 'context' with -p immediately > > Instead, leave the fomat as unspecified (if it hasn't been) and use the > -p flag as a hint to 'context' if no other formatting option is specified. > > This fixes `diff -purw`, used frequently by emaste, and matches the behavior > of its GNU counterpart. > > PR: 250015 > Reviewed by: emaste > MFC after: 1 week > > Modified: > head/usr.bin/diff/diff.c > > Modified: head/usr.bin/diff/diff.c > ============================================================================== > --- head/usr.bin/diff/diff.c Tue Oct 27 11:29:11 2020 (r367075) > +++ head/usr.bin/diff/diff.c Tue Oct 27 12:27:26 2020 (r367076) > @@ -210,17 +210,6 @@ main(int argc, char **argv) > diff_format = D_NREVERSE; > break; > case 'p': > - /* > - * If it's not unset and it's not set to context or > - * unified, we'll error out here as a conflicting > - * format. If it's unset, we'll go ahead and set it to > - * context. > - */ > - if (FORMAT_MISMATCHED(D_CONTEXT) && > - FORMAT_MISMATCHED(D_UNIFIED)) > - conflicting_format(); > - if (diff_format == D_UNSET) > - diff_format = D_CONTEXT; > dflags |= D_PROTOTYPE; > break; > case 'P': > @@ -320,6 +309,8 @@ main(int argc, char **argv) > newarg = optind != prevoptind; > prevoptind = optind; > } > + if (diff_format == D_UNSET && (dflags & D_PROTOTYPE) != 0) > + diff_format = D_CONTEXT; > if (diff_format == D_UNSET) > diff_format = D_NORMAL; > argc -= optind; I think it would be great to have a test to ensure we don't break it in the futur. Bapt [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAl+YGTEACgkQY4mL3PG3 PlpnOxAA48yGK1BrhOTGjcVhAAFdV2Cf05/nYHN1FlnRpzMVKlaem+ulNsu4uRd9 1Zz3tZaYgVBTPBEuH+QVzToOUimLkTxXv3OVCAIaKx/XT2bz1d2n5UH8+kD3Jr22 0lWW19QeOdoJw2m4vJow1Tre//8fDFpmh4NVIG5jKPcDyqygZ8zy5BNfRFuqh6PT Wmi72um5/enFcg9Uknx4UEFW6/KsYbIZi+qHoziDpgMIUIvCuhVd5z8sH2FT7XFC P3Zxht1DbE2iV3MrikQh4PM7dl7ntwIklhcz15qUlWawscRTDZKxk/7mkQV+s5Fn gbu91iSVD8/iZzGAHkylhCetUl1jZHjbjfDRYIqZAOzmTopv9SMH9j6n5dI/gnpR ao4yon1LYhuhXxLe9GS7AkmPRoZnsWYfMBswDoJgWmbYHzyfa734Pa1DbDqIy/R4 jNhAbr/3qyhINDeZ4Cvjh17+ZqTkfnHQGLkSaZNzk6Gnqor7LULOa+qWdrDq/ITt e/OL8qM5ieHbBBmlgvErWH1c+dkGDIlLUp31Zmw1JRhITjprg+2zlUycfAF+wzUI yRlKpj2aOQ8ICbwB2mVmNSg8E+XjLqcMDNg0YMr8aMNgmvKWKVXQtf7ugU3MZAWI Kkx5YrVUisuqs8k50tThRe083VEfadOURS0ULF/OzOP4Fd1u1Qg= =HoRE -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20201027125724.onnk46ruaqyqyizk>