Browse Source

Plan 9 from Bell Labs 2005-12-11

David du Colombier 15 years ago
parent
commit
59dd0aea31

+ 20 - 19
dist/replica/_plan9.db

@@ -19,8 +19,8 @@
 386/bin/8l - 775 sys sys 1130384229 115712
 386/bin/9660srv - 775 sys sys 1130594690 104069
 386/bin/aan - 775 sys sys 1130594690 130742
-386/bin/acid - 775 sys sys 1133814393 400982
-386/bin/acme - 775 sys sys 1133287400 429175
+386/bin/acid - 775 sys sys 1134237843 400982
+386/bin/acme - 775 sys sys 1134237844 429183
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1134151323 132870
 386/bin/ape/cc - 775 sys sys 1132418758 70437
@@ -39,7 +39,7 @@
 386/bin/ape/uname - 775 sys sys 1134151328 132699
 386/bin/ar - 775 sys sys 1131296672 111983
 386/bin/archfs - 775 sys sys 1133186773 141184
-386/bin/ascii - 775 sys sys 1130594693 64691
+386/bin/ascii - 775 sys sys 1134237844 64683
 386/bin/astro - 775 sys sys 1130384233 138837
 386/bin/auth - 20000000775 sys sys 1016920815 0
 386/bin/auth/aescbc - 775 sys sys 1132506827 140802
@@ -154,9 +154,9 @@
 386/bin/aux/write - 775 sys sys 1085077011 4188
 386/bin/aux/zerotrunc - 775 sys sys 1108268388 3891
 386/bin/awd - 775 sys sys 1130594717 58770
-386/bin/awk - 775 sys sys 1134151330 321767
+386/bin/awk - 775 sys sys 1134237845 321783
 386/bin/basename - 775 sys sys 1130384262 37902
-386/bin/bc - 775 sys sys 1131163701 81808
+386/bin/bc - 775 sys sys 1134237845 81800
 386/bin/bind - 775 sys sys 1130594717 59598
 386/bin/bitsy - 20000000775 sys sys 1018721039 0
 386/bin/bitsy/bitsyload - 775 sys sys 1130594717 63395
@@ -7237,14 +7237,14 @@ sys/man/1/2c - 664 sys sys 1109303821 8237
 sys/man/1/2l - 664 sys sys 1101668051 4365
 sys/man/1/INDEX - 664 sys sys 1104811679 3004
 sys/man/1/INDEX.html - 664 sys sys 1104736360 16403
-sys/man/1/acid - 664 sys sys 1101668051 9727
-sys/man/1/acme - 664 sys sys 1113743325 18097
+sys/man/1/acid - 664 sys sys 1134233059 9730
+sys/man/1/acme - 664 sys sys 1134233060 18105
 sys/man/1/ap - 664 sys sys 1068471657 364
 sys/man/1/ar - 664 sys sys 1079397701 3153
-sys/man/1/ascii - 664 sys sys 1113743329 2737
-sys/man/1/awk - 664 sys sys 944959677 10645
+sys/man/1/ascii - 664 sys sys 1134233061 2737
+sys/man/1/awk - 664 sys sys 1134233061 10881
 sys/man/1/basename - 664 sys sys 944959673 535
-sys/man/1/bc - 664 sys sys 1113743324 3758
+sys/man/1/bc - 664 sys sys 1134233060 3784
 sys/man/1/bind - 664 sys sys 1034195345 3928
 sys/man/1/bitsyload - 664 sys sys 988225301 2883
 sys/man/1/bundle - 664 sys sys 1113743325 986
@@ -7572,7 +7572,7 @@ sys/man/4 - 20000000775 sys sys 1018581459 0
 sys/man/4/0intro - 664 sys sys 944959699 472
 sys/man/4/INDEX - 664 sys sys 1104811679 985
 sys/man/4/INDEX.html - 664 sys sys 1104736381 4926
