History

Plan 9 from Bell Labs Fourth Edition 2005-01-29

David du Colombier committed 21 years ago

Commit 27e10911 parent 1b13ae89 files · +62 −26Browse files

Unified · Split

9 files
  1. dist/replica/_plan9.db +9 −6
  2. dist/replica/plan9.db +9 −9
  3. dist/replica/plan9.log +10 −0
  4. sys/lib/kbmap/bg +0 −0
  5. sys/man/1/diff +4 −1
  6. sys/src/cmd/diff/diffio.c +22 −6
  7. sys/src/cmd/diff/main.c +1 −0
  8. sys/src/cmd/disk/kfs/main.c +3 −0
  9. sys/src/cmd/ip/tftpd.c +4 −4
dist/replica/_plan9.db+9−6
@@ -3903,7 +3903,7 @@ sys/lib/httpd.rewrite - 664 sys sys 954262980 825 · 3902 unmodified lines
3903sys/lib/kbmap - 20000000775 sys sys 1079535430 03903sys/lib/kbmap - 20000000775 sys sys 1079535430 0
3904sys/lib/kbmap/ascii - 664 sys sys 1082221421 62483904sys/lib/kbmap/ascii - 664 sys sys 1082221421 6248
3905sys/lib/kbmap/azerty - 644 sys sys 1079473812 7353905sys/lib/kbmap/azerty - 644 sys sys 1079473812 735
3906sys/lib/kbmap/bgmap - 664 sys sys 1079475826 5613906sys/lib/kbmap/bg - 664 sys sys 1106924292 561
3907sys/lib/kbmap/de - 664 sys sys 1100894012 62653907sys/lib/kbmap/de - 664 sys sys 1100894012 6265
3908sys/lib/kbmap/ee - 644 sys sys 1080222237 4293908sys/lib/kbmap/ee - 644 sys sys 1080222237 429
3909sys/lib/kbmap/es - 664 sys sys 1079535430 13603909sys/lib/kbmap/es - 664 sys sys 1079535430 1360
@@ -4687,7 +4687,7 @@ sys/man/1/db - 664 sys sys 1015024738 17862 · 777 unmodified lines
4687sys/man/1/dc - 664 sys sys 944959674 48344687sys/man/1/dc - 664 sys sys 944959674 4834
4688sys/man/1/dd - 664 sys sys 1055693436 33464688sys/man/1/dd - 664 sys sys 1055693436 3346
4689sys/man/1/deroff - 664 sys sys 1017423524 18264689sys/man/1/deroff - 664 sys sys 1017423524 1826
4690sys/man/1/diff - 664 sys sys 1106723601 29074690sys/man/1/diff - 664 sys sys 1106938097 2960
4691sys/man/1/doc2txt - 664 sys sys 1105020018 20774691sys/man/1/doc2txt - 664 sys sys 1105020018 2077
4692sys/man/1/doctype - 664 sys sys 944959673 8494692sys/man/1/doctype - 664 sys sys 944959673 849
4693sys/man/1/du - 664 sys sys 1017166323 14104693sys/man/1/du - 664 sys sys 1017166323 1410
@@ -7364,9 +7364,9 @@ sys/src/cmd/dict/world.c - 664 sys sys 944960882 4264 · 2670 unmodified lines
7364sys/src/cmd/diff - 20000000775 sys sys 944960882 07364sys/src/cmd/diff - 20000000775 sys sys 944960882 0
7365sys/src/cmd/diff/diff.h - 664 sys sys 1106723609 7947365sys/src/cmd/diff/diff.h - 664 sys sys 1106723609 794
7366sys/src/cmd/diff/diffdir.c - 664 sys sys 1014925333 17917366sys/src/cmd/diff/diffdir.c - 664 sys sys 1014925333 1791
7367sys/src/cmd/diff/diffio.c - 664 sys sys 1106723609 63787367sys/src/cmd/diff/diffio.c - 664 sys sys 1106938096 6599
7368sys/src/cmd/diff/diffreg.c - 664 sys sys 1106723609 88427368sys/src/cmd/diff/diffreg.c - 664 sys sys 1106723609 8842
7369sys/src/cmd/diff/main.c - 664 sys sys 1106151067 43257369sys/src/cmd/diff/main.c - 664 sys sys 1106938096 4338
7370sys/src/cmd/diff/mkfile - 664 sys sys 944960882 1417370sys/src/cmd/diff/mkfile - 664 sys sys 944960882 141
7371sys/src/cmd/disk - 20000000775 sys sys 1018468546 07371sys/src/cmd/disk - 20000000775 sys sys 1018468546 0
7372sys/src/cmd/disk/9660 - 20000000775 sys sys 1017681443 07372sys/src/cmd/disk/9660 - 20000000775 sys sys 1017681443 0
@@ -7411,7 +7411,7 @@ sys/src/cmd/disk/kfs/errno.h - 664 sys sys 1015009189 1317 · 38 unmodified lines
7411sys/src/cmd/disk/kfs/fns.h - 664 sys sys 1019058719 10107411sys/src/cmd/disk/kfs/fns.h - 664 sys sys 1019058719 1010
7412sys/src/cmd/disk/kfs/ialloc.c - 664 sys sys 944960883 1037412sys/src/cmd/disk/kfs/ialloc.c - 664 sys sys 944960883 103
7413sys/src/cmd/disk/kfs/iobuf.c - 664 sys sys 1015009189 37697413sys/src/cmd/disk/kfs/iobuf.c - 664 sys sys 1015009189 3769
7414sys/src/cmd/disk/kfs/main.c - 664 sys sys 1022112155 94207414sys/src/cmd/disk/kfs/main.c - 664 sys sys 1106924274 9515
7415sys/src/cmd/disk/kfs/misc.c - 664 sys sys 1015009189 11827415sys/src/cmd/disk/kfs/misc.c - 664 sys sys 1015009189 1182
7416sys/src/cmd/disk/kfs/mkfile - 664 sys sys 1065916865 7177416sys/src/cmd/disk/kfs/mkfile - 664 sys sys 1065916865 717
7417sys/src/cmd/disk/kfs/ofcallfmt.c - 664 sys sys 1015009189 46747417sys/src/cmd/disk/kfs/ofcallfmt.c - 664 sys sys 1015009189 4674
@@ -9547,7 +9547,7 @@ sys/src/cmd/ip/snoopy/udp.c - 664 sys sys 1089299190 1990 · 2129 unmodified lines
9547sys/src/cmd/ip/telnet.c - 664 sys sys 1080058033 85359547sys/src/cmd/ip/telnet.c - 664 sys sys 1080058033 8535
9548sys/src/cmd/ip/telnet.h - 664 sys sys 1015090250 59029548sys/src/cmd/ip/telnet.h - 664 sys sys 1015090250 5902
9549sys/src/cmd/ip/telnetd.c - 664 sys sys 1032060109 117319549sys/src/cmd/ip/telnetd.c - 664 sys sys 1032060109 11731
9550sys/src/cmd/ip/tftpd.c - 664 sys sys 1106624712 76429550sys/src/cmd/ip/tftpd.c - 664 sys sys 1106943821 7646
9551sys/src/cmd/ip/traceroute.c - 664 sys sys 1032060124 93709551sys/src/cmd/ip/traceroute.c - 664 sys sys 1032060124 9370
9552sys/src/cmd/ip/udpecho.c - 664 sys sys 1050714674 8559552sys/src/cmd/ip/udpecho.c - 664 sys sys 1050714674 855
9553sys/src/cmd/join.c - 664 sys sys 944961364 74889553sys/src/cmd/join.c - 664 sys sys 944961364 7488
@@ -12456,3 +12456,6 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890 · 2902 unmodified lines
12456usr/glenda/readme.acme - 664 glenda glenda 1019860628 475312456usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
12457usr/glenda/readme.rio - 664 glenda glenda 1019860628 637012457usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
12458usr/glenda/tmp - 20000000775 glenda glenda 1018802620 012458usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
12459386/bin/diff - 775 sys sys 1106971478 85101
12460386/bin/disk/kfs - 775 sys sys 1106971479 248849
12461386/bin/ip/tftpd - 775 sys sys 1106971479 129489
dist/replica/plan9.db+9−9
@@ -195,13 +195,13 @@ · 194 unmodified lines
195386/bin/dial/expect - 775 sys sys 1104122000 60081195386/bin/dial/expect - 775 sys sys 1104122000 60081
196386/bin/dial/pass - 775 sys sys 1104122001 38814196386/bin/dial/pass - 775 sys sys 1104122001 38814
197386/bin/dict - 775 sys sys 1104122001 187459197386/bin/dict - 775 sys sys 1104122001 187459
198386/bin/diff - 775 sys sys 1106799173 84923198386/bin/diff - 775 sys sys 1106971478 85101
199386/bin/disk - 20000000775 sys sys 984788664 0199386/bin/disk - 20000000775 sys sys 984788664 0
200386/bin/disk/dump9660 - 775 sys sys 1104122002 152246200386/bin/disk/dump9660 - 775 sys sys 1104122002 152246
201386/bin/disk/exsort - 775 sys sys 1104122002 60210201386/bin/disk/exsort - 775 sys sys 1104122002 60210
202386/bin/disk/fdisk - 775 sys sys 1104122003 103794202386/bin/disk/fdisk - 775 sys sys 1104122003 103794
203386/bin/disk/format - 775 sys sys 1104122003 89534203386/bin/disk/format - 775 sys sys 1104122003 89534
204386/bin/disk/kfs - 775 sys sys 1106107677 248770204386/bin/disk/kfs - 775 sys sys 1106971479 248849
205386/bin/disk/kfscmd - 775 sys sys 1104122004 38222205386/bin/disk/kfscmd - 775 sys sys 1104122004 38222
206386/bin/disk/ksync - 775 sys sys 1020319074 302206386/bin/disk/ksync - 775 sys sys 1020319074 302
207386/bin/disk/mbr - 775 sys sys 1104122004 73689207386/bin/disk/mbr - 775 sys sys 1104122004 73689
@@ -297,7 +297,7 @@ · 89 unmodified lines
297386/bin/ip/rip - 775 sys sys 1104122029 91232297386/bin/ip/rip - 775 sys sys 1104122029 91232
298386/bin/ip/rlogind - 775 sys sys 1104122029 67402298386/bin/ip/rlogind - 775 sys sys 1104122029 67402
299386/bin/ip/telnetd - 775 sys sys 1104122030 121992299386/bin/ip/telnetd - 775 sys sys 1104122030 121992
300386/bin/ip/tftpd - 775 sys sys 1106799176 129444300386/bin/ip/tftpd - 775 sys sys 1106971479 129489
301386/bin/ip/traceroute - 775 sys sys 1104122030 73497301386/bin/ip/traceroute - 775 sys sys 1104122030 73497
302386/bin/ip/udpecho - 775 sys sys 1104122030 43159302386/bin/ip/udpecho - 775 sys sys 1104122030 43159
303386/bin/join - 775 sys sys 1104122031 116241303386/bin/join - 775 sys sys 1104122031 116241
@@ -3903,7 +3903,7 @@ sys/lib/httpd.rewrite - 664 sys sys 954262980 825 · 3599 unmodified lines
3903sys/lib/kbmap - 20000000775 sys sys 1079535430 03903sys/lib/kbmap - 20000000775 sys sys 1079535430 0
3904sys/lib/kbmap/ascii - 664 sys sys 1082221421 62483904sys/lib/kbmap/ascii - 664 sys sys 1082221421 6248
3905sys/lib/kbmap/azerty - 644 sys sys 1079473812 7353905sys/lib/kbmap/azerty - 644 sys sys 1079473812 735
3906sys/lib/kbmap/bgmap - 664 sys sys 1079475826 5613906sys/lib/kbmap/bg - 664 sys sys 1106924292 561
3907sys/lib/kbmap/de - 664 sys sys 1100894012 62653907sys/lib/kbmap/de - 664 sys sys 1100894012 6265
3908sys/lib/kbmap/ee - 644 sys sys 1080222237 4293908sys/lib/kbmap/ee - 644 sys sys 1080222237 429
3909sys/lib/kbmap/es - 664 sys sys 1079535430 13603909sys/lib/kbmap/es - 664 sys sys 1079535430 1360
@@ -4687,7 +4687,7 @@ sys/man/1/db - 664 sys sys 1015024738 17862 · 777 unmodified lines
4687sys/man/1/dc - 664 sys sys 944959674 48344687sys/man/1/dc - 664 sys sys 944959674 4834
4688sys/man/1/dd - 664 sys sys 1055693436 33464688sys/man/1/dd - 664 sys sys 1055693436 3346
4689sys/man/1/deroff - 664 sys sys 1017423524 18264689sys/man/1/deroff - 664 sys sys 1017423524 1826
4690sys/man/1/diff - 664 sys sys 1106723601 29074690sys/man/1/diff - 664 sys sys 1106938097 2960
4691sys/man/1/doc2txt - 664 sys sys 1105020018 20774691sys/man/1/doc2txt - 664 sys sys 1105020018 2077
4692sys/man/1/doctype - 664 sys sys 944959673 8494692sys/man/1/doctype - 664 sys sys 944959673 849
4693sys/man/1/du - 664 sys sys 1017166323 14104693sys/man/1/du - 664 sys sys 1017166323 1410
@@ -7364,9 +7364,9 @@ sys/src/cmd/dict/world.c - 664 sys sys 944960882 4264 · 2670 unmodified lines
7364sys/src/cmd/diff - 20000000775 sys sys 944960882 07364sys/src/cmd/diff - 20000000775 sys sys 944960882 0
7365sys/src/cmd/diff/diff.h - 664 sys sys 1106723609 7947365sys/src/cmd/diff/diff.h - 664 sys sys 1106723609 794
7366sys/src/cmd/diff/diffdir.c - 664 sys sys 1014925333 17917366sys/src/cmd/diff/diffdir.c - 664 sys sys 1014925333 1791
7367sys/src/cmd/diff/diffio.c - 664 sys sys 1106723609 63787367sys/src/cmd/diff/diffio.c - 664 sys sys 1106938096 6599
7368sys/src/cmd/diff/diffreg.c - 664 sys sys 1106723609 88427368sys/src/cmd/diff/diffreg.c - 664 sys sys 1106723609 8842
7369sys/src/cmd/diff/main.c - 664 sys sys 1106151067 43257369sys/src/cmd/diff/main.c - 664 sys sys 1106938096 4338
7370sys/src/cmd/diff/mkfile - 664 sys sys 944960882 1417370sys/src/cmd/diff/mkfile - 664 sys sys 944960882 141
7371sys/src/cmd/disk - 20000000775 sys sys 1018468546 07371sys/src/cmd/disk - 20000000775 sys sys 1018468546 0
7372sys/src/cmd/disk/9660 - 20000000775 sys sys 1017681443 07372sys/src/cmd/disk/9660 - 20000000775 sys sys 1017681443 0
@@ -7411,7 +7411,7 @@ sys/src/cmd/disk/kfs/errno.h - 664 sys sys 1015009189 1317 · 38 unmodified lines
7411sys/src/cmd/disk/kfs/fns.h - 664 sys sys 1019058719 10107411sys/src/cmd/disk/kfs/fns.h - 664 sys sys 1019058719 1010
7412sys/src/cmd/disk/kfs/ialloc.c - 664 sys sys 944960883 1037412sys/src/cmd/disk/kfs/ialloc.c - 664 sys sys 944960883 103
7413sys/src/cmd/disk/kfs/iobuf.c - 664 sys sys 1015009189 37697413sys/src/cmd/disk/kfs/iobuf.c - 664 sys sys 1015009189 3769
7414sys/src/cmd/disk/kfs/main.c - 664 sys sys 1022112155 94207414sys/src/cmd/disk/kfs/main.c - 664 sys sys 1106924274 9515
7415sys/src/cmd/disk/kfs/misc.c - 664 sys sys 1015009189 11827415sys/src/cmd/disk/kfs/misc.c - 664 sys sys 1015009189 1182
7416sys/src/cmd/disk/kfs/mkfile - 664 sys sys 1065916865 7177416sys/src/cmd/disk/kfs/mkfile - 664 sys sys 1065916865 717
7417sys/src/cmd/disk/kfs/ofcallfmt.c - 664 sys sys 1015009189 46747417sys/src/cmd/disk/kfs/ofcallfmt.c - 664 sys sys 1015009189 4674
@@ -9547,7 +9547,7 @@ sys/src/cmd/ip/snoopy/udp.c - 664 sys sys 1089299190 1990 · 2129 unmodified lines
9547sys/src/cmd/ip/telnet.c - 664 sys sys 1080058033 85359547sys/src/cmd/ip/telnet.c - 664 sys sys 1080058033 8535
9548sys/src/cmd/ip/telnet.h - 664 sys sys 1015090250 59029548sys/src/cmd/ip/telnet.h - 664 sys sys 1015090250 5902
9549sys/src/cmd/ip/telnetd.c - 664 sys sys 1032060109 117319549sys/src/cmd/ip/telnetd.c - 664 sys sys 1032060109 11731
9550sys/src/cmd/ip/tftpd.c - 664 sys sys 1106624712 76429550sys/src/cmd/ip/tftpd.c - 664 sys sys 1106943821 7646
9551sys/src/cmd/ip/traceroute.c - 664 sys sys 1032060124 93709551sys/src/cmd/ip/traceroute.c - 664 sys sys 1032060124 9370
9552sys/src/cmd/ip/udpecho.c - 664 sys sys 1050714674 8559552sys/src/cmd/ip/udpecho.c - 664 sys sys 1050714674 855
9553sys/src/cmd/join.c - 664 sys sys 944961364 74889553sys/src/cmd/join.c - 664 sys sys 944961364 7488
dist/replica/plan9.log+10−0
@@ -13334,3 +13334,13 @@ · 13333 unmodified lines
133341106800218 26 c 386/bin/vt - 775 sys sys 1106799182 172859133341106800218 26 c 386/bin/vt - 775 sys sys 1106799182 172859
133351106800218 27 c 386/lib/ape/libdraw.a - 664 sys sys 1106799183 573884133351106800218 27 c 386/lib/ape/libdraw.a - 664 sys sys 1106799183 573884
133361106800218 28 c 386/lib/libdraw.a - 664 sys sys 1106799185 373548133361106800218 28 c 386/lib/libdraw.a - 664 sys sys 1106799185 373548
133371106924442 0 a sys/lib/kbmap/bg - 664 sys sys 1106924292 561
133381106924442 1 c sys/src/cmd/disk/kfs/main.c - 664 sys sys 1106924274 9515
133391106924442 2 d sys/lib/kbmap/bgmap - 664 sys sys 1079475826 0
133401106938845 0 c sys/man/1/diff - 664 sys sys 1106938097 2960
133411106938845 1 c sys/src/cmd/diff/diffio.c - 664 sys sys 1106938096 6599
133421106938845 2 c sys/src/cmd/diff/main.c - 664 sys sys 1106938096 4338
133431106944246 0 c sys/src/cmd/ip/tftpd.c - 664 sys sys 1106943821 7646
133441106973052 0 c 386/bin/diff - 775 sys sys 1106971478 85101
133451106973052 1 c 386/bin/disk/kfs - 775 sys sys 1106971479 248849
133461106973052 2 c 386/bin/ip/tftpd - 775 sys sys 1106971479 129489
sys/lib/kbmap/bgrenamed from sys/lib/kbmap/bgmap+0−0

