aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/sdiff
Commit message (Collapse)AuthorAgeFilesLines
* sdiff: Fix binary case.Dag-Erling Smørgrav2024-02-182-46/+72
| | | | | | | MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43942
* sdiff: Fix --expand-tabs and --tabsize.Dag-Erling Smørgrav2024-02-183-11/+43
| | | | | | | MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43941
* sdiff: Misc cleanup.Dag-Erling Smørgrav2024-02-181-52/+50
| | | | | | | MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43943
* usr.bin: Automated cleanup of cdefs and other formattingWarner Losh2023-11-272-2/+0
| | | | | | | | | | | | | | | | Apply the following automated changes to try to eliminate no-longer-needed sys/cdefs.h includes as well as now-empty blank lines in a row. Remove /^#if.*\n#endif.*\n#include\s+<sys/cdefs.h>.*\n/ Remove /\n+#include\s+<sys/cdefs.h>.*\n+#if.*\n#endif.*\n+/ Remove /\n+#if.*\n#endif.*\n+/ Remove /^#if.*\n#endif.*\n/ Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/types.h>/ Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/param.h>/ Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/capsicum.h>/ Sponsored by: Netflix
* Remove $FreeBSD$: one-line nroff patternWarner Losh2023-08-161-1/+0
| | | | Remove /^\.\\"\s*\$FreeBSD\$$\n/
* Remove $FreeBSD$: one-line sh patternWarner Losh2023-08-165-5/+0
| | | | Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
* Remove $FreeBSD$: one-line .c patternWarner Losh2023-08-162-4/+0
| | | | Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/
* Remove $FreeBSD$: one-line .c comment patternWarner Losh2023-08-161-1/+0
| | | | Remove /^/[*/]\s*\$FreeBSD\$.*\n/
* Update/fix Makefile.depend for userlandSimon J. Gerraty2023-04-191-1/+0
|
* sdiff(1) can now be built defaults warning levelBaptiste Daroussin2017-12-061-1/+0
| | | | Notes: svn path=/head/; revision=326632
* Rename variables confusing gcc 4.2.1Baptiste Daroussin2017-12-061-6/+6
| | | | | | | | | While there is no reason it shadows div(3) gcc 4.2.1 complains about it MFC after: 1 week Notes: svn path=/head/; revision=326631
* Fix -Wincompatible-pointer-types-discards-qualifiers warningsBaptiste Daroussin2017-12-061-4/+6
| | | | | | | MFC after: 1 week Notes: svn path=/head/; revision=326630
* DIRDEPS_BUILD: Update dependencies.Bryan Drewery2017-10-311-1/+0
| | | | | | | Sponsored by: Dell EMC Isilon Notes: svn path=/head/; revision=325188
* Add HAS_TESTS to all Makefiles that are currently using theEnji Cooper2017-08-021-0/+1
| | | | | | | | | `SUBDIR.${MK_TESTS}+= tests` idiom. This is a follow up to r321912. Notes: svn path=/projects/make-check-sandbox/; revision=321914
* Convert traditional ${MK_TESTS} conditional idiom for including testEnji Cooper2017-08-021-3/+1
| | | | | | | | | | | | | | directories to SUBDIR.${MK_TESTS} idiom This is being done to pave the way for future work (and homogenity) in ^/projects/make-check-sandbox . No functional change intended. MFC after: 1 weeks Notes: svn path=/head/; revision=321912
* Remove a useless loop over the long options before passing through someBaptiste Daroussin2017-04-081-2/+0
| | | | | | | options to diff(1) Notes: svn path=/head/; revision=316638
* When passingthrough from sdiff to diff the -H/--speed-large-filesBaptiste Daroussin2017-04-082-4/+6
| | | | | | | | options rename it to the long version as GNU diff only support the long version of the option not the short version Notes: svn path=/head/; revision=316637
* Rename tests from <foo> to <foo>_test to match the FreeBSD test suiteEnji Cooper2017-03-232-1/+1
| | | | | | | | | | | | | naming scheme usr.bin/diff/diff_test was renamed to usr.bin/diff/netbsd_diff_test to avoid collisions with the renamed FreeBSD test. MFC after: 1 week Sponsored by: Dell EMC Isilon Notes: svn path=/head/; revision=315776
* Remove useless .Pp after the .Sh macro and remove empty lineBaptiste Daroussin2017-02-111-2/+0
| | | | | | | | Reported by: make manlint MFC after: 2 days Notes: svn path=/head/; revision=313665
* Remove extra entries from the option enumBaptiste Daroussin2016-12-301-19/+0
| | | | | | | MFC after: 3 days Notes: svn path=/head/; revision=310874
* Make sdiff --left-column work as expectedBaptiste Daroussin2016-12-301-2/+1
| | | | | | | MFC after: 3 days Notes: svn path=/head/; revision=310872
* Fix typos in sdiff(1) message and improve displayBaptiste Daroussin2016-10-151-18/+19
| | | | Notes: svn path=/head/; revision=307381
* Move cleanup() into the edit.c file which is the only users of that functionBaptiste Daroussin2016-10-154-35/+10
| | | | | | | Remove common.{c,h} Notes: svn path=/head/; revision=307372
* Turn editit into a static functionBaptiste Daroussin2016-10-151-3/+1
| | | | Notes: svn path=/head/; revision=307369
* Remove the common.h include which is actually not used in sdiff.cBaptiste Daroussin2016-10-151-1/+0
| | | | Notes: svn path=/head/; revision=307368
* Remove reference of z(s)diff which was dropped before importingBaptiste Daroussin2016-09-181-2/+2
| | | | Notes: svn path=/head/; revision=305927
* sdiff: improve errx stringEd Maste2016-09-151-1/+1
| | | | | | | | errx() appends a newline so \n is superfluous. Also switch to lower case with no period for consistency with other errx strings. Notes: svn path=/head/; revision=305823
* DIRDEPS_BUILD: Add some missing dirctories to the build.Bryan Drewery2016-08-311-0/+11
| | | | | | | Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=305148
* sdiff: remove non finish/function codeBaptiste Daroussin2016-08-051-38/+27
| | | | | | | | | | 2 extra options not available neither on other BSD nor in GNU sdiff: --diff-pid and --pipe-fd were present in the SoC code, none were usable Just remove it Notes: svn path=/head/; revision=303783
* Remove usage of _WITH_GETLINE from usr.binBaptiste Daroussin2016-07-301-1/+0
| | | | Notes: svn path=/head/; revision=303526
* DIRDEPS_BUILD: Connect new directories and update dependencies.Bryan Drewery2016-06-031-0/+18
| | | | | | | Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=301283
* sdiff(1): Fix potential NULL deref in cleanup pathConrad Meyer2016-05-101-1/+2
| | | | | | | | | | | | In the presence of the --diff-pid argument, it is possible for 'diffpipe' to be NULL. Only fclose() it if it was initialized. Reported by: Coverity CID: 1355183 Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=299385
* Only one program is build in usr.bin/sdiff use the right includeBaptiste Daroussin2016-05-071-1/+1
| | | | Notes: svn path=/head/; revision=299224
* Revert r299218 VISUAL is actually a perfecly valid env to specify an editorBaptiste Daroussin2016-05-072-3/+20
| | | | Notes: svn path=/head/; revision=299220
* Only use EDITOR as a variable to specify which text editor to useBaptiste Daroussin2016-05-072-20/+3
| | | | Notes: svn path=/head/; revision=299218
* Directly call the editor if needed instead of spawning /bin/shBaptiste Daroussin2016-05-071-8/+4
| | | | Notes: svn path=/head/; revision=299217
* Replace fparseln(3) with getline(3)Baptiste Daroussin2016-05-072-9/+11
| | | | | | | It removes a dependency on libutil. Notes: svn path=/head/; revision=299216
* Merge ^/user/ngie/release-pkg-fix-tests to unbreak how test files are installedEnji Cooper2016-05-041-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after r298107 Summary of changes: - Replace all instances of FILES/TESTS with ${PACKAGE}FILES. This ensures that namespacing is kept with FILES appropriately, and that this shouldn't need to be repeated if the namespace changes -- only the definition of PACKAGE needs to be changed - Allow PACKAGE to be overridden by callers instead of forcing it to always be `tests`. In the event we get to the point where things can be split up enough in the base system, it would make more sense to group the tests with the blocks they're a part of, e.g. byacc with byacc-tests, etc - Remove PACKAGE definitions where possible, i.e. where FILES wasn't used previously. - Remove unnecessary TESTSPACKAGE definitions; this has been elided into bsd.tests.mk - Remove unnecessary BINDIRs used previously with ${PACKAGE}FILES; ${PACKAGE}FILESDIR is now automatically defined in bsd.test.mk. - Fix installation of files under data/ subdirectories in lib/libc/tests/hash and lib/libc/tests/net/getaddrinfo - Remove unnecessary .include <bsd.own.mk>s (some opportunistic cleanup) Document the proposed changes in share/examples/tests/tests/... via examples so it's clear that ${PACKAGES}FILES is the suggested way forward in terms of replacing FILES. share/mk/bsd.README didn't seem like the appropriate method of communicating that info. MFC after: never probably X-MFC with: r298107 PR: 209114 Relnotes: yes Tested with: buildworld, installworld, checkworld; buildworld, packageworld Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=299094
* fgetc returns an int not a char.Bjoern A. Zeeb2016-05-021-2/+1
| | | | | | | | Found by: powerpc builds failing due to comparing with EOF raised: "comparison is always false due to limited range of data type" Notes: svn path=/head/; revision=298924
* When checking for binary file, check if ch is not EOF only ch actually gotBaptiste Daroussin2016-04-301-1/+3
| | | | | | | | | a value assigned Reported by: pfg Notes: svn path=/head/; revision=298851
* import sdiff(1) from GSoC 2012Baptiste Daroussin2016-04-2935-0/+3356
Import sdiff(1) from the diff version written by Raymond Lai, improved during GSoC 2012 by Jesse Hagewood. Compared to the version done in during that summer of code: - Remove the zlib frontend: zsdiff - Compatible output (column size and separators) with GNU sdiff Compared to GNU sdiff in ports: - The only difference is padding using spaces vs tabs Compared to OpenBSD and NetBSD import: - Implement missing options (including long options) from GNU sdiff - Improved support for the edition mode (signal handling) - Output visually compatible with GNU sdiff: size of columns While here import regression tests from NetBSD adapted to fit the output as expected by GNU sdiff Reviewed by: emaste (in part) Obtained from: OpenBSD, NetBSD, GSoC 2012 Relnotes: yes Differential Revision: https://reviews.freebsd.org/D5981 Differential Revision: https://reviews.freebsd.org/D6032 (diff with NetBSD version) Differential Revision: https://reviews.freebsd.org/D6033 (diff with OpenBSD version) Notes: svn path=/head/; revision=298823
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 11:35:53 +0000