---

yaml
---
r: 24558
b: refs/heads/try2
c: 10fd195
h: refs/heads/master
v: v3

Author: jdm

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 195dd54d61c32ca983b1f81237570e9b0e70abbd
+refs/heads/try2: 10fd19580ed1f2caed28e90893f2f4889760265d
 refs/heads/incoming: 05543fd04dfb3f63b453a331e239ceb1a9a219f9
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libstd/getopts.rs

@@ -220,10 +220,36 @@ fn getopts(args: ~[str], opts: ~[opt]) -> result unsafe {
                 }
             } else {
                 let mut j = 1u;
+                let mut last_valid_opt_id = option::none;
                 names = ~[];
                 while j < curlen {
                     let range = str::char_range_at(cur, j);
-                    vec::push(names, short(range.ch));
+                    let opt = short(range.ch);
+
+                    /* In a series of potential options (eg. -aheJ), if we see
+                       one which takes an argument, we assume all subsequent
+                       characters make up the argument. This allows options
+                       such as -L/usr/local/lib/foo to be interpreted correctly
+                    */
+                    alt find_opt(opts, opt) {
+                      some(id) {
+                        last_valid_opt_id = option::some(id);
+                      }
+                      none {
+                        let arg_follows = option::is_some(last_valid_opt_id) &&
+                            alt opts[option::get(last_valid_opt_id)].hasarg {
+                              yes | maybe { true }
+                              no { false }
+                            };
+                        if arg_follows && j + 1 < curlen {
+                            i_arg = option::some(str::slice(cur, j, curlen));
+                            break;
+                        } else {
+                            last_valid_opt_id = option::none;
+                        }
+                      }
+                    }
+                    vec::push(names, opt);
                     j = range.next;
                 }
             }
@@ -857,6 +883,18 @@ mod tests {
         assert opts_str(match, ~["e", "encrypt"]) == "foo";
         assert opts_str(match, ~["encrypt", "e"]) == "foo";
     }
+
+    #[test]
+    fn test_nospace() {
+        let args = ~["-Lfoo"];
+        let opts = ~[optmulti("L")];
+        let match = alt getopts(args, opts) {
+          result::ok(m) { m }
+          result::err(f) { fail; }
+        };
+        assert opts_present(match, ~["L"]);
+        assert opts_str(match, ~["L"]) == "foo";
+    }
 }
 
 // Local Variables: