diff options
Diffstat (limited to 'appl')
| -rw-r--r-- | appl/NOTICE | 26 | ||||
| -rw-r--r-- | appl/lib/NOTICE | 26 | ||||
| -rw-r--r-- | appl/lib/newns.b | 11 | ||||
| -rw-r--r-- | appl/lib/parseman.b | 4 |
4 files changed, 42 insertions, 25 deletions
diff --git a/appl/NOTICE b/appl/NOTICE index 04cbab52..55e1e0b4 100644 --- a/appl/NOTICE +++ b/appl/NOTICE @@ -10,16 +10,20 @@ Copyright © 1995-1999 Lucent Technologies Inc. Portions Copyright © 1997-2000 Vita Nuova Limited Portions Copyright © 2000-2010 Vita Nuova Holdings Limited -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/appl/lib/NOTICE b/appl/lib/NOTICE index 6169ac2f..55e1e0b4 100644 --- a/appl/lib/NOTICE +++ b/appl/lib/NOTICE @@ -10,16 +10,20 @@ Copyright © 1995-1999 Lucent Technologies Inc. Portions Copyright © 1997-2000 Vita Nuova Limited Portions Copyright © 2000-2010 Vita Nuova Holdings Limited -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License (`LGPL') as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -You should have received a copy of the GNU Lesser General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/appl/lib/newns.b b/appl/lib/newns.b index 6a53cb75..e6864f86 100644 --- a/appl/lib/newns.b +++ b/appl/lib/newns.b @@ -196,11 +196,12 @@ Moptres: adt { keyfile: string; ignore: int; use9: int; + doauth: int; }; mopt(argv: list of string): (ref Moptres, string) { - r := ref Moptres(nil, 0, "none", nil, 0, 0); + r := ref Moptres(nil, 0, "none", nil, 0, 0, 1); arg->init(argv); while ((opt := arg->opt()) != 0) { @@ -218,6 +219,8 @@ mopt(argv: list of string): (ref Moptres, string) return (nil, "mount: missing arg to -C option"); '9' => r.use9 = 1; + 'A' => + r.doauth = 0; * => return (nil, sys->sprint("mount: bad option -%c", opt)); } @@ -275,6 +278,12 @@ mount(argv: list of string, facfd: ref Sys->FD): string c := dial->dial(dest, nil); if(c == nil) return ig(r, sys->sprint("dial: %s: %r", dest)); + + if(r.doauth != 1){ + if(sys->mount(c.dfd, nil, dir, r.flags, spec) < 0) + return ig(r, sys->sprint("mount %q %q: %r", addr, dir)); + return nil; + } if(r.use9){ factotum := load Factotum Factotum->PATH; diff --git a/appl/lib/parseman.b b/appl/lib/parseman.b index bf420763..0f4151e9 100644 --- a/appl/lib/parseman.b +++ b/appl/lib/parseman.b @@ -443,11 +443,11 @@ parsetext[T](state: ref ParseState[T], t: string): list of Text case t[i] { '-' or '.' or '\\' => ch = t[i]; - ' ' => + ' ' or '0' => ch = ' '; 'e' => ch = '\\'; - '|' or '&' => + '|' or '&' or '^' => continue; '(' => if (width > 3) |