/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/_readdir_pyx.pyx

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 01:35:53 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610013553-560y7mn3su4pp763
Fix remaining tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/_readdir_pyx.pyx
16
16
 
17
17
"""Wrapper for readdir which returns files ordered by inode."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
 
20
22
import os
21
23
import sys
22
24
 
23
 
#python2.4 support
24
25
cdef extern from "python-compat.h":
25
26
    pass
26
27
 
106
107
    int closedir(DIR * dir)
107
108
    dirent *readdir(DIR *dir)
108
109
 
 
110
cdef object _directory
109
111
_directory = 'directory'
 
112
cdef object _chardev
110
113
_chardev = 'chardev'
 
114
cdef object _block
111
115
_block = 'block'
 
116
cdef object _file
112
117
_file = 'file'
 
118
cdef object _fifo
113
119
_fifo = 'fifo'
 
120
cdef object _symlink
114
121
_symlink = 'symlink'
 
122
cdef object _socket
115
123
_socket = 'socket'
 
124
cdef object _unknown
116
125
_unknown = 'unknown'
117
 
_missing = 'missing'
118
126
 
119
127
# add a typedef struct dirent dirent to workaround pyrex
120
128
cdef extern from 'readdir.h':
159
167
                     self.st_mtime, self.st_ctime))
160
168
 
161
169
 
162
 
from bzrlib import osutils
 
170
from . import osutils
163
171
 
 
172
cdef object _safe_utf8
 
173
_safe_utf8 = osutils.safe_utf8
164
174
 
165
175
cdef class UTF8DirReader:
166
176
    """A dir reader for utf8 file systems."""
167
177
 
168
 
    cdef readonly object _safe_utf8
169
 
    cdef _directory, _chardev, _block, _file, _fifo, _symlink
170
 
    cdef _socket, _unknown
171
 
 
172
 
    def __init__(self):
173
 
        self._safe_utf8 = osutils.safe_utf8
174
 
        self._directory = _directory
175
 
        self._chardev = _chardev
176
 
        self._block = _block
177
 
        self._file = _file
178
 
        self._fifo = _fifo
179
 
        self._symlink = _symlink
180
 
        self._socket = _socket
181
 
        self._unknown = _unknown
182
 
 
183
178
    def kind_from_mode(self, int mode):
184
179
        """Get the kind of a path from a mode status."""
185
180
        return self._kind_from_mode(mode)
187
182
    cdef _kind_from_mode(self, int mode):
188
183
        # Files and directories are the most common - check them first.
189
184
        if S_ISREG(mode):
190
 
            return self._file
 
185
            return _file
191
186
        if S_ISDIR(mode):
192
 
            return self._directory
 
187
            return _directory
193
188
        if S_ISCHR(mode):
194
 
            return self._chardev
 
189
            return _chardev
195
190
        if S_ISBLK(mode):
196
 
            return self._block
 
191
            return _block
197
192
        if S_ISLNK(mode):
198
 
            return self._symlink
 
193
            return _symlink
199
194
        if S_ISFIFO(mode):
200
 
            return self._fifo
 
195
            return _fifo
201
196
        if S_ISSOCK(mode):
202
 
            return self._socket
203
 
        return self._unknown
 
197
            return _socket
 
198
        return _unknown
204
199
 
205
200
    def top_prefix_to_starting_dir(self, top, prefix=""):
206
201
        """See DirReader.top_prefix_to_starting_dir."""
207
 
        return (self._safe_utf8(prefix), None, None, None,
208
 
            self._safe_utf8(top))
 
202
        return (_safe_utf8(prefix), None, None, None, _safe_utf8(top))
209
203
 
210
204
    def read_dir(self, prefix, top):
211
205
        """Read a single directory from a utf8 file system.
307
301
        if orig_dir_fd == -1:
308
302
            raise_os_error(errno, "open: ", ".")
309
303
        if -1 == chdir(path):
 
304
            # Ignore the return value, because we are already raising an
 
305
            # exception
 
306
            close(orig_dir_fd)
310
307
            raise_os_error(errno, "chdir: ", path)
311
308
    else:
312
309
        orig_dir_fd = -1