Page MenuHomeFreeBSD
Files F151689856

D25081.id72472.diff
No OneTemporary
Actions

D25081.id72472.diff
View Options

Index: usr.bin/diff/diff.c
===================================================================
--- usr.bin/diff/diff.c
+++ usr.bin/diff/diff.c
@@ -27,6 +27,7 @@
#include <ctype.h>
#include <err.h>
+#include <errno.h>
#include <getopt.h>
#include <stdlib.h>
#include <stdio.h>
@@ -351,13 +352,33 @@
if (strcmp(argv[0], "-") == 0) {
fstat(STDIN_FILENO, &stb1);
gotstdin = 1;
- } else if (stat(argv[0], &stb1) != 0)
- err(2, "%s", argv[0]);
+ } else if (stat(argv[0], &stb1) != 0) {
+ if (!Nflag || errno != ENOENT)
+ err(2, "%s", argv[0]);
+ dflags |= D_EMPTY1;
+ memset(&stb1, 0, sizeof(struct stat));
+ }
+
if (strcmp(argv[1], "-") == 0) {
fstat(STDIN_FILENO, &stb2);
gotstdin = 1;
- } else if (stat(argv[1], &stb2) != 0)
- err(2, "%s", argv[1]);
+ } else if (stat(argv[1], &stb2) != 0) {
+ if (!Nflag || errno != ENOENT)
+ err(2, "%s", argv[1]);
+ dflags |= D_EMPTY2;
+ memset(&stb2, 0, sizeof(stb2));
+ stb2.st_mode = stb1.st_mode;
+ }
+
+ if (dflags & D_EMPTY1 && dflags & D_EMPTY2){
+ warn("%s", argv[0]);
+ warn("%s", argv[1]);
+ exit(2);
+ }
+
+ if (stb1.st_mode == 0)
+ stb1.st_mode = stb2.st_mode;
+
if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode)))
errx(2, "can't compare - to a directory");
set_argstr(oargv, argv);
Index: usr.bin/diff/tests/diff_test.sh
===================================================================
--- usr.bin/diff/tests/diff_test.sh
+++ usr.bin/diff/tests/diff_test.sh
@@ -10,6 +10,7 @@
atf_test_case brief_format
atf_test_case b230049
atf_test_case Bflag
+atf_test_case Nflag
atf_test_case tabsize
atf_test_case conflicting_format
@@ -164,6 +165,17 @@
atf_check -s exit:1 -o file:"$(atf_get_srcdir)/Bflag_F.out" diff -B E F
}
+Nflag_body()
+{
+ atf_check -x 'printf "foo" > A'
+
+ atf_check \
+ -s exit:1 \
+ -o ignore \
+ -e ignore \
+ diff -N A NOFILE
+}
+
tabsize_body()
{
printf "\tA\n" > A
@@ -207,6 +219,7 @@
atf_add_test_case brief_format
atf_add_test_case b230049
atf_add_test_case Bflag
+ atf_add_test_case Nflag
atf_add_test_case tabsize
atf_add_test_case conflicting_format
}

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 11, 1:11 AM (8 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31259359
Default Alt Text
D25081.id72472.diff (2 KB)

Event Timeline