d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
249,984 Commits 4 Branches 49 Tags
Commit Graph

17 Commits

Author SHA1 Message Date
bapt
c072ea5a28 Rename variables confusing gcc 4.2.1 
While there is no reason it shadows div(3) gcc 4.2.1 complains about it

MFC after:	1 week
 2017-12-06 20:09:30 +00:00
bapt
c40125ba8e Fix -Wincompatible-pointer-types-discards-qualifiers warnings 
MFC after:	1 week
 2017-12-06 20:05:36 +00:00
bapt
720b4bcd33 Remove a useless loop over the long options before passing through some 
options to diff(1)
 2017-04-08 08:42:25 +00:00
bapt
9da7a2a743 When passingthrough from sdiff to diff the -H/--speed-large-files 
options rename it to the long version as GNU diff only support the long
version of the option not the short version
 2017-04-08 08:41:05 +00:00
bapt
5adbcfc208 Remove extra entries from the option enum 
MFC after:	3 days
 2016-12-30 23:46:11 +00:00
bapt
cff1941413 Make sdiff --left-column work as expected 
MFC after:	3 days
 2016-12-30 23:41:33 +00:00
bapt
f1028aefeb Fix typos in sdiff(1) message and improve display 2016-10-15 19:55:07 +00:00
bapt
5caa25d51a Remove the common.h include which is actually not used in sdiff.c 2016-10-15 13:41:58 +00:00
bapt
1d6d82b582 Remove reference of z(s)diff which was dropped before importing 2016-09-18 10:06:35 +00:00
emaste
a1a3735a51 sdiff: improve errx string 
errx() appends a newline so \n is superfluous. Also switch to lower case
with no period for consistency with other errx strings.
 2016-09-15 02:48:56 +00:00
bapt
767fa24126 sdiff: remove non finish/function code 
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
 2016-08-05 19:14:55 +00:00
bapt
4ecca13b4c Remove usage of _WITH_GETLINE from usr.bin 2016-07-30 01:07:47 +00:00
cem
0a07aade42 sdiff(1): Fix potential NULL deref in cleanup path 
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
 2016-05-10 20:09:40 +00:00
bapt
bb619f9f53 Replace fparseln(3) with getline(3) 
It removes a dependency on libutil.
 2016-05-07 18:21:58 +00:00
bz
31a46ef3a0 fgetc returns an int not a char. 
Found by:   powerpc builds failing due to comparing with EOF raised:
"comparison is always false due to limited range of data type"
 2016-05-02 15:07:43 +00:00
bapt
47bc90320f When checking for binary file, check if ch is not EOF only ch actually got 
a value assigned

Reported by:	pfg
 2016-04-30 14:48:30 +00:00
bapt
8f5c11fdbe import sdiff(1) from GSoC 2012 
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)
 2016-04-29 23:27:15 +00:00