only one .ini file (use cat and -p - for more) - vx32 - Local 9vx git repository for patches.
(DIR) Log
(DIR) Files
(DIR) Refs
---
(DIR) commit c4ae9b58794d90a67ad8879bae192d10dbfe297c
(DIR) parent acf15ba57323e35203a78b18a322358a389d7acf
(HTM) Author: Jesus Galan Lopez (yiyus) <yiyu.jgl@gmail.com>
Date: Fri, 25 Jun 2010 00:49:39 +0200
only one .ini file (use cat and -p - for more)
Diffstat:
doc/9vx.1 | 2 +-
src/9vx/main.c | 12 ++++--------
2 files changed, 5 insertions(+), 9 deletions(-)
---
(DIR) diff --git a/doc/9vx.1 b/doc/9vx.1
@@ -102,7 +102,7 @@ for the last given virtual network device.
.SS 9vx.ini configuration files
Configuration parameters can also be given to
.I 9vx
-in one or more configuration files specified with the
+in a configuration file specified with the
.I -p
command line option.
A file name
(DIR) diff --git a/src/9vx/main.c b/src/9vx/main.c
@@ -84,7 +84,7 @@ main(int argc, char **argv)
int vetap;
int i, n;
char *vedev;
- char *inifile[32];
+ char *inifile;
/* Minimal set up to make print work. */
setmach(&mach0);
@@ -157,7 +157,7 @@ main(int argc, char **argv)
addve(vedev, vetap);
break;
case 'p':
- inifile[n++] = EARGF(usage());
+ inifile = EARGF(usage());
break;
case 'r':
localroot = EARGF(usage());
@@ -172,12 +172,8 @@ main(int argc, char **argv)
usage();
}ARGEND
- /*
- * Loop in reverse direction to overwrite older options
- */
- for(i = n-1; i >= 0; i--)
- if(readini(inifile[i]) != 0)
- panic("error reading config file %s", inifile[i]);
+ if(inifile && readini(inifile) != 0)
+ panic("error reading config file %s", inifile);
bootargc = argc;
bootargv = argv;