* Copyright (C) 2007 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
+ * Copyright (C) 2007,2008 Øyvind Harboe *
+ * oyvind.harboe@zylin.com *
+ * *
+ * Copyright (C) 2008 by Spencer Oliver *
+ * spen@spen-soft.co.uk *
+ * *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
#include "config.h"
#endif
-#include "types.h"
-#include "replacements.h"
#include "log.h"
-
+#include "configuration.h"
#include "fileio.h"
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
-
-int fileio_close(fileio_t *fileio);
-int fileio_dispatch_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read);
-
-int fileio_open_local(fileio_t *fileio)
+static inline int fileio_open_local(fileio_t *fileio)
{
- fileio_local_t *fileio_local = malloc(sizeof(fileio_local_t));
char access[4];
switch (fileio->access)
strcpy(access, "a+");
break;
default:
- free(fileio_local);
- ERROR("BUG: access neither read, write nor readwrite");
+ LOG_ERROR("BUG: access neither read, write nor readwrite");
return ERROR_INVALID_ARGUMENTS;
}
-
+
/* win32 always opens in binary mode */
#ifndef _WIN32
if (fileio->type == FILEIO_BINARY)
strcat(access, "b");
}
- if (!(fileio_local->file = fopen(fileio->url, access)))
+ if (!(fileio->file = open_file_from_path (fileio->url, access)))
{
- free(fileio_local);
- snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "couldn't open %s", fileio->url);
+ LOG_ERROR("couldn't open %s", fileio->url);
return ERROR_FILEIO_OPERATION_FAILED;
}
* that refers to e.g. a tftp client */
int result, result2;
- result = fseek(fileio_local->file, 0, SEEK_END);
-
- fileio->size = ftell(fileio_local->file);
+ result = fseek(fileio->file, 0, SEEK_END);
+
+ fileio->size = ftell(fileio->file);
- result2 = fseek(fileio_local->file, 0, SEEK_SET);
+ result2 = fseek(fileio->file, 0, SEEK_SET);
- if ((fileio->size < 0) || (result < 0) || (result2 < 0))
+ if ((fileio->size < 0)||(result < 0)||(result2 < 0))
{
fileio_close(fileio);
return ERROR_FILEIO_OPERATION_FAILED;
fileio->size = 0x0;
}
- fileio->location_private = fileio_local;
-
return ERROR_OK;
}
-int fileio_open(fileio_t *fileio, char *url, enum fileio_access access, enum fileio_type type)
+int fileio_open(fileio_t *fileio, const char *url, enum fileio_access access, enum fileio_type type)
{
int retval = ERROR_OK;
- char *resource_identifier = NULL;
- /* try to identify file location. We only hijack the file paths we understand, the rest is
- * passed on to the OS which might implement e.g. tftp via a mounted tftp device.
- */
- if ((resource_identifier = strstr(url, "bootp://")) && (resource_identifier == url))
- {
- ERROR("bootp resource location isn't supported yet");
- return ERROR_FILEIO_RESOURCE_TYPE_UNKNOWN;
- }
- else
- {
- /* default to local files */
- fileio->location = FILEIO_LOCAL;
- }
-
fileio->type = type;
fileio->access = access;
fileio->url = strdup(url);
- switch (fileio->location)
- {
- case FILEIO_LOCAL:
- retval = fileio_open_local(fileio);
- break;
- default:
- ERROR("BUG: should never get here");
- exit(-1);
- }
-
- if (retval != ERROR_OK)
- return retval;
-
- return ERROR_OK;
+ retval = fileio_open_local(fileio);
+
+ return retval;
}
-int fileio_close_local(fileio_t *fileio)
+static inline int fileio_close_local(fileio_t *fileio)
{
int retval;
- fileio_local_t *fileio_local = fileio->location_private;
-
- if (fileio->location_private == NULL)
- {
- snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "couldn't close %s: ", fileio->url);
- return ERROR_FILEIO_OPERATION_FAILED;
- }
-
- if ((retval = fclose(fileio_local->file)) != 0)
+ if ((retval = fclose(fileio->file)) != 0)
{
if (retval == EBADF)
{
- snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "BUG: fileio_local->file not a valid file descriptor");
+ LOG_ERROR("BUG: fileio_local->file not a valid file descriptor");
}
else
{
- snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "couldn't close %s: %s", fileio->url, strerror(errno));
+ LOG_ERROR("couldn't close %s: %s", fileio->url, strerror(errno));
}
return ERROR_FILEIO_OPERATION_FAILED;
}
- free(fileio->location_private);
- fileio->location_private = NULL;
-
return ERROR_OK;
}
{
int retval;
- switch (fileio->location)
- {
- case FILEIO_LOCAL:
- retval = fileio_close_local(fileio);
- break;
- default:
- ERROR("BUG: should never get here");
- retval = ERROR_FILEIO_OPERATION_FAILED;
- }
-
- if (retval != ERROR_OK)
- return retval;
+ retval = fileio_close_local(fileio);
free(fileio->url);
fileio->url = NULL;
- return ERROR_OK;
+ return retval;
}
-int fileio_seek_local(fileio_t *fileio, u32 position)
+int fileio_seek(fileio_t *fileio, uint32_t position)
{
int retval;
- fileio_local_t *fileio_local = fileio->location_private;
-
- if ((retval = fseek(fileio_local->file, position, SEEK_SET)) != 0)
+ if ((retval = fseek(fileio->file, position, SEEK_SET)) != 0)
{
- snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "couldn't seek file %s: %s", fileio->url, strerror(errno));
+ LOG_ERROR("couldn't seek file %s: %s", fileio->url, strerror(errno));
return ERROR_FILEIO_OPERATION_FAILED;
}
return ERROR_OK;
}
-int fileio_seek(fileio_t *fileio, u32 position)
-{
- switch (fileio->location)
- {
- case FILEIO_LOCAL:
- return fileio_seek_local(fileio, position);
- break;
- default:
- ERROR("BUG: should never get here");
- }
-
- return ERROR_OK;
-}
-
-int fileio_local_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read)
+static inline int fileio_local_read(fileio_t *fileio, uint32_t size, uint8_t *buffer, uint32_t *size_read)
{
- fileio_local_t *fileio_local = fileio->location_private;
-
- *size_read = fread(buffer, 1, size, fileio_local->file);
+ *size_read = fread(buffer, 1, size, fileio->file);
return ERROR_OK;
}
-int fileio_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read)
+int fileio_read(fileio_t *fileio, uint32_t size, uint8_t *buffer, uint32_t *size_read)
{
- switch (fileio->location)
- {
- case FILEIO_LOCAL:
- return fileio_local_read(fileio, size, buffer, size_read);
- break;
- default:
- ERROR("BUG: should never get here");
- exit(-1);
- }
+ return fileio_local_read(fileio, size, buffer, size_read);
}
-int fileio_read_u32(fileio_t *fileio, u32 *data)
+int fileio_read_u32(fileio_t *fileio, uint32_t *data)
{
- u8 buf[4];
- u32 size_read;
+ uint8_t buf[4];
+ uint32_t size_read;
int retval;
- switch (fileio->location)
- {
- case FILEIO_LOCAL:
- if ((retval = fileio_local_read(fileio, 4, buf, &size_read)) != ERROR_OK)
- return retval;
- *data = be_to_h_u32(buf);
- break;
- default:
- ERROR("BUG: should never get here");
- exit(-1);
- }
+ if ((retval = fileio_local_read(fileio, 4, buf, &size_read)) != ERROR_OK)
+ return retval;
+ *data = be_to_h_u32(buf);
return ERROR_OK;
}
-int fileio_local_fgets(fileio_t *fileio, u32 size, u8 *buffer)
+static inline int fileio_local_fgets(fileio_t *fileio, uint32_t size, char *buffer)
{
- fileio_local_t *fileio_local = fileio->location_private;
-
- if( fgets(buffer, size, fileio_local->file) == NULL)
+ if ( fgets(buffer, size, fileio->file) == NULL)
return ERROR_FILEIO_OPERATION_FAILED;
return ERROR_OK;
}
-int fileio_fgets(fileio_t *fileio, u32 size, u8 *buffer)
+int fileio_fgets(fileio_t *fileio, uint32_t size, char *buffer)
{
- switch (fileio->location)
- {
- case FILEIO_LOCAL:
- return fileio_local_fgets(fileio, size, buffer);
- break;
- default:
- ERROR("BUG: should never get here");
- exit(-1);
- }
+ return fileio_local_fgets(fileio, size, buffer);
}
-int fileio_local_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written)
+static inline int fileio_local_write(fileio_t *fileio, uint32_t size, const uint8_t *buffer, uint32_t *size_written)
{
- fileio_local_t *fileio_local = fileio->location_private;
-
- *size_written = fwrite(buffer, 1, size, fileio_local->file);
+ *size_written = fwrite(buffer, 1, size, fileio->file);
return ERROR_OK;
}
-int fileio_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written)
+int fileio_write(fileio_t *fileio, uint32_t size, const uint8_t *buffer, uint32_t *size_written)
{
int retval;
- switch (fileio->location)
- {
- case FILEIO_LOCAL:
- retval = fileio_local_write(fileio, size, buffer, size_written);
- break;
- default:
- ERROR("BUG: should never get here");
- exit(-1);
- }
+ retval = fileio_local_write(fileio, size, buffer, size_written);
if (retval == ERROR_OK)
fileio->size += *size_written;
return retval;;
}
-int fileio_write_u32(fileio_t *fileio, u32 data)
+int fileio_write_u32(fileio_t *fileio, uint32_t data)
{
- u8 buf[4];
- u32 size_written;
+ uint8_t buf[4];
+ uint32_t size_written;
int retval;
h_u32_to_be(buf, data);
- switch (fileio->location)
- {
- case FILEIO_LOCAL:
- if ((retval = fileio_local_write(fileio, 4, buf, &size_written)) != ERROR_OK)
- return retval;
- break;
- default:
- ERROR("BUG: should never get here");
- }
+ if ((retval = fileio_local_write(fileio, 4, buf, &size_written)) != ERROR_OK)
+ return retval;
return ERROR_OK;
}
Code Review / openocd.git / blobdiff