Browse Source

Plan 9 from Bell Labs 2007-01-26

David du Colombier 14 years ago
parent
commit
7c9340139f
6 changed files with 26 additions and 25 deletions
  1. 4 4
      dist/replica/_plan9.db
  2. 4 4
      dist/replica/plan9.db
  3. 4 0
      dist/replica/plan9.log
  4. 1 0
      sys/games/lib/fortunes
  5. 6 6
      sys/man/2/memory
  6. 7 11
      sys/src/cmd/ls.c

+ 4 - 4
dist/replica/_plan9.db

@@ -324,7 +324,7 @@
 386/bin/lex - 775 sys sys 1168402332 99261
 386/bin/lnfs - 775 sys sys 1168402333 99675
 386/bin/look - 775 sys sys 1168402333 65774
-386/bin/ls - 775 sys sys 1168402333 82530
+386/bin/ls - 775 sys sys 1169783949 82470
 386/bin/mc - 775 sys sys 1168402333 134306
 386/bin/md5sum - 775 sys sys 1168402334 61498
 386/bin/mk - 775 sys sys 1168402334 144878
@@ -5763,7 +5763,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1168553329 262588
+sys/games/lib/fortunes - 664 sys sys 1169753249 262807
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -7507,7 +7507,7 @@ sys/man/2/malloc - 664 sys sys 1102093069 4763
 sys/man/2/matrix - 664 sys sys 950892861 6090
 sys/man/2/memdraw - 664 sys sys 1133883757 10112
 sys/man/2/memlayer - 664 sys sys 1040484074 6963
-sys/man/2/memory - 664 sys sys 944959694 2139
+sys/man/2/memory - 664 sys sys 1169741201 2145
 sys/man/2/mktemp - 664 sys sys 950892862 669
 sys/man/2/mouse - 664 sys sys 1140900146 4952
 sys/man/2/mp - 664 sys sys 1140106703 10762
@@ -12563,7 +12563,7 @@ sys/src/cmd/lp/lpdsend.c - 664 sys sys 1116770113 9583
 sys/src/cmd/lp/lpsend.c - 664 sys sys 1015090024 6180
 sys/src/cmd/lp/lpsend.rc - 775 sys sys 953344615 361
 sys/src/cmd/lp/mkfile - 664 sys sys 953344616 535
-sys/src/cmd/ls.c - 664 sys sys 1163342173 5715
+sys/src/cmd/ls.c - 664 sys sys 1169752489 5640
 sys/src/cmd/map - 20000000775 sys sys 1123098745 0
 sys/src/cmd/map/index.c - 664 sys sys 956282376 4345
 sys/src/cmd/map/iplot.h - 664 sys sys 944961024 1398

+ 4 - 4
dist/replica/plan9.db

@@ -324,7 +324,7 @@
 386/bin/lex - 775 sys sys 1168402332 99261
 386/bin/lnfs - 775 sys sys 1168402333 99675
 386/bin/look - 775 sys sys 1168402333 65774
-386/bin/ls - 775 sys sys 1168402333 82530
+386/bin/ls - 775 sys sys 1169783949 82470
 386/bin/mc - 775 sys sys 1168402333 134306
 386/bin/md5sum - 775 sys sys 1168402334 61498
 386/bin/mk - 775 sys sys 1168402334 144878
@@ -5763,7 +5763,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1168553329 262588
+sys/games/lib/fortunes - 664 sys sys 1169753249 262807
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -7507,7 +7507,7 @@ sys/man/2/malloc - 664 sys sys 1102093069 4763
 sys/man/2/matrix - 664 sys sys 950892861 6090
 sys/man/2/memdraw - 664 sys sys 1133883757 10112
 sys/man/2/memlayer - 664 sys sys 1040484074 6963
-sys/man/2/memory - 664 sys sys 944959694 2139
+sys/man/2/memory - 664 sys sys 1169741201 2145
 sys/man/2/mktemp - 664 sys sys 950892862 669
 sys/man/2/mouse - 664 sys sys 1140900146 4952
 sys/man/2/mp - 664 sys sys 1140106703 10762
@@ -12563,7 +12563,7 @@ sys/src/cmd/lp/lpdsend.c - 664 sys sys 1116770113 9583
 sys/src/cmd/lp/lpsend.c - 664 sys sys 1015090024 6180
 sys/src/cmd/lp/lpsend.rc - 775 sys sys 953344615 361
 sys/src/cmd/lp/mkfile - 664 sys sys 953344616 535
