[PATCH] fix bash-isms in arch/x86/entry/syscalls/syscalltbl.sh

[PATCH] fix bash-isms in arch/x86/entry/syscalls/syscalltbl.sh

[sylvain.bertrand]

Fix the bash-isms in the x86 syscall table generator shell script.
Signed-off-by: Sylvain BERTRAND <sylvain.bertrand@gmail.com>
---
diff --git a/arch/x86/entry/syscalls/syscalltbl.sh b/arch/x86/entry/syscalls/syscalltbl.sh
index cd3d301..751d1f9 100644
--- a/arch/x86/entry/syscalls/syscalltbl.sh
+++ b/arch/x86/entry/syscalls/syscalltbl.sh
@@ -10,8 +10,11 @@ syscall_macro() {
 
     # Entry can be either just a function name or "function/qualifier"
     real_entry="${entry%%/*}"
-    qualifier="${entry:${#real_entry}}"		# Strip the function name
-    qualifier="${qualifier:1}"			# Strip the slash, if any
+    if [ "$entry" = "$real_entry" ]; then
+        qualifier=
+    else
+        qualifier=${entry#*/}
+    fi
 
     echo "__SYSCALL_${abi}($nr, $real_entry, $qualifier)"
 }
@@ -22,7 +25,7 @@ emit() {
     entry="$3"
     compat="$4"
 
-    if [ "$abi" == "64" -a -n "$compat" ]; then
+    if [ "$abi" = "64" -a -n "$compat" ]; then
 	echo "a compat entry for a 64-bit syscall makes no sense" >&2
 	exit 1
     fi
@@ -45,17 +48,17 @@ emit() {
 grep '^[0-9]' "$in" | sort -n | (
     while read nr abi name entry compat; do
 	abi=`echo "$abi" | tr '[a-z]' '[A-Z]'`
-	if [ "$abi" == "COMMON" -o "$abi" == "64" ]; then
+	if [ "$abi" = "COMMON" -o "$abi" = "64" ]; then
 	    # COMMON is the same as 64, except that we don't expect X32
 	    # programs to use it.  Our expectation has nothing to do with
 	    # any generated code, so treat them the same.
 	    emit 64 "$nr" "$entry" "$compat"
-	elif [ "$abi" == "X32" ]; then
+	elif [ "$abi" = "X32" ]; then
 	    # X32 is equivalent to 64 on an X32-compatible kernel.
 	    echo "#ifdef CONFIG_X86_X32_ABI"
 	    emit 64 "$nr" "$entry" "$compat"
 	    echo "#endif"
-	elif [ "$abi" == "I386" ]; then
+	elif [ "$abi" = "I386" ]; then
 	    emit "$abi" "$nr" "$entry" "$compat"
 	else
 	    echo "Unknown abi $abi" >&2

[tip:x86/urgent] x86/syscalls: Remove bash-isms in syscall table generator

[tip-bot for sylvain.bertrand@gmail.com]

Commit-ID:  2df0e78b44e2cbbaa1e319cbca34f23599a4daa0
Gitweb:     http://git.kernel.org/tip/2df0e78b44e2cbbaa1e319cbca34f23599a4daa0
Author:     sylvain.bertrand@gmail.com <sylvain.bertrand@gmail.com>
AuthorDate: Thu, 29 Sep 2016 16:22:34 +0000
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 5 Oct 2016 11:34:25 +0200

x86/syscalls: Remove bash-isms in syscall table generator

Signed-off-by: Sylvain BERTRAND <sylvain.bertrand@gmail.com>
Link: http://lkml.kernel.org/r/20160929162234.GA29592@freedom
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
 arch/x86/entry/syscalls/syscalltbl.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/arch/x86/entry/syscalls/syscalltbl.sh b/arch/x86/entry/syscalls/syscalltbl.sh
index cd3d301..751d1f9 100644
--- a/arch/x86/entry/syscalls/syscalltbl.sh
+++ b/arch/x86/entry/syscalls/syscalltbl.sh
@@ -10,8 +10,11 @@ syscall_macro() {
 
     # Entry can be either just a function name or "function/qualifier"
     real_entry="${entry%%/*}"
-    qualifier="${entry:${#real_entry}}"		# Strip the function name
-    qualifier="${qualifier:1}"			# Strip the slash, if any
+    if [ "$entry" = "$real_entry" ]; then
+        qualifier=
+    else
+        qualifier=${entry#*/}
+    fi
 
     echo "__SYSCALL_${abi}($nr, $real_entry, $qualifier)"
 }
@@ -22,7 +25,7 @@ emit() {
     entry="$3"
     compat="$4"
 
-    if [ "$abi" == "64" -a -n "$compat" ]; then
+    if [ "$abi" = "64" -a -n "$compat" ]; then
 	echo "a compat entry for a 64-bit syscall makes no sense" >&2
 	exit 1
     fi
@@ -45,17 +48,17 @@ emit() {
 grep '^[0-9]' "$in" | sort -n | (
     while read nr abi name entry compat; do
 	abi=`echo "$abi" | tr '[a-z]' '[A-Z]'`
-	if [ "$abi" == "COMMON" -o "$abi" == "64" ]; then
+	if [ "$abi" = "COMMON" -o "$abi" = "64" ]; then
 	    # COMMON is the same as 64, except that we don't expect X32
 	    # programs to use it.  Our expectation has nothing to do with
 	    # any generated code, so treat them the same.
 	    emit 64 "$nr" "$entry" "$compat"
-	elif [ "$abi" == "X32" ]; then
+	elif [ "$abi" = "X32" ]; then
 	    # X32 is equivalent to 64 on an X32-compatible kernel.
 	    echo "#ifdef CONFIG_X86_X32_ABI"
 	    emit 64 "$nr" "$entry" "$compat"
 	    echo "#endif"
-	elif [ "$abi" == "I386" ]; then
+	elif [ "$abi" = "I386" ]; then
 	    emit "$abi" "$nr" "$entry" "$compat"
 	else
 	    echo "Unknown abi $abi" >&2

Re: [PATCH] fix bash-isms in arch/x86/entry/syscalls/syscalltbl.sh

[sylvain.bertrand]

On Thu, Sep 29, 2016 at 04:22:34PM +0000, sylvain.bertrand@gmail.com wrote:
> Fix the bash-isms in the x86 syscall table generator shell script.

What's up with this patch?

regards,

-- 
Sylvain

Re: [PATCH] fix bash-isms in arch/x86/entry/syscalls/syscalltbl.sh

[Thomas Gleixner]

On Thu, 27 Oct 2016, sylvain.bertrand@gmail.com wrote:

> On Thu, Sep 29, 2016 at 04:22:34PM +0000, sylvain.bertrand@gmail.com wrote:
> > Fix the bash-isms in the x86 syscall table generator shell script.
> 
> What's up with this patch?

You got a mail on Sept 19th, which told you that the patch was queued in
the tip tree. It contains the commit id. If you take said commit id and
check whether it's in Linus tree, then you should see:

2df0e78b44e2: x86/syscalls: Remove bash-isms in syscall table generator

A simple:

# git log arch/x86/entry/syscalls/syscalltbl.sh

on Linus tree would have told you the same thing.

Thanks,

	tglx