On 20090120.2203+0100, Andy Johnson <ajohnson@aecno.com> wrote:
The glibc.sh script doesn't handle the glibc versions with
an underscore very well (bash expected integer error). I
have attached a small patch for that. Instead of looking
for "not period" I changed the sense to look for numbers.
I initially tried to make it look for either a period or
an underscore, but that didn't work like I wanted (probably
because I did something wrong).

Original patch modified to be more robust.

/trunk/scripts/build/libc/glibc.sh | 8 4 4 0 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff -dur strace-4.5.16.orig/syscall.c strace-4.5.16/syscall.c

--- strace-4.5.16.orig/syscall.c	2006-12-21 23:13:33.000000000 +0100

+++ strace-4.5.16/syscall.c	2007-07-14 19:21:44.000000000 +0200

@@ -1045,6 +1045,15 @@

 		/*

 		 * Note: we only deal with only 32-bit CPUs here.

 		 */

+

+		if (!(tcp->flags & TCB_INSYSCALL) &&

+		    (tcp->flags & TCB_WAITEXECVE)) {

+			/* caught a fake syscall from the execve's exit */

+			tcp->flags &= ~TCB_WAITEXECVE;

+			return 0;

+		}

+

+

 		if (regs.ARM_cpsr & 0x20) {

 			/*

 			 * Get the Thumb-mode system call number