[PATCH] Modify the OS string parsing to handle two number strings

[Dmitry V. Levin]

On Mon, May 14, 2012 at 10:34:46PM +1000, Bryce Gibson wrote:
> Modify OS string parsing to handle a two character OS string.
> If a shorter than expected OS string is found, pad a zero on the end and then try the comparison.
> ---
> strace.c | 5 +++++
> 1 file changed, 5 insertions(+)
> 
> diff --git a/strace.c b/strace.c
> index 857136d..2bc8d59 100644
> --- a/strace.c
> +++ b/strace.c
> @@ -1432,6 +1432,11 @@ get_os_release(void)
> break;
> while (*p >= '0' && *p = KERNEL_VERSION(1,0,0))
> + break;
> + }
> if (*p != '.')
> error_msg_and_die("Bad OS release string: '%s'", u.release);
> p++;

Sorry, it is not a patch.  How about this one:

diff --git a/strace.c b/strace.c
index 857136d..65dee7d 100644
--- a/strace.c
+++ b/strace.c
@@ -1432,8 +1432,14 @@ get_os_release(void)
 			break;
 		while (*p >= '0' && *p <= '9')
 			p++;
-		if (*p != '.')
+		if (*p != '.') {
+			if (rel >= KERNEL_VERSION(0,1,0)) {
+				/* "X.Y-something" means "X.Y.0" */
+				rel <<= 8;
+				break;
+			}
 			error_msg_and_die("Bad OS release string: '%s'", u.release);
+		}
 		p++;
 	}
 	return rel;


-- 
ldv
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.strace.io/pipermail/strace-devel/attachments/20120515/10d75e92/attachment.bin>