vx32

commit c4c9adc7ca1f55279c3231eba09f15649609555d
parent 3376809c353f55c4578a09224c54197aaaf7788a
Author: Jesus Galan Lopez (yiyus) <yiyu.jgl@gmail.com>
Date:   Tue, 22 Jun 2010 21:52:45 +0200

remove default values

Diffstat:
src/9vx/etherpcap.c
 | 
13
+++++++------
src/9vx/main.c
 | 
47
++++++++++-------------------------------------

2 files changed, 17 insertions(+), 43 deletions(-)
diff --git a/src/9vx/etherpcap.c b/src/9vx/etherpcap.c
@@ -52,12 +52,13 @@ setup(char *dev, uchar *ea)
 	ea[0], ea[1], ea[2],ea[3], ea[4], ea[5]) == -1)
 		return veerror("cannot create pcap filter");
 
-	if (!dev && (dev = pcap_lookupdev(errbuf)) == nil)
-		return veerror("cannot find network device");
-
-//	if ((pd = pcap_open_live(netdev, 1514, 1, 1, errbuf)) == nil)
-	if ((pd = pcap_open_live(dev, 65000, 1, 1, errbuf)) == nil)
-		return nil;
+	if ((pd = pcap_open_live(dev, 65000, 1, 1, errbuf)) == nil){
+		// try to find a device
+		if ((dev = pcap_lookupdev(errbuf)) == nil)
+			return veerror("cannot find network device");
+		if ((pd = pcap_open_live(dev, 65000, 1, 1, errbuf)) == nil)
+			return nil;
+	}
 
 	pcap_lookupnet(dev, &net, &mask, errbuf);
 	pcap_compile(pd, &prog, filter, 0, net);
diff --git a/src/9vx/main.c b/src/9vx/main.c
@@ -80,13 +80,12 @@ static void	iniopt(char *name, char *value);
 static void	inienv(char *name, char *value);
 
 static char*	getuser(void);
-static char*	findroot(void);
 
 void
 usage(void)
 {
 	// TODO(yy): add debug and other options by ron
-	fprint(2, "usage: 9vx [-p file.ini] [-bfgit] [-m memsize] [-n [tap] [netdev]] [-a macaddr] [-r root] [-u user]\n");
+	fprint(2, "usage: 9vx [-p file.ini] [-bfgit] [-m memsize] [-n [tap] netdev] [-a macaddr] [-r root] [-u user]\n");
 	exit(1);
 }
 
@@ -100,6 +99,7 @@ main(int argc, char **argv)
 {
 	int vetap;
 	char *vedev;
+	char cwd[1024];
 	char buf[1024];
 	
 	/* Minimal set up to make print work. */
@@ -170,11 +170,8 @@ main(int argc, char **argv)
 			vetap = 1;
 			vedev = ARGF();
 		}
-		if(vedev != nil && vedev[0] == '-'){
-			vedev = nil;
-			argc++;
-			argv--;
-		}
+		if(vedev == nil)
+			usage();
 		addve(vedev, vetap);
 		break;
 	case 'p':
@@ -192,7 +189,7 @@ main(int argc, char **argv)
 	default:
 		usage();
 	}ARGEND
-	
+
 	if(argc != 0)
 		usage();
 	
@@ -204,8 +201,11 @@ main(int argc, char **argv)
 	}
 
 	if(!bootboot){
-		if(localroot == nil && (localroot = findroot()) == nil)
-			panic("cannot find plan 9 root; use -r");
+		if(localroot == nil){
+			if(getcwd(cwd, sizeof cwd) == nil)
+				panic("getcwd: %r");
+			localroot = cwd;
+		}
 		snprint(buf, sizeof buf, "%s/386/bin/rc", localroot);
 		if(access(buf, 0) < 0)
 			panic("%s does not exist", buf);
@@ -447,33 +447,6 @@ inienv(char *name, char *value)
 		ksetenv(name, value, 0);
 }
 
-/*
- * Search for Plan 9 /386/bin/rc to find root.
- */
-static char*
-findroot(void)
-{
-	static char cwd[1024];
-	int i;
-	char buf[1024];
-	char *dir[] = {
-		cwd,
-		"/usr/local/9vx"
-	};
-	
-	if(getcwd(cwd, sizeof cwd) == nil){
-		oserrstr();
-		panic("getcwd: %r");
-	}
-
-	for(i=0; i<nelem(dir); i++){
-		snprint(buf, sizeof buf, "%s/386/bin/rc", dir[i]);
-		if(access(buf, 0) >= 0)
-			return dir[i];
-	}
-	return nil;
-}
-
 static char*
 getuser(void)
 {