X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Ffileio.c;h=71e807ff7870a7aa4e992de1c7d42180acbb28b5;hb=2eba49b8b135fd6cbf95920f2794b411027f3d2e;hp=0fc1b11df96ee470e1aa7a946a55eaa21bd97a59;hpb=c97caebccd07be7e5bae61d6d40921e01786ba06;p=openocd.git diff --git a/src/helper/fileio.c b/src/helper/fileio.c index 0fc1b11df9..71e807ff78 100644 --- a/src/helper/fileio.c +++ b/src/helper/fileio.c @@ -2,7 +2,7 @@ * Copyright (C) 2007 by Dominic Rath * * Dominic.Rath@gmx.de * * * - * Copyright (C) 2007,2008 Øyvind Harboe * + * Copyright (C) 2007,2008 Øyvind Harboe * * oyvind.harboe@zylin.com * * * * Copyright (C) 2008 by Spencer Oliver * @@ -31,26 +31,26 @@ #include "configuration.h" #include "fileio.h" -static inline int fileio_open_local(fileio_t *fileio) +static inline int fileio_open_local(struct fileio *fileio) { - char access[4]; + char file_access[4]; switch (fileio->access) { case FILEIO_READ: - strcpy(access, "r"); + strcpy(file_access, "r"); break; case FILEIO_WRITE: - strcpy(access, "w"); + strcpy(file_access, "w"); break; case FILEIO_READWRITE: - strcpy(access, "w+"); + strcpy(file_access, "w+"); break; case FILEIO_APPEND: - strcpy(access, "a"); + strcpy(file_access, "a"); break; case FILEIO_APPENDREAD: - strcpy(access, "a+"); + strcpy(file_access, "a+"); break; default: LOG_ERROR("BUG: access neither read, write nor readwrite"); @@ -62,10 +62,10 @@ static inline int fileio_open_local(fileio_t *fileio) if (fileio->type == FILEIO_BINARY) #endif { - strcat(access, "b"); + strcat(file_access, "b"); } - if (!(fileio->file = open_file_from_path (fileio->url, access))) + if (!(fileio->file = open_file_from_path (fileio->url, file_access))) { LOG_ERROR("couldn't open %s", fileio->url); return ERROR_FILEIO_OPERATION_FAILED; @@ -98,7 +98,7 @@ static inline int fileio_open_local(fileio_t *fileio) return ERROR_OK; } -int fileio_open(fileio_t *fileio, const char *url, enum fileio_access access, enum fileio_type type) +int fileio_open(struct fileio *fileio, const char *url, enum fileio_access access, enum fileio_type type) { int retval = ERROR_OK; @@ -111,7 +111,7 @@ int fileio_open(fileio_t *fileio, const char *url, enum fileio_access access, en return retval; } -static inline int fileio_close_local(fileio_t *fileio) +static inline int fileio_close_local(struct fileio *fileio) { int retval; if ((retval = fclose(fileio->file)) != 0) @@ -131,19 +131,19 @@ static inline int fileio_close_local(fileio_t *fileio) return ERROR_OK; } -int fileio_close(fileio_t *fileio) +int fileio_close(struct fileio *fileio) { int retval; retval = fileio_close_local(fileio); - free(fileio->url); + free((void*)fileio->url); fileio->url = NULL; return retval; } -int fileio_seek(fileio_t *fileio, uint32_t position) +int fileio_seek(struct fileio *fileio, size_t position) { int retval; if ((retval = fseek(fileio->file, position, SEEK_SET)) != 0) @@ -155,32 +155,34 @@ int fileio_seek(fileio_t *fileio, uint32_t position) return ERROR_OK; } -static inline int fileio_local_read(fileio_t *fileio, uint32_t size, uint8_t *buffer, uint32_t *size_read) +static int fileio_local_read(struct fileio *fileio, + size_t size, void *buffer, size_t *size_read) { - *size_read = fread(buffer, 1, size, fileio->file); - - return ERROR_OK; + ssize_t retval = fread(buffer, 1, size, fileio->file); + *size_read = (retval >= 0) ? retval : 0; + return (retval < 0) ? retval : ERROR_OK; } -int fileio_read(fileio_t *fileio, uint32_t size, uint8_t *buffer, uint32_t *size_read) +int fileio_read(struct fileio *fileio, size_t size, void *buffer, + size_t *size_read) { return fileio_local_read(fileio, size, buffer, size_read); } -int fileio_read_u32(fileio_t *fileio, uint32_t *data) +int fileio_read_u32(struct fileio *fileio, uint32_t *data) { uint8_t buf[4]; - uint32_t size_read; - int retval; - - if ((retval = fileio_local_read(fileio, 4, buf, &size_read)) != ERROR_OK) - return retval; - *data = be_to_h_u32(buf); - - return ERROR_OK; + size_t size_read; + int retval = fileio_local_read(fileio, sizeof(uint32_t), buf, &size_read); + if (ERROR_OK == retval && sizeof(uint32_t) != size_read) + retval = -EIO; + if (ERROR_OK == retval) + *data = be_to_h_u32(buf); + return retval; } -static inline int fileio_local_fgets(fileio_t *fileio, uint32_t size, char *buffer) +static int fileio_local_fgets(struct fileio *fileio, + size_t size, void *buffer) { if (fgets(buffer, size, fileio->file) == NULL) return ERROR_FILEIO_OPERATION_FAILED; @@ -188,40 +190,37 @@ static inline int fileio_local_fgets(fileio_t *fileio, uint32_t size, char *buff return ERROR_OK; } -int fileio_fgets(fileio_t *fileio, uint32_t size, char *buffer) +int fileio_fgets(struct fileio *fileio, size_t size, void *buffer) { return fileio_local_fgets(fileio, size, buffer); } -static inline int fileio_local_write(fileio_t *fileio, uint32_t size, const uint8_t *buffer, uint32_t *size_written) +static int fileio_local_write(struct fileio *fileio, + size_t size, const void *buffer, size_t *size_written) { - *size_written = fwrite(buffer, 1, size, fileio->file); - - return ERROR_OK; + ssize_t retval = fwrite(buffer, 1, size, fileio->file); + *size_written = (retval >= 0) ? retval : 0; + return (retval < 0) ? retval : ERROR_OK; } -int fileio_write(fileio_t *fileio, uint32_t size, const uint8_t *buffer, uint32_t *size_written) +int fileio_write(struct fileio *fileio, + size_t size, const void *buffer, size_t *size_written) { - int retval; - - retval = fileio_local_write(fileio, size, buffer, size_written); - + int retval = fileio_local_write(fileio, size, buffer, size_written); if (retval == ERROR_OK) fileio->size += *size_written; - - return retval;; + return retval; } -int fileio_write_u32(fileio_t *fileio, uint32_t data) +int fileio_write_u32(struct fileio *fileio, uint32_t data) { uint8_t buf[4]; - uint32_t size_written; - int retval; - h_u32_to_be(buf, data); - if ((retval = fileio_local_write(fileio, 4, buf, &size_written)) != ERROR_OK) - return retval; + size_t size_written; + int retval = fileio_write(fileio, 4, buf, &size_written); + if (ERROR_OK == retval && size_written != sizeof(uint32_t)) + retval = -EIO; - return ERROR_OK; + return retval; }