R/rmodb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renamed R based files

Browse Source
This commit is contained in:
Craig Williams
2020-09-15 15:14:44 +01:00
parent 69340c25e8
commit bf84d5694a
4 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Rmagic.c → src/R_magic.c
View File

@@ -1,9 +1,9 @@
#include "Rmagic.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "R_magic.h"
int R_WriteMagic(FILE *fp, int number) int R_WriteMagic(FILE *fp, int number)
{ {
unsigned char buf[5]; unsigned char buf[5];
@@ -67,7 +67,7 @@ int R_ReadMagic(FILE *fp)
return R_MAGIC_CORRUPT; return R_MAGIC_CORRUPT;
} }
} }
/* Version 1 */ /* Version 1 */
if (strncmp((char*)buf, "RDA1\n", 5) == 0) { if (strncmp((char*)buf, "RDA1\n", 5) == 0) {
return R_MAGIC_ASCII_V1; return R_MAGIC_ASCII_V1;
@@ -103,4 +103,4 @@ int R_ReadMagic(FILE *fp)
d3 = (buf[1] - '0') % 10; d3 = (buf[1] - '0') % 10;
d4 = (buf[0] - '0') % 10; d4 = (buf[0] - '0') % 10;
return d1 + 10 * d2 + 100 * d3 + 1000 * d4; return d1 + 10 * d2 + 100 * d3 + 1000 * d4;
} }

2
src/Rmagic.h → src/R_magic.h
View File

@@ -29,4 +29,4 @@ int R_WriteMagic(FILE *fp, int number);
int R_ReadMagic(FILE *fp); int R_ReadMagic(FILE *fp);
#endif // __R_MAGIC_H__ #endif // __R_MAGIC_H__

93
src/Rmemory-object.c → src/R_memory-object.c
View File

