Page MenuHomeFreeBSD
Files F168187312

D10607.id28047.diff
No OneTemporary
Actions

D10607.id28047.diff
View Options

Index: contrib/netbsd-tests/usr.bin/grep/t_grep.sh
===================================================================
--- contrib/netbsd-tests/usr.bin/grep/t_grep.sh
+++ contrib/netbsd-tests/usr.bin/grep/t_grep.sh
@@ -494,6 +494,25 @@
atf_check -s exit:1 grep -v -w "x" test1
atf_check -s exit:1 grep -v -w "x" test2
}
+
+atf_test_case grep_lflag_nolines
+grep_lflag_nolines_head()
+{
+ atf_set "descr" "Check for -l flag not producing line matches or context (PR 219077)"
+}
+
+grep_lflag_nolines_body()
+{
+ printf "A\nB\nC\n" > test1
+
+ atf_check -o inline:"test1\n" grep -l -e "B" test1
+
+ atf_check -o inline:"test1\n" grep -l -B 1 -e "B" test1
+
+ atf_check -o inline:"test1\n" grep -l -A 1 -e "B" test1
+
+ atf_check -o inline:"test1\n" grep -l -C 1 -e "B" test1
+}
# End FreeBSD
atf_init_test_cases()
@@ -527,5 +546,6 @@
atf_add_test_case fgrep_sanity
atf_add_test_case egrep_sanity
atf_add_test_case grep_sanity
+ atf_add_test_case grep_lflag_nolines
# End FreeBSD
}
Index: sys/dev/bnxt/bnxt.h
===================================================================
--- sys/dev/bnxt/bnxt.h
+++ sys/dev/bnxt/bnxt.h
@@ -78,6 +78,7 @@
#define BCM57417_NPAR1 0x16c0
#define BCM57417_NPAR2 0x16cc
#define BCM57417_SFP 0x16e2
+#define BCM57454 0x1614
#define BCM58700 0x16cd
#define NETXTREME_C_VF1 0x16cb
#define NETXTREME_C_VF2 0x16e1
Index: sys/dev/bnxt/if_bnxt.c
===================================================================
--- sys/dev/bnxt/if_bnxt.c
+++ sys/dev/bnxt/if_bnxt.c
@@ -127,6 +127,8 @@
"Broadcom BCM57417 NetXtreme-E Ethernet Partition"),
PVID(BROADCOM_VENDOR_ID, BCM57417_SFP,
"Broadcom BCM57417 NetXtreme-E 10Gb/25Gb Ethernet"),
+ PVID(BROADCOM_VENDOR_ID, BCM57454,
+ "Broadcom BCM57454 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb Ethernet"),
PVID(BROADCOM_VENDOR_ID, BCM58700,
"Broadcom BCM58700 Nitro 1Gb/2.5Gb/10Gb Ethernet"),
PVID(BROADCOM_VENDOR_ID, NETXTREME_C_VF1,
Index: usr.bin/grep/util.c
===================================================================
--- usr.bin/grep/util.c
+++ usr.bin/grep/util.c
@@ -283,7 +283,7 @@
tail = Aflag;
}
/* Print the matching line, but only if not quiet/binary */
- if (t == 0 && !qflag && !pc.binary) {
+ if (t == 0 && !lflag && !qflag && !pc.binary) {
printline(&pc, ':');
first_match = false;
same_file = true;

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 27, 7:00 PM (9 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37410915
Default Alt Text
D10607.id28047.diff (2 KB)

Event Timeline