-sys/src/cmd/ls.c - 664 sys sys 1163342173 5715
+sys/src/cmd/ls.c - 664 sys sys 1169752489 5640
 sys/src/cmd/map - 20000000775 sys sys 1123098745 0
 sys/src/cmd/map/index.c - 664 sys sys 956282376 4345
 sys/src/cmd/map/iplot.h - 664 sys sys 944961024 1398

+ 4 - 0
dist/replica/plan9.log

@@ -47444,3 +47444,7 @@
 1169613006 26 c 386/bin/ndb/dnstcp - 775 sys sys 1169612031 220748
 1169613006 27 c 386/bin/ndb/ipquery - 775 sys sys 1169612031 96994
 1169613006 28 c 386/lib/libip.a - 664 sys sys 1169612032 35672
+1169742606 0 c sys/man/2/memory - 664 sys sys 1169741201 2145
+1169753407 0 c sys/games/lib/fortunes - 664 sys sys 1169753249 262807
+1169753407 1 c sys/src/cmd/ls.c - 664 sys sys 1169752489 5640
+1169784006 0 c 386/bin/ls - 775 sys sys 1169783949 82470

+ 1 - 0
sys/games/lib/fortunes

@@ -4161,3 +4161,4 @@ In the land of the clueless, the man with half an idea is king.  - Todd Robbins
 Chebyshev said it, and I say it again / There is always a prime between n and 2n.  - Paul Erdös
 Using Linux is like rediscovering your childhood and realising it really was pretty miserable.  - jmk
 remove is identical to install except that packages are removed instead of installed. If a plus sign is appended to the package name (with no intervening space), the identified package will be installed instead of removed.  - apt-get(8)
+I guess the idea is that ... even though the structures are all different. Everythings fine, dont worry, lie back and think of England. ... I think we can call it Pollyanna-morphism. -- Ron Minnich on Python libraries.

+ 6 - 6
sys/man/2/memory

@@ -8,22 +8,22 @@ memccpy, memchr, memcmp, memcpy, memmove, memset \- memory operations
 .PP
 .ta \w'\fLvoid* 'u
 .B
-void*	memccpy(void *s1, void *s2, int c, long n)
+void*	memccpy(void *s1, void *s2, int c, ulong n)
 .PP
 .B
-void*	memchr(void *s, int c, long n)
+void*	memchr(void *s, int c, ulong n)
 .PP
 .B
-int	memcmp(void *s1, void *s2, long n)
+int	memcmp(void *s1, void *s2, ulong n)
 .PP
 .B
-void*	memcpy(void *s1, void *s2, long n)
+void*	memcpy(void *s1, void *s2, ulong n)
 .PP
 .B
-void*	memmove(void *s1, void *s2, long n)
+void*	memmove(void *s1, void *s2, ulong n)
 .PP
 .B
-void*	memset(void *s, int c, long n)
+void*	memset(void *s, int c, ulong n)
 .SH DESCRIPTION
 These functions operate efficiently on memory areas
 (arrays of bytes bounded by a count, not terminated by a zero byte).

+ 7 - 11
sys/src/cmd/ls.c

@@ -221,21 +221,17 @@ format(Dir *db, char *name)
 			qwidth, db->qid.vers,
 			db->qid.type);
 	if(Tflag)
-		Bprint(&bin, "%c ", (db->mode&DMTMP) ? 't' : '-');
+		Bprint(&bin, "%c ", (db->mode&DMTMP)? 't': '-');
 
 	if(lflag)
-		Bprint(&bin,
-			Qflag? "%M %C %*ud %*s %s %*llud %s %s\n" : "%M %C %*ud %*s %s %*llud %s %q\n",
+		Bprint(&bin, "%M %C %*ud %*s %s %*llud %s ",
 			db->mode, db->type,
 			vwidth, db->dev,
 			-uwidth, db->uid,
 			db->gid,
-			(int)(glwidth-strlen(db->gid)), db->length,
-			asciitime(uflag? db->atime : db->mtime), name);
-	else
-		Bprint(&bin,
-			Qflag? "%s%s\n" : "%q%s\n",
-			name, fileflag(db));
+			(int)(glwidth - strlen(db->gid)), db->length,
+			asciitime(uflag? db->atime: db->mtime));
+	Bprint(&bin, Qflag? "%s%s\n": "%q%s\n", name, fileflag(db));
 }
 
 void
@@ -248,7 +244,7 @@ growto(long n)
 	if(dirbuf == 0){
 		fprint(2, "ls: malloc fail\n");
 		exits("malloc fail");
-	}		
+	}
 }
 
 int
@@ -312,7 +308,7 @@ char*
 xcleanname(char *name)
 {
 	char *r, *w;
-	
+
 	for(r=w=name; *r; r++){
 		if(*r=='/' && r>name && *(r-1)=='/')
 			continue;