Browse Source

Plan 9 from Bell Labs 2004-03-29

David du Colombier 20 years ago
parent
commit
a1a7fc54f3
6 changed files with 28 additions and 12 deletions
  1. 5 4
      dist/replica/plan9.db
  2. 5 0
      dist/replica/plan9.log
  3. 2 0
      sys/games/lib/fortunes
  4. 2 2
      sys/man/1/2c
  5. 1 1
      sys/src/cmd/ndb/cs.c
  6. 13 5
      sys/src/libc/9sys/dial.c

+ 5 - 4
dist/replica/plan9.db

@@ -3332,7 +3332,7 @@ sys/doc/venti/venti.pdf - 755 sys sys 1020384352 139090
 sys/doc/venti/venti.ps - 664 sys sys 1019852320 2012620
 sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
-sys/games/lib/fortunes - 664 sys sys 1078453847 248109
+sys/games/lib/fortunes - 664 sys sys 1080495629 248306
 sys/include - 20000000775 sys sys 1016902416 0
 sys/include/9p.h - 664 sys sys 1044836327 4309
 sys/include/String.h - 664 sys sys 1055701304 1291
@@ -4612,7 +4612,7 @@ sys/man - 20000000775 sys sys 1012278794 0
 sys/man/1 - 20000000775 sys sys 1018897631 0
 sys/man/1/0intro - 664 sys sys 958249499 9623
 sys/man/1/2a - 664 sys sys 944959673 1032
-sys/man/1/2c - 664 sys sys 1016731553 7349
+sys/man/1/2c - 664 sys sys 1080485731 7341
 sys/man/1/2l - 664 sys sys 944959675 4074
 sys/man/1/INDEX - 664 sys sys 1045538129 2900
 sys/man/1/INDEX.html - 664 sys sys 1026845791 15882
@@ -5232,6 +5232,7 @@ sys/src/9/boot/bootmkfile - 664 sys sys 1032053196 390
 sys/src/9/boot/doauthenticate.c - 664 sys sys 1015012529 2300
 sys/src/9/boot/embed.c - 664 sys sys 1039763720 1191
 sys/src/9/boot/getpasswd.c - 664 sys sys 957373373 654
+sys/src/9/boot/libboot.a8 - 664 sys sys 1080484754 63496
 sys/src/9/boot/local.c - 664 sys sys 1068835808 5355
 sys/src/9/boot/mkboot - 775 sys sys 1045504382 1935
 sys/src/9/boot/nopsession.c - 664 sys sys 957373374 843
@@ -9763,7 +9764,7 @@ sys/src/cmd/mv.c - 664 sys sys 1014926695 4276
 sys/src/cmd/ndb - 20000000775 sys sys 988249988 0
 sys/src/cmd/ndb/convDNS2M.c - 664 sys sys 1060612175 6862
 sys/src/cmd/ndb/convM2DNS.c - 664 sys sys 1060612175 7248
-sys/src/cmd/ndb/cs.c - 664 sys sys 1079357413 33069
+sys/src/cmd/ndb/cs.c - 664 sys sys 1080504975 33075
 sys/src/cmd/ndb/csgetval.c - 664 sys sys 957402051 1051
 sys/src/cmd/ndb/csquery.c - 664 sys sys 1014926159 1062
 sys/src/cmd/ndb/dblookup.c - 664 sys sys 1078927860 18090
@@ -11521,7 +11522,7 @@ sys/src/libc/9sys/convM2S.c - 664 sys sys 1017679320 4969
 sys/src/libc/9sys/convS2M.c - 664 sys sys 1021580001 5014
 sys/src/libc/9sys/cputime.c - 664 sys sys 944961712 191
 sys/src/libc/9sys/ctime.c - 664 sys sys 944961712 4919
-sys/src/libc/9sys/dial.c - 664 sys sys 1048796753 3625
+sys/src/libc/9sys/dial.c - 664 sys sys 1080498909 3837
 sys/src/libc/9sys/dirfstat.c - 664 sys sys 1041363499 676
 sys/src/libc/9sys/dirfwstat.c - 664 sys sys 1014927336 242
 sys/src/libc/9sys/dirmodefmt.c - 664 sys sys 1014927337 581

+ 5 - 0
dist/replica/plan9.log