-sys/man/4/acme - 664 sys sys 1125314183 10229
+sys/man/4/acme - 664 sys sys 1134233060 10274
 sys/man/4/archfs - 664 sys sys 960000712 533
 sys/man/4/cdfs - 664 sys sys 1026846913 3638
 sys/man/4/cfs - 664 sys sys 1015024813 1758
@@ -9183,11 +9183,12 @@ sys/src/cmd/7c/swt.c - 664 sys sys 1098463320 11561
 sys/src/cmd/7c/txt.c - 664 sys sys 1089299172 20195
 sys/src/cmd/7l - 20000000775 sys sys 954267784 0
 sys/src/cmd/7l/asm.c - 774 sys sys 1045503943 27093
-sys/src/cmd/7l/l.h - 774 sys sys 1014926954 4981
+sys/src/cmd/7l/compat.c - 664 sys sys 1134261563 445
+sys/src/cmd/7l/l.h - 774 sys sys 1134261563 5002
 sys/src/cmd/7l/list.c - 774 sys sys 1014926954 4146
-sys/src/cmd/7l/mkfile - 774 sys sys 944961629 360
+sys/src/cmd/7l/mkfile - 774 sys sys 1134261563 372
 sys/src/cmd/7l/noop.c - 774 sys sys 1045503944 19495
-sys/src/cmd/7l/obj.c - 774 sys sys 1045503944 23202
+sys/src/cmd/7l/obj.c - 774 sys sys 1134261563 22824
 sys/src/cmd/7l/optab.c - 774 sys sys 944961630 5087
 sys/src/cmd/7l/pass.c - 774 sys sys 1132450430 8676
 sys/src/cmd/7l/sched.c - 774 sys sys 944961630 244
@@ -9275,13 +9276,13 @@ sys/src/cmd/acid/exec.c - 664 sys sys 1132674180 8383
 sys/src/cmd/acid/expr.c - 664 sys sys 1131289461 15220
 sys/src/cmd/acid/lex.c - 664 sys sys 1131289460 7963
 sys/src/cmd/acid/list.c - 664 sys sys 1131289462 3680
-sys/src/cmd/acid/main.c - 664 sys sys 1131289460 8565
+sys/src/cmd/acid/main.c - 664 sys sys 1134233059 8561
 sys/src/cmd/acid/mkfile - 664 sys sys 1046199006 366
 sys/src/cmd/acid/print.c - 664 sys sys 1131289462 6831
 sys/src/cmd/acid/proc.c - 664 sys sys 1131289462 4356
 sys/src/cmd/acid/util.c - 664 sys sys 1131289461 4609
 sys/src/cmd/acme - 20000000775 sys sys 969511023 0
-sys/src/cmd/acme/acme.c - 664 sys sys 1104430286 19613
+sys/src/cmd/acme/acme.c - 664 sys sys 1134233060 19621
 sys/src/cmd/acme/addr.c - 664 sys sys 1111171698 4805
 sys/src/cmd/acme/buff.c - 664 sys sys 1014926092 5573
 sys/src/cmd/acme/cols.c - 664 sys sys 1111119425 11229
@@ -9307,7 +9308,7 @@ sys/src/cmd/acme/wind.c - 664 sys sys 1122526112 11233
 sys/src/cmd/acme/xfid.c - 664 sys sys 1125314186 19766
 sys/src/cmd/ar.c - 664 sys sys 1131293258 23778
 sys/src/cmd/archfs.c - 664 sys sys 1014925694 3871
-sys/src/cmd/ascii.c - 664 sys sys 964457138 3989
+sys/src/cmd/ascii.c - 664 sys sys 1134233061 3980
 sys/src/cmd/astro - 20000000775 sys sys 964456342 0
 sys/src/cmd/astro/astro.h - 664 sys sys 1014924926 4078
 sys/src/cmd/astro/comet.c - 664 sys sys 1015700930 2397
