X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Ffileio.c;h=2664bfa1160dd5be688384f382537a07af35f0b9;hp=71e807ff7870a7aa4e992de1c7d42180acbb28b5;hb=627f1cb3542408533158dc5682b468ef48614eb8;hpb=3e51d893ed3d1273b5487e05196f00fe3d14773d

diff --git a/src/helper/fileio.c b/src/helper/fileio.c
index 71e807ff78..2664bfa116 100644
--- a/src/helper/fileio.c
+++ b/src/helper/fileio.c
@@ -21,8 +21,9 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -31,12 +32,21 @@
 #include "configuration.h"
 #include "fileio.h"
 
-static inline int fileio_open_local(struct fileio *fileio)
+struct fileio_internal {
+	char *url;
+	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)
 {
 	char file_access[4];
+	ssize_t file_size;
 
-	switch (fileio->access)
-	{
+	switch (fileio->access) {
 		case FILEIO_READ:
 			strcpy(file_access, "r");
 			break;
@@ -54,25 +64,24 @@ static inline int fileio_open_local(struct fileio *fileio)
 			break;
 		default:
 			LOG_ERROR("BUG: access neither read, write nor readwrite");
-			return ERROR_INVALID_ARGUMENTS;
+			return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	/* win32 always opens in binary mode */
 #ifndef _WIN32
 	if (fileio->type == FILEIO_BINARY)
 #endif
-	{
 		strcat(file_access, "b");
-	}
 
-	if (!(fileio->file = open_file_from_path (fileio->url, file_access)))
-	{
+	fileio->file = open_file_from_path(fileio->url, file_access);
+	if (!fileio->file) {
 		LOG_ERROR("couldn't open %s", fileio->url);
 		return ERROR_FILEIO_OPERATION_FAILED;
 	}
 
-	if ((fileio->access != FILEIO_WRITE) || (fileio->access == FILEIO_READWRITE))
-	{
+	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
 		 * that refers to e.g. a tftp client */
@@ -80,50 +89,56 @@ static inline int fileio_open_local(struct fileio *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))
-		{
-			fileio_close(fileio);
+		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, const char *url, enum fileio_access access,	enum fileio_type type)
+int fileio_open(struct fileio *fileio_p,
+	const char *url,
+	enum fileio_access access_type,
+	enum fileio_type type)
 {
-	int retval = ERROR_OK;
+	int retval;
+	struct fileio_internal *fileio;
+
+	fileio = malloc(sizeof(struct fileio_internal));
 
 	fileio->type = type;
-	fileio->access = access;
+	fileio->access = access_type;
 	fileio->url = strdup(url);
 
 	retval = fileio_open_local(fileio);
 
-	return retval;
+	if (retval != ERROR_OK) {
+		free(fileio->url);
+		free(fileio);
+		return retval;
+	}
+
+	fileio_p->fp = fileio;
+
+	return ERROR_OK;
 }
 
-static inline int fileio_close_local(struct fileio *fileio)
+static inline int fileio_close_local(struct fileio_internal *fileio)
 {
-	int retval;
-	if ((retval = fclose(fileio->file)) != 0)
-	{
+	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));
-		}
 
 		return ERROR_FILEIO_OPERATION_FAILED;
 	}
@@ -131,23 +146,28 @@ static inline int fileio_close_local(struct fileio *fileio)
 	return ERROR_OK;
 }
 
-int fileio_close(struct fileio *fileio)
+int fileio_close(struct fileio *fileio_p)
 {
 	int retval;
+	struct fileio_internal *fileio = fileio_p->fp;
 
 	retval = fileio_close_local(fileio);
 
-	free((void*)fileio->url);
+	free(fileio->url);
 	fileio->url = NULL;
 
+	free(fileio);
+	fileio_p->fp = NULL;
+
 	return retval;
 }
 
-int fileio_seek(struct fileio *fileio, size_t position)
+int fileio_seek(struct fileio *fileio_p, size_t position)
 {
 	int retval;
-	if ((retval = fseek(fileio->file, position, SEEK_SET)) != 0)
-	{
+	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;
 	}
@@ -155,24 +175,26 @@ int fileio_seek(struct fileio *fileio, size_t position)
 	return ERROR_OK;
 }
 
-static int fileio_local_read(struct fileio *fileio,
-		size_t size, void *buffer, size_t *size_read)
+static int fileio_local_read(struct fileio_internal *fileio,
+	size_t size, void *buffer, size_t *size_read)
 {
 	ssize_t 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, size_t size, void *buffer,
-		size_t *size_read)
+int fileio_read(struct fileio *fileio_p, 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, uint32_t *data)
+int fileio_read_u32(struct fileio *fileio_p, uint32_t *data)
 {
 	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);
 	if (ERROR_OK == retval && sizeof(uint32_t) != size_read)
 		retval = -EIO;
@@ -181,8 +203,8 @@ int fileio_read_u32(struct fileio *fileio, uint32_t *data)
 	return retval;
 }
 
-static int fileio_local_fgets(struct fileio *fileio,
-		size_t size, void *buffer)
+static int fileio_local_fgets(struct fileio_internal *fileio,
+	size_t size, void *buffer)
 {
 	if (fgets(buffer, size, fileio->file) == NULL)
 		return ERROR_FILEIO_OPERATION_FAILED;
@@ -190,37 +212,55 @@ static int fileio_local_fgets(struct fileio *fileio,
 	return ERROR_OK;
 }
 
-int fileio_fgets(struct fileio *fileio, size_t size, void *buffer)
+int fileio_fgets(struct fileio *fileio_p, 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 *fileio,
-		size_t size, const void *buffer, size_t *size_written)
+static int fileio_local_write(struct fileio_internal *fileio,
+	size_t size, const void *buffer, size_t *size_written)
 {
 	ssize_t 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,
-		size_t size, const void *buffer, size_t *size_written)
+int fileio_write(struct fileio *fileio_p,
+	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);
 	if (retval == ERROR_OK)
 		fileio->size += *size_written;
 	return retval;
 }
 
-int fileio_write_u32(struct fileio *fileio, uint32_t data)
+int fileio_write_u32(struct fileio *fileio_p, uint32_t data)
 {
 	uint8_t buf[4];
 	h_u32_to_be(buf, data);
-
 	size_t size_written;
-	int retval = fileio_write(fileio, 4, buf, &size_written);
+	int retval = fileio_write(fileio_p, 4, buf, &size_written);
 	if (ERROR_OK == retval && size_written != sizeof(uint32_t))
 		retval = -EIO;
 
 	return retval;
 }
+
+/**
+ * FIX!!!!
+ *
+ * For now this can not fail, but that's because a seek was executed
+ * on startup.
+ *
+ * Avoiding the seek on startup opens up for using streams.
+ *
+ */
+int fileio_size(struct fileio *fileio_p, size_t *size)
+{
+	struct fileio_internal *fileio = fileio_p->fp;
+	*size = fileio->size;
+
+	return ERROR_OK;
+}