From ef4f002ba242786ecee74764577d9556ccc4a325 Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Mon, 22 Oct 2012 16:13:51 -0400 Subject: Allow Gen version decimals. This is preparatory work for Haswell (Gen 7.5). Signed-off-by: Gwenole Beauchesne --- src/main.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main.c b/src/main.c index 82e395c..ef2afc4 100644 --- a/src/main.c +++ b/src/main.c @@ -287,8 +287,22 @@ int main(int argc, char **argv) break; - case 'g': - gen_level = strtol(optarg, NULL, 0) * 10; + case 'g': { + char *dec_ptr, *end_ptr; + unsigned long decimal; + + gen_level = strtol(optarg, &dec_ptr, 10) * 10; + + if (*dec_ptr == '.') { + decimal = strtoul(++dec_ptr, &end_ptr, 10); + if (end_ptr != dec_ptr && *end_ptr == '\0') { + if (decimal > 10) { + fprintf(stderr, "Invalid Gen X decimal version\n"); + exit(1); + } + gen_level += decimal; + } + } if (gen_level < 40 || gen_level > 70) { usage(); @@ -296,6 +310,7 @@ int main(int argc, char **argv) } break; + } case 'a': advanced_flag = 1; -- cgit v1.2.3