X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Freadwrite.c;h=e6660ae4238ef9ed16a0ad0dfc2634c9e865b5ce;hb=e75b508724effaad1bfd6dcf337c34a368855095;hp=657d8173dd674ecfa9528cfce9653ee5dd841449;hpb=fb8ddca6abc66eb7e52a007850689309b4cda938;p=plomrogue diff --git a/src/readwrite.c b/src/readwrite.c index 657d817..e6660ae 100644 --- a/src/readwrite.c +++ b/src/readwrite.c @@ -1,39 +1,18 @@ /* readwrite.c */ #include "readwrite.h" +#include /* for size_t */ #include /* for FILE typedef, fopen(), fgetc(), fputc(), fseek(), * sprintf(), fwrite(), ferror() */ #include /* for uint8_t, uint16_t, uint32_t */ -#include /* for strlen()*/ +#include /* for strlen() */ #include /* for unlink() */ -#include "rexit.h" /* for exit_err() */ -#include "misc.h" /* for trouble_msg() */ -struct World; +#include "rexit.h" /* for exit_err(), exit_trouble() */ -/* Read/write "x" from/to "file" as bigendian representation of "size" bits. On - * failure, return 1, else 0. (As of of now, all extern read/write functions - * build on top of these.) - * - * Only use multiples of 8 greater or equal 32 for "size", so that storage - * inside uint32_t is possible. Originally a bit number check prefaced the code - * of both functions. It was removed as redundant due to all possible "size" - * values being hardcoded into the library (i.e. in all extern functions calling - * / wrapping around either function). If this ever changes, (re-)insert: - * - * if (0 == size || size > 32 || 0 != size % 8) - * { - * return 1; - * } - */ -static uint8_t read_uintX_bigendian(FILE * file, uint32_t * x, uint8_t size); -static uint8_t write_uintX_bigendian(FILE * file, uint32_t x, uint8_t size); - - - -extern FILE * try_fopen(char * path, char * mode, struct World * w, char * f) +extern FILE * try_fopen(char * path, char * mode, char * f) { char * msg1 = "Trouble in "; char * msg2 = " with fopen() (mode '"; @@ -44,47 +23,66 @@ extern FILE * try_fopen(char * path, char * mode, struct World * w, char * f) char msg[size]; sprintf(msg, "%s%s%s%s%s%s%s", msg1, f, msg2, mode, msg3, path, msg4); FILE * file_p = fopen(path, mode); - exit_err(NULL == file_p, w, msg); + exit_err(NULL == file_p, msg); return file_p; } -extern void try_fclose(FILE * file, struct World * w, char * f) +extern void try_fclose(FILE * file, char * f) +{ + exit_trouble(fclose(file), f, "fclose()"); +} + + + +extern void try_fwrite(void * ptr, size_t size, size_t nmemb, FILE * stream, + char * f) +{ + exit_trouble(0 == fwrite(ptr, size, nmemb, stream), f, "fwrite()"); +} + + + +extern void try_fputc(uint8_t c, FILE * file, char * f) { - char * msg = trouble_msg(w, f, "fclose()"); - exit_err(fclose(file), w, msg); - free(msg); + exit_trouble(EOF == fputc(c, file), f, "fputc()"); } -extern char * try_fgets(char * line, int linemax, FILE * file, - struct World * w, char * f) +extern char * try_fgets(char * line, int linemax, FILE * file, char * f) { - char * msg = trouble_msg(w, f, "fgets()"); char * test = fgets(line, linemax, file); - exit_err(NULL == test && ferror(file), w, msg); - free(msg); + exit_trouble(NULL == test && ferror(file), f, "fgets()"); return test; } -extern void try_fwrite(void * ptr, size_t size, size_t nmemb, FILE * stream, - struct World * w, char * f) +extern int try_fgetc(FILE * file, char * f) { - char * msg = trouble_msg(w, f, "fwrite()"); - exit_err(0 == fwrite(ptr, size, nmemb, stream), w, msg); - free(msg); + int test = fgetc(file); + exit_trouble(EOF == test && ferror(file), f, "fgetc()"); + return test; +} + + + +extern uint8_t try_fgetc_noeof(FILE * file, char * f) +{ + char * f_name = "try_fgetc_noeof()"; + int test = try_fgetc(file, f_name); + exit_trouble(EOF == test, f, "fgetc() unexpectedly hitting EOF"); + return (uint8_t) test; } extern void try_fclose_unlink_rename(FILE * file, char * p1, char * p2, - struct World * w, char * f) + char * f) { - try_fclose(file, w, f); + try_fclose(file, f); char * msg1 = "Trouble in "; char * msg4 = "'."; if (!access(p2, F_OK)) @@ -94,7 +92,7 @@ extern void try_fclose_unlink_rename(FILE * file, char * p1, char * p2, + strlen(f) + strlen(p2) + 1; char msg[size]; sprintf(msg, "%s%s%s%s%s", msg1, f, msg2, p2, msg4); - exit_err(unlink(p2), w, msg); + exit_err(unlink(p2), msg); } char * msg2 = " with rename() from '"; char * msg3 = "' to '"; @@ -102,32 +100,21 @@ extern void try_fclose_unlink_rename(FILE * file, char * p1, char * p2, + strlen(msg3) + strlen(p2) + strlen(msg4) + 1; char msg[size]; sprintf(msg, "%s%s%s%s%s%s%s", msg1, f, msg2, p1, msg3, p2, msg4); - exit_err(rename(p1, p2), w, msg); -} - - - -extern uint16_t get_linemax(FILE * file, struct World * w, char * f) -{ - char * msg = trouble_msg(w, f, "textfile_sizes()"); - uint16_t linemax; - exit_err(textfile_sizes(file, &linemax, NULL), w, msg); - free(msg); - return linemax; + exit_err(rename(p1, p2), msg); } -extern uint8_t textfile_sizes(FILE * file, uint16_t * linemax_p, - uint16_t * n_lines_p) +extern uint16_t textfile_sizes(FILE * file, uint16_t * n_lines_p) { + char * f_name = "textfile_sizes()"; int c = 0; uint16_t c_count = 0; uint16_t n_lines = 0; uint16_t linemax = 0; while (1) { - c = fgetc(file); + c = try_fgetc(file, f_name); if (EOF == c) { break; @@ -150,101 +137,34 @@ extern uint8_t textfile_sizes(FILE * file, uint16_t * linemax_p, { /* line / lack newline chars. */ linemax = c_count; } - - if (-1 == fseek(file, 0, SEEK_SET)) - { - return 1; - } - * linemax_p = linemax; + exit_trouble(-1 == fseek(file, 0, SEEK_SET), f_name, "fseek()"); if (n_lines_p) { * n_lines_p = n_lines; } - return 0; -} - - - -static uint8_t read_uintX_bigendian(FILE * file, uint32_t * x, uint8_t size) -{ - * x = 0; - int16_t bitshift = size - 8; - int test; - for (; bitshift >= 0; bitshift = bitshift - 8) - { - test = fgetc(file); - if (EOF == test) - { - return 1; - } - * x = * x + ((uint32_t) test << bitshift); - } - return 0; -} - - - -static uint8_t write_uintX_bigendian(FILE * file, uint32_t x, uint8_t size) -{ - int16_t bitshift = size - 8; - for (; bitshift >= 0; bitshift = bitshift - 8) - { - if (EOF == fputc((x >> bitshift) & 0xFF, file)) - { - return 1; - } - } - return 0; -} - - - -extern uint8_t read_uint8(FILE * file, uint8_t * x) -{ - /* Since read_uintX_bigendian() works on -- and zeroes -- four bytes, direct - * work on values of fewer bytes would corrupt immediate neighbor values. - */ - uint32_t y = * x; - uint8_t err = read_uintX_bigendian(file, &y, 8); - * x = (uint8_t) y; - return err; -} - - - -extern uint8_t read_uint16_bigendian(FILE * file, uint16_t * x) -{ - /* See read_uint8() introductory code comment for rationale. */ - uint32_t y = * x; - uint8_t err = read_uintX_bigendian(file, &y, 16); - * x = (uint16_t) y; - return err; -} - - - -extern uint8_t read_uint32_bigendian(FILE * file, uint32_t * x) -{ - return read_uintX_bigendian(file, x, 32); -} - - - -extern uint8_t write_uint8(uint8_t x, FILE * file) -{ - return write_uintX_bigendian(file, x, 8); + return linemax; } -extern uint8_t write_uint16_bigendian(uint16_t x, FILE * file) +extern uint32_t read_uint32_bigendian(FILE * file) { - return write_uintX_bigendian(file, x, 16); + char * f_name = "read_uint32_bigendian()"; + uint32_t x; + x = (uint32_t) try_fgetc_noeof(file, f_name) << 24; + x = x + ( (uint32_t) try_fgetc_noeof(file, f_name) << 16 ); + x = x + ( (uint32_t) try_fgetc_noeof(file, f_name) << 8 ); + x = x + (uint32_t) try_fgetc_noeof(file, f_name); + return x; } -extern uint8_t write_uint32_bigendian(uint32_t x, FILE * file) +extern void write_uint32_bigendian(uint32_t x, FILE * file) { - return write_uintX_bigendian(file, x, 32); + char * f_name = "write_uint32_bigendian()"; + try_fputc( x >> 24, file, f_name); + try_fputc( ( x >> 16 ) & 0xFF, file, f_name); + try_fputc( ( x >> 8 ) & 0xFF, file, f_name); + try_fputc( x & 0xFF, file, f_name); }