fileio_local_t *fileio_local = malloc(sizeof(fileio_local_t));
char access[4];
- fileio->location_private = fileio_local;
-
- if ((fileio->access != FILEIO_WRITE) && (fileio->access != FILEIO_READWRITE))
- {
- if (stat(fileio->url, &fileio_local->file_stat) == -1)
- {
- free(fileio_local);
- snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING,
- "couldn't stat() %s: %s", fileio->url, strerror(errno));
- return ERROR_FILEIO_NOT_FOUND;
- }
-
- if (S_ISDIR(fileio_local->file_stat.st_mode))
- {
- free(fileio_local);
- snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "%s is a directory", fileio->url);
- return ERROR_FILEIO_NOT_FOUND;
- }
- }
-
switch (fileio->access)
{
case FILEIO_READ:
ERROR("BUG: access neither read, write nor readwrite");
return ERROR_INVALID_ARGUMENTS;
}
-
- if (fileio->access == FILEIO_READ)
- {
- if (fileio_local->file_stat.st_size == 0)
- {
- /* tried to open an empty file for reading */
- free(fileio_local);
- snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "empty file %s", fileio->url);
- return ERROR_FILEIO_OPERATION_FAILED;
- }
- }
-
+
+ /* win32 always opens in binary mode */
+#ifndef _WIN32
if (fileio->type == FILEIO_BINARY)
+#endif
+ {
strcat(access, "b");
+ }
if (!(fileio_local->file = fopen(fileio->url, access)))
{
if ((fileio->access != FILEIO_WRITE) || (fileio->access == FILEIO_READWRITE))
{
- fileio->size = fileio_local->file_stat.st_size;
+ /* 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 */
+ int result, result2;
+
+ result = fseek(fileio_local->file, 0, SEEK_END);
+
+ fileio->size = ftell(fileio_local->file);
+
+ result2 = fseek(fileio_local->file, 0, SEEK_SET);
+
+ if ((fileio->size < 0) || (result < 0) || (result2 < 0))
+ {
+ fileio_close(fileio);
+ return ERROR_FILEIO_OPERATION_FAILED;
+ }
}
else
{
fileio->size = 0x0;
}
+ fileio->location_private = fileio_local;
+
return ERROR_OK;
}
int retval = ERROR_OK;
char *resource_identifier = NULL;
- /* try to identify file location */
+ /* 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 if ((resource_identifier = strstr(url, "tftp://")) && (resource_identifier == url))
- {
- ERROR("tftp resource location isn't supported yet");
- return ERROR_FILEIO_RESOURCE_TYPE_UNKNOWN;
- }
else
{
/* default to local files */
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 == EBADF)
}
free(fileio->location_private);
+ fileio->location_private = NULL;
return ERROR_OK;
}
return retval;
free(fileio->url);
+ fileio->url = NULL;
return ERROR_OK;
}
return ERROR_OK;
}
+int fileio_local_fgets(fileio_t *fileio, u32 size, u8 *buffer)
+{
+ fileio_local_t *fileio_local = fileio->location_private;
+
+ if( fgets(buffer, size, fileio_local->file) == NULL)
+ return ERROR_FILEIO_OPERATION_FAILED;
+
+ return ERROR_OK;
+}
+
+int fileio_fgets(fileio_t *fileio, u32 size, u8 *buffer)
+{
+ switch (fileio->location)
+ {
+ case FILEIO_LOCAL:
+ return fileio_local_fgets(fileio, size, buffer);
+ break;
+ default:
+ ERROR("BUG: should never get here");
+ exit(-1);
+ }
+}
+
int fileio_local_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written)
{
fileio_local_t *fileio_local = fileio->location_private;
int fileio_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written)
{
+ int retval;
+
switch (fileio->location)
{
case FILEIO_LOCAL:
- return fileio_local_write(fileio, size, buffer, size_written);
+ retval = fileio_local_write(fileio, size, buffer, size_written);
break;
default:
ERROR("BUG: should never get here");
+ exit(-1);
}
- return ERROR_OK;
+ if (retval == ERROR_OK)
+ fileio->size += *size_written;
+
+ return retval;;
}
int fileio_write_u32(fileio_t *fileio, u32 data)