bin/142384: sync fsck_msdosfs with OpenBSD

Wed Jan 6 19:10:09 UTC 2010

The following reply was made to PR bin/142384; it has been noted by GNATS.

From: "Pedro F. Giffuni" <giffunip at tutopia.com>
To: Antoine Brodin <antoine at FreeBSD.org>
Cc: freebsd-gnats-submit at freebsd.org
Subject: Re: bin/142384: sync fsck_msdosfs with OpenBSD
Date: Wed, 6 Jan 2010 11:03:23 -0800 (PST)

 --0-437212032-1262804603=:89207
 Content-Type: text/plain; charset=us-ascii

 ----- Original Message ----
 ...
 > 
 > My problem was with the parenthesis between "n=" and "read" in your patch.
 > 

 Ooops.. my bad, sorry!

 New patch attached.

 --0-437212032-1262804603=:89207
 Content-Type: application/octet-stream; name=patch-fsck_msdosfs
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="patch-fsck_msdosfs"

 ZGlmZiAtcnUgZnNja19tc2Rvc2ZzLm9yaWcvYm9vdC5jIGZzY2tfbXNkb3Nm
 cy9ib290LmMKLS0tIGZzY2tfbXNkb3Nmcy5vcmlnL2Jvb3QuYwkyMDEwLTAx
 LTA2IDExOjA3OjI0LjAwMDAwMDAwMCArMDAwMAorKysgZnNja19tc2Rvc2Zz
 L2Jvb3QuYwkyMDEwLTAxLTA2IDEzOjU3OjUzLjAwMDAwMDAwMCArMDAwMApA
 QCAtNTUsOSArNTUsOSBAQAogCXVfY2hhciBibG9ja1tET1NCT09UQkxPQ0tT
 SVpFXTsKIAl1X2NoYXIgZnNpbmZvWzIgKiBET1NCT09UQkxPQ0tTSVpFXTsK
 IAl1X2NoYXIgYmFja3VwW0RPU0JPT1RCTE9DS1NJWkVdOwotCWludCByZXQg
 PSBGU09LOworCWludCBuLCByZXQgPSBGU09LOwogCQotCWlmIChyZWFkKGRv
 c2ZzLCBibG9jaywgc2l6ZW9mIGJsb2NrKSA8IHNpemVvZiBibG9jaykgewor
 CWlmICgobiA9IHJlYWQoZG9zZnMsIGJsb2NrLCBzaXplb2YgYmxvY2spIDwg
 c2l6ZW9mIGJsb2NrKSA9PSAtMSB8fCBuICE9IHNpemVvZiBibG9jaykgewog
 CQlwZXJyb3IoImNvdWxkIG5vdCByZWFkIGJvb3QgYmxvY2siKTsKIAkJcmV0
 dXJuIEZTRkFUQUw7CiAJfQpAQCAtMTA2LDEwICsxMDYsMTAgQEAKIAkJYm9v
 dC0+RlNJbmZvID0gYmxvY2tbNDhdICsgKGJsb2NrWzQ5XSA8PCA4KTsKIAkJ
 Ym9vdC0+QmFja3VwID0gYmxvY2tbNTBdICsgKGJsb2NrWzUxXSA8PCA4KTsK
 IAotCQlpZiAobHNlZWsoZG9zZnMsIGJvb3QtPkZTSW5mbyAqIGJvb3QtPkJ5
 dGVzUGVyU2VjLCBTRUVLX1NFVCkKLQkJICAgICE9IGJvb3QtPkZTSW5mbyAq
 IGJvb3QtPkJ5dGVzUGVyU2VjCi0JCSAgICB8fCByZWFkKGRvc2ZzLCBmc2lu
 Zm8sIHNpemVvZiBmc2luZm8pCi0JCSAgICAhPSBzaXplb2YgZnNpbmZvKSB7
 CisJCWlmICgobiA9IGxzZWVrKGRvc2ZzLCBib290LT5GU0luZm8gKiBib290
 LT5CeXRlc1BlclNlYywgU0VFS19TRVQpKSA9PSAtMQorIAkJICAgIHx8IG4g
 IT0gYm9vdC0+RlNJbmZvICogYm9vdC0+Qnl0ZXNQZXJTZWMKKyAJCSAgICB8
 fCAobiA9IHJlYWQoZG9zZnMsIGZzaW5mbywgc2l6ZW9mIGZzaW5mbykpID09
 IC0xCisgCQkgICAgfHwgbiAhPSBzaXplb2YgZnNpbmZvKSB7CiAJCQlwZXJy
 b3IoImNvdWxkIG5vdCByZWFkIGZzaW5mbyBibG9jayIpOwogCQkJcmV0dXJu
 IEZTRkFUQUw7CiAJCX0KQEAgLTEzMywxMCArMTMzLDEwIEBACiAJCQkJZnNp
 bmZvWzB4M2ZjXSA9IGZzaW5mb1sweDNmZF0gPSAwOwogCQkJCWZzaW5mb1sw
 eDNmZV0gPSAweDU1OwogCQkJCWZzaW5mb1sweDNmZl0gPSAweGFhOwotCQkJ
 CWlmIChsc2Vlayhkb3NmcywgYm9vdC0+RlNJbmZvICogYm9vdC0+Qnl0ZXNQ
 ZXJTZWMsIFNFRUtfU0VUKQotCQkJCSAgICAhPSBib290LT5GU0luZm8gKiBi
 b290LT5CeXRlc1BlclNlYwotCQkJCSAgICB8fCB3cml0ZShkb3NmcywgZnNp
 bmZvLCBzaXplb2YgZnNpbmZvKQotCQkJCSAgICAhPSBzaXplb2YgZnNpbmZv
 KSB7CisgCQkJCWlmICgobiA9IGxzZWVrKGRvc2ZzLCBib290LT5GU0luZm8g
 KiBib290LT5CeXRlc1BlclNlYywgU0VFS19TRVQpKSA9PSAtMQorIAkJCQkg
 ICAgfHwgbiAhPSBib290LT5GU0luZm8gKiBib290LT5CeXRlc1BlclNlYwor
 IAkJCQkgICAgfHwgKG4gPSB3cml0ZShkb3NmcywgZnNpbmZvLCBzaXplb2Yg
 ZnNpbmZvKSkgPT0gLTEKKwkJCQkgICAgfHwgbiAhPSBzaXplb2YgZnNpbmZv
 KSB7CiAJCQkJCXBlcnJvcigiVW5hYmxlIHRvIHdyaXRlIEZTSW5mbyIpOwog
 CQkJCQlyZXR1cm4gRlNGQVRBTDsKIAkJCQl9CkBAIC0xNTMsOSArMTUzLDEw
 IEBACiAJCQkJICAgICAgICsgKGZzaW5mb1sweDFlZl0gPDwgMjQpOwogCQl9
 CiAKLQkJaWYgKGxzZWVrKGRvc2ZzLCBib290LT5CYWNrdXAgKiBib290LT5C
 eXRlc1BlclNlYywgU0VFS19TRVQpCi0JCSAgICAhPSBib290LT5CYWNrdXAg
 KiBib290LT5CeXRlc1BlclNlYwotCQkgICAgfHwgcmVhZChkb3NmcywgYmFj
 a3VwLCBzaXplb2YgYmFja3VwKSAhPSBzaXplb2YgIGJhY2t1cCkgeworIAkJ
 aWYgKChuID0gbHNlZWsoZG9zZnMsIGJvb3QtPkJhY2t1cCAqIGJvb3QtPkJ5
 dGVzUGVyU2VjLCBTRUVLX1NFVCkpID09IC0xCisgCQkgICAgfHwgbiAhPSBi
 b290LT5CYWNrdXAgKiBib290LT5CeXRlc1BlclNlYworIAkJICAgIHx8IChu
 ID0gcmVhZChkb3NmcywgYmFja3VwLCBzaXplb2YgYmFja3VwKSkgPT0gLTEK
 KyAJCSAgICB8fCBuICE9IHNpemVvZiBiYWNrdXApIHsKIAkJCXBlcnJvcigi
 Y291bGQgbm90IHJlYWQgYmFja3VwIGJvb3RibG9jayIpOwogCQkJcmV0dXJu
 IEZTRkFUQUw7CiAJCX0KQEAgLTIzNSwxMCArMjM2LDEyIEBACiAJc3RydWN0
 IGJvb3RibG9jayAqYm9vdDsKIHsKIAl1X2NoYXIgZnNpbmZvWzIgKiBET1NC
 T09UQkxPQ0tTSVpFXTsKLQotCWlmIChsc2Vlayhkb3NmcywgYm9vdC0+RlNJ
 bmZvICogYm9vdC0+Qnl0ZXNQZXJTZWMsIFNFRUtfU0VUKQotCSAgICAhPSBi
 b290LT5GU0luZm8gKiBib290LT5CeXRlc1BlclNlYwotCSAgICB8fCByZWFk
 KGRvc2ZzLCBmc2luZm8sIHNpemVvZiBmc2luZm8pICE9IHNpemVvZiBmc2lu
 Zm8pIHsKKyAJaW50IG47CisgIAorIAlpZiAoKG4gPSBsc2Vlayhkb3Nmcywg
 Ym9vdC0+RlNJbmZvICogYm9vdC0+Qnl0ZXNQZXJTZWMsIFNFRUtfU0VUKSkg
 PT0gLTEKKyAJICAgIHx8IG4gIT0gYm9vdC0+RlNJbmZvICogYm9vdC0+Qnl0
 ZXNQZXJTZWMKKyAJICAgIHx8IChuID0gcmVhZChkb3NmcywgZnNpbmZvLCBz
 aXplb2YgZnNpbmZvKSkgPT0gLTEKKyAJICAgIHx8IG4gIT0gc2l6ZW9mIGZz
 aW5mbykgewogCQlwZXJyb3IoImNvdWxkIG5vdCByZWFkIGZzaW5mbyBibG9j
 ayIpOwogCQlyZXR1cm4gRlNGQVRBTDsKIAl9CkBAIC0yNTAsMTAgKzI1Mywx
 MCBAQAogCWZzaW5mb1sweDFlZF0gPSAodV9jaGFyKShib290LT5GU05leHQg
 Pj4gOCk7CiAJZnNpbmZvWzB4MWVlXSA9ICh1X2NoYXIpKGJvb3QtPkZTTmV4
 dCA+PiAxNik7CiAJZnNpbmZvWzB4MWVmXSA9ICh1X2NoYXIpKGJvb3QtPkZT
 TmV4dCA+PiAyNCk7Ci0JaWYgKGxzZWVrKGRvc2ZzLCBib290LT5GU0luZm8g
 KiBib290LT5CeXRlc1BlclNlYywgU0VFS19TRVQpCi0JICAgICE9IGJvb3Qt
 PkZTSW5mbyAqIGJvb3QtPkJ5dGVzUGVyU2VjCi0JICAgIHx8IHdyaXRlKGRv
 c2ZzLCBmc2luZm8sIHNpemVvZiBmc2luZm8pCi0JICAgICE9IHNpemVvZiBm
 c2luZm8pIHsKKyAJaWYgKChuID0gbHNlZWsoZG9zZnMsIGJvb3QtPkZTSW5m
 byAqIGJvb3QtPkJ5dGVzUGVyU2VjLCBTRUVLX1NFVCkpID09IC0xCisJICAg
 IHx8IG4gIT0gYm9vdC0+RlNJbmZvICogYm9vdC0+Qnl0ZXNQZXJTZWMKKyAJ
 ICAgIHx8IChuID0gd3JpdGUoZG9zZnMsIGZzaW5mbywgc2l6ZW9mIGZzaW5m
 bykpID09IC0xCisgCSAgICB8fCBuICE9IHNpemVvZiBmc2luZm8pIHsKIAkJ
 cGVycm9yKCJVbmFibGUgdG8gd3JpdGUgRlNJbmZvIik7CiAJCXJldHVybiBG
 U0ZBVEFMOwogCX0KZGlmZiAtcnUgZnNja19tc2Rvc2ZzLm9yaWcvZXh0Lmgg
 ZnNja19tc2Rvc2ZzL2V4dC5oCi0tLSBmc2NrX21zZG9zZnMub3JpZy9leHQu
 aAkyMDEwLTAxLTA2IDExOjA3OjI0LjAwMDAwMDAwMCArMDAwMAorKysgZnNj
 a19tc2Rvc2ZzL2V4dC5oCTIwMTAtMDEtMDYgMTE6MjY6MzMuMDAwMDAwMDAw
 ICswMDAwCkBAIC04Miw3ICs4Miw3IEBACiAjZGVmaW5lIEZTRklYRkFUCTY0
 CQkvKiBGaXggZmlsZSBzeXN0ZW0gRkFUICovCiAKIC8qCi0gKiByZWFkIGEg
 Ym9vdCBibG9jayBpbiBhIG1hY2hpbmUgaW5kZXBlbmRlbmQgZmFzaGlvbiBh
 bmQgdHJhbnNsYXRlCisgKiByZWFkIGEgYm9vdCBibG9jayBpbiBhIG1hY2hp
 bmUgaW5kZXBlbmRlbnQgZmFzaGlvbiBhbmQgdHJhbnNsYXRlCiAgKiBpdCBp
 bnRvIG91ciBzdHJ1Y3QgYm9vdGJsb2NrLgogICovCiBpbnQgcmVhZGJvb3Qo
 aW50LCBzdHJ1Y3QgYm9vdGJsb2NrICopOwpkaWZmIC1ydSBmc2NrX21zZG9z
 ZnMub3JpZy9mYXQuYyBmc2NrX21zZG9zZnMvZmF0LmMKLS0tIGZzY2tfbXNk
 b3Nmcy5vcmlnL2ZhdC5jCTIwMTAtMDEtMDYgMTE6MDc6MjQuMDAwMDAwMDAw
 ICswMDAwCisrKyBmc2NrX21zZG9zZnMvZmF0LmMJMjAxMC0wMS0wNiAxMToz
 MDoyMy4wMDAwMDAwMDAgKzAwMDAKQEAgLTU0Nyw3ICs1NDcsOCBAQAogCW9m
 Zl90IG9mZjsKIAlpbnQgcmV0ID0gRlNPSzsKIAotCWJ1ZmZlciA9IG1hbGxv
 YyhmYXRzeiA9IGJvb3QtPkZBVHNlY3MgKiBib290LT5CeXRlc1BlclNlYyk7
 CisJZmF0c3ogPSBib290LT5GQVRzZWNzICogYm9vdC0+Qnl0ZXNQZXJTZWM7
 CisJYnVmZmVyID0gY2FsbG9jKGJvb3QtPkZBVHNlY3MsIGJvb3QtPkJ5dGVz
 UGVyU2VjKTsKIAlpZiAoYnVmZmVyID09IE5VTEwpIHsKIAkJcGVycm9yKCJO
 byBzcGFjZSBmb3IgRkFUIik7CiAJCXJldHVybiBGU0ZBVEFMOwo=

 --0-437212032-1262804603=:89207--