upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-10 09:11:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmp: Style and type issues.

Browse source 
MFC after:	3 days
Sponsored by:	Klara, Inc.
Reviewed by:	0mp, markj
Differential Revision:	https://reviews.freebsd.org/D47019
This commit is contained in:
Dag-Erling Smørgrav 2024-10-09 14:08:42 +02:00
parent e578fd853a
commit d350e8d795
5 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr.bin/cmp/cmp.c
View file

@ -38,6 +38,7 @@
#include <fcntl.h>
#include <getopt.h>
#include <nl_types.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -66,7 +67,6 @@ volatile sig_atomic_t info;
static void
siginfo(int signo)
{
info = signo;
}
#endif
@ -244,7 +244,7 @@ main(int argc, char *argv[])
else {
if (zflag && sb1.st_size != sb2.st_size) {
if (!sflag)
(void) printf("%s %s differ: size\n",
(void)printf("%s %s differ: size\n",
file1, file2);
exit(DIFF_EXIT);
}

4
usr.bin/cmp/link.c
View file

@ -27,6 +27,7 @@
*/
#include <sys/types.h>
#include <err.h>
#include <limits.h>
#include <stdbool.h>
@ -42,7 +43,8 @@ c_link(const char *file1, off_t skip1, const char *file2, off_t skip2,
{
char buf1[PATH_MAX], *p1;
char buf2[PATH_MAX], *p2;
int dfound, len1, len2;
ssize_t len1, len2;
int dfound;
off_t byte;
u_char ch;

1
usr.bin/cmp/regular.c
View file

@ -37,6 +37,7 @@
#include <err.h>
#include <limits.h>
#include <signal.h>
#include <stdbool.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>

1
usr.bin/cmp/special.c
View file

@ -33,6 +33,7 @@
#include <capsicum_helpers.h>
#include <err.h>
#include <stdbool.h>
#include <stdlib.h>
#include <stdio.h>

16
usr.bin/cmp/tests/cmp_test2.sh
View file

@ -31,12 +31,12 @@ special_head() {
special_body() {
echo 0123456789abcdef > a
echo 0123456789abcdeg > b
atf_check -s exit:0 -o empty -e empty -x "cat a | cmp a -"
atf_check -s exit:0 -o empty -e empty -x "cat a | cmp - a"
atf_check -s exit:1 -o not-empty -e empty -x "cat b | cmp a -"
atf_check -s exit:1 -o not-empty -e empty -x "cat b | cmp - a"
atf_check -s exit:0 -o empty -e empty cmp a - <a
atf_check -s exit:0 -o empty -e empty cmp - a <a
atf_check -s exit:1 -o not-empty -e empty cmp a - <b
atf_check -s exit:1 -o not-empty -e empty cmp - a <b
atf_check -s exit:0 -o empty -e empty -x "cmp a a <&-"
atf_check -s exit:0 -o empty -e empty cmp a a <&-
}
atf_test_case symlink
@ -112,9 +112,9 @@ limit_body()
# Test special, too. The implementation for link is effectively
# identical.
atf_check -s exit:0 -e empty -x "cat a | cmp -sn 4 b -"
atf_check -s exit:0 -e empty -x "cat a | cmp -sn 3 b -"
atf_check -s exit:1 -o ignore -x "cat a | cmp -sn 5 b -"
atf_check -s exit:0 -e empty cmp -sn 4 b - <a
atf_check -s exit:0 -e empty cmp -sn 3 b - <a
atf_check -s exit:1 -o ignore cmp -sn 5 b - <a
}
atf_test_case bflag