--- geom.c	2007-09-19 14:12:58.000000000 +0200
+++ geom.c.new	2007-09-18 18:23:58.000000000 +0200
@@ -224,9 +224,7 @@
 	if (G_OPT_TYPE(opt) == G_TYPE_NUMBER) {
 		intmax_t number;
 
-		errno = 0;
-		number = strtoimax(val, NULL, 0);
-		if (errno != 0) {
+		if (expand_number(val, &number) == -1) {
 			err(EXIT_FAILURE, "Invalid value for '%c' argument.",
 			    opt->go_char);
 		}