ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove excessive use of printf/scanf in mbed_fdopen/_open

pull/4831/head
Fahrzin Hemmati 2017-07-30 03:19:26 -07:00
parent 2305a8c7e4
commit e5ef69a925
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platform/mbed_retarget.cpp
View File

@ -231,7 +231,7 @@ extern "C" FILEHANDLE PREFIX(_open)(const char* name, int openmode) {
/* FILENAME: ":0x12345678" describes a FileHandle* */ /* FILENAME: ":0x12345678" describes a FileHandle* */
if (name[0] == ':') { if (name[0] == ':') {
void *p; void *p;
std::sscanf(name, ":%p", &p); memcpy(&p, name + 1, sizeof(p));
res = (FileHandle*)p; res = (FileHandle*)p;
/* FILENAME: "/file_system/file_name" */ /* FILENAME: "/file_system/file_name" */
@ -826,8 +826,12 @@ void mbed_set_unbuffered_stream(std::FILE *_file) {
*/ */
std::FILE *mbed_fdopen(FileHandle *fh, const char *mode) std::FILE *mbed_fdopen(FileHandle *fh, const char *mode)
{ {
char buf[12]; /* :0x12345678 + null byte */ char buf[2 + sizeof(fh) + 1]; /* :(pointer) + null byte */
std::sprintf(buf, ":%p", fh); static_assert(sizeof(buf) == 7, "Pointers should be 4 bytes.");
buf[0] = ':';
memcpy(buf + 1, &fh, sizeof(fh));
buf[1 + sizeof(fh)] = '\0';
std::FILE *stream = std::fopen(buf, mode); std::FILE *stream = std::fopen(buf, mode);
/* newlib-nano doesn't appear to ever call _isatty itself, so /* newlib-nano doesn't appear to ever call _isatty itself, so
* happily fully buffers an interactive stream. Deal with that here. * happily fully buffers an interactive stream. Deal with that here.