Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 75 insertions, 0 deletions

diff --git a/fs/ncpfs/getopt.c b/fs/ncpfs/getopt.c
new file mode 100644
index 000000000000..335b003dddf9
--- /dev/null
+++ b/fs/ncpfs/getopt.c
@@ -0,0 +1,75 @@
+/*
+ * getopt.c
+ */
+
+#include <linux/kernel.h>
+#include <linux/string.h>
+
+#include <asm/errno.h>
+
+#include "getopt.h"
+
+/**
+ *      ncp_getopt - option parser
+ *      @caller: name of the caller, for error messages
+ *      @options: the options string
+ *      @opts: an array of &struct option entries controlling parser operations
+ *      @optopt: output; will contain the current option
+ *      @optarg: output; will contain the value (if one exists)
+ *      @flag: output; may be NULL; should point to a long for or'ing flags
+ *      @value: output; may be NULL; will be overwritten with the integer value
+ *              of the current argument.
+ *
+ *      Helper to parse options on the format used by mount ("a=b,c=d,e,f").
+ *      Returns opts->val if a matching entry in the 'opts' array is found,
+ *      0 when no more tokens are found, -1 if an error is encountered.
+ */
+int ncp_getopt(const char *caller, char **options, const struct ncp_option *opts,
+               char **optopt, char **optarg, unsigned long *value)
+{
+        char *token;
+        char *val;
+
+        do {
+                if ((token = strsep(options, ",")) == NULL)
+                        return 0;
+        } while (*token == '\0');
+        if (optopt)
+                *optopt = token;
+
+        if ((val = strchr (token, '=')) != NULL) {
+                *val++ = 0;
+        }
+        *optarg = val;
+        for (; opts->name; opts++) {
+                if (!strcmp(opts->name, token)) {
+                        if (!val) {
+                                if (opts->has_arg & OPT_NOPARAM) {
+                                        return opts->val;
+                                }
+                                printk(KERN_INFO "%s: the %s option requires an argument\n",
+                                       caller, token);
+                                return -EINVAL;
+                        }
+                        if (opts->has_arg & OPT_INT) {
+                                char* v;
+
+                                *value = simple_strtoul(val, &v, 0);
+                                if (!*v) {
+                                        return opts->val;
+                                }
+                                printk(KERN_INFO "%s: invalid numeric value in %s=%s\n",
+                                        caller, token, val);
+                                return -EDOM;
+                        }
+                        if (opts->has_arg & OPT_STRING) {
+                                return opts->val;
+                        }
+                        printk(KERN_INFO "%s: unexpected argument %s to the %s option\n",
+                                caller, val, token);
+                        return -EINVAL;
+                }
+        }
+        printk(KERN_INFO "%s: Unrecognized mount option %s\n", caller, token);
+        return -EOPNOTSUPP;
+}