@@ -14766,3 +14766,8 @@
 1080223318 0 a sys/lib/kbmap/ee - 644 sys sys 1080222237 429
 1080401431 0 c sys/src/cmd/aux/timesync.c - 664 sys sys 1080399717 24797
 1080401431 1 c sys/src/libdraw/stringwidth.c - 664 sys sys 1080400060 1589
+1080486110 0 c sys/man/1/2c - 664 sys sys 1080485731 7341
+1080486110 1 a sys/src/9/boot/libboot.a8 - 664 sys sys 1080484754 63496
+1080496911 0 c sys/games/lib/fortunes - 664 sys sys 1080495629 248306
+1080500511 0 c sys/src/libc/9sys/dial.c - 664 sys sys 1080498909 3837
+1080505912 0 c sys/src/cmd/ndb/cs.c - 664 sys sys 1080504975 33075

+ 2 - 0
sys/games/lib/fortunes

@@ -4004,3 +4004,5 @@ return ({goto L; p;}) && ({L: 5;});
 object-oriented design is the roman numerals of computing.  - rob
 Java is the f*cking COBOL of the 90s, and future generations of geeks are going to fly back from Mars to piss on our graves for inflicting it on them.  - rasputnik@hellooperator.net
 httpd_server* httpd_initialize(char* hostname, httpd_sockaddr* sa4P, httpd_sockaddr* sa6P, unsigned short port, char* cgi_pattern, int cgi_limit, char* charset, char* p3p, int max_age, char* cwd, int no_log, FILE* logfp, int no_symlink_check, int vhost, int global_passwd, char* url_pattern, char* local_pattern, int no_empty_referers )
+it's easier to post to 9fans than to think. - boyd
+We assume familiarity with Rubik's Cube, the delights of which cannot be presented adequately in a textual description!  - an algorithms textbook

+ 2 - 2
sys/man/1/2c

@@ -231,7 +231,7 @@ which initializes the third and tenth elements of the eleven-element array
 Structure initializers can specify the structure element by using the name
 following a period, as
 .EX
-    int struct { int x; int y; } s = { .y 1, .x 5 };
+    struct { int x; int y; } s = { .y 1, .x 5 };
 .EE
 which initializes elements
 .B y
@@ -242,7 +242,7 @@ of the structure
 These forms also accept the new ANSI C notation, which includes an equal sign:
 .EX
     int a[] = { [3] = 1, [10] = 5 };
-    int struct { int x; int y; } s = { .y = 1, .x = 5 };
+    struct { int x; int y; } s = { .y = 1, .x = 5 };
 .EE
 .TP
 \-

+ 1 - 1
sys/src/cmd/ndb/cs.c

@@ -980,7 +980,7 @@ ipid(void)
 		 *
 		 */
 		p = getenv("sysname");
-		if(p){
+		if(p && *p){
 			attr = ipattr(p);
 			if(strcmp(attr, "ip") != 0)
 				mysysname = strdup(p);

+ 13 - 5
sys/src/libc/9sys/dial.c

@@ -129,9 +129,17 @@ static int
 call(char *clone, char *dest, DS *ds)
 {
 	int fd, cfd, n;
-	char name[Maxpath], data[Maxpath], *p;
+	char cname[Maxpath], name[Maxpath], data[Maxpath], *p;
 
-	cfd = open(clone, ORDWR);
+	/* because cs is in a different name space, replace the mount point */
+	p = strchr(clone+1, '/');
+	if(p == nil)
+		p = clone;
+	else 
+		p++;
+	snprint(cname, sizeof cname, "%s/%s", ds->netdir, p);
+
+	cfd = open(cname, ORDWR);
 	if(cfd < 0)
 		return -1;
 
@@ -145,11 +153,11 @@ call(char *clone, char *dest, DS *ds)
 	for(p = name; *p == ' '; p++)
 		;
 	snprint(name, sizeof(name), "%ld", strtoul(p, 0, 0));
-	p = strrchr(clone, '/');
+	p = strrchr(cname, '/');
 	*p = 0;
 	if(ds->dir)
-		snprint(ds->dir, NETPATHLEN, "%s/%s", clone, name);
-	snprint(data, sizeof(data), "%s/%s/data", clone, name);
+		snprint(ds->dir, NETPATHLEN, "%s/%s", cname, name);
+	snprint(data, sizeof(data), "%s/%s/data", cname, name);
 
 	/* connect */
 	if(ds->local)