Some code-stylistic improvements to rexit library; also moved exit_trouble() into it.

[plomrogue] / src / readwrite.c

diff --git a/src/readwrite.c b/src/readwrite.c
index 96505adf4387cc52f4a83241f03098869b0a67d9..e5db3061cf10abb5408dfea5afffac3d2d80862e 100644 (file)
--- a/src/readwrite.c
+++ b/src/readwrite.c
@@ -1,8 +1,14 @@
 /* readwrite.c */
 
 #include "readwrite.h"
-#include <stdio.h> /* for FILE typedef, fgetc(), fputc(), fseek() */
+#include <stdio.h>  /* for FILE typedef, fopen(), fgetc(), fputc(), fseek(),
+                     * sprintf(), fwrite(), ferror()
+                     */
 #include <stdint.h> /* for uint8_t, uint16_t, uint32_t */
+#include <string.h> /* for strlen()*/
+#include <unistd.h> /* for unlink() */
+#include "rexit.h"  /* for exit_err(), exit_trouble() */
+#include "main.h"   /* for world global */
 
 
 
@@ -26,6 +32,82 @@ static uint8_t write_uintX_bigendian(FILE * file, uint32_t x, uint8_t size);
 
 
 
+extern FILE * try_fopen(char * path, char * mode, char * f)
+{
+    char * msg1 = "Trouble in ";
+    char * msg2 = " with fopen() (mode '";
+    char * msg3 = "') on path '";
+    char * msg4 = "'.";
+    uint16_t size = strlen(msg1) + strlen(msg2) + strlen(msg3) + strlen(msg4)
+                    + strlen(f) + strlen(path) + strlen(mode) + 1;
+    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, msg);
+    return file_p;
+}
+
+
+
+extern void try_fclose(FILE * file, char * f)
+{
+    exit_trouble(fclose(file), f, "fclose()");
+}
+
+
+
+extern char * try_fgets(char * line, int linemax, FILE * file, char * f)
+{
+    char * test = fgets(line, linemax, file);
+    exit_trouble(NULL == test && ferror(file), f, "fgets()");
+    return test;
+}
+
+
+
+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_fclose_unlink_rename(FILE * file, char * p1, char * p2,
+                                     char * f)
+{
+    try_fclose(file, f);
+    char * msg1 = "Trouble in ";
+    char * msg4 = "'.";
+    if (!access(p2, F_OK))
+    {
+        char * msg2 = " with unlink() on path '";
+        uint16_t size = strlen(msg1) + strlen(msg2) + strlen(msg4)
+                        + strlen(f) + strlen(p2) + 1;
+        char msg[size];
+        sprintf(msg, "%s%s%s%s%s", msg1, f, msg2, p2, msg4);
+        exit_err(unlink(p2), msg);
+    }
+    char * msg2 = " with rename() from '";
+    char * msg3 = "' to '";
+    uint16_t size = strlen(msg1) + strlen(f) + strlen(msg2) + strlen(p1)
+                    + 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), msg);
+}
+
+
+
+extern uint16_t get_linemax(FILE * file, char * f)
+{
+    uint16_t linemax;
+    exit_trouble(textfile_sizes(file, &linemax, NULL), f, "textfile_sizes()");
+    return linemax;
+}
+
+
+
 extern uint8_t textfile_sizes(FILE * file, uint16_t * linemax_p,
                               uint16_t * n_lines_p)
 {