File renamed without changes.

sys/man/1/diff+4−1
@@ -4,7 +4,7 @@ diff \- differential file comparator · 3 unmodified lines
4.SH SYNOPSIS4.SH SYNOPSIS
5.B diff5.B diff
6[6[
7.B -cefmnbwr7.B -acefmnbwr
8] file1 ... file28] file1 ... file2
9.SH DESCRIPTION9.SH DESCRIPTION
10.I Diff10.I Diff
@@ -127,6 +127,9 @@ The · 116 unmodified lines
127.B -c127.B -c
128option includes three lines of context around each128option includes three lines of context around each
129change, merging changes whose contexts overlap.129change, merging changes whose contexts overlap.
130The
131.B -a
132flag displays the entire file as context.
130.PP133.PP
131Except in rare circumstances,134Except in rare circumstances,
132.I diff135.I diff
sys/src/cmd/diff/diffio.c+22−6
@@ -302,6 +302,7 @@ change(int a, int b, int c, int d) · 301 unmodified lines
302 range(a, b, " ");302 range(a, b, " ");
303 break;303 break;
304 case 'c':304 case 'c':
305 case 'a':
305 if(nchanges%1024 == 0)306 if(nchanges%1024 == 0)
306 changes = erealloc(changes, (nchanges+1024)*sizeof(changes[0]));307 changes = erealloc(changes, (nchanges+1024)*sizeof(changes[0]));
307 ch = &changes[nchanges++];308 ch = &changes[nchanges++];
@@ -348,24 +349,39 @@ flushchanges(void) · 40 unmodified lines
348 349
349 for(i=0; i<nchanges; ){350 for(i=0; i<nchanges; ){
350 j = changeset(i);351 j = changeset(i);
351 a = changes[i].a;352 a = changes[i].a-Lines;
352 b = changes[j-1].b;353 b = changes[j-1].b+Lines;
353 c = changes[i].c;354 c = changes[i].c-Lines;
354 d = changes[j-1].d;355 d = changes[j-1].d+Lines;
356 if(a < 1)
357 a = 1;
358 if(c < 1)
359 c = 1;
360 if(b > len[0])
361 b = len[0];
362 if(d > len[1])
363 d = len[1];
364 if(mode == 'a'){
365 a = 1;
366 b = len[0];
367 c = 1;
368 d = len[1];
369 j = nchanges;
370 }
355 Bprint(&stdout, "%s:", file1);371 Bprint(&stdout, "%s:", file1);
356 range(a, b, ",");372 range(a, b, ",");
357 Bprint(&stdout, " - ");373 Bprint(&stdout, " - ");
358 Bprint(&stdout, "%s:", file2);374 Bprint(&stdout, "%s:", file2);
359 range(c, d, ",");375 range(c, d, ",");
360 Bputc(&stdout, '\n');376 Bputc(&stdout, '\n');
361 at = a-Lines;377 at = a;
362 for(; i<j; i++){378 for(; i<j; i++){
363 fetch(ixold, at, changes[i].a-1, input[0], " ");379 fetch(ixold, at, changes[i].a-1, input[0], " ");
364 fetch(ixold, changes[i].a, changes[i].b, input[0], "< ");380 fetch(ixold, changes[i].a, changes[i].b, input[0], "< ");
365 fetch(ixnew, changes[i].c, changes[i].d, input[1], "> ");381 fetch(ixnew, changes[i].c, changes[i].d, input[1], "> ");
366 at = changes[i].b+1;382 at = changes[i].b+1;
367 }383 }
368 fetch(ixold, at, b+Lines, input[0], " ");384 fetch(ixold, at, b, input[0], " ");
369 }385 }
370 nchanges = 0;386 nchanges = 0;
371}387}
sys/src/cmd/diff/main.c+1−0
@@ -191,6 +191,7 @@ main(int argc, char *argv[]) · 190 unmodified lines
191 case 'f':191 case 'f':
192 case 'n':192 case 'n':
193 case 'c':193 case 'c':
194 case 'a':
194 mode = *p;195 mode = *p;
195 break;196 break;
196 197
sys/src/cmd/disk/kfs/main.c+3−0
@@ -97,6 +97,9 @@ main(int argc, char *argv[]) · 96 unmodified lines
97 97
98 cmdfd = 2;98 cmdfd = 2;
99 99
100 if (access(wrenfile, AREAD|AWRITE) == -1)
101 sysfatal("%s cannot access device\n", wrenfile);
102
100 formatinit();103 formatinit();
101 sublockinit();104 sublockinit();
102 105
sys/src/cmd/ip/tftpd.c+4−4
@@ -107,7 +107,7 @@ main(int argc, char **argv) · 106 unmodified lines
107 if (cfd < 0)107 if (cfd < 0)
108 sysfatal("announcing on %s: %r", buf);108 sysfatal("announcing on %s: %r", buf);
109 syslog(dbg, flog, "tftpd started on %s dir %s", buf, adir);109 syslog(dbg, flog, "tftpd started on %s dir %s", buf, adir);
110// setuser(); Moved to doserve [sape]110 setuser();
111 for(;;) {111 for(;;) {
112 lcfd = listen(adir, ldir);112 lcfd = listen(adir, ldir);
113 if(lcfd < 0)113 if(lcfd < 0)
@@ -140,7 +140,6 @@ doserve(int fd) · 26 unmodified lines
140 char *mode, *p;140 char *mode, *p;
141 short op;141 short op;
142 142
143 setuser();
144 dlen = read(fd, bigbuf, sizeof(bigbuf));143 dlen = read(fd, bigbuf, sizeof(bigbuf));
145 if(dlen < 0)144 if(dlen < 0)
146 sysfatal("listen read: %r");145 sysfatal("listen read: %r");
@@ -411,11 +410,12 @@ sunkernel(char *name) · 264 unmodified lines
411 uchar v6[IPaddrlen];410 uchar v6[IPaddrlen];
412 char buf[256];411 char buf[256];
413 char ipbuf[128];412 char ipbuf[128];
413 char *suffix;
414 414
415 if(strlen(name) != 14 || strncmp(name + 8, ".SUN", 4) != 0)415 addr = strtoul(name, &suffix, 16);
416 if(suffix-name != 8 || (strcmp(suffix, "") != 0 && strcmp(suffix, ".SUN") != 0))
416 return name;417 return name;
417 418
418 addr = strtoul(name, 0, 16);
419 v4[0] = addr>>24;419 v4[0] = addr>>24;
420 v4[1] = addr>>16;420 v4[1] = addr>>16;
421 v4[2] = addr>>8;421 v4[2] = addr>>8;