@@ -9657,7 +9658,7 @@ sys/src/cmd/awk/awk.h - 664 sys sys 944960803 4624
 sys/src/cmd/awk/awkgram.y - 664 sys sys 944960803 13930
 sys/src/cmd/awk/lex.c - 664 sys sys 944960803 12346
 sys/src/cmd/awk/lib.c - 664 sys sys 950315704 16241
-sys/src/cmd/awk/main.c - 664 sys sys 944960803 5261
+sys/src/cmd/awk/main.c - 664 sys sys 1134233061 5281
 sys/src/cmd/awk/maketab.c - 664 sys sys 944960802 5101
 sys/src/cmd/awk/mkfile - 664 sys sys 1036687332 955
 sys/src/cmd/awk/parse.c - 664 sys sys 944960802 5068
@@ -9667,7 +9668,7 @@ sys/src/cmd/awk/re.c - 664 sys sys 964456820 6987
 sys/src/cmd/awk/run.c - 664 sys sys 1036687054 42680
 sys/src/cmd/awk/tran.c - 664 sys sys 944960802 11855
 sys/src/cmd/basename.c - 664 sys sys 944961619 605
-sys/src/cmd/bc.y - 664 sys sys 1131110144 13457
+sys/src/cmd/bc.y - 664 sys sys 1134233060 13455
 sys/src/cmd/bind.c - 664 sys sys 944961467 830
 sys/src/cmd/bitsy - 20000000775 sys sys 988249960 0
 sys/src/cmd/bitsy/bitsyload.c - 664 sys sys 1019509527 2494

+ 20 - 19
dist/replica/plan9.db

@@ -19,8 +19,8 @@
 386/bin/8l - 775 sys sys 1130384229 115712
 386/bin/9660srv - 775 sys sys 1130594690 104069
 386/bin/aan - 775 sys sys 1130594690 130742
-386/bin/acid - 775 sys sys 1133814393 400982
-386/bin/acme - 775 sys sys 1133287400 429175
+386/bin/acid - 775 sys sys 1134237843 400982
+386/bin/acme - 775 sys sys 1134237844 429183
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1134151323 132870
 386/bin/ape/cc - 775 sys sys 1132418758 70437
@@ -39,7 +39,7 @@
 386/bin/ape/uname - 775 sys sys 1134151328 132699
 386/bin/ar - 775 sys sys 1131296672 111983
 386/bin/archfs - 775 sys sys 1133186773 141184
-386/bin/ascii - 775 sys sys 1130594693 64691
+386/bin/ascii - 775 sys sys 1134237844 64683
 386/bin/astro - 775 sys sys 1130384233 138837
 386/bin/auth - 20000000775 sys sys 1016920815 0
 386/bin/auth/aescbc - 775 sys sys 1132506827 140802
@@ -154,9 +154,9 @@
 386/bin/aux/write - 775 sys sys 1085077011 4188
 386/bin/aux/zerotrunc - 775 sys sys 1108268388 3891
 386/bin/awd - 775 sys sys 1130594717 58770
-386/bin/awk - 775 sys sys 1134151330 321767
+386/bin/awk - 775 sys sys 1134237845 321783
 386/bin/basename - 775 sys sys 1130384262 37902
-386/bin/bc - 775 sys sys 1131163701 81808
+386/bin/bc - 775 sys sys 1134237845 81800
 386/bin/bind - 775 sys sys 1130594717 59598
 386/bin/bitsy - 20000000775 sys sys 1018721039 0
 386/bin/bitsy/bitsyload - 775 sys sys 1130594717 63395
@@ -7237,14 +7237,14 @@ sys/man/1/2c - 664 sys sys 1109303821 8237
 sys/man/1/2l - 664 sys sys 1101668051 4365
 sys/man/1/INDEX - 664 sys sys 1104811679 3004
 sys/man/1/INDEX.html - 664 sys sys 1104736360 16403
