[libc] fix the fcntl issue in newlib
This commit is contained in:
parent
64a20c0f15
commit
4e41b0573b
|
@ -23,6 +23,7 @@
|
|||
* 2010-07-18 Bernard add stat and statfs structure definitions.
|
||||
* 2011-05-16 Yi.qiu Change parameter name of rename, "new" is C++ key word.
|
||||
* 2017-12-27 Bernard Add fcntl API.
|
||||
* 2018-02-07 Bernard Change the 3rd parameter of open/fcntl/ioctl to '...'
|
||||
*/
|
||||
|
||||
#ifndef __DFS_POSIX_H__
|
||||
|
@ -52,7 +53,7 @@ void rewinddir(DIR *d);
|
|||
int closedir(DIR* d);
|
||||
|
||||
/* file api*/
|
||||
int open(const char *file, int flags, int mode);
|
||||
int open(const char *file, int flags, ...);
|
||||
int close(int d);
|
||||
#ifdef RT_USING_NEWLIB
|
||||
_READ_WRITE_RETURN_TYPE _EXFUN(read, (int __fd, void *__buf, size_t __nbyte));
|
||||
|
@ -67,8 +68,8 @@ int unlink(const char *pathname);
|
|||
int stat(const char *file, struct stat *buf);
|
||||
int fstat(int fildes, struct stat *buf);
|
||||
int fsync(int fildes);
|
||||
int fcntl(int fildes, int cmd, void *data);
|
||||
int ioctl(int fildes, int cmd, void *data);
|
||||
int fcntl(int fildes, int cmd, ...);
|
||||
int ioctl(int fildes, int cmd, ...);
|
||||
|
||||
/* directory api*/
|
||||
int rmdir(const char *path);
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
* Change Logs:
|
||||
* Date Author Notes
|
||||
* 2009-05-27 Yi.qiu The first version
|
||||
* 2018-02-07 Bernard Change the 3rd parameter of open/fcntl/ioctl to '...'
|
||||
*/
|
||||
|
||||
#include <dfs.h>
|
||||
|
@ -38,11 +39,10 @@
|
|||
*
|
||||
* @param file the path name of file.
|
||||
* @param flags the file open flags.
|
||||
* @param mode ignored parameter
|
||||
*
|
||||
* @return the non-negative integer on successful open, others for failed.
|
||||
*/
|
||||
int open(const char *file, int flags, int mode)
|
||||
int open(const char *file, int flags, ...)
|
||||
{
|
||||
int fd, result;
|
||||
struct dfs_fd *d;
|
||||
|
@ -428,7 +428,7 @@ RTM_EXPORT(fsync);
|
|||
* @return 0 on successful completion. Otherwise, -1 shall be returned and errno
|
||||
* set to indicate the error.
|
||||
*/
|
||||
int fcntl(int fildes, int cmd, void *data)
|
||||
int fcntl(int fildes, int cmd, ...)
|
||||
{
|
||||
int ret = -1;
|
||||
struct dfs_fd *d;
|
||||
|
@ -437,7 +437,14 @@ int fcntl(int fildes, int cmd, void *data)
|
|||
d = fd_get(fildes);
|
||||
if (d)
|
||||
{
|
||||
ret = dfs_file_ioctl(d, cmd, data);
|
||||
void* arg;
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, cmd);
|
||||
arg = va_arg(ap, void*);
|
||||
va_end(ap);
|
||||
|
||||
ret = dfs_file_ioctl(d, cmd, arg);
|
||||
fd_put(d);
|
||||
}
|
||||
else ret = -EBADF;
|
||||
|
@ -464,10 +471,17 @@ RTM_EXPORT(fcntl);
|
|||
* @return 0 on successful completion. Otherwise, -1 shall be returned and errno
|
||||
* set to indicate the error.
|
||||
*/
|
||||
int ioctl(int fildes, int cmd, void *data)
|
||||
int ioctl(int fildes, int cmd, ...)
|
||||
{
|
||||
void* arg;
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, cmd);
|
||||
arg = va_arg(ap, void*);
|
||||
va_end(ap);
|
||||
|
||||
/* we use fcntl for this API. */
|
||||
return fcntl(fildes, cmd, data);
|
||||
return fcntl(fildes, cmd, arg);
|
||||
}
|
||||
RTM_EXPORT(ioctl);
|
||||
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
#ifndef __RTT_FCNTL_H__
|
||||
#define __RTT_FCNTL_H__
|
||||
|
||||
/* Operation flags */
|
||||
#define O_RDONLY 0x0000000
|
||||
#define O_WRONLY 0x0000001
|
||||
#define O_RDWR 0x0000002
|
||||
#define O_ACCMODE 0x0000003
|
||||
#define O_CREAT 0x0000100
|
||||
#define O_EXCL 0x0000200
|
||||
#define O_TRUNC 0x0001000
|
||||
#define O_APPEND 0x0002000
|
||||
#define O_DIRECTORY 0x0200000
|
||||
#define O_BINARY 0x0008000
|
||||
|
||||
#endif
|
|
@ -1,6 +1,27 @@
|
|||
/*
|
||||
* fcntl.h file in libc
|
||||
*/
|
||||
* File : libc_fcntl.h
|
||||
* This file is part of RT-Thread RTOS
|
||||
* COPYRIGHT (C) 2017 - 2018, RT-Thread Development Team
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Change Logs:
|
||||
* Date Author Notes
|
||||
* 2018-02-07 Bernard Add O_DIRECTORY definition in NEWLIB mode.
|
||||
*/
|
||||
|
||||
#ifndef LIBC_FCNTL_H__
|
||||
#define LIBC_FCNTL_H__
|
||||
|
||||
|
@ -8,11 +29,10 @@
|
|||
#include <fcntl.h>
|
||||
|
||||
#ifndef O_NONBLOCK
|
||||
#define O_NONBLOCK 04000
|
||||
#define O_NONBLOCK 0x4000
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32)
|
||||
#define O_DIRECTORY 0200000
|
||||
#define O_ACCMODE (_O_RDONLY | _O_WRONLY | _O_RDWR)
|
||||
#endif
|
||||
|
||||
|
@ -23,6 +43,10 @@
|
|||
#define F_SETFL 4
|
||||
#endif
|
||||
|
||||
#ifndef O_DIRECTORY
|
||||
#define O_DIRECTORY 0x200000
|
||||
#endif
|
||||
|
||||
#else
|
||||
#define O_RDONLY 00
|
||||
#define O_WRONLY 01
|
||||
|
@ -77,4 +101,3 @@
|
|||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue