Clean up error messages a bit.

[remoteglot-book] / binloader.cpp

diff --git a/binloader.cpp b/binloader.cpp
index 730f59279eba946af8073826b08cf775564cf994..7825116794da680bb0548f581e658192da1d70a8 100644 (file)
--- a/binloader.cpp
+++ b/binloader.cpp
@@ -150,76 +150,69 @@ int main(int argc, char **argv)
                        if (bpfen_len == -1) {
                                break;
                        }
-                       assert(bpfen_len <= 32);
-                       if (bpfen_len >= int(sizeof(bpfen))) {
+                       if (bpfen_len <= 0) {
+                               fprintf(stderr, "Underlong BPFEN (%d bytes)\n", bpfen_len);
+                               exit(1);
+                       }
+                       if (bpfen_len >= 32) {
                                fprintf(stderr, "Overlong BPFEN (%d bytes)\n", bpfen_len);
-               //              exit(1);
-                               break;
+                               exit(1);
                        }
                        if (fread(bpfen, bpfen_len, 1, fp) != 1) {
-                               perror("fread()");
-               //              exit(1);
-                               break;
+                               perror("fread(bpfen)");
+                               exit(1);
                        }
 
                        int r = getc(fp);
                        if (r == -1) {
                                perror("getc()");
-                               //exit(1);
-                               break;
+                               exit(1);
                        }
 
                        int opening_num, white_elo, black_elo, file_num;
                        time_t timestamp;
                        long start_position;
                        if (fread(&white_elo, sizeof(white_elo), 1, fp) != 1) {
-                               perror("fread()");
-                               //exit(1);
-                               break;
+                               perror("fread(white_elo)");
+                               exit(1);
                        }
                        if (fread(&black_elo, sizeof(black_elo), 1, fp) != 1) {
-                               perror("fread()");
-                               //exit(1);
-                               break;
+                               perror("fread(black_elo)");
+                               exit(1);
                        }
                        if (fread(&opening_num, sizeof(opening_num), 1, fp) != 1) {
-                               perror("fread()");
-                               //exit(1);
-                               break;
+                               perror("fread(opening_num)");
+                               exit(1);
                        }
                        if (fread(&timestamp, sizeof(timestamp), 1, fp) != 1) {
-                               perror("fread()");
-                               //exit(1);
-                               break;
+                               perror("fread(timestamp)");
+                               exit(1);
                        }
                        if (fread(&file_num, sizeof(file_num), 1, fp) != 1) {
-                               perror("fread()");
-                               //exit(1);
-                               break;
+                               perror("fread(file_num)");
+                               exit(1);
                        }
                        if (fread(&start_position, sizeof(start_position), 1, fp) != 1) {
-                               perror("fread()");
-                               //exit(1);
-                               break;
+                               perror("fread(start_position)");
+                               exit(1);
                        }
 
 
                        char move[8];
                        int l = getc(fp);
                        if (l == -1) {
+                               perror("getc(move_length)");
                                break;
                        }
                        if (l >= int(sizeof(move))) {
                                fprintf(stderr, "Overlong move (%d bytes)\n", l);
-               //              exit(1);
-                               break;
+                               exit(1);
                        }
                        if (l == 0) {
                                move[0] = 0;
                        } else if (fread(&move[0], l, 1, fp) != 1) {
-                               perror("fread()");
-               //              exit(1);
-                               break;
+                               perror("fread(move)");
+                               exit(1);
                        }
                        move[l] = 0;