-sys/man/1/acid - 664 sys sys 1101668051 9727
-sys/man/1/acme - 664 sys sys 1113743325 18097
+sys/man/1/acid - 664 sys sys 1134233059 9730
+sys/man/1/acme - 664 sys sys 1134233060 18105
 sys/man/1/ap - 664 sys sys 1068471657 364
 sys/man/1/ar - 664 sys sys 1079397701 3153
-sys/man/1/ascii - 664 sys sys 1113743329 2737
-sys/man/1/awk - 664 sys sys 944959677 10645
+sys/man/1/ascii - 664 sys sys 1134233061 2737
+sys/man/1/awk - 664 sys sys 1134233061 10881
 sys/man/1/basename - 664 sys sys 944959673 535
-sys/man/1/bc - 664 sys sys 1113743324 3758
+sys/man/1/bc - 664 sys sys 1134233060 3784
 sys/man/1/bind - 664 sys sys 1034195345 3928
 sys/man/1/bitsyload - 664 sys sys 988225301 2883
 sys/man/1/bundle - 664 sys sys 1113743325 986
@@ -7572,7 +7572,7 @@ sys/man/4 - 20000000775 sys sys 1018581459 0
 sys/man/4/0intro - 664 sys sys 944959699 472
 sys/man/4/INDEX - 664 sys sys 1104811679 985
 sys/man/4/INDEX.html - 664 sys sys 1104736381 4926
-sys/man/4/acme - 664 sys sys 1125314183 10229
+sys/man/4/acme - 664 sys sys 1134233060 10274
 sys/man/4/archfs - 664 sys sys 960000712 533
 sys/man/4/cdfs - 664 sys sys 1026846913 3638
 sys/man/4/cfs - 664 sys sys 1015024813 1758
@@ -9183,11 +9183,12 @@ sys/src/cmd/7c/swt.c - 664 sys sys 1098463320 11561
 sys/src/cmd/7c/txt.c - 664 sys sys 1089299172 20195
 sys/src/cmd/7l - 20000000775 sys sys 954267784 0
 sys/src/cmd/7l/asm.c - 774 sys sys 1045503943 27093
-sys/src/cmd/7l/l.h - 774 sys sys 1014926954 4981
+sys/src/cmd/7l/compat.c - 664 sys sys 1134261563 445
+sys/src/cmd/7l/l.h - 774 sys sys 1134261563 5002
 sys/src/cmd/7l/list.c - 774 sys sys 1014926954 4146
-sys/src/cmd/7l/mkfile - 774 sys sys 944961629 360
+sys/src/cmd/7l/mkfile - 774 sys sys 1134261563 372
 sys/src/cmd/7l/noop.c - 774 sys sys 1045503944 19495
-sys/src/cmd/7l/obj.c - 774 sys sys 1045503944 23202
+sys/src/cmd/7l/obj.c - 774 sys sys 1134261563 22824
 sys/src/cmd/7l/optab.c - 774 sys sys 944961630 5087
 sys/src/cmd/7l/pass.c - 774 sys sys 1132450430 8676
 sys/src/cmd/7l/sched.c - 774 sys sys 944961630 244
@@ -9275,13 +9276,13 @@ sys/src/cmd/acid/exec.c - 664 sys sys 1132674180 8383
 sys/src/cmd/acid/expr.c - 664 sys sys 1131289461 15220
 sys/src/cmd/acid/lex.c - 664 sys sys 1131289460 7963
 sys/src/cmd/acid/list.c - 664 sys sys 1131289462 3680
-sys/src/cmd/acid/main.c - 664 sys sys 1131289460 8565
+sys/src/cmd/acid/main.c - 664 sys sys 1134233059 8561
 sys/src/cmd/acid/mkfile - 664 sys sys 1046199006 366
 sys/src/cmd/acid/print.c - 664 sys sys 1131289462 6831
 sys/src/cmd/acid/proc.c - 664 sys sys 1131289462 4356
 sys/src/cmd/acid/util.c - 664 sys sys 1131289461 4609
 sys/src/cmd/acme - 20000000775 sys sys 969511023 0