@@ -1,20 +1,19 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <R.h> #include <R.h>
#include <Rinternals.h> #include <Rinternals.h>
#include <Rembedded.h> #include <Rembedded.h>
#include "Rmagic.h" #include "R_memory-object.h"
#include "Rmemory-object.h" #include "R_magic.h"
int rdataToMemory(const char *filename, struct rmemoryobject_t *memObj) int rdataToMemory(const char *filename, struct r_memoryobject_t *mem_obj)
{ {
size_t iosz; size_t iosz;
FILE *fp; FILE *fp;
int magicSize; int64_t magic_size;
// Open the file // Open the file
fp = fopen(filename, "rb"); fp = fopen(filename, "rb");
@@ -24,16 +23,16 @@ int rdataToMemory(const char *filename, struct rmemoryobject_t *memObj)
} }
// Read the magic from the file // Read the magic from the file
memObj->magic = R_ReadMagic(fp); mem_obj->magic = R_ReadMagic(fp);
if (memObj->magic == R_MAGIC_EMPTY || memObj->magic == R_MAGIC_CORRUPT) { if (mem_obj->magic == R_MAGIC_EMPTY || mem_obj->magic == R_MAGIC_CORRUPT) {
fprintf(stderr, "R_ReadMagic: (%d) Error reading magic/magic corrupted\n", memObj->magic); fprintf(stderr, "R_ReadMagic: (%d) Error reading magic/magic corrupted\n", mem_obj->magic);
fclose(fp); fclose(fp);
return EINVAL; return EINVAL;
} }
// Get the current position (ie length of the magic) // Get the current position (ie length of the magic)
magicSize = ftell(fp); magic_size = ftell(fp);
if (magicSize <= 0) { if (magic_size <= 0) {
fprintf(stderr, "ftell: (%d) %s\n", errno, strerror(errno)); fprintf(stderr, "ftell: (%d) %s\n", errno, strerror(errno));
fclose(fp); fclose(fp);
return errno; return errno;
@@ -47,37 +46,37 @@ int rdataToMemory(const char *filename, struct rmemoryobject_t *memObj)
} }
// Get the current position (ie length of the file + magic) // Get the current position (ie length of the file + magic)
memObj->bufsz = ftell(fp) - magicSize; mem_obj->buf_size = (size_t)(ftell(fp) - magic_size);
if (memObj->bufsz <= 0) { if (mem_obj->buf_size <= 0) {
fprintf(stderr, "ftell: (%d) %s\n", errno, strerror(errno)); fprintf(stderr, "ftell: (%d) %s\n", errno, strerror(errno));
fclose(fp); fclose(fp);
return errno; return errno;
} }
// Go back to the (nearly) the beginning of the file // Go back to the (nearly) the beginning of the file
if (fseek(fp, magicSize, SEEK_SET) != 0) { if (fseek(fp, magic_size, SEEK_SET) != 0) {
fprintf(stderr, "fseek: (%d) %s\n", errno, strerror(errno)); fprintf(stderr, "fseek: (%d) %s\n", errno, strerror(errno));
fclose(fp); fclose(fp);
return errno; return errno;
} }
// Allocate a memory buffer for the file contents // Allocate a memory buffer for the file contents
memObj->buf = (char *)malloc((memObj->bufsz) * sizeof(char)); mem_obj->buf = (char *)malloc((mem_obj->buf_size) * sizeof(char));
if (memObj->buf == 0) { if (mem_obj->buf == 0) {
fprintf(stderr, "malloc: (%d) %s\n", errno, strerror(errno)); fprintf(stderr, "malloc: (%d) %s\n", errno, strerror(errno));
fclose(fp); fclose(fp);
return errno; return errno;
} }
// Read the file contents to the memory buffer // Read the file contents to the memory buffer
iosz = fread(memObj->buf, sizeof(char), memObj->bufsz, fp); iosz = fread(mem_obj->buf, sizeof(char), mem_obj->buf_size, fp);
if (iosz == 0) { if (iosz == 0) {
fprintf(stderr, "fread: (%d) %s\n", errno, strerror(errno)); fprintf(stderr, "fread: (%d) %s\n", errno, strerror(errno));
fclose(fp); fclose(fp);
return errno; return errno;
} }
if (iosz != memObj->bufsz) { if (iosz != mem_obj->buf_size) {
fprintf(stderr, "fread: Not enough bytes (got %lu, expected %lu)\n", iosz, memObj->bufsz); fprintf(stderr, "fread: Not enough bytes (got %lu, expected %lu)\n", iosz, mem_obj->buf_size);
fclose(fp); fclose(fp);
return ENODATA; return ENODATA;
} }
@@ -91,7 +90,7 @@ int rdataToMemory(const char *filename, struct rmemoryobject_t *memObj)
// If you got here, well done, have a zero // If you got here, well done, have a zero
return 0; return 0;
} }
int memoryToRData(const char *filename, struct rmemoryobject_t memObj) int memoryToRData(const char *filename, struct r_memoryobject_t mem_obj)
{ {
size_t iosz; size_t iosz;
FILE *fp; FILE *fp;
@@ -104,21 +103,21 @@ int memoryToRData(const char *filename, struct rmemoryobject_t memObj)
} }
// Write the R magic // Write the R magic
if (R_WriteMagic(fp, memObj.magic) != 0) { if (R_WriteMagic(fp, mem_obj.magic) != 0) {
fprintf(stderr, "R_WriteMagic: (%d) %s\n", errno, strerror(errno)); fprintf(stderr, "R_WriteMagic: (%d) %s\n", errno, strerror(errno));
fclose(fp); fclose(fp);
return errno; return errno;
} }
// Write the file contents from the memory buffer // Write the file contents from the memory buffer
iosz = fwrite(memObj.buf, sizeof(char), memObj.bufsz, fp); iosz = fwrite(mem_obj.buf, sizeof(char), mem_obj.buf_size, fp);
if (iosz == 0) { if (iosz == 0) {
fprintf(stderr, "fwrite: (%d) %s\n", errno, strerror(errno)); fprintf(stderr, "fwrite: (%d) %s\n", errno, strerror(errno));
fclose(fp); fclose(fp);
return errno; return errno;
} }
if (iosz != memObj.bufsz) { if (iosz != mem_obj.buf_size) {
fprintf(stderr, "fwrite: Not enough bytes (wrote %lu, expected %lu)\n", iosz, memObj.bufsz); fprintf(stderr, "fwrite: Not enough bytes (wrote %lu, expected %lu)\n", iosz, mem_obj.buf_size);
fclose(fp); fclose(fp);
return ENODATA; return ENODATA;
} }
@@ -134,14 +133,14 @@ int memoryToRData(const char *filename, struct rmemoryobject_t memObj)
} }
SEXP memoryToRObject(struct rmemoryobject_t memObj) SEXP memoryToRObject(struct r_memoryobject_t mem_obj)
{ {
FILE *fp; FILE *fp;
struct R_inpstream_st rin; struct R_inpstream_st rin;
SEXP rObj; SEXP rObj;
int format; R_pstream_format_t format;
switch (memObj.magic) { switch (mem_obj.magic) {
case R_MAGIC_ASCII_V2: case R_MAGIC_ASCII_V2:
case R_MAGIC_ASCII_V3: case R_MAGIC_ASCII_V3:
format = R_pstream_ascii_format; format = R_pstream_ascii_format;
@@ -158,12 +157,12 @@ SEXP memoryToRObject(struct rmemoryobject_t memObj)
break; break;
default: default:
fprintf(stderr, "Bad R magic: %d\n", memObj.magic); fprintf(stderr, "Bad R magic: %d\n", mem_obj.magic);
return R_NilValue; return R_NilValue;
} }
// Create a memory file device // Create a memory file device
fp = fmemopen(memObj.buf, memObj.bufsz, "r"); fp = fmemopen(mem_obj.buf, mem_obj.buf_size, "r");
if (fp == NULL) { if (fp == NULL) {
fprintf(stderr, "fmemopen: (%d) %s\n", errno, strerror(errno)); fprintf(stderr, "fmemopen: (%d) %s\n", errno, strerror(errno));
return R_NilValue; return R_NilValue;
@@ -182,14 +181,14 @@ SEXP memoryToRObject(struct rmemoryobject_t memObj)
Rf_unprotect(1); Rf_unprotect(1);
return rObj; return rObj;
} }
struct rmemoryobject_t *robjectToMemory(SEXP rObj, int magic) struct r_memoryobject_t *robjectToMemory(SEXP r_obj, int magic)
{ {
FILE *fp; FILE *fp;
int version; int version;
int format; R_pstream_format_t format;
struct R_outpstream_st rout; struct R_outpstream_st rout;
struct rmemoryobject_t memObj; struct r_memoryobject_t mem_obj;
struct rmemoryobject_t *memObjPtr; struct r_memoryobject_t *mem_obj_ptr;
// Get version and format from the R magic header // Get version and format from the R magic header
switch (magic) { switch (magic) {
@@ -229,10 +228,10 @@ struct rmemoryobject_t *robjectToMemory(SEXP rObj, int magic)
fprintf(stderr, "Bad R magic: %d\n", magic); fprintf(stderr, "Bad R magic: %d\n", magic);
return NULL; return NULL;
} }
memObj.magic = magic; mem_obj.magic = magic;
// Create an in-memory file // Create an in-memory file
fp = open_memstream(&(memObj.buf), &(memObj.bufsz)); fp = open_memstream(&(mem_obj.buf), &(mem_obj.buf_size));
if (fp == NULL) { if (fp == NULL) {
fprintf(stderr, "open_memstream: (%d) %s\n", errno, strerror(errno)); fprintf(stderr, "open_memstream: (%d) %s\n", errno, strerror(errno));
return NULL; return NULL;
@@ -240,7 +239,7 @@ struct rmemoryobject_t *robjectToMemory(SEXP rObj, int magic)
// Write to in-memory file // Write to in-memory file
R_InitFileOutPStream(&rout, fp, format, version, NULL, NULL); R_InitFileOutPStream(&rout, fp, format, version, NULL, NULL);
R_Serialize(rObj, &rout); R_Serialize(r_obj, &rout);
// Close the in-memory file // Close the in-memory file
if (fclose(fp) != 0) { if (fclose(fp) != 0) {
@@ -249,21 +248,20 @@ struct rmemoryobject_t *robjectToMemory(SEXP rObj, int magic)
} }
// All done // All done
memObjPtr = (struct rmemoryobject_t *)malloc(sizeof(struct rmemoryobject_t)); mem_obj_ptr = (struct r_memoryobject_t *)malloc(sizeof(struct r_memoryobject_t));
memcpy((void *)memObjPtr, (void *)&memObj, sizeof(struct rmemoryobject_t)); memcpy((void *)mem_obj_ptr, (void *)&mem_obj, sizeof(struct r_memoryobject_t));
return memObjPtr; return mem_obj_ptr;
} }
SEXP rdataToRObject(const char *filename) SEXP rdataToRObject(const char *filename)
{ {
size_t iosz;
FILE *fp; FILE *fp;
int magic; int magic;
struct R_inpstream_st rin; struct R_inpstream_st rin;
int format; R_pstream_format_t format;
SEXP rObj; SEXP r_obj;
// Open the file // Open the file
fp = fopen(filename, "rb"); fp = fopen(filename, "rb");
@@ -302,7 +300,7 @@ SEXP rdataToRObject(const char *filename)
// Read the stream // Read the stream
R_InitFileInPStream(&rin, fp, format, NULL, NULL); R_InitFileInPStream(&rin, fp, format, NULL, NULL);
rObj = Rf_protect(R_Unserialize(&rin)); r_obj = Rf_protect(R_Unserialize(&rin));
// Close the in-memory file device // Close the in-memory file device
if (fclose(fp) != 0) { if (fclose(fp) != 0) {
@@ -310,14 +308,13 @@ SEXP rdataToRObject(const char *filename)
} }
// If you got here, well done // If you got here, well done
return rObj; return r_obj;
} }
int robjectToRData(const char *filename, SEXP rObj, int magic) int robjectToRData(const char *filename, SEXP r_obj, int magic)
{ {
size_t iosz;
FILE *fp; FILE *fp;
int version; int version;
int format; R_pstream_format_t format;
struct R_outpstream_st rout; struct R_outpstream_st rout;
// Get version and format from the R magic // Get version and format from the R magic
@@ -375,7 +372,7 @@ int robjectToRData(const char *filename, SEXP rObj, int magic)
// Write to file // Write to file
R_InitFileOutPStream(&rout, fp, format, version, NULL, NULL); R_InitFileOutPStream(&rout, fp, format, version, NULL, NULL);
R_Serialize(rObj, &rout); R_Serialize(r_obj, &rout);
// Close the file // Close the file
if (fclose(fp) != 0) { if (fclose(fp) != 0) {
@@ -385,4 +382,4 @@ int robjectToRData(const char *filename, SEXP rObj, int magic)
// If you got here, well done, have a zero // If you got here, well done, have a zero
return 0; return 0;
} }

2
src/Rmemory-object.h → src/R_memory-object.h
View File

@@ -18,4 +18,4 @@ struct rmemoryobject_t *robjectToMemory(SEXP rObj, int magic);
SEXP rdataToRObject(const char *filename); SEXP rdataToRObject(const char *filename);
int robjectToRData(const char *filename, SEXP rObj, int magic); int robjectToRData(const char *filename, SEXP rObj, int magic);
#endif // __R_MEMORY_OBJECT_H__ #endif // __R_MEMORY_OBJECT_H__