diff options
author | Spencer Oliver <ntfreak@users.sourceforge.net> | 2010-01-27 21:20:18 +0000 |
---|---|---|
committer | Spencer Oliver <ntfreak@users.sourceforge.net> | 2010-01-28 20:21:31 +0000 |
commit | 465a06dfdc6c5d4af377dac7b9d71845cb0dc034 (patch) | |
tree | 2e3e5e3a4089ca621e486795b37154a1309fce1b /src | |
parent | 3172be80a3e14f4c8c3628a37db348c04fd60fc4 (diff) | |
download | openocd+libswd-465a06dfdc6c5d4af377dac7b9d71845cb0dc034.tar.gz openocd+libswd-465a06dfdc6c5d4af377dac7b9d71845cb0dc034.tar.bz2 openocd+libswd-465a06dfdc6c5d4af377dac7b9d71845cb0dc034.tar.xz openocd+libswd-465a06dfdc6c5d4af377dac7b9d71845cb0dc034.zip |
ARM semihosting: fix writing to stdout
SYS_FLEN would be called before a write on a descriptor to check its size.
Currently lseek would fail with -1 when given the stdout/stderr descriptor.
Changing to use fstat seems to be the standard way of handling this.
Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
Diffstat (limited to 'src')
-rw-r--r-- | src/helper/system.h | 2 | ||||
-rw-r--r-- | src/target/arm_semihosting.c | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/helper/system.h b/src/helper/system.h index 169df1cb..af19d018 100644 --- a/src/helper/system.h +++ b/src/helper/system.h @@ -50,6 +50,8 @@ #ifdef _WIN32 #include <winsock2.h> #include <ws2tcpip.h> +#include <sys/types.h> +#include <sys/stat.h> #endif // --- platform specific headers --- diff --git a/src/target/arm_semihosting.c b/src/target/arm_semihosting.c index f4244c84..1d0acd63 100644 --- a/src/target/arm_semihosting.c +++ b/src/target/arm_semihosting.c @@ -230,18 +230,14 @@ static int do_semihosting(struct target *target) return retval; else { int fd = target_buffer_get_u32(target, params+0); - off_t cur = lseek(fd, 0, SEEK_CUR); - if (cur == (off_t)-1) { + struct stat buf; + result = fstat(fd, &buf); + if (result == -1) { armv4_5->semihosting_errno = errno; result = -1; break; } - result = lseek(fd, 0, SEEK_END); - armv4_5->semihosting_errno = errno; - if (lseek(fd, cur, SEEK_SET) == (off_t)-1) { - armv4_5->semihosting_errno = errno; - result = -1; - } + result = buf.st_size; } break; |