From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Patterson Subject: [[PATCH v2 2/2] libxl: replace deprecated readdir_r() with readdir() Date: Wed, 1 Jun 2016 14:19:38 -0400 Message-ID: <1464805178-8989-2-git-send-email-cjp256@gmail.com> References: <1464805178-8989-1-git-send-email-cjp256@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1464805178-8989-1-git-send-email-cjp256@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, Chris Patterson , jbeulich@suse.com List-Id: xen-devel@lists.xenproject.org RnJvbTogQ2hyaXMgUGF0dGVyc29uIDxwYXR0ZXJzb25jQGFpbmZvc2VjLmNvbT4KClJlcGxhY2Ug dGhlIHVzYWdlIG9mIHJlYWRkaXJfcigpIHdpdGggcmVhZGRpcigpIHRvIGFkZHJlc3MgYQpjb21w aWxhdGlvbiBlcnJvciB1bmRlciBnbGliYyBkdWUgdG8gdGhlIGRlcHJlY2F0aW9uIG9mIHJlYWRk aXJfcgpmb3IgdGhlaXIgbmV4dCByZWxlYXNlICgyLjI0KSBbMSwgMl0uCgpSZW1vdmUgY29kZSBz cGVjaWZpYyB0byB1c2FnZSBvZiByZWFkZGlyX3Igd2hpY2ggaXMgbm8gbG9uZ2VyIHJlcXVpcmVk LApzdWNoIGFzIHphbGxvY19kaXJlbnQoKS4KCi0tCgpGcm9tIHRoZSBHTlUgbGliYyBtYW51YWwg WzNdOgoiCiBJdCBpcyBleHBlY3RlZCB0aGF0IGZ1dHVyZSB2ZXJzaW9ucyBvZiBQT1NJWCB3aWxs IG9ic29sZXRlIHJlYWRkaXJfciBhbmQKIG1hbmRhdGUgdGhlIGxldmVsIG9mIHRocmVhZCBzYWZl dHkgZm9yIHJlYWRkaXIgd2hpY2ggaXMgcHJvdmlkZWQgYnkgdGhlCiBHTlUgQyBMaWJyYXJ5IGFu ZCBvdGhlciBpbXBsZW1lbnRhdGlvbnMgdG9kYXkuCiIKClRoZXJlIGlzIGEgZmlsZWQgYnVnIGlu IHRoZSBBdXN0aW4gR3JvdXAgRGVmZWN0IFRyYWNrZXIgWzRdICBpbiB3aGljaCAnZGFsaWFzJwpw cm9wb3NlcyAoaW4gY29tbWVudCAwMDAxNjMyKSB0aGF0OgoiCiAgIEkgd291bGQgbGlrZSB0byBw cm9wb3NlIGFuIGFsdGVybmF0ZSBzb2x1dGlvbi4gRm9yIHJlYWRkaXIsIHJlcGxhY2UgdGhlIHRl eHQ6CiAgICAiVGhlIHJlYWRkaXIoKSBmdW5jdGlvbiBuZWVkIG5vdCBiZSB0aHJlYWQtc2FmZS4i CiAgIHdpdGg6CiAgICAiSWYgbXVsdGlwbGUgdGhyZWFkcyBjYWxsIHRoZSByZWFkZGlyKCkgZnVu Y3Rpb24gd2l0aCB0aGUgc2FtZSBkaXJlY3RvcnkKICAgIHN0cmVhbSBhcmd1bWVudCBhbmQgd2l0 aG91dCBzeW5jaHJvbml6YXRpb24gdG8gcHJlY2x1ZGUgc2ltdWx0YW5lb3VzCiAgICBhY2Nlc3Ms IHRoZW4gdGhlIGJlaGF2aW9yIGlzIHVuZGVmaW5lZC4iCgogICBXaXRoIHRoaXMgY2hhbmdlLCB0 aGUgY2x1bmt5IHJlYWRkaXJfciBmdW5jdGlvbiBpcyBubyBsb25nZXIgbmVlZGVkIG9yCiAgIHVz ZWZ1bCwgYW5kIHNob3VsZCBwcm9iYWJseSBiZSBkZXByZWNhdGVkLiBBcyB0aGUgb25seSByZWFz b25hYmxlIHdheQogICB0byBtZWV0IHRoZSBpbXBsZW1lbnRhdGlvbiByZXF1aXJlbWVudHMgZm9y IHJlYWRkaXIgaXMgdG8gaGF2ZSB0aGUgZGlyZW50CiAgIGJ1ZmZlciBpbiB0aGUgRElSIHN0cnVj dHVyZSwgdGhpcyBjaGFuZ2Ugc2hvdWxkIG5vdCByZXF1aXJlIGFueSBjaGFuZ2UgdG8KICAgZXhp c3RpbmcgaW1wbGVtZW50YXRpb25zLgoiCgpbMV0gaHR0cHM6Ly9zb3VyY2V3YXJlLm9yZy9tbC9s aWJjLWFscGhhLzIwMTYtMDIvbXNnMDAwOTMuaHRtbApbMl0gaHR0cHM6Ly9zb3VyY2V3YXJlLm9y Zy9idWd6aWxsYS9zaG93X2J1Zy5jZ2k/aWQ9MTkwNTYKWzNdIGh0dHBzOi8vd3d3LmdudS5vcmcv c29mdHdhcmUvbGliYy9tYW51YWwvaHRtbF9ub2RlL1JlYWRpbmdfMDAyZkNsb3NpbmctRGlyZWN0 b3J5Lmh0bWwKWzRdIGh0dHA6Ly9hdXN0aW5ncm91cGJ1Z3MubmV0L3ZpZXcucGhwP2lkPTY5NgoK LS0KCnYyOgotIEFkZGl0aW9uYWwgZGV0YWlsIGluIGNvbW1pdCBtZXNzYWdlCi0gRml4IHJlYWRk aXIgbG9vcCBsb2dpYyAoZG8gbm90IHRyZWF0IE5VTEwgYXMgZXJyb3IpCi0gQ2xlYW51cCBhZGRp dGlvbmFsIHJlbGF0ZWQgKG5vIGxvbmdlciB1c2VkKSBjb2RlCgpTaWduZWQtb2ZmLWJ5OiBDaHJp cyBQYXR0ZXJzb24gPHBhdHRlcnNvbmNAYWluZm9zZWMuY29tPgotLS0KIHRvb2xzL2xpYnhsL2xp YnhsX3B2dXNiLmMgfCA0MiArKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KIHRvb2xzL2xpYnhsL2xpYnhsX3V0aWxzLmMgfCAxNCArLS0tLS0tLS0tLS0tLQogMiBmaWxl cyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDUyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L3Rvb2xzL2xpYnhsL2xpYnhsX3B2dXNiLmMgYi90b29scy9saWJ4bC9saWJ4bF9wdnVzYi5jCmlu ZGV4IDlmMWU4NDIuLjAxODE5YmQgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX3B2dXNi LmMKKysrIGIvdG9vbHMvbGlieGwvbGlieGxfcHZ1c2IuYwpAQCAtNTA4LDE5ICs1MDgsMTAgQEAg aW50IGxpYnhsX2RldmlkX3RvX2RldmljZV91c2JjdHJsKGxpYnhsX2N0eCAqY3R4LAogICAgIHJl dHVybiByYzsKIH0KIAotc3RhdGljIHZvaWQgKnphbGxvY19kaXJlbnQobGlieGxfX2djICpnYywg Y29uc3QgY2hhciAqZGlycGF0aCkKLXsKLSAgICBzaXplX3QgbmVlZCA9IG9mZnNldG9mKHN0cnVj dCBkaXJlbnQsIGRfbmFtZSkgKwotICAgICAgICAgICAgICAgICAgcGF0aGNvbmYoZGlycGF0aCwg X1BDX05BTUVfTUFYKSArIDE7Ci0KLSAgICByZXR1cm4gbGlieGxfX3phbGxvYyhnYywgbmVlZCk7 Ci19Ci0KIHN0YXRpYyBjaGFyICp1c2JkZXZfYnVzYWRkcl90b19idXNpZChsaWJ4bF9fZ2MgKmdj LCBpbnQgYnVzLCBpbnQgYWRkcikKIHsKICAgICBESVIgKmRpcjsKICAgICBjaGFyICpidXNpZCA9 IE5VTEw7Ci0gICAgc3RydWN0IGRpcmVudCAqZGVfYnVmOwogICAgIHN0cnVjdCBkaXJlbnQgKmRl OwogCiAgICAgLyogaW52YWxpZCBob3N0YnVzIG9yIGhvc3RhZGRyICovCkBAIC01MzMsMjIgKzUy NCwxMiBAQCBzdGF0aWMgY2hhciAqdXNiZGV2X2J1c2FkZHJfdG9fYnVzaWQobGlieGxfX2djICpn YywgaW50IGJ1cywgaW50IGFkZHIpCiAgICAgICAgIHJldHVybiBOVUxMOwogICAgIH0KIAotICAg IGRlX2J1ZiA9IHphbGxvY19kaXJlbnQoZ2MsIFNZU0ZTX1VTQl9ERVYpOwotCi0gICAgZm9yICg7 OykgeworICAgIHdoaWxlICgoZGUgPSByZWFkZGlyKGRpcikpICE9IE5VTEwpIHsKICAgICAgICAg Y2hhciAqZmlsZW5hbWU7CiAgICAgICAgIHZvaWQgKmJ1ZjsKICAgICAgICAgaW50IGJ1c251bSA9 IC0xOwogICAgICAgICBpbnQgZGV2bnVtID0gLTE7CiAKLSAgICAgICAgaW50IHIgPSByZWFkZGly X3IoZGlyLCBkZV9idWYsICZkZSk7Ci0gICAgICAgIGlmIChyKSB7Ci0gICAgICAgICAgICBMT0dF KEVSUk9SLCAiZmFpbGVkIHRvIHJlYWRkaXIgJXMiLCBTWVNGU19VU0JfREVWKTsKLSAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgICAgIGlmICghZGUpCi0gICAgICAgICAgICBicmVh azsKLQogICAgICAgICBpZiAoIXN0cmNtcChkZS0+ZF9uYW1lLCAiLiIpIHx8CiAgICAgICAgICAg ICAhc3RyY21wKGRlLT5kX25hbWUsICIuLiIpKQogICAgICAgICAgICAgY29udGludWU7CkBAIC0x MTU3LDkgKzExMzgsNyBAQCBzdGF0aWMgaW50IHVzYmRldl9nZXRfYWxsX2ludGVyZmFjZXMobGli eGxfX2djICpnYywgY29uc3QgY2hhciAqYnVzaWQsCiB7CiAgICAgRElSICpkaXI7CiAgICAgY2hh ciAqYnVmOwotICAgIHN0cnVjdCBkaXJlbnQgKmRlX2J1ZjsKICAgICBzdHJ1Y3QgZGlyZW50ICpk ZTsKLSAgICBpbnQgcmM7CiAKICAgICAqaW50ZnMgPSBOVUxMOwogICAgICpudW0gPSAwOwpAQCAt MTE3MiwxOSArMTE1MSw3IEBAIHN0YXRpYyBpbnQgdXNiZGV2X2dldF9hbGxfaW50ZXJmYWNlcyhs aWJ4bF9fZ2MgKmdjLCBjb25zdCBjaGFyICpidXNpZCwKICAgICAgICAgcmV0dXJuIEVSUk9SX0ZB SUw7CiAgICAgfQogCi0gICAgZGVfYnVmID0gemFsbG9jX2RpcmVudChnYywgU1lTRlNfVVNCX0RF Vik7Ci0KLSAgICBmb3IgKDs7KSB7Ci0gICAgICAgIGludCByID0gcmVhZGRpcl9yKGRpciwgZGVf YnVmLCAmZGUpOwotCi0gICAgICAgIGlmIChyKSB7Ci0gICAgICAgICAgICBMT0dFKEVSUk9SLCAi ZmFpbGVkIHRvIHJlYWRkaXIgJXMiLCBTWVNGU19VU0JfREVWKTsKLSAgICAgICAgICAgIHJjID0g RVJST1JfRkFJTDsKLSAgICAgICAgICAgIGdvdG8gb3V0OwotICAgICAgICB9Ci0gICAgICAgIGlm ICghZGUpCi0gICAgICAgICAgICBicmVhazsKLQorICAgIHdoaWxlICgoZGUgPSByZWFkZGlyKGRp cikpICE9IE5VTEwpIHsKICAgICAgICAgaWYgKCFzdHJjbXAoZGUtPmRfbmFtZSwgIi4iKSB8fAog ICAgICAgICAgICAgIXN0cmNtcChkZS0+ZF9uYW1lLCAiLi4iKSkKICAgICAgICAgICAgIGNvbnRp bnVlOwpAQCAtMTE5NiwxMSArMTE2Myw4IEBAIHN0YXRpYyBpbnQgdXNiZGV2X2dldF9hbGxfaW50 ZXJmYWNlcyhsaWJ4bF9fZ2MgKmdjLCBjb25zdCBjaGFyICpidXNpZCwKICAgICAgICAgfQogICAg IH0KIAotICAgIHJjID0gMDsKLQotb3V0OgogICAgIGNsb3NlZGlyKGRpcik7Ci0gICAgcmV0dXJu IHJjOworICAgIHJldHVybiAwOwogfQogCiAvKiBFbmNvZGUgdXNiIGludGVyZmFjZSBzbyB0aGF0 IGl0IGNvdWxkIGJlIHdyaXR0ZW4gdG8geGVuc3RvcmUgYXMgYSBrZXkuCmRpZmYgLS1naXQgYS90 b29scy9saWJ4bC9saWJ4bF91dGlscy5jIGIvdG9vbHMvbGlieGwvbGlieGxfdXRpbHMuYwppbmRl eCBjZWI4ODI1Li41NzMwNzc0IDEwMDY0NAotLS0gYS90b29scy9saWJ4bC9saWJ4bF91dGlscy5j CisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX3V0aWxzLmMKQEAgLTU0OCwyMSArNTQ4LDkgQEAgaW50 IGxpYnhsX19yZW1vdmVfZGlyZWN0b3J5KGxpYnhsX19nYyAqZ2MsIGNvbnN0IGNoYXIgKmRpcnBh dGgpCiAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KIAotICAgIHNpemVfdCBuZWVkID0gb2Zmc2V0 b2Yoc3RydWN0IGRpcmVudCwgZF9uYW1lKSArCi0gICAgICAgIHBhdGhjb25mKGRpcnBhdGgsIF9Q Q19OQU1FX01BWCkgKyAxOwotICAgIHN0cnVjdCBkaXJlbnQgKmRlX2J1ZiA9IGxpYnhsX196YWxs b2MoZ2MsIG5lZWQpOwogICAgIHN0cnVjdCBkaXJlbnQgKmRlOwogCi0gICAgZm9yICg7Oykgewot ICAgICAgICBpbnQgciA9IHJlYWRkaXJfcihkLCBkZV9idWYsICZkZSk7Ci0gICAgICAgIGlmIChy KSB7Ci0gICAgICAgICAgICBMT0dFKEVSUk9SLCAiZmFpbGVkIHRvIHJlYWRkaXIgJXMgZm9yIHJl bW92YWwiLCBkaXJwYXRoKTsKLSAgICAgICAgICAgIHJjID0gRVJST1JfRkFJTDsKLSAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgICAgIGlmICghZGUpCi0gICAgICAgICAgICBicmVh azsKLQorICAgIHdoaWxlICgoZGUgPSByZWFkZGlyKGQpKSAhPSBOVUxMKSB7CiAgICAgICAgIGlm ICghc3RyY21wKGRlLT5kX25hbWUsICIuIikgfHwKICAgICAgICAgICAgICFzdHJjbXAoZGUtPmRf bmFtZSwgIi4uIikpCiAgICAgICAgICAgICBjb250aW51ZTsKLS0gCjIuMS40CgoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcg bGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2 ZWwK