X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Ffileio.c;h=47494dfcd8e412974c457ac628689d264536c27c;hp=c6f45e6ba78bb23d8dec0bcdb00abe2b5ee4ed15;hb=bcaf775fc10d88d2c63c06bafada141895318b34;hpb=517ba0690dcc9e859a05df2113ce32401a5ab254 diff --git a/src/helper/fileio.c b/src/helper/fileio.c index c6f45e6ba7..47494dfcd8 100644 --- a/src/helper/fileio.c +++ b/src/helper/fileio.c @@ -19,9 +19,7 @@ * 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. * + * along with this program. If not, see . * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -32,18 +30,33 @@ #include "configuration.h" #include "fileio.h" -struct fileio_internal { +struct fileio { char *url; - ssize_t size; + size_t size; enum fileio_type type; enum fileio_access access; FILE *file; }; -static inline int fileio_close_local(struct fileio_internal *fileio); -static inline int fileio_open_local(struct fileio_internal *fileio) +static inline int fileio_close_local(struct fileio *fileio) +{ + int retval = fclose(fileio->file); + if (retval != 0) { + if (retval == EBADF) + LOG_ERROR("BUG: fileio->file not a valid file descriptor"); + else + LOG_ERROR("couldn't close %s: %s", fileio->url, strerror(errno)); + + return ERROR_FILEIO_OPERATION_FAILED; + } + + return ERROR_OK; +} + +static inline int fileio_open_local(struct fileio *fileio) { char file_access[4]; + ssize_t file_size; switch (fileio->access) { case FILEIO_READ: @@ -78,6 +91,8 @@ static inline int fileio_open_local(struct fileio_internal *fileio) return ERROR_FILEIO_OPERATION_FAILED; } + file_size = 0; + if ((fileio->access != FILEIO_WRITE) || (fileio->access == FILEIO_READWRITE)) { /* NB! Here we use fseek() instead of stat(), since stat is a * more advanced operation that might not apply to e.g. a disk path @@ -86,75 +101,64 @@ static inline int fileio_open_local(struct fileio_internal *fileio) result = fseek(fileio->file, 0, SEEK_END); - fileio->size = ftell(fileio->file); + file_size = ftell(fileio->file); result2 = fseek(fileio->file, 0, SEEK_SET); - if ((fileio->size < 0) || (result < 0) || (result2 < 0)) { + if ((file_size < 0) || (result < 0) || (result2 < 0)) { fileio_close_local(fileio); return ERROR_FILEIO_OPERATION_FAILED; } - } else - fileio->size = 0x0; + } + + fileio->size = file_size; return ERROR_OK; } -int fileio_open(struct fileio *fileio_p, - const char *url, - enum fileio_access access_type, - enum fileio_type type) +int fileio_open(struct fileio **fileio, const char *url, + enum fileio_access access_type, enum fileio_type type) { - int retval = ERROR_OK; - - struct fileio_internal *fileio = malloc(sizeof(struct fileio_internal)); - fileio_p->fp = fileio; - - fileio->type = type; - fileio->access = access_type; - fileio->url = strdup(url); + int retval; + struct fileio *tmp; - retval = fileio_open_local(fileio); + tmp = malloc(sizeof(struct fileio)); - return retval; -} + tmp->type = type; + tmp->access = access_type; + tmp->url = strdup(url); -static inline int fileio_close_local(struct fileio_internal *fileio) -{ - int retval = fclose(fileio->file); - if (retval != 0) { - if (retval == EBADF) - LOG_ERROR("BUG: fileio_local->file not a valid file descriptor"); - else - LOG_ERROR("couldn't close %s: %s", fileio->url, strerror(errno)); + retval = fileio_open_local(tmp); - return ERROR_FILEIO_OPERATION_FAILED; + if (retval != ERROR_OK) { + free(tmp->url); + free(tmp); + return retval; } + *fileio = tmp; + return ERROR_OK; } -int fileio_close(struct fileio *fileio_p) +int fileio_close(struct fileio *fileio) { int retval; - struct fileio_internal *fileio = fileio_p->fp; retval = fileio_close_local(fileio); free(fileio->url); - fileio->url = NULL; - free(fileio); - fileio_p->fp = NULL; return retval; } -int fileio_seek(struct fileio *fileio_p, size_t position) +int fileio_seek(struct fileio *fileio, size_t position) { int retval; - struct fileio_internal *fileio = fileio_p->fp; + retval = fseek(fileio->file, position, SEEK_SET); + if (retval != 0) { LOG_ERROR("couldn't seek file %s: %s", fileio->url, strerror(errno)); return ERROR_FILEIO_OPERATION_FAILED; @@ -163,36 +167,40 @@ int fileio_seek(struct fileio *fileio_p, size_t position) return ERROR_OK; } -static int fileio_local_read(struct fileio_internal *fileio, - size_t size, void *buffer, size_t *size_read) +static int fileio_local_read(struct fileio *fileio, size_t size, void *buffer, + size_t *size_read) { - ssize_t retval = fread(buffer, 1, size, fileio->file); + ssize_t retval; + + retval = fread(buffer, 1, size, fileio->file); *size_read = (retval >= 0) ? retval : 0; + return (retval < 0) ? retval : ERROR_OK; } -int fileio_read(struct fileio *fileio_p, size_t size, void *buffer, - size_t *size_read) +int fileio_read(struct fileio *fileio, size_t size, void *buffer, + size_t *size_read) { - struct fileio_internal *fileio = fileio_p->fp; return fileio_local_read(fileio, size, buffer, size_read); } -int fileio_read_u32(struct fileio *fileio_p, uint32_t *data) +int fileio_read_u32(struct fileio *fileio, uint32_t *data) { + int retval; uint8_t buf[4]; size_t size_read; - struct fileio_internal *fileio = fileio_p->fp; - int retval = fileio_local_read(fileio, sizeof(uint32_t), buf, &size_read); + + 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 int fileio_local_fgets(struct fileio_internal *fileio, - size_t size, void *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; @@ -200,36 +208,44 @@ static int fileio_local_fgets(struct fileio_internal *fileio, return ERROR_OK; } -int fileio_fgets(struct fileio *fileio_p, size_t size, void *buffer) +int fileio_fgets(struct fileio *fileio, size_t size, void *buffer) { - struct fileio_internal *fileio = fileio_p->fp; return fileio_local_fgets(fileio, size, buffer); } -static int fileio_local_write(struct fileio_internal *fileio, - size_t size, const void *buffer, size_t *size_written) +static int fileio_local_write(struct fileio *fileio, size_t size, + const void *buffer, size_t *size_written) { - ssize_t retval = fwrite(buffer, 1, size, fileio->file); + ssize_t retval; + + retval = fwrite(buffer, 1, size, fileio->file); *size_written = (retval >= 0) ? retval : 0; + return (retval < 0) ? retval : ERROR_OK; } -int fileio_write(struct fileio *fileio_p, - size_t size, const void *buffer, size_t *size_written) +int fileio_write(struct fileio *fileio, size_t size, const void *buffer, + size_t *size_written) { - struct fileio_internal *fileio = fileio_p->fp; - int retval = fileio_local_write(fileio, size, buffer, size_written); + int retval; + + retval = fileio_local_write(fileio, size, buffer, size_written); + if (retval == ERROR_OK) fileio->size += *size_written; + return retval; } -int fileio_write_u32(struct fileio *fileio_p, uint32_t data) +int fileio_write_u32(struct fileio *fileio, uint32_t data) { + int retval; uint8_t buf[4]; h_u32_to_be(buf, data); size_t size_written; - int retval = fileio_write(fileio_p, 4, buf, &size_written); + + retval = fileio_write(fileio, 4, buf, &size_written); + if (ERROR_OK == retval && size_written != sizeof(uint32_t)) retval = -EIO; @@ -245,9 +261,9 @@ int fileio_write_u32(struct fileio *fileio_p, uint32_t data) * Avoiding the seek on startup opens up for using streams. * */ -int fileio_size(struct fileio *fileio_p, int *size) +int fileio_size(struct fileio *fileio, size_t *size) { - struct fileio_internal *fileio = fileio_p->fp; *size = fileio->size; + return ERROR_OK; }