diff options
| author | James Peach <jpeach@samba.org> | 2006-04-24 00:16:51 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:04:14 -0500 |
| commit | 6ab33938d5239e8688440f65e802f627622d301b (patch) | |
| tree | 7c2253d8e3252ccd973b2d2d36754d0d0e196d7a /source4/ntvfs/posix/pvfs_dirlist.c | |
| parent | f380d365eaad89db2c46331a3fa2d5d8600aeba1 (diff) | |
| download | samba-6ab33938d5239e8688440f65e802f627622d301b.tar.gz samba-6ab33938d5239e8688440f65e802f627622d301b.tar.bz2 samba-6ab33938d5239e8688440f65e802f627622d301b.zip | |
r15186: Introduce ISDOT and ISDOTDOT macros for testing whether a filename is
"." for "..". These express the intention better that strcmp or strequal
and improve searchability via cscope/ctags.
(This used to be commit 7e4ad7e8e5ec266b969e3075c4ad7f021571f24e)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_dirlist.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_dirlist.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source4/ntvfs/posix/pvfs_dirlist.c b/source4/ntvfs/posix/pvfs_dirlist.c index a61fc458b3..a3eaca3cbb 100644 --- a/source4/ntvfs/posix/pvfs_dirlist.c +++ b/source4/ntvfs/posix/pvfs_dirlist.c @@ -218,8 +218,7 @@ const char *pvfs_list_next(struct pvfs_dir *dir, uint_t *ofs) while ((de = readdir(dir->dir))) { const char *dname = de->d_name; - if (strcmp(dname, ".") == 0 || - strcmp(dname, "..") == 0) { + if (ISDOT(dname) || ISDOT(dname)) { continue; } @@ -269,13 +268,13 @@ NTSTATUS pvfs_list_seek(struct pvfs_dir *dir, const char *name, uint_t *ofs) struct dirent *de; int i; - if (strcmp(name, ".") == 0) { + if (ISDOT(name)) { dir->offset = DIR_OFFSET_DOTDOT; *ofs = dir->offset; return NT_STATUS_OK; } - if (strcmp(name, "..") == 0) { + if (ISDOTDOT(name)) { dir->offset = DIR_OFFSET_BASE; *ofs = dir->offset; return NT_STATUS_OK; @@ -324,8 +323,7 @@ BOOL pvfs_directory_empty(struct pvfs_state *pvfs, struct pvfs_filename *name) } while ((de = readdir(dir))) { - if (strcmp(de->d_name, ".") != 0 && - strcmp(de->d_name, "..") != 0) { + if (!ISDOT(de->d_name) && !ISDOTDOT(de->d_name)) { closedir(dir); return False; } |