Received: by taz.hyperreal.com (8.8.3/V2.0) id BAA05665; Fri, 10 Jan 1997 01:35:20 -0800 (PST) Received: from eat.organic.com by taz.hyperreal.com (8.8.3/V2.0) with ESMTP id BAA05661; Fri, 10 Jan 1997 01:35:17 -0800 (PST) Received: from localhost (brian@localhost) by eat.organic.com (8.8.3/8.6.12) with SMTP id BAA18708; Fri, 10 Jan 1997 01:36:25 -0800 (PST) Date: Fri, 10 Jan 1997 01:36:25 -0800 (PST) From: Brian Behlendorf To: Garey Smiley , Apache Developers Mailing List Subject: Re: OS/2 Fixes In-Reply-To: <9701070543.AA2273@main.slink.com> Message-ID: MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="_=_=_=IMA.BOUNDARY.E3MIL6138764=_=_=_" Content-ID: Sender: new-httpd-owner@apache.org Precedence: bulk Reply-To: new-httpd@hyperreal.com This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. --_=_=_=IMA.BOUNDARY.E3MIL6138764=_=_=_ Content-Type: TEXT/PLAIN; CHARSET=us-ascii Content-ID: On Tue, 7 Jan 1997, Garey Smiley wrote: > Please commit these fixes. I hope the attached file will patch without > the CR-LF problem. Almost did - I had to patch util_script.c by hand. Otherwise they look fine, and have been committed. Brian --=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-- brian@organic.com www.apache.org hyperreal.com http://www.organic.com/JOBS --_=_=_=IMA.BOUNDARY.E3MIL6138764=_=_=_ Content-Type: APPLICATION/OCTET-STREAM; NAME="fixes.PATCH" Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: KioqIGNvbmYuaC5vcmlnICAgICAgICBGcmkgRGVjIDI3IDE2OjA5OjA4IDE5OTYKLS0tIGNvbmYu aCAgICAgICAgV2VkIEphbiAgMSAxMzozNDo1NiAxOTk3CioqKioqKioqKioqKioqKgoqKiogMzk5 LDQwNSAqKioqCiAgI2RlZmluZSBjaGRpciBfY2hkaXIyCiAgI2luY2x1ZGUgPHN5cy90aW1lLmg+ ICAgICAKICAjZGVmaW5lIE1BWFNPQ0tFVFMgNDA5NgotICNkZWZpbmUgQVJHX01BWCAgICBfUE9T SVhfQVJHX01BWAogICNkZWZpbmUgSEFWRV9NTUFQCiAgICAgIAogICNlbGlmIGRlZmluZWQoX19N QUNIVEVOX18pCi0tLSAzOTksNDA0IC0tLS0KKioqKioqKioqKioqKioqCioqKiA1MjQsNTMxICoq KioKLS0tIDUyMyw1MzMgLS0tLQogICNlbmRpZgogIAogICNpZm5kZWYgU19JU0xOSworICNpZm5k ZWYgX19FTVhfXworIC8qIERvbid0IGRlZmluZSB0aGlzIGZvciBPUy8yICovCiAgI2RlZmluZSBT X0lTTE5LKG0pICgoKG0pICYgU19JRk1UKSA9PSBTX0lGTE5LKQogICNlbmRpZgorICNlbmRpZgog IAogICNpZm5kZWYgSU5BRERSX05PTkUKICAjZGVmaW5lIElOQUREUl9OT05FICgodW5zaWduZWQg bG9uZykgLTEpCioqKiBtb2RfbG9nX2FnZW50LmMub3JpZyAgICAgICAgU3VuIERlYyAgMSAxMjoy OToxMiAxOTk2Ci0tLSBtb2RfbG9nX2FnZW50LmMgICAgICAgIFdlZCBKYW4gIDEgMTU6MTI6NTQg MTk5NwoqKioqKioqKioqKioqKioKKioqIDEwNSwxMTEgKioqKgotLS0gMTA1LDExNiAtLS0tCiAg ICAgIAogICAgICBjbGVhbnVwX2Zvcl9leGVjKCk7CiAgICAgIHNpZ25hbCAoU0lHSFVQLCBTSUdf SUdOKTsKKyAjaWZkZWYgX19FTVhfXyAgICAKKyAgICAgLyogRm9yIE9TLzIgd2UgbmVlZCB0byB1 c2UgYSAnLycgKi8KKyAgICAgZXhlY2wgKFNIRUxMX1BBVEgsIFNIRUxMX1BBVEgsICIvYyIsIChj aGFyICopY21kLCBOVUxMKTsKKyAjZWxzZSAgICAKICAgICAgZXhlY2wgKFNIRUxMX1BBVEgsIFNI RUxMX1BBVEgsICItYyIsIChjaGFyICopY21kLCBOVUxMKTsKKyAjZW5kaWYgICAgCiAgICAgIGV4 aXQgKDEpOwogIH0KICAKKioqIG1vZF9sb2dfcmVmZXJlci5jLm9yaWcgICAgICAgIFN1biBEZWMg IDEgMTI6Mjk6MTQgMTk5NgotLS0gbW9kX2xvZ19yZWZlcmVyLmMgICAgICAgIFdlZCBKYW4gIDEg MTU6MTk6MjYgMTk5NwoqKioqKioqKioqKioqKioKKioqIDExOSwxMjUgKioqKgotLS0gMTE5LDEz MCAtLS0tCiAgICAgIAogICAgICBjbGVhbnVwX2Zvcl9leGVjKCk7CiAgICAgIHNpZ25hbCAoU0lH SFVQLCBTSUdfSUdOKTsKKyAjaWZkZWYgX19FTVhfXworICAgICAvKiBGb3IgT1MvMiB3ZSBuZWVk IHRvIHVzZSBhICcvJyAqLworICAgICBleGVjbCAoU0hFTExfUEFUSCwgU0hFTExfUEFUSCwgIi9j IiwgKGNoYXIgKiljbWQsIE5VTEwpOworICNlbHNlCiAgICAgIGV4ZWNsIChTSEVMTF9QQVRILCBT SEVMTF9QQVRILCAiLWMiLCAoY2hhciAqKWNtZCwgTlVMTCk7CisgI2VuZGlmCiAgICAgIGZwcmlu dGYgKHN0ZGVyciwgIkV4ZWMgb2Ygc2hlbGwgZm9yIGxvZ2dpbmcgZmFpbGVkISEhXG4iKTsKICAg ICAgZXhpdCAoMSk7CiAgfQoqKiogbW9kX2xvZ19jb25maWcuYy5vcmlnICAgICAgICBUdWUgRGVj IDEwIDIxOjE2OjA4IDE5OTYKLS0tIG1vZF9sb2dfY29uZmlnLmMgICAgICAgIFdlZCBKYW4gIDEg MTU6MTM6MTQgMTk5NwoqKioqKioqKioqKioqKioKKioqIDY3Myw2NzkgKioqKgotLS0gNjczLDY4 NCAtLS0tCiAgICAgIAogICAgICBjbGVhbnVwX2Zvcl9leGVjKCk7CiAgICAgIHNpZ25hbCAoU0lH SFVQLCBTSUdfSUdOKTsKKyAjaWZkZWYgX19FTVhfXworICAgICAvKiBGb3IgT1MvMiB3ZSBuZWVk IHRvIHVzZSBhICcvJyAqLworICAgICBleGVjbCAoU0hFTExfUEFUSCwgU0hFTExfUEFUSCwgIi9j IiwgKGNoYXIgKiljbWQsIE5VTEwpOworICNlbHNlCiAgICAgIGV4ZWNsIChTSEVMTF9QQVRILCBT SEVMTF9QQVRILCAiLWMiLCAoY2hhciAqKWNtZCwgTlVMTCk7CisgI2VuZGlmCiAgICAgIGZwcmlu dGYgKHN0ZGVyciwgIkV4ZWMgb2Ygc2hlbGwgZm9yIGxvZ2dpbmcgZmFpbGVkISEhXG4iKTsKICAg ICAgZXhpdCAoMSk7CiAgfQoqKiogbW9kX3Jld3JpdGUuYy5vcmlnICAgICAgICBUdWUgRGVjIDI0 IDExOjQwOjE2IDE5OTYKLS0tIG1vZF9yZXdyaXRlLmMgICAgICAgIFdlZCBKYW4gIDEgMTU6MzA6 MjAgMTk5NwoqKioqKioqKioqKioqKioKKioqIDExMiwxMTcgKioqKgotLS0gMTEyLDEyMiAtLS0t CiAgICAgIC8qIG5vdyBvdXIgb3duIHN0dWZmIC4uLiAqLwogICNpbmNsdWRlICJtb2RfcmV3cml0 ZS5oIgogIAorICNpZmRlZiBfX0VNWF9fCisgLyogT1MvMiBkb3Nlbid0IHN1cHBvcnQgbGlua3Mu ICovCisgI2RlZmluZSBTX0lTTE5LCisgI2VuZGlmCisgCiAgIAogIAogIAoqKioqKioqKioqKioq KioKKioqIDIxNjQsMjE3MCAqKioqCi0tLSAyMTY5LDIxODAgLS0tLQogIHsKICAgICAgY2xlYW51 cF9mb3JfZXhlYygpOwogICAgICBzaWduYWwoU0lHSFVQLCBTSUdfSUdOKTsKKyAjaWZkZWYgX19F TVhfXworICAgICAvKiBGb3IgT1MvMiB3ZSBuZWVkIHRvIHVzZSBhICcvJyAqLworICAgICBleGVj bChTSEVMTF9QQVRILCBTSEVMTF9QQVRILCAiL2MiLCAoY2hhciAqKWNtZCwgTlVMTCk7CisgI2Vs c2UKICAgICAgZXhlY2woU0hFTExfUEFUSCwgU0hFTExfUEFUSCwgIi1jIiwgKGNoYXIgKiljbWQs IE5VTEwpOworICNlbmRpZgogICAgICBleGl0KDEpOwogIH0KICAKKioqKioqKioqKioqKioqCioq KiAyMzAzLDIzMDkgKioqKgotLS0gMjMxMywyMzI0IC0tLS0KICB7CiAgICAgIGNsZWFudXBfZm9y X2V4ZWMoKTsKICAgICAgc2lnbmFsKFNJR0hVUCwgU0lHX0lHTik7CisgI2lmZGVmIF9fRU1YX18K KyAgICAgLyogRm9yIE9TLzIgd2UgbmVlZCB0byB1c2UgYSAnLycgKi8KKyAgICAgZXhlY2woU0hF TExfUEFUSCwgU0hFTExfUEFUSCwgIi9jIiwgKGNoYXIgKiljbWQsIE5VTEwpOworICNlbHNlCiAg ICAgIGV4ZWNsKFNIRUxMX1BBVEgsIFNIRUxMX1BBVEgsICItYyIsIChjaGFyICopY21kLCBOVUxM KTsKKyAjZW5kaWYgICAgCiAgICAgIGV4aXQoMSk7CiAgfQogIAoqKiogaHR0cF9sb2cuYy5vcmln ICAgICAgICBTdW4gRGVjICAxIDEyOjI4OjI0IDE5OTYKLS0tIGh0dHBfbG9nLmMgICAgICAgIFdl ZCBKYW4gIDEgMTU6MTM6MzggMTk5NwoqKioqKioqKioqKioqKioKKioqIDc0LDgwICoqKioKLS0t IDc0LDg1IC0tLS0KICAgICAgCiAgICAgIGNsZWFudXBfZm9yX2V4ZWMoKTsKICAgICAgc2lnbmFs IChTSUdIVVAsIFNJR19JR04pOworICNpZmRlZiBfX0VNWF9fCisgICAgIC8qIEZvciBPUy8yIHdl IG5lZWQgdG8gdXNlIGEgJy8nICovCisgICAgIGV4ZWNsIChTSEVMTF9QQVRILCBTSEVMTF9QQVRI LCAiL2MiLCAoY2hhciAqKWNtZCwgTlVMTCk7CisgI2Vsc2UgICAgCiAgICAgIGV4ZWNsIChTSEVM TF9QQVRILCBTSEVMTF9QQVRILCAiLWMiLCAoY2hhciAqKWNtZCwgTlVMTCk7CisgI2VuZGlmICAg IAogICAgICBleGl0ICgxKTsKICB9CiAgCioqKiBDb25maWd1cmUub3JpZyAgICAgICAgRnJpIERl YyAyNyAxNjowOTowOCAxOTk2Ci0tLSBDb25maWd1cmUuICAgICAgICBUaHUgSmFuICAyIDEyOjEy OjU2IDE5OTcKKioqKioqKioqKioqKioqCioqKiAxNzksMTg1ICoqKioKICAgICAgICAgIERFRl9X QU5USFNSRUdFWD15ZXMKICAgICAgICAgIE9TPSdFTVggT1MvMicKICAgICAgICAgIENGTEFHUz0i JENGTEFHUyAtWmJzZC1zaWduYWxzIC1aYmluLWZpbGVzIC1EVENQSVBWNCAtZyIKISAgICAgICAg IExJQlM9IiRMSUJTIC1sc29ja2V0IC1sbGlidWZjIC1sZ2RibSAtbGJzZCIKICAgICAgICAgIDs7 CiAgICAgICotaHAtaHB1eDEwLiopCiAgICAgICAgICBPUz0nSFAtVVggMTAnCi0tLSAxNzksMTg2 IC0tLS0KICAgICAgICAgIERFRl9XQU5USFNSRUdFWD15ZXMKICAgICAgICAgIE9TPSdFTVggT1Mv MicKICAgICAgICAgIENGTEFHUz0iJENGTEFHUyAtWmJzZC1zaWduYWxzIC1aYmluLWZpbGVzIC1E VENQSVBWNCAtZyIKISAgICAgICAgIExJQlM9IiRMSUJTIC1sc29ja2V0IC1sbGlidWZjIC1sYnNk IgohICAgICAgICAgREJNX0xJQj0iLWxnZGJtIgogICAgICAgICAgOzsKICAgICAgKi1ocC1ocHV4 MTAuKikKICAgICAgICAgIE9TPSdIUC1VWCAxMCcKKioqIHV0aWxfc2NyaXB0LmMub3JpZyAgICAg ICAgV2VkIEphbiAgMSAxMzowOToyNiAxOTk3Ci0tLSB1dGlsX3NjcmlwdC5jICAgICAgICBXZWQg SmFuICAxIDEzOjE0OjA2IDE5OTcKKioqKioqKioqKioqKioqCioqKiA0NjIsNDY3ICoqKioKLS0t IDQ2Miw0OTAgLS0tLQogICNlbmRpZgogIAogICNpZmRlZiBfX0VNWF9fCisgICAgIHsKKyAgICAg ICAgIC8qIEFkZGl0aW9ucyBieSBBbGVjIEtsb3NzLCB0byBhbGxvdyBleGVjJ2luZyBvZiBzY3Jp cHRzIHVuZGVyIE9TLzIgKi8KKyAgICAgICAgIGludCBpc19zY3JpcHQ7CisgICAgICAgICBjaGFy IGludGVycHJldGVyWzIwNDhdOyAvKiBob3BlIHRoaXMgaXMgbGFyZ2UgZW5vdWdoIGZvciB0aGUg aW50ZXJwcmV0ZXIgcGF0aCAqLworICAgICAgICAgRklMRSAqIHByb2dyYW07CisgICAgICAgICBw cm9ncmFtID0gZm9wZW4gKHItPmZpbGVuYW1lLCAiciIpOworICAgICAgICAgaWYgKCFwcm9ncmFt KSB7CisgICAgICAgICAgICAgY2hhciBlcnJfc3RyaW5nW0hVR0VfU1RSSU5HX0xFTl07CisgICAg ICAgICAgICAgc3ByaW50ZihlcnJfc3RyaW5nLCAib3BlbiBvZiAlcyBmYWlsZWQsIGVycm5vIGlz ICVkXG4iLCByLT5maWxlbmFtZSwgZXJybm8pOworICAgICAgICAgICAgIC8qIHdyaXRlKDIsIGVy cl9zdHJpbmcsIHN0cmxlbihlcnJfc3RyaW5nKSk7ICovCisgICAgICAgICAgICAgLyogZXhpdCgw KTsgKi8KKyAgICAgICAgICAgICBsb2dfdW5peGVycigiZm9wZW4iLCBOVUxMLCBlcnJfc3RyaW5n LCByLT5zZXJ2ZXIpOworICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgIH0KKyAgICAgICAg IGZnZXRzIChpbnRlcnByZXRlciwgMjA0OCwgcHJvZ3JhbSk7CisgICAgICAgICBmY2xvc2UgKHBy b2dyYW0pOworICAgICAgICAgaWYgKCFzdHJuY21wIChpbnRlcnByZXRlciwgIiMhIiwgMikpIHsK KyAgICAgICAgICAgICBpc19zY3JpcHQgPSAxOworICAgICAgICAgICAgIGludGVycHJldGVyW3N0 cmxlbihpbnRlcnByZXRlciktMV0gPSAnXDAnOworICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg ICAgICBpc19zY3JpcHQgPSAwOworICAgICAgICAgfQorIAogICAgICBpZiAoKCFyLT5hcmdzKSB8 fCAoIXItPmFyZ3NbMF0pIHx8IChpbmQoci0+YXJncywnPScpID49IDApKSB7CiAgICAgIGludCBl bXhsb29wOwogICAgICBjaGFyICplbXh0ZW1wOwoqKioqKioqKioqKioqKioKKioqIDQ3Miw0Nzcg KioqKgotLS0gNDk1LDUwNiAtLS0tCiAgICAgIGZvciAoZW14bG9vcD0wOyAoKGVteHRlbXAgPSBl bnZbZW14bG9vcF0pICE9IE5VTEwpOyBlbXhsb29wKyspCiAgICAgICAgICBwdXRlbnYoZW14dGVt cCk7CiAgCisgICAgIC8qIEFkZGl0aW9ucyBieSBBbGVjIEtsb3NzLCB0byBhbGxvdyBleGVjJ2lu ZyBvZiBzY3JpcHRzIHVuZGVyIE9TLzIgKi8KKyAgICAgaWYgKGlzX3NjcmlwdCkgeworICAgICAg ICAgLyogaGVyZSdzIHRoZSBzdHVmZiB0byBydW4gdGhlIGludGVycHJldGVyICovCisgICAgICAg ICBleGVjbCAoaW50ZXJwcmV0ZXIrMiwgaW50ZXJwcmV0ZXIrMiwgci0+ZmlsZW5hbWUsIE5VTEwp OworICAgICB9IGVsc2UKKyAKICAgICAgaWYgKHN0cnN0cihzdHJ1cHIoci0+ZmlsZW5hbWUpLCAi LkNNRCIpID4gMCkgewogICAgICAgICAgLyogU3BlY2lhbCBjYXNlIHRvIGFsbG93IHVzZSBvZiBS RVhYIGNvbW1hbmRzIGFzIHNjcmlwdHMuICovCiAgICAgICAgICBvczJwYXRobmFtZShyLT5maWxl bmFtZSk7CioqKioqKioqKioqKioqKgoqKiogNTAwLDUwNyAqKioqCiAgICAgICAgICAgICAgZXhl Y3Yoci0+ZmlsZW5hbWUsIGNyZWF0ZV9hcmd2KHIsIGFyZ3YwLCByLT5hcmdzLCBOVUxMKSk7CiAg ICAgIH0KKyAgICAgfQogICNlbHNlCiAgICAgIGlmICggc3VleGVjX2VuYWJsZWQgJiYKICAgICAg ICAgICAoKHItPnNlcnZlci0+c2VydmVyX3VpZCAhPSB1c2VyX2lkKSB8fAotLS0gNTI5LDUzNCAt LS0tCg== --_=_=_=IMA.BOUNDARY.E3MIL6138764=_=_=_--