From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Patterson Subject: [PATCH v3 1/2] libxl: replace deprecated readdir_r() with readdir() Date: Fri, 3 Jun 2016 12:50:09 -0400 Message-ID: <1464972610-24115-1-git-send-email-cjp256@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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: ian.jackson@eu.citrix.com, Chris Patterson , wei.liu2@citrix.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 U2lnbmVkLW9mZi1ieTogQ2hyaXMgUGF0dGVyc29uIDxwYXR0ZXJzb25jQGFpbmZvc2VjLmNvbT4K LS0tCgp2MjoKLSBBZGRpdGlvbmFsIGRldGFpbCBpbiBjb21taXQgbWVzc2FnZQotIEZpeCByZWFk ZGlyIGxvb3AgbG9naWMgKGRvIG5vdCB0cmVhdCBOVUxMIGFzIGVycm9yKQotIENsZWFudXAgYWRk aXRpb25hbCAobm8gbG9uZ2VyIHVzZWQpIGNvZGUKCnYzOgotIFJlc3RvcmUgb3JpZ2luYWwgbG9v cCAmIGVycm9yIGhhbmRsaW5nCgogdG9vbHMvbGlieGwvbGlieGxfcHZ1c2IuYyB8IDI0ICsrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLQogdG9vbHMvbGlieGwvbGlieGxfdXRpbHMuYyB8ICA4ICsrKy0t LS0tCiAyIGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxfcHZ1c2IuYyBiL3Rvb2xzL2xpYnhsL2xpYnhs X3B2dXNiLmMKaW5kZXggOWYxZTg0Mi4uZWM5N2ZmOCAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGwv bGlieGxfcHZ1c2IuYworKysgYi90b29scy9saWJ4bC9saWJ4bF9wdnVzYi5jCkBAIC01MDgsMTkg KzUwOCwxMCBAQCBpbnQgbGlieGxfZGV2aWRfdG9fZGV2aWNlX3VzYmN0cmwobGlieGxfY3R4ICpj dHgsCiAgICAgcmV0dXJuIHJjOwogfQogCi1zdGF0aWMgdm9pZCAqemFsbG9jX2RpcmVudChsaWJ4 bF9fZ2MgKmdjLCBjb25zdCBjaGFyICpkaXJwYXRoKQotewotICAgIHNpemVfdCBuZWVkID0gb2Zm c2V0b2Yoc3RydWN0IGRpcmVudCwgZF9uYW1lKSArCi0gICAgICAgICAgICAgICAgICBwYXRoY29u ZihkaXJwYXRoLCBfUENfTkFNRV9NQVgpICsgMTsKLQotICAgIHJldHVybiBsaWJ4bF9femFsbG9j KGdjLCBuZWVkKTsKLX0KLQogc3RhdGljIGNoYXIgKnVzYmRldl9idXNhZGRyX3RvX2J1c2lkKGxp YnhsX19nYyAqZ2MsIGludCBidXMsIGludCBhZGRyKQogewogICAgIERJUiAqZGlyOwogICAgIGNo YXIgKmJ1c2lkID0gTlVMTDsKLSAgICBzdHJ1Y3QgZGlyZW50ICpkZV9idWY7CiAgICAgc3RydWN0 IGRpcmVudCAqZGU7CiAKICAgICAvKiBpbnZhbGlkIGhvc3RidXMgb3IgaG9zdGFkZHIgKi8KQEAg LTUzMywxNiArNTI0LDE1IEBAIHN0YXRpYyBjaGFyICp1c2JkZXZfYnVzYWRkcl90b19idXNpZChs aWJ4bF9fZ2MgKmdjLCBpbnQgYnVzLCBpbnQgYWRkcikKICAgICAgICAgcmV0dXJuIE5VTEw7CiAg ICAgfQogCi0gICAgZGVfYnVmID0gemFsbG9jX2RpcmVudChnYywgU1lTRlNfVVNCX0RFVik7Ci0K ICAgICBmb3IgKDs7KSB7CiAgICAgICAgIGNoYXIgKmZpbGVuYW1lOwogICAgICAgICB2b2lkICpi dWY7CiAgICAgICAgIGludCBidXNudW0gPSAtMTsKICAgICAgICAgaW50IGRldm51bSA9IC0xOwog Ci0gICAgICAgIGludCByID0gcmVhZGRpcl9yKGRpciwgZGVfYnVmLCAmZGUpOwotICAgICAgICBp ZiAocikgeworICAgICAgICBlcnJubyA9IDA7CisgICAgICAgIGRlID0gcmVhZGRpcihkaXIpOwor ICAgICAgICBpZiAoIWRlICYmIGVycm5vKSB7CiAgICAgICAgICAgICBMT0dFKEVSUk9SLCAiZmFp bGVkIHRvIHJlYWRkaXIgJXMiLCBTWVNGU19VU0JfREVWKTsKICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICB9CkBAIC0xMTU3LDcgKzExNDcsNiBAQCBzdGF0aWMgaW50IHVzYmRldl9nZXRfYWxs X2ludGVyZmFjZXMobGlieGxfX2djICpnYywgY29uc3QgY2hhciAqYnVzaWQsCiB7CiAgICAgRElS ICpkaXI7CiAgICAgY2hhciAqYnVmOwotICAgIHN0cnVjdCBkaXJlbnQgKmRlX2J1ZjsKICAgICBz dHJ1Y3QgZGlyZW50ICpkZTsKICAgICBpbnQgcmM7CiAKQEAgLTExNzIsMTIgKzExNjEsMTEgQEAg c3RhdGljIGludCB1c2JkZXZfZ2V0X2FsbF9pbnRlcmZhY2VzKGxpYnhsX19nYyAqZ2MsIGNvbnN0 IGNoYXIgKmJ1c2lkLAogICAgICAgICByZXR1cm4gRVJST1JfRkFJTDsKICAgICB9CiAKLSAgICBk ZV9idWYgPSB6YWxsb2NfZGlyZW50KGdjLCBTWVNGU19VU0JfREVWKTsKLQogICAgIGZvciAoOzsp IHsKLSAgICAgICAgaW50IHIgPSByZWFkZGlyX3IoZGlyLCBkZV9idWYsICZkZSk7CisgICAgICAg IGVycm5vID0gMDsKKyAgICAgICAgZGUgPSByZWFkZGlyKGRpcik7CiAKLSAgICAgICAgaWYgKHIp IHsKKyAgICAgICAgaWYgKCFkZSAmJiBlcnJubykgewogICAgICAgICAgICAgTE9HRShFUlJPUiwg ImZhaWxlZCB0byByZWFkZGlyICVzIiwgU1lTRlNfVVNCX0RFVik7CiAgICAgICAgICAgICByYyA9 IEVSUk9SX0ZBSUw7CiAgICAgICAgICAgICBnb3RvIG91dDsKZGlmZiAtLWdpdCBhL3Rvb2xzL2xp YnhsL2xpYnhsX3V0aWxzLmMgYi90b29scy9saWJ4bC9saWJ4bF91dGlscy5jCmluZGV4IGNlYjg4 MjUuLjRjYTZiY2IgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX3V0aWxzLmMKKysrIGIv dG9vbHMvbGlieGwvbGlieGxfdXRpbHMuYwpAQCAtNTQ4LDE0ICs1NDgsMTIgQEAgaW50IGxpYnhs X19yZW1vdmVfZGlyZWN0b3J5KGxpYnhsX19nYyAqZ2MsIGNvbnN0IGNoYXIgKmRpcnBhdGgpCiAg ICAgICAgIGdvdG8gb3V0OwogICAgIH0KIAotICAgIHNpemVfdCBuZWVkID0gb2Zmc2V0b2Yoc3Ry dWN0IGRpcmVudCwgZF9uYW1lKSArCi0gICAgICAgIHBhdGhjb25mKGRpcnBhdGgsIF9QQ19OQU1F X01BWCkgKyAxOwotICAgIHN0cnVjdCBkaXJlbnQgKmRlX2J1ZiA9IGxpYnhsX196YWxsb2MoZ2Ms IG5lZWQpOwogICAgIHN0cnVjdCBkaXJlbnQgKmRlOwogCiAgICAgZm9yICg7OykgewotICAgICAg ICBpbnQgciA9IHJlYWRkaXJfcihkLCBkZV9idWYsICZkZSk7Ci0gICAgICAgIGlmIChyKSB7Cisg ICAgICAgIGVycm5vID0gMDsKKyAgICAgICAgZGUgPSByZWFkZGlyKGQpOworICAgICAgICBpZiAo IWRlICYmIGVycm5vKSB7CiAgICAgICAgICAgICBMT0dFKEVSUk9SLCAiZmFpbGVkIHRvIHJlYWRk aXIgJXMgZm9yIHJlbW92YWwiLCBkaXJwYXRoKTsKICAgICAgICAgICAgIHJjID0gRVJST1JfRkFJ TDsKICAgICAgICAgICAgIGJyZWFrOwotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZl bEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=