This allows a hyphenated range of positive numbers in the string passed
to command line helper function, get_options.
Signed-off-by: Derek Fults <[email protected]>
Index: linux/lib/cmdline.c
===================================================================
--- linux.orig/lib/cmdline.c 2006-09-19 22:42:06.000000000 -0500
+++ linux/lib/cmdline.c 2006-10-30 10:39:13.351641023 -0600
@@ -29,6 +29,10 @@
* 0 : no int in string
* 1 : int found, no subsequent comma
* 2 : int found including a subsequent comma
+ * -(int): int found with a subsequent hyphen to denote a range.
+ * The negative number is the number of integers in the range
+ * used to increment the counter in the while loop.
+ *
*/
int get_option (char **str, int *pint)
@@ -44,7 +48,16 @@
(*str)++;
return 2;
}
+ if (**str == '-') {
+ int x,inc_counter= 0, upper_range = 0;
+ (*str)++;
+ upper_range = simple_strtol ((*str), NULL, 0);
+ inc_counter = upper_range - *pint ;
+ for (x=*pint; x < upper_range; x++)
+ *pint++ = x;
+ return -inc_counter;
+ }
return 1;
}
@@ -55,7 +68,8 @@
* @ints: integer array
*
* This function parses a string containing a comma-separated
- * list of integers. The parse halts when the array is
+ * list of integers, a hyphen-separated range of _positive_ integers,
+ * or a combination of both. The parse halts when the array is
* full, or when no more numbers can be retrieved from the
* string.
*
@@ -75,6 +89,11 @@
i++;
if (res == 1)
break;
+ if (res < 0)
+ /* Decrement the result by one to leave out the
+ last number in the range. The next iteration
+ will handle the upper number in the range */
+ i += ((-res) - 1);
}
ints[0] = i - 1;
return (char *)str;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
