From: Tom de Vries <tdevries@suse.de>
Date: Mon, 21 Oct 2024 13:19:25 +0000 (+0200)
Subject: [gdb/contrib] Handle dot in spellcheck.sh
X-Git-Tag: gdb-16-branchpoint~621
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3be7119db237a7a89775f83b37e4ec89451b6945;p=thirdparty%2Fbinutils-gdb.git

[gdb/contrib] Handle dot in spellcheck.sh

Add handling of '.' in gdb/contrib/spellcheck.sh.

While we're at, simplify the sed invocation by using a single s command
instead of 3 s commands.

Also introduce sed_join and grep_join.

Fix the following common misspellings:
...
bandwith -> bandwidth
emmitted -> emitted
immediatly -> immediately
suprize -> surprise
thru -> through
transfered -> transferred
...

Verified with shellcheck.
---

diff --git a/gdb/contrib/spellcheck.sh b/gdb/contrib/spellcheck.sh
index 08c745aa92d..1b3e88e259b 100755
--- a/gdb/contrib/spellcheck.sh
+++ b/gdb/contrib/spellcheck.sh
@@ -73,8 +73,20 @@ join ()
 
 grep_or="|"
 sed_or="\|"
-grep_separator=$(join $grep_or "${grep_separators[@]}")
-sed_separator=$(join $sed_or "${sed_separators[@]}")
+
+grep_join ()
+{
+    local res
+    res=$(join $grep_or "$@")
+    echo "($res)"
+}
+
+sed_join ()
+{
+    local res
+    res=$(join $sed_or "$@")
+    echo "\($res\)"
+}
 
 usage ()
 {
@@ -201,26 +213,24 @@ find_files_matching_words ()
     local patfile
     patfile="$cache_dir/$cache_file2".$cache_id
 
+    local pat
     if [ -f "$patfile" ]; then
 	pat=$(cat "$patfile")
     else
 	rm -f "$cache_dir/$cache_file2".*
 
-	local pat
-	pat=""
-	for word in "${words[@]}"; do
-	    if [ "$pat" = "" ]; then
-		pat="$word"
-	    else
-		pat="$pat|$word"
-	    fi
-	done
-	pat="($pat)"
+	pat=$(grep_join "${words[@]}")
 
-	local sep
-	sep=$grep_separator
+	local before after
+	before=$(grep_join \
+		     "^" \
+		     "${grep_separators[@]}")
+	after=$(grep_join \
+		    "${grep_separators[@]}" \
+		    "\." \
+		    "$")
 
-	pat="(^|$sep)$pat($sep|$)"
+	pat="$before$pat$after"
 
 	echo "$pat" \
 	     > "$patfile"
@@ -238,10 +248,16 @@ find_files_matching_word ()
     pat="$1"
     shift
 
-    local sep
-    sep=$grep_separator
+    local before after
+    before=$(grep_join \
+		 "^" \
+		 "${grep_separators[@]}")
+    after=$(grep_join \
+		"${grep_separators[@]}" \
+		"\." \
+		"$")
 
-    pat="(^|$sep)$pat($sep|$)"
+    pat="$before$pat$after"
 
     grep -E \
 	-l \
@@ -260,22 +276,20 @@ replace_word_in_file ()
     local file
     file="$3"
 
-    local sep
-    sep=$sed_separator
-
-    # Save separator.
-    sep="\($sep\)"
-
-    local repl1 repl2 repl3
-
-    repl1="s%$sep$word$sep%\1$replacement\2%g"
-
-    repl2="s%^$word$sep%$replacement\1%"
+    local before after
+    before=$(sed_join \
+		 "^" \
+		 "${sed_separators[@]}")
+    after=$(sed_join \
+		"${sed_separators[@]}" \
+		"\." \
+		"$")
 
-    repl3="s%$sep$word$%\1$replacement%"
+    local repl
+    repl="s%$before$word$after%\1$replacement\2%g"
 
     sed -i \
-	"$repl1;$repl2;$repl3" \
+	"$repl" \
 	"$file"
 }
 
