RE: Patch: FreeBSD support for Coda 5.2.20
"Kang Liu" <[email protected]> Fri, 7 Mar 2003 14:13:10 +0800
| Newsgroups | gmane.comp.file-systems.coda.devel |
|---|---|
| Message-ID | <!~!UENERkVCMDkAAQACAAAAAAAAAAAAAAAAABgAAAAAAAAAioo13Dwsfk6m7/[email protected]> |
This is a multi-part message in MIME format. ------=_NextPart_000_0020_01C2E4B3.AB1B7EE0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Is it a patch for 5.3.20? I saw your PR ports/48830 @freebsd.org :) > -----Original Message----- > From: Tim Robbins [mailto:[email protected]] > Sent: Friday, March 07, 2003 1:52 PM > To: [email protected] > Subject: Patch: FreeBSD support for Coda 5.2.20 > > This patch against Coda 5.2.20 makes it compile on FreeBSD 5. It changes > three things: > - Does not access the `struct stat' (non-)field st_qspare. > - scandir()'s third argument is a function that takes a non-const > struct dirent pointer as an argument. > - Define __BIT_TYPES_DEFINED__ on FreeBSD 5 to avoid duplicate > definitions of int8_t, etc. > > All three of these changes could potentially be made into autoconf > tests. > > Index: coda-src/venus/vproc.cc > =================================================================== > RCS file: /home/tim/coda/repo/coda/coda-src/venus/vproc.cc,v > retrieving revision 1.1.1.1 > retrieving revision 1.2 > diff -u -r1.1.1.1 -r1.2 > --- coda-src/venus/vproc.cc 7 Mar 2003 04:27:39 -0000 1.1.1.1 > +++ coda-src/venus/vproc.cc 7 Mar 2003 04:55:35 -0000 1.2 > @@ -784,8 +784,10 @@ > #if !defined(NetBSD1_3) && !defined(__NetBSD_Version__) > sp->st_lspare = 0; > #endif > +#if __FreeBSD__ < 5 > sp->st_qspare[0] = 0; > sp->st_qspare[1] = 0; > +#endif > #endif /* __BSD44__ */ > } > > Index: coda-src/vice/srv.cc > =================================================================== > RCS file: /home/tim/coda/repo/coda/coda-src/vice/srv.cc,v > retrieving revision 1.1.1.1 > retrieving revision 1.2 > diff -u -r1.1.1.1 -r1.2 > --- coda-src/vice/srv.cc 7 Mar 2003 04:27:39 -0000 1.1.1.1 > +++ coda-src/vice/srv.cc 7 Mar 2003 05:01:33 -0000 1.2 > @@ -1267,8 +1267,13 @@ > char buf[100], buf2[100]; /* can't believe there will be more logs! > */ > struct dirent **namelist = NULL; > > +#if __FreeBSD__ >= 5 > + count = scandir(".", &namelist, (int (*)(dirent *)) xselect, > + (int (*)(const void *, const void *)) compar); > +#else > count = scandir(".", &namelist, (int (*)(const dirent *)) xselect, > (int (*)(const void *, const void *)) compar); > +#endif > /* It is safe now to blindly rename */ > for (i = 0; i < count; i++) { > sprintf(buf, "SrvLog-%d", count-i); > Index: lib-src/kernel-includes/coda.h > =================================================================== > RCS file: /home/tim/coda/repo/coda/lib-src/kernel-includes/coda.h,v > retrieving revision 1.1.1.1 > retrieving revision 1.2 > diff -u -r1.1.1.1 -r1.2 > --- lib-src/kernel-includes/coda.h 7 Mar 2003 04:27:41 -0000 1.1.1.1 > +++ lib-src/kernel-includes/coda.h 7 Mar 2003 04:40:46 -0000 1.2 > @@ -125,6 +125,10 @@ > #define __BIT_TYPES_DEFINED__ > #endif > > +#if __FreeBSD__ >= 5 > +#define __BIT_TYPES_DEFINED__ > +#endif > + > #ifndef __BIT_TYPES_DEFINED__ > #define __BIT_TYPES_DEFINED__ > typedef signed char int8_t; ------=_NextPart_000_0020_01C2E4B3.AB1B7EE0 Content-Type: application/x-pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIJnzCCAy0w ggKWoAMCAQICAQAwDQYJKoZIhvcNAQEEBQAwgdExCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0 ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEaMBgGA1UEChMRVGhhd3RlIENvbnN1bHRpbmcx KDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24xJDAiBgNVBAMTG1RoYXd0 ZSBQZXJzb25hbCBGcmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJARYccGVyc29uYWwtZnJlZW1haWxA dGhhd3RlLmNvbTAeFw05NjAxMDEwMDAwMDBaFw0yMDEyMzEyMzU5NTlaMIHRMQswCQYDVQQGEwJa QTEVMBMGA1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xGjAYBgNVBAoTEVRo YXd0ZSBDb25zdWx0aW5nMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u MSQwIgYDVQQDExtUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgQ0ExKzApBgkqhkiG9w0BCQEWHHBl cnNvbmFsLWZyZWVtYWlsQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANRp 19SwlGRbcelH2AxRtupykbCEXn0tDY97Et+FJXUodDpCLGMnn5V7S+9+GYcdhuqj3bnOlmQawhRu RKx85o/oTQ9xH0A4pgCjh3j2+ZSGXq3qwF5269kUo11uenwMpUtVfwYZKX+emibVars4JAhqmMex 2qOYkf152+VaxBy5AgMBAAGjEzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEA x+ySfk749ZalZ2IqpPBNEWDQb41gWGGsJrtSNVwIzzD7qEqWih9iQiOMFw/0umScF6xHKd+dmF7S bGBxXKKs3Hnj524ARx+1DSjoAp3kmv0T9KbZfLH43F8jJgmRgHPQFBveQ6mDJfLmnC8Vyv6mq4oH dYsM3VGEa+T40c53ooEwggMuMIICl6ADAgECAgMI8TMwDQYJKoZIhvcNAQEEBQAwgZIxCzAJBgNV BAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEPMA0GA1UE ChMGVGhhd3RlMR0wGwYDVQQLExRDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEoMCYGA1UEAxMfUGVyc29u YWwgRnJlZW1haWwgUlNBIDIwMDAuOC4zMDAeFw0wMjEyMjAwOTI0MjBaFw0wMzEyMjAwOTI0MjBa MIGyMR8wHQYDVQQDExZUaGF3dGUgRnJlZW1haWwgTWVtYmVyMSIwIAYJKoZIhvcNAQkBFhNsaXVr YW5nQGJqcHUuZWR1LmNuMSMwIQYJKoZIhvcNAQkBFhRsYXp5a2FuZ0Bob3RtYWlsLmNvbTEjMCEG CSqGSIb3DQEJARYUbGl1a2FuZ2VAbmV0ZWFzZS5jb20xITAfBgkqhkiG9w0BCQEWEnJvb3RAZ29v Z2xlLm9yZy5jbjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAp75ZMLqxTs8J5MBHUw48InhU LtU8UXQOal5cGFItNW2Fyy6km01CShv17XALPO4fym5eWmnGuuAOlaphRRtxIDt3tJG4G9dN1D7H ZBt8ocILQM1w0RHrSQWpM8ZPVLpaOSG70agQbZIYVN43Kr0DfJR/yRs2+Q6VovswbJk3hqkCAwEA AaNwMG4wXgYDVR0RBFcwVYETbGl1a2FuZ0BianB1LmVkdS5jboEUbGF6eWthbmdAaG90bWFpbC5j b22BFGxpdWthbmdlQG5ldGVhc2UuY29tgRJyb290QGdvb2dsZS5vcmcuY24wDAYDVR0TAQH/BAIw ADANBgkqhkiG9w0BAQQFAAOBgQBPLUWxSjc1K/ob349WxOmnJ+rM7+sb1Km8bOaE+TPomHADFqWE J68waRZW9zuYH3sR2dd86SGzU1lGlcDyVwNjJIvEhh7zqUvH5auZkTXsDbHaK422zW8d353thTLy fsc5Tm+6nOqh7aLj5mFB0gX1KIHQFLROCGMLhFzEGp6uvDCCAzgwggKhoAMCAQICEGZFcrfMdPXP Y3ZFhNAukQEwDQYJKoZIhvcNAQEEBQAwgdExCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJu IENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEaMBgGA1UEChMRVGhhd3RlIENvbnN1bHRpbmcxKDAm BgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24xJDAiBgNVBAMTG1RoYXd0ZSBQ ZXJzb25hbCBGcmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJARYccGVyc29uYWwtZnJlZW1haWxAdGhh d3RlLmNvbTAeFw0wMDA4MzAwMDAwMDBaFw0wNDA4MjcyMzU5NTlaMIGSMQswCQYDVQQGEwJaQTEV MBMGA1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xDzANBgNVBAoTBlRoYXd0 ZTEdMBsGA1UECxMUQ2VydGlmaWNhdGUgU2VydmljZXMxKDAmBgNVBAMTH1BlcnNvbmFsIEZyZWVt YWlsIFJTQSAyMDAwLjguMzAwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN4zMqZjxwklRT7S bngnZ4HF2ogZgpcO40QpimM1Km1wPPrcrvfudG8wvDOQf/k0caCjbZjxw0+iZdsN+kvx1t1hpfmF zVWaNRqdknWoJ67Ycvm6AvbXsJHeHOmr4BgDqHxDQlBRh4M88Dm0m1SKE4f/s5udSWYALQmJ7JRr 6aFpAgMBAAGjTjBMMCkGA1UdEQQiMCCkHjAcMRowGAYDVQQDExFQcml2YXRlTGFiZWwxLTI5NzAS BgNVHRMBAf8ECDAGAQH/AgEAMAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQQFAAOBgQAxsUtHXfkB ceX1U2xdedY9mMAmE2KBIqcS+CKV6BtJtyd7BDm6/ObyJOuR+r3sDSo491BVqGz3Da1MG7wD9LXr okefbKIMWI0xQgkRbLAaadErErJAXWr5edDqLiXdiuT82w0fnQLzWtvKPPZE6iZph39Ins6ln+eE 2MliYq0FxjGCA2kwggNlAgEBMIGaMIGSMQswCQYDVQQGEwJaQTEVMBMGA1UECBMMV2VzdGVybiBD YXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xDzANBgNVBAoTBlRoYXd0ZTEdMBsGA1UECxMUQ2VydGlm aWNhdGUgU2VydmljZXMxKDAmBgNVBAMTH1BlcnNvbmFsIEZyZWVtYWlsIFJTQSAyMDAwLjguMzAC AwjxMzAJBgUrDgMCGgUAoIICJDAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJ BTEPFw0wMzAzMDcwNjEzMDRaMCMGCSqGSIb3DQEJBDEWBBRRpqhbkhFpjKId/oxtuO+Dnf5j6zBn BgkqhkiG9w0BCQ8xWjBYMAoGCCqGSIb3DQMHMA4GCCqGSIb3DQMCAgIAgDANBggqhkiG9w0DAgIB QDAHBgUrDgMCBzANBggqhkiG9w0DAgIBKDAHBgUrDgMCGjAKBggqhkiG9w0CBTCBqwYJKwYBBAGC NxAEMYGdMIGaMIGSMQswCQYDVQQGEwJaQTEVMBMGA1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQH EwlDYXBlIFRvd24xDzANBgNVBAoTBlRoYXd0ZTEdMBsGA1UECxMUQ2VydGlmaWNhdGUgU2Vydmlj ZXMxKDAmBgNVBAMTH1BlcnNvbmFsIEZyZWVtYWlsIFJTQSAyMDAwLjguMzACAwjxMzCBrQYLKoZI hvcNAQkQAgsxgZ2ggZowgZIxCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQ BgNVBAcTCUNhcGUgVG93bjEPMA0GA1UEChMGVGhhd3RlMR0wGwYDVQQLExRDZXJ0aWZpY2F0ZSBT ZXJ2aWNlczEoMCYGA1UEAxMfUGVyc29uYWwgRnJlZW1haWwgUlNBIDIwMDAuOC4zMAIDCPEzMA0G CSqGSIb3DQEBAQUABIGAHKZx/myegY5PYTAC69zHHdGhaXkPAkvnGpoEtDhR3yyZDMbN3pmTR3yF 0LdLMY4uKArW2OO0SbdI0MHy2Ah1VIUu7JefdEYQpd79VLBRlJp7mGuAouLglJrqkSJ55PXj7DTv x45SHcrVret1ubyluTCaiqcrT3UT0s7vUxFqaqQAAAAAAAA= ------=_NextPart_000_0020_01C2E4B3.AB1B7EE0--