-sys/src/cmd/acme/acme.c - 664 sys sys 1104430286 19613
+sys/src/cmd/acme/acme.c - 664 sys sys 1134233060 19621
 sys/src/cmd/acme/addr.c - 664 sys sys 1111171698 4805
 sys/src/cmd/acme/buff.c - 664 sys sys 1014926092 5573
 sys/src/cmd/acme/cols.c - 664 sys sys 1111119425 11229
@@ -9307,7 +9308,7 @@ sys/src/cmd/acme/wind.c - 664 sys sys 1122526112 11233
 sys/src/cmd/acme/xfid.c - 664 sys sys 1125314186 19766
 sys/src/cmd/ar.c - 664 sys sys 1131293258 23778
 sys/src/cmd/archfs.c - 664 sys sys 1014925694 3871
-sys/src/cmd/ascii.c - 664 sys sys 964457138 3989
+sys/src/cmd/ascii.c - 664 sys sys 1134233061 3980
 sys/src/cmd/astro - 20000000775 sys sys 964456342 0
 sys/src/cmd/astro/astro.h - 664 sys sys 1014924926 4078
 sys/src/cmd/astro/comet.c - 664 sys sys 1015700930 2397
@@ -9657,7 +9658,7 @@ sys/src/cmd/awk/awk.h - 664 sys sys 944960803 4624
 sys/src/cmd/awk/awkgram.y - 664 sys sys 944960803 13930
 sys/src/cmd/awk/lex.c - 664 sys sys 944960803 12346
 sys/src/cmd/awk/lib.c - 664 sys sys 950315704 16241
-sys/src/cmd/awk/main.c - 664 sys sys 944960803 5261
+sys/src/cmd/awk/main.c - 664 sys sys 1134233061 5281
 sys/src/cmd/awk/maketab.c - 664 sys sys 944960802 5101
 sys/src/cmd/awk/mkfile - 664 sys sys 1036687332 955
 sys/src/cmd/awk/parse.c - 664 sys sys 944960802 5068
@@ -9667,7 +9668,7 @@ sys/src/cmd/awk/re.c - 664 sys sys 964456820 6987
 sys/src/cmd/awk/run.c - 664 sys sys 1036687054 42680
 sys/src/cmd/awk/tran.c - 664 sys sys 944960802 11855
 sys/src/cmd/basename.c - 664 sys sys 944961619 605
-sys/src/cmd/bc.y - 664 sys sys 1131110144 13457
+sys/src/cmd/bc.y - 664 sys sys 1134233060 13455
 sys/src/cmd/bind.c - 664 sys sys 944961467 830
 sys/src/cmd/bitsy - 20000000775 sys sys 988249960 0
 sys/src/cmd/bitsy/bitsyload.c - 664 sys sys 1019509527 2494

+ 20 - 0
dist/replica/plan9.log

@@ -23441,3 +23441,23 @@
 1134153063 19 c 386/bin/troff - 775 sys sys 1134151360 357941
 1134153063 20 c 386/bin/upas/unesc - 775 sys sys 1134151361 132264
 1134153063 21 c 386/lib/ape/libap.a - 664 sys sys 1134151363 809462
