--------------Boundary-00=_4YR0OAN5HEEL4NQKHJ98 Content-Type: text/plain Content-Transfer-Encoding: 8bit On Mon, 28 Aug 2000, Simon Hausmann wrote: > > Hi, > > There is a small problem with the isParentOf() method of KURL. It > currently breaks when checking if /blah/foo is a parent of /blah/foo2 . > The current isParentOf method returns true, which however is not correct > ;-) . The attached patch fixes it, but I'm not sure if that's the correct > way of doing it. Please review it :-) (some KURL expert) I think it gives a false hit for /blah/foo and /blah/foo2/test. And what about /blah/foo/ and /blah/foo/test? What about if (p1.isEmpty() || p1[p1.length()-1] != '/') p1 += '/'; return (p2.startsWith(p1)); *checking actual code* Hm.. it seems cleanDirPath strips the leading '/' that KURL::path(1) had so carefully added. What about the attached patch then. Cheers, Waldo -- KDE/Linux, made for people, made by people. --------------Boundary-00=_4YR0OAN5HEEL4NQKHJ98 Content-Type: text/plain; name="kurl.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="kurl.diff" SW5kZXg6IGt1cmwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVsaWJzL2tk ZWNvcmUva3VybC5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTM3CmRpZmYgLXUgLXIxLjEz NyBrdXJsLmNwcAotLS0ga3VybC5jcHAJMjAwMC8wOC8xNCAyMDowMTowMQkxLjEzNworKysga3Vy bC5jcHAJMjAwMC8wOC8yOCAyMDo0MDoyOQpAQCAtNzM5LDE1ICs3MzksMTQgQEAKICAgICAgICBt X3N0clJlZl9lbmNvZGVkID09IF91Lm1fc3RyUmVmX2VuY29kZWQgJiYKICAgICAgICBtX2lQb3J0 ID09IF91Lm1faVBvcnQgKQogICB7Ci0gICAgUVN0cmluZyBwMSggUURpcjo6Y2xlYW5EaXJQYXRo KCBwYXRoKDEpICkgKTsKLSAgICBRU3RyaW5nIHAyKCBRRGlyOjpjbGVhbkRpclBhdGgoIF91LnBh dGgoMSkgKSApOworICAgIFFTdHJpbmcgcDEoIFFEaXI6OmNsZWFuRGlyUGF0aCggcGF0aCgpICkr Jy8nICk7CisgICAgUVN0cmluZyBwMiggUURpcjo6Y2xlYW5EaXJQYXRoKCBfdS5wYXRoKCkgKSsn LycgKTsKIAogICAgIC8va2REZWJ1ZygxMjYpIDw8ICJwMT0iIDw8IHAxIDw8IGVuZGw7CiAgICAg Ly9rZERlYnVnKDEyNikgPDwgInAyPSIgPDwgcDIgPDwgZW5kbDsKICAgICAvL2tkRGVidWcoMTI2 KSA8PCAicDEubGVuZ3RoKCk9IiA8PCBwMS5sZW5ndGgoKSA8PCBlbmRsOwogICAgIC8va2REZWJ1 ZygxMjYpIDw8ICJwMi5sZWZ0KCEkKT0iIDw8IHAyLmxlZnQoIHAxLmxlbmd0aCgpICkgPDwgZW5k bDsKLSAgICBpZiAoIHAxID09IHAyLmxlZnQoIHAxLmxlbmd0aCgpICkgKQotICAgICAgcmV0dXJu IHRydWU7CisgICAgcmV0dXJuIHAyLnN0YXJ0c1dpdGgoIHAxICk7CiAgIH0KICAgcmV0dXJuIGZh bHNlOwogfQo= --------------Boundary-00=_4YR0OAN5HEEL4NQKHJ98--