aboutsummaryrefslogtreecommitdiff
path: root/winsup
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2024-01-18 10:53:25 +0100
committerCorinna Vinschen <corinna@vinschen.de>2024-01-18 10:53:25 +0100
commitd45261f62a15f8abd94a1031020b9a9f455e4eed (patch)
treedb5e6dfd6848d7edfa822b943a580d9d4c501b00 /winsup
parent70b27cee0c8ab12a1b4d5b31d086fc79d60c4001 (diff)
downloadnewlib-d45261f62a15f8abd94a1031020b9a9f455e4eed.zip
newlib-d45261f62a15f8abd94a1031020b9a9f455e4eed.tar.gz
newlib-d45261f62a15f8abd94a1031020b9a9f455e4eed.tar.bz2
Cygwin: replace all `fgrep' with `grep -F'
Unfortunately fgrep is now deprecated in a very pushy way. Make sure to use grep -F instead all around, even in docs and comments/ Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup')
-rw-r--r--winsup/cygwin/include/cygwin/version.h4
-rw-r--r--winsup/cygwin/linux-locale-helpers/fetch-lc_messages-from-linux.c6
-rw-r--r--winsup/cygwin/linux-locale-helpers/fetch-lc_time_era-from-linux.c2
-rw-r--r--winsup/doc/faq-programming.xml2
-rwxr-xr-xwinsup/doc/xidepend2
5 files changed, 8 insertions, 8 deletions
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index 3036878..4122125 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -530,9 +530,9 @@ details. */
The mkvers.sh script at the top level produces a .cc file which initializes
a cygwin_version structure based on the above version information and
- creates a string table for grepping via "fgrep '%%%' cygwinwhatever.dll"
+ creates a string table for grepping via "grep -F '%%%' cygwinwhatever.dll"
if you are using GNU grep. Otherwise you may want to do a
- "strings cygwinwhatever.dll | fgrep '%%%'" instead.
+ "strings cygwinwhatever.dll | grep -F '%%%'" instead.
This will produce output such as:
diff --git a/winsup/cygwin/linux-locale-helpers/fetch-lc_messages-from-linux.c b/winsup/cygwin/linux-locale-helpers/fetch-lc_messages-from-linux.c
index 03755c6..e83bad6 100644
--- a/winsup/cygwin/linux-locale-helpers/fetch-lc_messages-from-linux.c
+++ b/winsup/cygwin/linux-locale-helpers/fetch-lc_messages-from-linux.c
@@ -149,8 +149,8 @@ main ()
{
char name[32], *c;
FILE *pp;
-
- pp = popen ("locale -a | grep -a '_' | fgrep -v .", "r");
+
+ pp = popen ("locale -a | grep -a '_' | grep -F -v .", "r");
if (!pp)
{
perror ("popen failed");
@@ -160,7 +160,7 @@ main ()
{
c = strchr (name, '\n');
if (c)
- *c = '\0';
+ *c = '\0';
read_locale_messages (name);
}
pclose (pp);
diff --git a/winsup/cygwin/linux-locale-helpers/fetch-lc_time_era-from-linux.c b/winsup/cygwin/linux-locale-helpers/fetch-lc_time_era-from-linux.c
index 1ee75ca..66dc7aa 100644
--- a/winsup/cygwin/linux-locale-helpers/fetch-lc_time_era-from-linux.c
+++ b/winsup/cygwin/linux-locale-helpers/fetch-lc_time_era-from-linux.c
@@ -218,7 +218,7 @@ main ()
char name[32], *c;
FILE *pp;
- pp = popen ("locale -a | grep -a '_' | fgrep -v .", "r");
+ pp = popen ("locale -a | grep -a '_' | grep -F -v .", "r");
if (!pp)
{
perror ("popen failed");
diff --git a/winsup/doc/faq-programming.xml b/winsup/doc/faq-programming.xml
index ba00dfe..a834298 100644
--- a/winsup/doc/faq-programming.xml
+++ b/winsup/doc/faq-programming.xml
@@ -380,7 +380,7 @@ cygexec, you can find them with a script like this:
<screen>
#!/bin/sh
cd /bin; for f in `find . -type f -name '*.exe'`; do
- cygcheck $f | (fgrep -qi cygwin1.dll || echo $f)
+ cygcheck $f | (grep -Fqi cygwin1.dll || echo $f)
done
</screen>
diff --git a/winsup/doc/xidepend b/winsup/doc/xidepend
index cc04f4a..bfbadfe 100755
--- a/winsup/doc/xidepend
+++ b/winsup/doc/xidepend
@@ -12,7 +12,7 @@ fi
for f in "$@"
do
f=`basename "$f"`
- if fgrep -q 'xi:include' "$f"
+ if grep -F -q 'xi:include' "$f"
then
# This file uses XIncludes. Let's chase its deps recursively.
base=`basename "$f" .xml`