+1134234084 0 c sys/man/1/acid - 664 sys sys 1134233059 9730
+1134234084 1 c sys/man/1/acme - 664 sys sys 1134233060 18105
+1134234084 2 c sys/man/1/ascii - 664 sys sys 1134233061 2737
+1134234084 3 c sys/man/1/awk - 664 sys sys 1134233061 10881
+1134234084 4 c sys/man/1/bc - 664 sys sys 1134233060 3784
+1134234084 5 c sys/man/4/acme - 664 sys sys 1134233060 10274
+1134234084 6 c sys/src/cmd/acid/main.c - 664 sys sys 1134233059 8561
+1134234084 7 c sys/src/cmd/acme/acme.c - 664 sys sys 1134233060 19621
+1134234084 8 c sys/src/cmd/awk/main.c - 664 sys sys 1134233061 5281
+1134234084 9 c sys/src/cmd/ascii.c - 664 sys sys 1134233061 3980
+1134234084 10 c sys/src/cmd/bc.y - 664 sys sys 1134233060 13455
+1134239485 0 c 386/bin/acid - 775 sys sys 1134237843 400982
+1134239485 1 c 386/bin/acme - 775 sys sys 1134237844 429183
+1134239485 2 c 386/bin/ascii - 775 sys sys 1134237844 64683
+1134239485 3 c 386/bin/awk - 775 sys sys 1134237845 321783
+1134239485 4 c 386/bin/bc - 775 sys sys 1134237845 81800
+1134262892 0 a sys/src/cmd/7l/compat.c - 664 sys sys 1134261563 445
+1134262892 1 c sys/src/cmd/7l/l.h - 774 sys sys 1134261563 5002
+1134262892 2 c sys/src/cmd/7l/mkfile - 774 sys sys 1134261563 372
+1134262892 3 c sys/src/cmd/7l/obj.c - 774 sys sys 1134261563 22824

+ 3 - 3
sys/man/1/acid

@@ -4,10 +4,10 @@ acid, truss, trump \- debugger
 .SH SYNOPSIS
 .B acid
 [
-.BI -l " libfile
+.B -kqw
 ]
 [
-.B -wq
+.BI -l " library
 ] [
 .B -m
 .I machine
@@ -89,7 +89,7 @@ files.
 Definitions in any file may override previously defined functions.
 If the function
 .IR acidinit ()
-is defined, it will be invoked after all modules have been loaded.
+is defined, it will be invoked after all libraries have been loaded.
 See
 .IR 2c (1)
 for information about creating

+ 6 - 6
sys/man/1/acme

@@ -7,6 +7,10 @@ acme, win, awd \- interactive text windows
 .B -ab
 ]
 [
+.B -c
+.I ncol
+]
+[
 .B -f
 .I varfont
 ]
@@ -15,12 +19,8 @@ acme, win, awd \- interactive text windows
 .I fixfont
 ]
 [
-.B -c
-.I ncol
-]
-[
 .B -l
-.I file
+.I loadfile
 |
 .I file
 \&... ]
@@ -54,7 +54,7 @@ With the
 .B -l
 option, the state of the entire system is loaded
 from
-.IR file ,
+.IR loadfile ,
 which should have been created by a
 .B Dump
 command (q.v.),

+ 5 - 5
sys/man/1/ascii

