@@ -290,7 +290,7 @@ static FileHandle *get_console(int fd)
290
290
}
291
291
292
292
/* Deal with the fact C library may not _open descriptors 0, 1, 2 - auto bind */
293
- static FileHandle *get_fhc (int fd)
293
+ FileHandle *mbed::mbed_file_handle (int fd)
294
294
{
295
295
if (fd >= OPEN_MAX) {
296
296
return NULL ;
@@ -490,13 +490,13 @@ extern "C" FILEHANDLE PREFIX(_open)(const char *name, int openflags)
490
490
/* Use the posix convention that stdin,out,err are filehandles 0,1,2.
491
491
*/
492
492
if (std::strcmp (name, __stdin_name) == 0 ) {
493
- get_fhc (STDIN_FILENO);
493
+ mbed_file_handle (STDIN_FILENO);
494
494
return STDIN_FILENO;
495
495
} else if (std::strcmp (name, __stdout_name) == 0 ) {
496
- get_fhc (STDOUT_FILENO);
496
+ mbed_file_handle (STDOUT_FILENO);
497
497
return STDOUT_FILENO;
498
498
} else if (std::strcmp (name, __stderr_name) == 0 ) {
499
- get_fhc (STDERR_FILENO);
499
+ mbed_file_handle (STDERR_FILENO);
500
500
return STDERR_FILENO;
501
501
}
502
502
#endif
@@ -555,7 +555,7 @@ extern "C" int PREFIX(_close)(FILEHANDLE fh)
555
555
556
556
extern " C" int close (int fildes)
557
557
{
558
- FileHandle *fhc = get_fhc (fildes);
558
+ FileHandle *fhc = mbed_file_handle (fildes);
559
559
filehandles[fildes] = NULL ;
560
560
if (fhc == NULL ) {
561
561
errno = EBADF;
@@ -667,7 +667,7 @@ extern "C" int PREFIX(_write)(FILEHANDLE fh, const unsigned char *buffer, unsign
667
667
extern " C" ssize_t write (int fildes, const void *buf, size_t length)
668
668
{
669
669
670
- FileHandle *fhc = get_fhc (fildes);
670
+ FileHandle *fhc = mbed_file_handle (fildes);
671
671
if (fhc == NULL ) {
672
672
errno = EBADF;
673
673
return -1 ;
@@ -761,8 +761,7 @@ extern "C" int PREFIX(_read)(FILEHANDLE fh, unsigned char *buffer, unsigned int
761
761
762
762
extern " C" ssize_t read (int fildes, void *buf, size_t length)
763
763
{
764
-
765
- FileHandle *fhc = get_fhc (fildes);
764
+ FileHandle *fhc = mbed_file_handle (fildes);
766
765
if (fhc == NULL ) {
767
766
errno = EBADF;
768
767
return -1 ;
@@ -789,7 +788,7 @@ extern "C" int _isatty(FILEHANDLE fh)
789
788
790
789
extern " C" int isatty (int fildes)
791
790
{
792
- FileHandle *fhc = get_fhc (fildes);
791
+ FileHandle *fhc = mbed_file_handle (fildes);
793
792
if (fhc == NULL ) {
794
793
errno = EBADF;
795
794
return 0 ;
@@ -828,7 +827,7 @@ int _lseek(FILEHANDLE fh, int offset, int whence)
828
827
829
828
extern " C" off_t lseek (int fildes, off_t offset, int whence)
830
829
{
831
- FileHandle *fhc = get_fhc (fildes);
830
+ FileHandle *fhc = mbed_file_handle (fildes);
832
831
if (fhc == NULL ) {
833
832
errno = EBADF;
834
833
return -1 ;
@@ -844,7 +843,7 @@ extern "C" off_t lseek(int fildes, off_t offset, int whence)
844
843
845
844
extern " C" int ftruncate (int fildes, off_t length)
846
845
{
847
- FileHandle *fhc = get_fhc (fildes);
846
+ FileHandle *fhc = mbed_file_handle (fildes);
848
847
if (fhc == NULL ) {
849
848
errno = EBADF;
850
849
return -1 ;
@@ -868,7 +867,7 @@ extern "C" int PREFIX(_ensure)(FILEHANDLE fh)
868
867
869
868
extern " C" int fsync (int fildes)
870
869
{
871
- FileHandle *fhc = get_fhc (fildes);
870
+ FileHandle *fhc = mbed_file_handle (fildes);
872
871
if (fhc == NULL ) {
873
872
errno = EBADF;
874
873
return -1 ;
@@ -886,7 +885,7 @@ extern "C" int fsync(int fildes)
886
885
#ifdef __ARMCC_VERSION
887
886
extern " C" long PREFIX (_flen)(FILEHANDLE fh)
888
887
{
889
- FileHandle *fhc = get_fhc (fh);
888
+ FileHandle *fhc = mbed_file_handle (fh);
890
889
if (fhc == NULL ) {
891
890
errno = EBADF;
892
891
return -1 ;
@@ -936,7 +935,7 @@ extern "C" int _fstat(int fh, struct stat *st)
936
935
937
936
extern " C" int fstat (int fildes, struct stat *st)
938
937
{
939
- FileHandle *fhc = get_fhc (fildes);
938
+ FileHandle *fhc = mbed_file_handle (fildes);
940
939
if (fhc == NULL ) {
941
940
errno = EBADF;
942
941
return -1 ;
@@ -949,7 +948,7 @@ extern "C" int fstat(int fildes, struct stat *st)
949
948
950
949
extern " C" int fcntl (int fildes, int cmd, ...)
951
950
{
952
- FileHandle *fhc = get_fhc (fildes);
951
+ FileHandle *fhc = mbed_file_handle (fildes);
953
952
if (fhc == NULL ) {
954
953
errno = EBADF;
955
954
return -1 ;
@@ -994,7 +993,7 @@ extern "C" int poll(struct pollfd fds[], nfds_t nfds, int timeout)
994
993
for (nfds_t n = 0 ; n < nfds; n++) {
995
994
// Underlying FileHandle poll returns POLLNVAL if given NULL, so
996
995
// we don't need to take special action.
997
- fhs[n].fh = get_fhc (fds[n].fd );
996
+ fhs[n].fh = mbed_file_handle (fds[n].fd );
998
997
fhs[n].events = fds[n].events ;
999
998
}
1000
999
int ret = poll (fhs, nfds, timeout);
0 commit comments