From 8f67315a57ee3ef314187544f5a12b5037a2a692 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Sat, 7 Sep 1991 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1991-09-07 --- gnot/boot.c | 23 +- gnot/boot.h | 687 +++++++++++++++++++++++++++------------------------- gnot/main.c | 4 +- pc/main.c | 6 +- 4 files changed, 372 insertions(+), 348 deletions(-) diff --git a/gnot/boot.c b/gnot/boot.c index 490da3f4546e52fb61a377aa80282ae0ae2614a2..0f5c578670cd11f7de8fac033f7568f0c68c0bd5 100644 --- a/gnot/boot.c +++ b/gnot/boot.c @@ -19,8 +19,9 @@ char bootdevice; int authenticated; char bootline[64]; -char password[32]; -char username[32]; +char bootuser[NAMELEN]; +char password[NAMELEN]; +char username[NAMELEN]; char sys[NAMELEN]; char buf[4*1024]; @@ -44,7 +45,7 @@ void kill(int); void passwd(void); int authenticate(int); void termtype(char*); -void userpasswd(void); +void setuser(char*); int fileserver(void); int inconctl(void); int asyncctl(char*); @@ -77,8 +78,12 @@ main(int argc, char *argv[]) */ if(!authenticated){ strcpy(username, "none"); - userpasswd(); + outin("user", username, sizeof(username)); + passwd(); + } else { + strcpy(username, bootuser); } + setuser(username); /* * get the control channel for the network @@ -161,6 +166,11 @@ bootparams(void) read(f, &bootdevice, 1); close(f); } + f = open("#e/bootuser", OREAD); + if(f >= 0){ + read(f, &bootuser, sizeof(bootuser)); + close(f); + } f = open("#e/bootserver", OREAD); if(f >= 0){ read(f, sys, sizeof(sys)); @@ -196,13 +206,10 @@ termtype(char *t) * boot rom didn't authenticate */ void -userpasswd(void) +setuser(char *name) { int fd; - outin("user", username, sizeof(username)); - passwd(); - /* * set user id */ diff --git a/gnot/boot.h b/gnot/boot.h index d561a8f6358811994fd304ee02f8ec84e07c7879..879cff2eb8c3f89f3762ff1e37a333f7b7eec9f7 100644 --- a/gnot/boot.h +++ b/gnot/boot.h @@ -1,8 +1,8 @@ ulong bootcode[]={ 0x000000107, - 0x000003040, - 0x0000006d0, - 0x00000129c, + 0x000003084, + 0x0000006d8, + 0x0000012b0, 0x000000000, 0x000002020, 0x000000000, @@ -14,87 +14,98 @@ ulong bootcode[]={ 0x000142f2f, 0x00014610c, 0x02f006100, - 0x00eec4fef, + 0x00f304fef, 0x0001c4e75, 0x0518f42a7, 0x0486e811a, - 0x061001126, + 0x06100116a, 0x048780001, 0x0486e8122, - 0x06100111a, + 0x06100115e, 0x048780001, 0x0486e812a, - 0x06100110e, + 0x061001152, 0x0487803e8, - 0x061001112, - 0x0610000ca, + 0x061001156, + 0x0610000f6, 0x0486e8132, - 0x0610001c6, + 0x06100021e, 0x04aae8006, - 0x06612486e, - 0x0813e486e, - 0x098ce6100, - 0x010466100, - 0x0020c508f, - 0x06100025e, - 0x04fef0020, + 0x0660000d2, + 0x0486e813e, + 0x0486e98ee, + 0x061001088, + 0x04878001c, + 0x0486e98ee, + 0x0486e8143, + 0x061000bd0, + 0x061000d94, + 0x0486e98ee, + 0x06100024a, + 0x06100028a, + 0x04fef0038, 0x07241b280, 0x06700008a, 0x07261b280, 0x067747269, 0x0b280676c, - 0x0610002f0, + 0x06100031c, 0x024002f02, - 0x06100038e, - 0x0486e974e, - 0x0610003e2, + 0x0610003ba, + 0x0486e9756, + 0x06100040e, 0x04a806d3e, 0x02f006100, - 0x004d04aae, + 0x004fc4aae, 0x0802e6720, 0x042a7486e, + 0x08182486e, 0x0817d486e, - 0x08178486e, - 0x0816c6100, - 0x00f92486e, - 0x081916100, - 0x00b144fef, + 0x081716100, + 0x00fbe486e, + 0x081966100, + 0x00b404fef, 0x000284e75, 0x042a7486e, - 0x0818c486e, - 0x081806100, - 0x00f76598f, + 0x08191486e, + 0x081856100, + 0x00fa2598f, 0x060e0486e, - 0x081506100, - 0x00e6a4878, + 0x081556100, + 0x00e964878, 0x003e86100, - 0x0106c4fef, + 0x010984fef, 0x0000c60a0, 0x06092486e, - 0x081436100, - 0x002ae2400, + 0x081486100, + 0x002da2400, 0x0588f608a, - 0x0486e814a, - 0x0610002a0, + 0x0486e814f, + 0x0610002cc, 0x02400588f, 0x06000ff7c, + 0x0486e98b6, + 0x0486e98ee, + 0x061000fb8, + 0x04feffff4, + 0x06000ff3e, 0x0518f42ae, 0x0802a42ae, 0x0802e42a7, - 0x0486e819d, - 0x061001026, + 0x0486e81a2, + 0x06100103e, 0x04a806d74, 0x04878003f, - 0x0486e986e, + 0x0486e9876, 0x02f002f40, 0x000186100, - 0x010162f2f, + 0x0102e2f2f, 0x000186100, - 0x00fe4207c, - 0x00000786c, + 0x00ffc207c, + 0x000007874, 0x048780020, 0x02f086100, - 0x00f0e2040, + 0x00f262040, 0x04a804fef, 0x000186740, 0x052880c10, @@ -114,94 +125,100 @@ ulong bootcode[]={ 0x070012d40, 0x0802a60ea, 0x042a7486e, - 0x081a96100, - 0x00fa44a80, + 0x081ae6100, + 0x00fbc4a80, 0x06d1e4878, 0x00001486e, 0x080362f00, 0x02f400020, - 0x061000f94, + 0x061000fac, 0x02f2f0020, - 0x061000f62, + 0x061000f7a, 0x04fef0010, 0x042a7486e, - 0x081b76100, - 0x00f784a80, - 0x06d2e4878, + 0x081bc6100, + 0x00f904a80, + 0x06d1e4878, 0x0001c486e, - 0x0974e2f00, + 0x098b62f00, 0x02f400028, - 0x061000f68, + 0x061000f80, 0x02f2f0028, - 0x061000f36, + 0x061000f4e, + 0x04fef0010, + 0x042a7486e, + 0x081c86100, + 0x00f644a80, + 0x06d2e4878, + 0x0001c486e, + 0x097562f00, + 0x02f400030, + 0x061000f54, + 0x02f2f0030, + 0x061000f22, 0x00c2e0069, 0x080366606, 0x070012d40, 0x080064fef, - 0x000304e75, - 0x0486e81c5, - 0x0486e974e, - 0x061000e98, + 0x000384e75, + 0x0486e81d6, + 0x0486e9756, + 0x061000e84, 0x0518f60dc, 0x0598f4878, 0x001b64878, 0x00001486e, - 0x081c96100, - 0x00f064a80, + 0x081da6100, + 0x00ef24a80, 0x042e72f40, 0x0000e44df, 0x06c0a486e, - 0x081d56100, - 0x0099c588f, + 0x081e66100, + 0x00988588f, 0x02f2f0014, - 0x061000e76, + 0x061000e62, 0x0588f2f00, 0x02f2f0018, 0x02f2f0014, - 0x061000f0e, + 0x061000efa, 0x04a806c0a, - 0x0486e81de, - 0x061000976, + 0x0486e81ef, + 0x061000962, 0x0588f2f2f, 0x000186100, - 0x00ebc4fef, + 0x00ea84fef, 0x000204e75, 0x0598f4878, - 0x00020486e, - 0x098ce486e, - 0x081e76100, - 0x0097e6100, - 0x00b424878, 0x00011486e, - 0x081ec6100, + 0x081f86100, 0x00eb84a80, 0x042e72f40, - 0x0001644df, + 0x0000a44df, 0x06d24486e, - 0x098ce6100, + 0x098ee6100, 0x00e14588f, 0x02f00486e, - 0x098ce2f2f, - 0x0001c6100, + 0x098ee2f2f, + 0x000106100, 0x00eac2f2f, - 0x000206100, + 0x000146100, 0x00e684fef, 0x000104fef, - 0x000184e75, + 0x0000c4e75, 0x0598f142e, 0x080360c02, 0x000736708, 0x0100249c0, 0x0588f4e75, - 0x0486e81f4, + 0x0486e8200, 0x0486f0004, 0x061000dc0, - 0x0486e81f6, - 0x0486e974e, + 0x0486e8202, + 0x0486e9756, 0x061000db4, 0x048780004, 0x0486f0014, - 0x0486e81fa, + 0x0486e8206, 0x0610008fc, 0x0102f001c, 0x049c04fef, @@ -215,30 +232,30 @@ ulong bootcode[]={ 0x0706c588f, 0x04e754878, 0x0001c486e, - 0x0974e486e, - 0x082226100, + 0x09756486e, + 0x0822e6100, 0x008c27069, 0x04fef0010, 0x04e754878, 0x0001c486e, - 0x0974e486e, - 0x082306100, + 0x09756486e, + 0x0823c6100, 0x008aa7041, 0x04fef0010, 0x04e754878, 0x0001c486e, - 0x0974e486e, - 0x082296100, + 0x09756486e, + 0x082356100, 0x008927061, 0x04fef0010, 0x04e75598f, 0x048780002, - 0x0486e8237, + 0x0486e8243, 0x061000dc6, 0x0220042e7, 0x02f40000a, 0x044df6c0e, - 0x0486e823e, + 0x0486e824a, 0x06100083e, 0x0222f000c, 0x0588f2001, @@ -246,40 +263,40 @@ ulong bootcode[]={ 0x04e754fef, 0x0fff44878, 0x00002486e, - 0x0824d6100, + 0x082596100, 0x00d942f40, 0x000104aaf, 0x000106c0a, - 0x0486e8258, + 0x0486e8264, 0x06100080e, 0x0588f2f2f, 0x000182f2f, 0x000146100, 0x007ac4878, 0x00002486e, - 0x0826b6100, + 0x082776100, 0x00d682f40, 0x0001c4aaf, 0x0001c6c0a, - 0x0486e8273, + 0x0486e827f, 0x0610007e2, 0x0588f2f2f, 0x0001c6100, 0x008662f2f, 0x000206100, 0x00d20486e, - 0x082832f2f, + 0x0828f2f2f, 0x0002c6100, 0x00770202f, 0x000304fef, 0x000344e75, - 0x0486e828e, + 0x0486e829a, 0x02f2f0008, 0x06100075a, 0x0206f000c, 0x04aae8006, 0x0673a486e, - 0x082992f08, + 0x082a52f08, 0x061000746, 0x061000cfe, 0x04fef0010, @@ -293,37 +310,37 @@ ulong bootcode[]={ 0x0ea606100, 0x00cf0588f, 0x060f260ee, - 0x0486e82af, + 0x0486e82bb, 0x02f086100, 0x0070c60c4, 0x04feffff0, 0x02f2f0014, - 0x0486e82c3, - 0x0486e86d2, + 0x0486e82cf, + 0x0486e86da, 0x061000b90, - 0x0486e86d2, + 0x0486e86da, 0x061000c26, 0x02f400010, 0x042af0014, 0x048780002, - 0x0486e82ce, + 0x0486e82da, 0x061000ca2, 0x04a8042e7, 0x02f400026, 0x044df6c0a, - 0x0486e82d8, + 0x0486e82e4, 0x06100071a, 0x0588f4878, 0x00002486e, - 0x082ea6100, + 0x082f66100, 0x00c802f40, 0x000284aaf, 0x000286c0a, - 0x0486e82f3, + 0x0486e82ff, 0x0610006fa, 0x0588f2f2f, 0x00020486e, - 0x086d22f2f, + 0x086da2f2f, 0x000306100, 0x00c74b0af, 0x0002c660e, @@ -345,22 +362,22 @@ ulong bootcode[]={ 0x000286000, 0x0ff682f2f, 0x00040486e, - 0x083046100, + 0x083106100, 0x00a0a486e, - 0x083152f2f, + 0x083212f2f, 0x000406100, 0x006342f2f, 0x000446100, 0x00bd02d7c, - 0x000006318, + 0x000006324, 0x0800a2d7c, - 0x00000631b, + 0x000006327, 0x08032202f, 0x0004c4fef, 0x000504e75, 0x04feffecc, 0x04878002f, - 0x0486e974e, + 0x0486e9756, 0x061000b52, 0x024006700, 0x002505282, @@ -372,105 +389,105 @@ ulong bootcode[]={ 0x02f2f0148, 0x0610004d4, 0x02f40014c, - 0x0486e8320, + 0x0486e832c, 0x06100099c, 0x02f2f0140, - 0x0486e8328, - 0x0486e86d2, + 0x0486e8334, + 0x0486e86da, 0x061000a5c, 0x0487801b6, 0x048780001, - 0x0486e86d2, + 0x0486e86da, 0x061000b5c, 0x04a8042e7, 0x02f40015e, 0x044df6c0a, - 0x0486e832e, + 0x0486e833a, 0x0610005f2, 0x0588f2f2f, 0x00168486e, - 0x08335486e, - 0x086d26100, + 0x08341486e, + 0x086da6100, 0x00a26486e, - 0x086d26100, + 0x086da6100, 0x00abc588f, 0x02f00486e, - 0x086d22f2f, + 0x086da2f2f, 0x001706100, 0x00b542f00, - 0x0486e86d2, + 0x0486e86da, 0x061000aa2, 0x0588f221f, 0x0b280670a, - 0x0486e8338, + 0x0486e8344, 0x0610005ae, 0x0588f2f2f, 0x001746100, 0x00af44878, 0x001b64878, 0x00001486e, - 0x0833e6100, + 0x0834a6100, 0x00aea4a80, 0x042e72f40, 0x0018644df, 0x06c0a486e, - 0x083466100, + 0x083526100, 0x00580588f, 0x02f2f0190, - 0x0486e834d, - 0x0486e86d2, + 0x0486e8359, + 0x0486e86da, 0x0610009b4, - 0x0486e86d2, + 0x0486e86da, 0x061000a4a, 0x0588f2f00, - 0x0486e86d2, + 0x0486e86da, 0x02f2f0198, 0x061000ae2, 0x02f00486e, - 0x086d26100, + 0x086da6100, 0x00a30588f, 0x0221fb280, 0x0670a486e, - 0x083506100, + 0x0835c6100, 0x0053c588f, 0x02f2f019c, 0x061000a82, - 0x0486e8356, + 0x0486e8362, 0x0610008a0, 0x042a7486e, - 0x08361486e, - 0x0835f6100, + 0x0836d486e, + 0x0836b6100, 0x00a5a4a80, 0x06c0a486e, - 0x083636100, + 0x0836f6100, 0x00510588f, - 0x0486e836b, - 0x0486e836a, + 0x0486e8377, + 0x0486e8376, 0x048780006, - 0x0486e8368, + 0x0486e8374, 0x02f2f01cc, 0x061000a64, 0x04a806c0a, - 0x0486e836c, + 0x0486e8378, 0x0610004ea, 0x0588f486e, - 0x083726100, + 0x0837e6100, 0x00856486f, 0x000dc486e, - 0x0837a6100, + 0x083866100, 0x00a5a4a80, 0x06c0a486e, - 0x0837e6100, + 0x0838a6100, 0x004c8588f, 0x0486f0158, 0x0486f00e8, 0x061000a52, 0x048780001, - 0x0486e8383, + 0x0486e838f, 0x061000a22, 0x02f4001e0, 0x02f2f01c8, - 0x0486e838b, + 0x0486e8397, 0x0486f00fc, 0x0610008e0, 0x0486f0100, @@ -481,42 +498,42 @@ ulong bootcode[]={ 0x061000a0e, 0x02f2f01f8, 0x0610009ca, - 0x0486e838f, + 0x0486e839b, 0x0610007e8, 0x04aae8032, 0x067302f2e, 0x0800a486e, - 0x08398486f, + 0x083a4486f, 0x000dc6100, 0x008a242a7, 0x0486f00e4, 0x02f2e8032, 0x06100098c, 0x042a7486e, - 0x083a02f2e, + 0x083ac2f2e, 0x080326100, 0x0097e4fef, 0x000244aae, 0x0800a672e, 0x02f2e800a, - 0x0486e83a9, + 0x0486e83b5, 0x0486f00dc, 0x06100086c, 0x0486f00e0, - 0x0486e83b9, + 0x0486e83c5, 0x061000790, 0x042a7486e, - 0x083db486f, + 0x083e7486f, 0x000f06100, 0x0094a4fef, 0x000204fef, 0x002084e75, 0x02f7c0000, - 0x0774c0130, + 0x077540130, 0x06000fdae, 0x0598f4878, 0x01000486e, - 0x086d22f2f, + 0x086da2f2f, 0x000106100, 0x0095e2200, 0x07002b081, @@ -524,181 +541,181 @@ ulong bootcode[]={ 0x005ca70ff, 0x04fef0010, 0x04e75422e, - 0x086d4486e, - 0x083ec486e, - 0x086d26100, + 0x086dc486e, + 0x083f8486e, + 0x086da6100, 0x008704a80, 0x066084280, 0x04fef0018, 0x04e75486e, - 0x083ef486e, - 0x086d26100, + 0x083fb486e, + 0x086da6100, 0x008584a80, 0x06634486e, - 0x098ae486e, - 0x098ce486e, - 0x083f2486e, - 0x086d26100, + 0x098d2486e, + 0x098ee486e, + 0x083fe486e, + 0x086da6100, 0x007d6486e, - 0x086d26100, + 0x086da6100, 0x0086c588f, 0x02f00486e, - 0x086d22f2f, + 0x086da2f2f, 0x0003c6100, 0x009044fef, 0x000386000, 0x0ff7e486e, - 0x083f9486e, - 0x086d26100, + 0x08405486e, + 0x086da6100, 0x008144a80, 0x04fef0024, 0x06600ff68, 0x061000548, - 0x0486e98ae, - 0x0486e98ce, - 0x0486e83fc, - 0x0486e86d2, + 0x0486e98d2, + 0x0486e98ee, + 0x0486e8408, + 0x0486e86da, 0x061000788, - 0x0486e86d2, + 0x0486e86da, 0x06100081e, 0x0588f2f00, - 0x0486e86d2, + 0x0486e86da, 0x02f2f0020, 0x0610008b6, 0x04fef001c, 0x06000ff30, 0x0598f486e, - 0x084036100, + 0x0840f6100, 0x0068e1d7c, - 0x0003296d2, + 0x0003296da, 0x03d7cffff, - 0x096d6486e, - 0x086d2486e, - 0x096d26100, + 0x096de486e, + 0x086da486e, + 0x096da6100, 0x010602f00, 0x02f400010, - 0x0486e86d2, + 0x0486e86da, 0x02f2f001c, 0x06100087a, 0x0b0af0018, 0x0670a486e, - 0x0840a6100, + 0x084166100, 0x002e0588f, 0x048781000, - 0x0486e86d2, + 0x0486e86da, 0x02f2f0028, 0x061000848, 0x022007002, 0x0b0816608, 0x00c2e004f, - 0x086d2677c, + 0x086da677c, 0x04a8142e7, 0x02f410026, 0x044df6e0e, - 0x0486e8414, + 0x0486e8420, 0x0610002aa, 0x0222f0028, 0x0588f2f01, - 0x0486e96d2, - 0x0486e86d2, + 0x0486e96da, + 0x0486e86da, 0x0610009c2, 0x04a806638, - 0x0102e86d5, + 0x0102e86dd, 0x049c02f00, - 0x0102e86d4, + 0x0102e86dc, 0x049c02f00, - 0x0102e86d3, + 0x0102e86db, 0x049c02f00, - 0x0102e86d2, + 0x0102e86da, 0x049c02f00, 0x02f2f0040, - 0x0486e841d, + 0x0486e8429, 0x0610005dc, - 0x0486e8444, + 0x0486e8450, 0x06100025e, 0x04fef001c, 0x00c2e0033, - 0x096d2670a, - 0x0486e844f, + 0x096da670a, + 0x0486e845b, 0x06100024a, 0x0588f4fef, 0x000344e75, 0x00c2e004b, - 0x086d36600, + 0x086db6600, 0x0ff7c4878, 0x01000486e, - 0x086d22f2f, + 0x086da2f2f, 0x000346100, 0x007a22200, 0x04fef000c, 0x06000ff62, 0x0598f486e, - 0x084586100, + 0x084646100, 0x0058a1d7c, - 0x0003496d2, + 0x0003496da, 0x03d7cffff, - 0x096d6486e, - 0x086d2486e, - 0x096d26100, + 0x096de486e, + 0x086da486e, + 0x096da6100, 0x00f5c2f00, 0x02f400010, - 0x0486e86d2, + 0x0486e86da, 0x02f2f001c, 0x061000776, 0x0b0af0018, 0x0670a486e, - 0x084636100, + 0x0846f6100, 0x001dc588f, 0x048781000, - 0x0486e86d2, + 0x0486e86da, 0x02f2f0028, 0x061000744, 0x02f400024, 0x04aaf0024, 0x06e0a486e, - 0x084716100, + 0x0847d6100, 0x001b8588f, 0x02f2f0024, - 0x0486e96d2, - 0x0486e86d2, + 0x0486e96da, + 0x0486e86da, 0x0610008d2, 0x04a80660a, - 0x0486e847e, + 0x0486e848a, 0x06100019a, 0x0588f0c2e, - 0x0003796d2, + 0x0003796da, 0x06618486e, - 0x096d8486e, - 0x0848d6100, + 0x096e0486e, + 0x084996100, 0x004fa486e, - 0x096d86100, + 0x096e06100, 0x0017c4fef, 0x0000c0c2e, - 0x0003596d2, + 0x0003596da, 0x0670a486e, - 0x084976100, + 0x084a36100, 0x00168588f, 0x04fef0034, 0x04e754fef, 0x0ff804857, - 0x0486e84a4, + 0x0486e84b0, 0x06100150c, 0x04a806c0a, 0x0202f008c, 0x04fef0088, 0x04e75486f, 0x00008486e, - 0x084a96100, + 0x084b56100, 0x014f24a80, 0x06c0a202f, 0x000944fef, 0x000904e75, - 0x0486e84b5, + 0x0486e84c1, 0x061000498, 0x0486f0088, 0x06100065e, 0x04a806c0a, - 0x0486e84bc, + 0x0486e84c8, 0x06100010e, 0x0588f6100, 0x006704fef, @@ -728,23 +745,23 @@ ulong bootcode[]={ 0x0610005f6, 0x04aae802a, 0x0672042a7, - 0x0486e84da, + 0x0486e84e6, + 0x0486e84e3, + 0x0486e84df, 0x0486e84d7, - 0x0486e84d3, - 0x0486e84cb, - 0x0486e84c6, + 0x0486e84d2, 0x0610004fc, 0x04fef0034, 0x060a242a7, - 0x0486e84f9, - 0x0486e84f6, - 0x0486e84f3, - 0x0486e84eb, - 0x0486e84e6, + 0x0486e8505, + 0x0486e8502, + 0x0486e84ff, + 0x0486e84f7, + 0x0486e84f2, 0x0610004dc, 0x04fef0034, 0x06082486e, - 0x084c16158, + 0x084cd6158, 0x0588f6082, 0x0598f2f2f, 0x0000c6100, @@ -763,7 +780,7 @@ ulong bootcode[]={ 0x005ae486f, 0x000042f2f, 0x0004c486e, - 0x085054878, + 0x085114878, 0x000026100, 0x003e64fef, 0x000544e75, @@ -772,7 +789,7 @@ ulong bootcode[]={ 0x0058a486f, 0x000042f2f, 0x0004c486e, - 0x085134878, + 0x0851f4878, 0x000026100, 0x003c242a7, 0x06100031c, @@ -781,7 +798,7 @@ ulong bootcode[]={ 0x0fefc2f2f, 0x0010c2f2f, 0x0010c486e, - 0x085216100, + 0x0852d6100, 0x0033a2f2f, 0x0011c486f, 0x0001042a7, @@ -791,7 +808,7 @@ ulong bootcode[]={ 0x042e72f40, 0x0010244df, 0x06c0c486e, - 0x0852a619c, + 0x08536619c, 0x0222f0104, 0x0588f7001, 0x0b0816716, @@ -804,7 +821,7 @@ ulong bootcode[]={ 0x04fef0104, 0x04e754fef, 0x0ff70486e, - 0x0854c6100, + 0x085586100, 0x002de6100, 0x004cc2f40, 0x0000c588f, @@ -813,11 +830,11 @@ ulong bootcode[]={ 0x04281b280, 0x067000098, 0x042a7486e, - 0x085896100, + 0x085956100, 0x004b82f40, 0x000084aaf, 0x000086c0a, - 0x0486e8592, + 0x0486e859e, 0x06100ff32, 0x0588f4878, 0x00001486f, @@ -841,7 +858,7 @@ ulong bootcode[]={ 0x000086100, 0x00430486f, 0x0001c486e, - 0x085a06100, + 0x085ac6100, 0x0024a4fef, 0x00014518f, 0x0609c2f2f, @@ -858,7 +875,7 @@ ulong bootcode[]={ 0x0001c6100, 0x0042e486f, 0x00020486e, - 0x0856f6100, + 0x0857b6100, 0x0020660fe, 0x04282b483, 0x06c180c37, @@ -873,19 +890,19 @@ ulong bootcode[]={ 0x0610003ee, 0x04fef0018, 0x060a4486e, - 0x085636100, + 0x0856f6100, 0x0fe54588f, 0x060984fef, 0x0ffdc2f2f, 0x00028486e, - 0x085bb486f, + 0x085c7486f, 0x0000c6100, 0x002824878, 0x00001486f, 0x000146100, 0x003a44878, 0x00003486e, - 0x085c92f00, + 0x085d52f00, 0x02f400020, 0x0610003aa, 0x02f2f0020, @@ -893,15 +910,15 @@ ulong bootcode[]={ 0x04fef0048, 0x04e754fef, 0x0ff7442a7, - 0x0486e85cd, + 0x0486e85d9, 0x061000376, 0x04a8042e7, 0x02f400012, 0x044df6c0a, - 0x0486e85d6, + 0x0486e85e2, 0x06100fdee, 0x0588f486e, - 0x085f96100, + 0x086056100, 0x0015a42af, 0x000184878, 0x00001486f, @@ -910,7 +927,7 @@ ulong bootcode[]={ 0x0034a2f40, 0x000284aaf, 0x000286c0a, - 0x0486e8604, + 0x0486e8610, 0x06100fdbe, 0x0588f4aaf, 0x000284fef, @@ -924,23 +941,23 @@ ulong bootcode[]={ 0x0b2006748, 0x0202f000c, 0x01daf0014, - 0x0092098ae, + 0x0092098d2, 0x052af000c, 0x00c2f000a, 0x000146710, - 0x07020b0af, + 0x0701cb0af, 0x0000c4fef, 0x0fff46e92, 0x04fef000c, 0x0202f000c, 0x042360920, - 0x098ae2f2f, + 0x098d22f2f, 0x000086100, 0x002ac486e, - 0x086296100, + 0x086356100, 0x000ca4fef, 0x000944e75, - 0x0486e8627, + 0x0486e8633, 0x0610000bc, 0x0598f6000, 0x0ff5660b8, @@ -950,10 +967,10 @@ ulong bootcode[]={ 0x0598f4281, 0x07021b081, 0x06f1e4ab6, - 0x01d2097ea, + 0x01d2097f2, 0x0660e2daf, 0x000081d20, - 0x097ea7001, + 0x097f27001, 0x0588f4e75, 0x052817021, 0x0b0816ee2, @@ -963,9 +980,9 @@ ulong bootcode[]={ 0x042827021, 0x0b0826f18, 0x020362d20, - 0x097eab088, + 0x097f2b088, 0x0660642b6, - 0x02d2097ea, + 0x02d2097f2, 0x052827021, 0x0b0826ee8, 0x0588f4e75, @@ -977,11 +994,11 @@ ulong bootcode[]={ 0x04e75518f, 0x072204a81, 0x06d222eb6, - 0x01d2097ea, + 0x01d2097f2, 0x04a976712, 0x02f410004, 0x042b61d20, - 0x097ea4eb7, + 0x097f24eb7, 0x00151222f, 0x000045381, 0x04a816cde, @@ -2042,54 +2059,54 @@ ulong bootcode[]={ 0x0f1b84280, 0x04fef0084, 0x04e752d7c, - 0x00000468e, - 0x086361d7c, - 0x000019919, + 0x0000046d2, + 0x0863e1d7c, + 0x000019935, 0x01d7c0001, - 0x0991b1d7c, - 0x000019911, + 0x099371d7c, + 0x00001992d, 0x01d7c0001, - 0x099561d7c, - 0x00001995a, + 0x099721d7c, + 0x000019976, 0x01d7c0001, - 0x099632d7c, - 0x0000042fe, - 0x0863a1d7c, - 0x000029952, + 0x0997f2d7c, + 0x000004342, + 0x086421d7c, + 0x00002996e, 0x01d7c0002, - 0x0995d1d7c, - 0x000029966, + 0x099791d7c, + 0x000029982, 0x01d7c0002, - 0x099462d7c, - 0x0000046e0, - 0x0863e1d7c, - 0x000039953, + 0x099622d7c, + 0x000004724, + 0x086461d7c, + 0x00003996f, 0x01d7c0003, - 0x099541d7c, - 0x000039955, + 0x099701d7c, + 0x000039971, 0x01d7c0003, - 0x099331d7c, - 0x000039935, + 0x0994f1d7c, + 0x000039951, 0x02d7c0000, - 0x046308642, + 0x04674864a, 0x01d7c0004, - 0x099512d7c, - 0x000004656, - 0x086461d7c, - 0x000059961, + 0x0996d2d7c, + 0x00000469a, + 0x0864e1d7c, + 0x00005997d, 0x02d7c0000, - 0x04674864a, + 0x046b88652, 0x01d7c0006, - 0x099137007, + 0x0992f7007, 0x02d408016, 0x048780080, 0x048780001, - 0x0486e976a, + 0x0486e9772, 0x061000eba, - 0x0422e976a, - 0x0422e9773, - 0x0422e9774, - 0x0422e978f, + 0x0422e9772, + 0x0422e977b, + 0x0422e977c, + 0x0422e9797, 0x04fef000c, 0x04e754aae, 0x080166604, @@ -2102,13 +2119,13 @@ ulong bootcode[]={ 0x08016122f, 0x0000749c1, 0x01d801920, - 0x098ee52ae, + 0x0990a52ae, 0x08016122f, 0x0000749c1, 0x010361920, - 0x098ee49c0, + 0x0990a49c0, 0x02daf0008, - 0x00d208632, + 0x00d20863a, 0x042804e75, 0x04fefffe4, 0x02a2f002c, @@ -2126,7 +2143,7 @@ ulong bootcode[]={ 0x0291049c0, 0x02600707f, 0x0c0834a36, - 0x00920976a, + 0x009209772, 0x066000186, 0x0d3c2d7c2, 0x02d4b8012, @@ -2211,9 +2228,9 @@ ulong bootcode[]={ 0x000282f05, 0x02f450040, 0x010362920, - 0x098ee49c0, + 0x0990a49c0, 0x020760d20, - 0x086324e90, + 0x0863a4e90, 0x02a2f0040, 0x0266e8012, 0x0246f002c, @@ -2427,9 +2444,9 @@ ulong bootcode[]={ 0x000182f2f, 0x000182f2f, 0x000181236, - 0x0392098ee, + 0x03920990a, 0x049c12076, - 0x01d208632, + 0x01d20863a, 0x04e904fef, 0x000184e75, 0x01ebc002a, @@ -3175,49 +3192,52 @@ ulong bootcode[]={ 0x020676e6f, 0x074203100, 0x06e6f6e65, - 0x000423139, - 0x032303000, - 0x042393630, - 0x030006361, - 0x06e277420, - 0x0636f6e6e, - 0x06563742c, - 0x020726574, - 0x07279696e, - 0x0672e2e2e, - 0x00a002f36, - 0x038303230, - 0x02f696e69, - 0x07400696e, - 0x06974002d, - 0x06d002f36, - 0x038303230, - 0x02f696e69, - 0x07400696e, - 0x06974002f, + 0x000757365, + 0x072004231, + 0x039323030, + 0x000423936, + 0x030300063, + 0x0616e2774, + 0x020636f6e, + 0x06e656374, + 0x02c207265, + 0x074727969, + 0x06e672e2e, + 0x02e0a002f, 0x036383032, 0x0302f696e, - 0x069740023, - 0x0652f626f, - 0x06f746c69, - 0x06e650023, - 0x0652f626f, - 0x06f746465, - 0x076696365, - 0x00023652f, - 0x0626f6f74, - 0x073657276, - 0x06572004e, - 0x066730023, - 0x0652f7465, - 0x0726d696e, - 0x0616c0074, + 0x069740069, + 0x06e697400, + 0x02d6d002f, + 0x036383032, + 0x0302f696e, + 0x069740069, + 0x06e697400, + 0x02f363830, + 0x032302f69, + 0x06e697400, + 0x023652f62, + 0x06f6f746c, + 0x0696e6500, + 0x023652f62, + 0x06f6f7464, + 0x065766963, + 0x065002365, + 0x02f626f6f, + 0x074757365, + 0x072002365, + 0x02f626f6f, + 0x074736572, + 0x076657200, + 0x04e667300, + 0x023652f74, 0x065726d69, 0x06e616c00, 0x07465726d, 0x0696e616c, - 0x000757365, - 0x072002363, + 0x000746572, + 0x06d696e61, + 0x06c002363, 0x02f757365, 0x072003900, 0x04e667300, @@ -3490,8 +3510,7 @@ ulong bootcode[]={ 0x0626f6f74, 0x0000a000a, 0x000000000, - 0x000000000, - 0x0000045cc, + 0x000004610, 0x000000000, 0x000000000, 0x000000000, @@ -3531,8 +3550,6 @@ ulong bootcode[]={ 0x000000000, 0x000000000, 0x000000000, - 0x00003730, - 0x0, - 0x00003730, + 0x0000377c, 0x0, }; diff --git a/gnot/main.c b/gnot/main.c index 57bd1b513515ffa9e14511b7f3b79c0cb402553d..c763c832ba17c5ae2583fd8aacb51f7f0ad5b608 100644 --- a/gnot/main.c +++ b/gnot/main.c @@ -122,13 +122,13 @@ init0(void) u->dot = clone(u->slash, 0); if(!waserror()){ c = namec("#e/bootuser", Acreate, OWRITE, 0600); - (*devtab[c->type].write)(c, bootuser, 64, 0); + (*devtab[c->type].write)(c, bootuser, strlen(bootuser), 0); close(c); c = namec("#e/bootline", Acreate, OWRITE, 0600); (*devtab[c->type].write)(c, bootline, 64, 0); close(c); c = namec("#e/bootserver", Acreate, OWRITE, 0600); - (*devtab[c->type].write)(c, bootserver, 64, 0); + (*devtab[c->type].write)(c, bootserver, strlen(bootuser), 0); close(c); c = namec("#e/bootdevice", Acreate, OWRITE, 0600); (*devtab[c->type].write)(c, bootdevice, 2, 0); diff --git a/pc/main.c b/pc/main.c index 0fda3138dee2597a7aa58bbc312c0b9b147956f4..2c0ab6022ed9bd418cfe4c08ece105775a62233b 100644 --- a/pc/main.c +++ b/pc/main.c @@ -227,7 +227,7 @@ confinit(void) void matherror(Ureg *ur) { - postnote(u->p, 1, "math: 837 error", 0); + pexit("Math error", 0); } /* @@ -247,7 +247,7 @@ mathemu(Ureg *ur) break; case FPactive: print("emu actv 0x%lux\n", getcr0()); - postnote(u->p, 1, "math: emulation", 0); + pexit("Math emu", 0); break; } } @@ -258,7 +258,7 @@ print("emu actv 0x%lux\n", getcr0()); void mathover(Ureg *ur) { - postnote(u->p, 1, "math: segment overrun", 0); + pexit("Math overrun", 0); } void