@@ -4,13 +4,13 @@ ascii, unicode \- interpret ASCII, Unicode characters
 .SH SYNOPSIS
 .B ascii
 [
-.B -8
-]
-[
-.BI -oxdb n
+.B -8cnt
 ]
 [
-.B -nct
+.B -dox
+|
+.B -b
+.I n
 ]
 [
 .I text

+ 35 - 14
sys/man/1/awk

@@ -4,22 +4,31 @@ awk \- pattern-directed scanning and processing language
 .SH SYNOPSIS
 .B awk
 [
-.BI -F fs
+.B -F
+.I fs
 ]
 [
-.BI -v
-.I var=value
+.B -d
 ]
 [
-.BI -mr n
+.BI -mf
+.I n
 ]
 [
-.BI -mf n
+.B -mr
+.I n
 ]
 [
-.B -f
-.I prog
+.B -safe
+]
+[
+.B -v
+.I var=value
+]
 [
+.B -f
+.I progfile
+|
 .I prog
 ]
 [
@@ -30,11 +39,11 @@ awk \- pattern-directed scanning and processing language
 scans each input
 .I file
 for lines that match any of a set of patterns specified literally in
-.IR prog
+.I prog
 or in one or more files
 specified as
 .B -f
-.IR file .
+.IR progfile .
 With each pattern
 there can be an associated action that will be performed
 when a line of a
@@ -56,13 +65,12 @@ The option
 .B -v
 followed by
 .I var=value
-is an assignment to be done before
-.I prog
+is an assignment to be done before the program
 is executed;
 any number of
 .B -v
 options may be present.
-.B \-F
+.B -F
 .IR fs
 option defines the input field separator to be the regular expression
 .IR fs .
@@ -82,12 +90,25 @@ is null, the input line is split into one field per character.
 .PP
 To compensate for inadequate implementation of storage management,
 the 
-.B \-mr
+.B -mr
 option can be used to set the maximum size of the input record,
 and the
-.B \-mf
+.B -mf
 option to set the maximum number of fields.
 .PP
+The
+.B -safe
+option causes
+.I awk
+to run in 
+``safe mode,''
+in which it is not allowed to 
+run shell commands or open files
+and the environment is not made available
+in the 
+.B ENVIRON
+variable.
+.PP
 A pattern-action statement has the form
 .IP
 .IB pattern " { " action " }

+ 7 - 9
sys/man/1/bc

@@ -4,13 +4,7 @@ bc \- arbitrary-precision arithmetic language
 .SH SYNOPSIS
 .B bc
 [
-.B -c
-]
-[
-.B -l
-]
-[
-.B -s
+.B -cdls
 ]
 [
 .I file ...
@@ -22,13 +16,17 @@ C but provides arithmetic on numbers of arbitrary length with up
 to 100 digits right of the decimal point.
 It takes input from any files given, then reads
 the standard input.
+.PP
+The
+.B -d
+option enables debugging output.
 The
 .B -l
-argument stands for the name
+option stands for the name
 of an arbitrary precision math library.
 The
 .B -s
-argument suppresses the automatic display
+option suppresses the automatic display
 of calculation results; all output is via the
 .B print
 command.

+ 12 - 1
sys/man/4/acme

@@ -4,13 +4,24 @@ acme \- control files for text windows
 .SH SYNOPSIS
 .B acme
 [
+.B -ab
+]
+[
+.B -c
+.I ncol
+]
+[
 .B -f
 .I varfont
-] [
+]
+[
 .B -F
 .I fixfont
 ]
 [
+.B -l
+.I file
+|
 .I file
 \&... ]
 .SH DESCRIPTION

+ 2 - 0
sys/src/9/port/segment.c

@@ -453,6 +453,8 @@ ibrk(ulong addr, int seg)
 	newsize = (newtop-s->base)/BY2PG;
 	if(newtop < s->top) {
 		mfreeseg(s, newtop, (s->top-newtop)/BY2PG);
+		s->top = newtop;
+		s->size = newsize;
 		qunlock(&s->lk);
 		flushmmu();
 		return 0;

+ 50 - 0
sys/src/cmd/7l/compat.c

@@ -0,0 +1,50 @@
+#include	"l.h"
+
+/*
+ * fake malloc
+ */
+void*
+malloc(ulong n)
+{
+	void *p;
+
+	while(n & 7)
+		n++;
+	while(nhunk < n)
+		gethunk();
+	p = hunk;
+	nhunk -= n;
+	hunk += n;
+	return p;
+}
+
+void
+free(void *p)
+{
+	USED(p);
+}
+
+void*
+calloc(ulong m, ulong n)
+{
+	void *p;
+
+	n *= m;
+	p = malloc(n);
+	memset(p, 0, n);
+	return p;
+}
+
+void*
+realloc(void*, ulong)
+{
+	fprint(2, "realloc called\n");
+	abort();
+	return 0;
+}
+
+void*
+mysbrk(ulong size)
+{
+	return sbrk(size);
+}

+ 1 - 0
sys/src/cmd/7l/l.h

@@ -286,6 +286,7 @@ Sym*	lookup(char*, int);
 void	lput(long);
 void	lputbe(long);
 void	mkfwd(void);
+void*	mysbrk(ulong);
 void	names(void);
 void	nocache(Prog*);
 void	noops(void);

+ 1 - 0
sys/src/cmd/7l/mkfile

@@ -11,6 +11,7 @@ OFILES=\
 	sched.$O\
 	span.$O\
 	enam.$O\
+	compat.$O\
 
 HFILES=\
 	l.h\

+ 1 - 44
sys/src/cmd/7l/obj.c

@@ -1032,7 +1032,7 @@ gethunk(void)
 		if(thunk >= 25L*NHUNK)
 			nh = 25L*NHUNK;
 	}
-	h = sbrk(nh);
+	h = mysbrk(nh);
 	if(h == (char*)-1) {
 		diag("out of memory");
 		errorexit();
@@ -1317,46 +1317,3 @@ ieeedtod(Ieee *ieee)
 	exp -= (1L<<10) - 2L;
 	return ldexp(fr, exp);
 }
-
-/*
- * fake malloc
- */
-void*
-malloc(ulong n)
-{
-	void *p;
-
-	while(n & 7)
-		n++;
-	while(nhunk < n)
-		gethunk();
-	p = hunk;
-	nhunk -= n;
-	hunk += n;
-	return p;
-}
-
-void
-free(void *p)
-{
-	USED(p);
-}
-
-void*
-calloc(ulong m, ulong n)
-{
-	void *p;
-
-	n *= m;
-	p = malloc(n);
-	memset(p, 0, n);
-	return p;
-}
-
-void*
-realloc(void*, ulong)
-{
-	fprint(2, "realloc called\n");
-	abort();
-	return 0;
-}

+ 1 - 1
sys/src/cmd/acid/main.c

@@ -22,7 +22,7 @@ void	die(void);
 void
 usage(void)
 {
-	fprint(2, "usage: acid [-l module] [-m machine] [-qrw] [-k] [pid] [file]\n");
+	fprint(2, "usage: acid [-kqw] [-l library] [-m machine] [pid] [file]\n");
 	exits("usage");
 }
 

+ 1 - 1
sys/src/cmd/acme/acme.c

@@ -101,7 +101,7 @@ threadmain(int argc, char *argv[])
 		break;
 	default:
 	Usage:
-		fprint(2, "usage: acme -a -c ncol -f fontname -F fixedwidthfontname -l loadfile\n");
+		fprint(2, "usage: acme [-ab] [-c ncol] [-f font] [-F fixedfont] [-l loadfile | file...]\n");
 		exits("usage");
 	}ARGEND
 

+ 1 - 1
sys/src/cmd/ascii.c

@@ -112,7 +112,7 @@ main(int argc, char **argv)
 void
 usage(void)
 {
-	fprint(2, "usage: %s [-8] [-xod | -b8] [-ncst] [--] [text]\n", argv0);
+	fprint(2, "usage: %s [-8cnt] [-dox | -b n] [text]\n", argv0);
 	exits("usage");
 }
 void

+ 1 - 1
sys/src/cmd/awk/main.c

@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
 
 	cmdname = argv[0];
 	if (argc == 1) {
-		fprintf(stderr, "Usage: %s [-f programfile | 'program'] [-Ffieldsep] [-v var=value] [files]\n", cmdname);
+		fprintf(stderr, "Usage: %s [-F fieldsep] [-mf n] [-mr n] [-v var=value] [-f programfile | 'program'] [file ...]\n", cmdname);
 		exit(1);
 	}
 	signal(SIGFPE, fpecatch);

+ 1 - 1
sys/src/cmd/bc.y

@@ -956,7 +956,7 @@ main(int argc, char **argv)
 			sflag++;
 			break;
 		default:
-			fprint(2, "Usage: bc [-l] [-c] [file ...]\n");
+			fprint(2, "Usage: bc [-cdls] [file ...]\n");
 			exits("usage");
 		}
 		argc--;