Merge "Add portable support for stuct statfs and two functions."

This commit is contained in:
Andrew Hsieh
2012-08-17 17:16:19 -07:00
committed by android code review
3 changed files with 104 additions and 0 deletions

View File

@@ -33,6 +33,7 @@ libportable_arch_src_files += \
arch-mips/ioctl.c \ arch-mips/ioctl.c \
arch-mips/mmap.c \ arch-mips/mmap.c \
arch-mips/stat.c \ arch-mips/stat.c \
arch-mips/statfs.c \
arch-mips/open.c \ arch-mips/open.c \
arch-mips/socket.c \ arch-mips/socket.c \
arch-mips/sockopt.c \ arch-mips/sockopt.c \

View File

@@ -0,0 +1,49 @@
/*
* Copyright 2012, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <statfs_portable.h>
#include <string.h>
static inline void statfs_ntop(struct statfs *n_statfs, struct statfs_portable *p_statfs)
{
memset(p_statfs, '\0', sizeof(struct statfs_portable));
p_statfs->f_type = n_statfs->f_type;
p_statfs->f_bsize = n_statfs->f_bsize;
p_statfs->f_blocks = n_statfs->f_blocks;
p_statfs->f_bfree = n_statfs->f_bfree;
p_statfs->f_bavail = n_statfs->f_bavail;
p_statfs->f_files = n_statfs->f_files;
p_statfs->f_ffree = n_statfs->f_ffree;
p_statfs->f_fsid = n_statfs->f_fsid;
p_statfs->f_namelen = n_statfs->f_namelen;
p_statfs->f_frsize = n_statfs->f_frsize;
}
int statfs_portable(const char* path, struct statfs_portable* stat)
{
struct statfs mips_stat;
int ret = statfs(path, &mips_stat);
statfs_ntop(&mips_stat, stat);
return ret;
}
int fstatfs_portable(int fd, struct statfs_portable* stat)
{
struct statfs mips_stat;
int ret = fstatfs(fd, &mips_stat);
statfs_ntop(&mips_stat, stat);
return ret;
}

View File

@@ -0,0 +1,54 @@
/*
* Copyright 2012, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef _STATFS_PORTABLE_H_
#define _STATFS_PORTABLE_H_
#include <sys/vfs.h>
/* It's easy to change kernel to support statfs */
struct statfs_portable {
uint32_t f_type;
uint32_t f_bsize;
uint64_t f_blocks;
uint64_t f_bfree;
uint64_t f_bavail;
uint64_t f_files;
uint64_t f_ffree;
__kernel_fsid_t f_fsid;
uint32_t f_namelen;
uint32_t f_frsize;
uint32_t f_spare[5];
};
/*
The MIPS Version is
struct statfs {
uint32_t f_type;
uint32_t f_bsize;
uint32_t f_frsize;
uint32_t __pad;
uint64_t f_blocks;
uint64_t f_bfree;
uint64_t f_files;
uint64_t f_ffree;
uint64_t f_bavail;
__kernel_fsid_t f_fsid;
uint32_t f_namelen;
uint32_t f_spare[6];
};
*/
#endif /* _STATFS_PORTABLE_H_ */