/* vi: set sw=4 ts=4: */
/*
- * Copyright (C) 2003 Erik Andersen <andersee@debian.org>
+ * Copyright (C) 2003-2004 Erik Andersen <andersen@codepoet.org>
*/
#include <getopt.h>
#include <errno.h>
#include <assert.h>
+#include <ctype.h>
#include "busybox.h"
-extern long bb_xgetlarg(char *arg, int base, long lower, long upper)
+extern long bb_xgetlarg(const char *arg, int base, long lower, long upper)
{
long result;
char *endptr;
int errno_save = errno;
assert(arg!=NULL);
+
+ /* Don't allow leading whitespace.
+ * Wrap isspace in () to make sure we call the
+ * function rather than the macro. */
+ if ((isspace)(*arg)) {
+ bb_show_usage();
+ }
+
errno = 0;
result = strtol(arg, &endptr, base);
- if (errno != 0 || *endptr!='\0' || result < lower || result > upper)
- show_usage();
+ if (errno != 0 || *endptr!='\0' || endptr==arg || result < lower || result > upper)
+ bb_show_usage();
errno = errno_save;
return result;
}