diff --git a/gdb/remote.c b/gdb/remote.c
index fdd83ecbacc..b65a1c3094a 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -9501,7 +9501,7 @@ remote_target::remote_write_bytes_aux (const char *header, CORE_ADDR memaddr,
   strcat (rs->buf.data (), header);
   p = rs->buf.data () + strlen (header);
 
-  /* Compute a best guess of the number of bytes actually transfered.  */
+  /* Compute a best guess of the number of bytes actually transferred.  */
   if (packet_format == 'X')
     {
       /* Best guess at number of bytes that will fit.  */
diff --git a/gdb/testsuite/gdb.base/bigcore.exp b/gdb/testsuite/gdb.base/bigcore.exp
index 6c64d402502..5e09d2f7986 100644
--- a/gdb/testsuite/gdb.base/bigcore.exp
+++ b/gdb/testsuite/gdb.base/bigcore.exp
@@ -25,7 +25,7 @@ require isnative
 # Can the system run this test (in particular support sparse
 # corefiles)?  On systems that lack sparse corefile support this test
 # consumes too many resources - gigabytes worth of disk space and
-# I/O bandwith.
+# I/O bandwidth.
 
 if { [istarget "*-*-*bsd*"]
      || [istarget "*-*-solaris*"] 
diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp
index 91a4e5b863f..3a83d964dd9 100644
--- a/gdb/testsuite/gdb.base/call-sc.exp
+++ b/gdb/testsuite/gdb.base/call-sc.exp
@@ -286,7 +286,7 @@ proc test_scalar_returns { } {
 	}
 	-re ".*${gdb_prompt} $" {
 	    if $return_value_unimplemented {
-		# What a suprize.  The architecture hasn't implemented
+		# What a surprise.  The architecture hasn't implemented
 		# return_value, and hence has to fail.
 		kfail "$test" gdb/1444
 	    } else {
diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp
index 7f1192d48e5..ab68da27efa 100644
--- a/gdb/testsuite/gdb.base/structs.exp
+++ b/gdb/testsuite/gdb.base/structs.exp
@@ -376,7 +376,7 @@ proc test_struct_returns { n } {
 	}
 	-re ".*${gdb_prompt} $" {
 	    if $return_value_unimplemented {
-		# What a suprize.  The architecture hasn't implemented
+		# What a surprise.  The architecture hasn't implemented
 		# return_value, and hence has to fail.
 		kfail "$test" gdb/1444
 	    } else {
diff --git a/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp b/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
index aa1c263e800..0819aaeec72 100644
--- a/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
+++ b/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
@@ -16,7 +16,7 @@
 # This test triggers the "separate debug info file has no debug info" warning by replacing
 # the build-id based .debug file with the stripped binary and then loading it to gdb.
 # It then also sets up local debuginfod server with the correct debug file to download
-# to make sure no warnings are emmitted.
+# to make sure no warnings are emitted.
 
 
 standard_testfile
diff --git a/gdb/testsuite/gdb.mi/mi-memory-changed.exp b/gdb/testsuite/gdb.mi/mi-memory-changed.exp
index 486c4d794d4..6d9e504e241 100644
--- a/gdb/testsuite/gdb.mi/mi-memory-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-memory-changed.exp
@@ -44,11 +44,11 @@ mi_gdb_test "-var-create var_c * C" \
 
 mi_gdb_test "-var-assign var_c 5" \
     "-var-assign var_c 5\r\n\\^done,value=\"5\"" \
-    "change C thru. varobj"
+    "change C through. varobj"
 
 mi_gdb_test  "-data-write-memory-bytes &C \"00\"" \
     {\^done} \
-    "change C thru. -data-write-memory-bytes"
+    "change C through. -data-write-memory-bytes"
 
 # Modify code section also triggers MI notification.
 
diff --git a/gdbserver/server.cc b/gdbserver/server.cc
index 69ffb722be7..5190df4aed5 100644
--- a/gdbserver/server.cc
+++ b/gdbserver/server.cc
@@ -3735,7 +3735,7 @@ handle_status (char *own_buf)
     {
       for_each_thread (queue_stop_reply_callback);
 
-      /* The first is sent immediatly.  OK is sent if there is no
+      /* The first is sent immediately.  OK is sent if there is no
 	 stopped thread, which is the same handling of the vStopped
 	 packet (by design).  */
       notif_write_event (&notif_stop, cs.own_buf);