s/zallowed/allowed/ and usage - vx32 - Local 9vx git repository for patches.
(HTM) git clone git://r-36.net/vx32
(DIR) Log
(DIR) Files
(DIR) Refs
---
(DIR) commit d2a5337d0444a374d2577f5d68f13169fe772b94
(DIR) parent f1f6db0c5d7fa1a4e80b7a42377d5f9f20db2c5a
(HTM) Author: Jesus Galan Lopez (yiyus) <yiyu.jgl@gmail.com>
Date: Sat, 18 Sep 2010 22:28:38 +0200
s/zallowed/allowed/ and usage
Diffstat:
M doc/9vx.1 | 6 +++---
M src/9vx/conf.c | 8 ++++----
M src/9vx/conf.h | 2 +-
M src/9vx/main.c | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
---
(DIR) diff --git a/doc/9vx.1 b/doc/9vx.1
@@ -135,9 +135,9 @@ Use the hardware address
.I macaddress
for the last given virtual network device.
.TP
-.BI -z " zallowed"
+.BI -z " allowed"
Do not allow access to host files in #Z whose path does not begin with
-.I zallowed
+.I allowed
(/ by default).
.SS 9vx.ini configuration files
Configuration parameters can also be given to
@@ -162,7 +162,7 @@ pairs in a similar fasion to plan9.ini(8). Additional options are
.I netdev,
.I macaddr
(that can also be part of a netdev line),
-.I zallowed.
+.I allowed.
.I localroot.
.I initcmd,
and
(DIR) diff --git a/src/9vx/conf.c b/src/9vx/conf.c
@@ -161,8 +161,8 @@ iniopt(char *name, char *value)
setmac(value);
else if(strcmp(name, "localroot") == 0 && !localroot)
localroot = value;
- else if(strcmp(name, "zallowed") == 0 && !zallowed)
- zallowed = value;
+ else if(strcmp(name, "allowed") == 0 && !allowed)
+ allowed = value;
else if(strcmp(name, "user") == 0 && !username)
username = value;
else if(strcmp(name, "initcmd") == 0 && !initcmd)
@@ -200,8 +200,8 @@ printconfig(char *argv0){
if(ve[i].mac != nil)
print(" -a %s", ve[i].mac);
}
- if(zallowed)
- print(" -z %s", zallowed);
+ if(allowed)
+ print(" -z %s", allowed);
if(localroot)
print(" -r %s", localroot);
print(" -u %s", username);
(DIR) diff --git a/src/9vx/conf.h b/src/9vx/conf.h
@@ -15,7 +15,7 @@ char** bootargv;
char* initcmd;
char* inifile;
char* localroot;
-char* zallowed;
+char* allowed;
char* username;
int readini(char *fn);
(DIR) diff --git a/src/9vx/main.c b/src/9vx/main.c
@@ -75,7 +75,7 @@ void
usage(void)
{
// TODO(yy): add debug and other options by ron
- fprint(2, "usage: 9vx [-p file.ini] [-cfgit] [-l cpulimit] [-m memsize] [-n [tap] netdev] [-a macaddr] [-r root] [-u user] [-e initcmd] [bootargs]\n");
+ fprint(2, "usage: 9vx [-p file.ini] [-fgit] [-l cpulimit] [-m memsize] [-n [tap] netdev] [-a macaddr] [-z allowed] [-r root] [-u user] [-e initcmd] [bootargs]\n");
exit(1);
}
@@ -107,7 +107,7 @@ main(int argc, char **argv)
nofork = 0;
nve = 0;
usetty = 0;
- zallowed = "/";
+ allowed = "/";
ARGBEGIN{
/* debugging options */
case '1':
@@ -188,7 +188,7 @@ main(int argc, char **argv)
username = EARGF(usage());
break;
case 'z':
- zallowed = EARGF(usage());
+ allowed = EARGF(usage());
break;
default:
usage();