d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use C99-style initialization for struct dirent in preparation for

Browse Source 
changing the structure.

Sponsored by:	Google Summer of Code 2011
This commit is contained in:
Gleb Kurtsou 2012-05-25 09:16:59 +00:00
parent 6aca1fbc91
commit fb2a3e6ea1
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/fs/hpfs/hpfs_vnops.c
View File

@ -797,10 +797,21 @@ hpfs_de_uiomove (
}
static struct dirent hpfs_de_dot =
{ 0, sizeof(struct dirent), DT_DIR, 1, "." };
static struct dirent hpfs_de_dotdot =
{ 0, sizeof(struct dirent), DT_DIR, 2, ".." };
static struct dirent hpfs_de_dot = {
.d_fileno = 0,
.d_reclen = sizeof(struct dirent),
.d_type = DT_DIR,
.d_namlen = 1,
.d_name = "."
};
static struct dirent hpfs_de_dotdot = {
.d_fileno = 0,
.d_reclen = sizeof(struct dirent),
.d_type = DT_DIR,
.d_namlen = 2,
.d_name = ".."
};
int
hpfs_readdir(ap)
struct vop_readdir_args /* {

18
sys/fs/ntfs/ntfs_vnops.c
View File

@ -493,8 +493,13 @@ ntfs_readdir(ap)
/* Simulate . in every dir except ROOT */
if( ip->i_number != NTFS_ROOTINO ) {
struct dirent dot = { NTFS_ROOTINO,
sizeof(struct dirent), DT_DIR, 1, "." };
struct dirent dot = {
.d_fileno = NTFS_ROOTINO,
.d_reclen = sizeof(struct dirent),
.d_type = DT_DIR,
.d_namlen = 1,
.d_name = "."
};
if( uio->uio_offset < sizeof(struct dirent) ) {
dot.d_fileno = ip->i_number;
@ -508,8 +513,13 @@ ntfs_readdir(ap)
/* Simulate .. in every dir including ROOT */
if( uio->uio_offset < 2 * sizeof(struct dirent) ) {
struct dirent dotdot = { NTFS_ROOTINO,
sizeof(struct dirent), DT_DIR, 2, ".." };
struct dirent dotdot = {
.d_fileno = NTFS_ROOTINO,
.d_reclen = sizeof(struct dirent),
.d_type = DT_DIR,
.d_namlen = 2,
.d_name = ".."
};
error = uiomove((char *)&dotdot,sizeof(struct dirent),uio);
if(error)