From: Guido van Rossum Date: Tue, 15 Dec 1992 21:43:04 +0000 (+0000) Subject: Fix misunderstood readdir count (bytes, not dir entries) X-Git-Tag: v0.9.8~46 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad5f862125fec14b11e76628430d2b4722195400;p=thirdparty%2FPython%2Fcpython.git Fix misunderstood readdir count (bytes, not dir entries) and minor other changes. --- diff --git a/Demo/rpc/nfsclient.py b/Demo/rpc/nfsclient.py index 645a2a70dc8d..7a3a87d90e31 100644 --- a/Demo/rpc/nfsclient.py +++ b/Demo/rpc/nfsclient.py @@ -169,7 +169,7 @@ class NFSClient(UDPClient): # Shorthand to get the entire contents of a directory def Listdir(self, dir): list = [] - ra = (dir, 0, 16) + ra = (dir, 0, 2000) while 1: (status, rest) = self.Readdir(ra) if status <> NFS_OK: @@ -177,10 +177,9 @@ class NFSClient(UDPClient): entries, eof = rest last_cookie = None for fileid, name, cookie in entries: - print (fileid, name, cookie) # XXX list.append(fileid, name) last_cookie = cookie - if eof or not last_cookie: + if eof or last_cookie == None: break ra = (ra[0], last_cookie, ra[2]) return list @@ -208,6 +207,6 @@ def test(): print as list = ncl.Listdir(fh) for item in list: print item - mcl.Unmnt(filesys) + mcl.Umnt(filesys) test()