read_file_to_board deals with spaces and unwelcome chars

Author: nofarmo

file_utils.c

@@ -3,6 +3,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+int count_fixed(Board* board);
+int check_only_digits(const char* path);
+
 /* write current board to path in file format
 mark if fixed. if in edit mode all is fixed.*/
 int write_file_from_board (Board* board,const char* path){
@@ -46,20 +49,27 @@ int write_file_from_board (Board* board,const char* path){
 return -1 if didn't create_empty_board
 return 0 if not vaild file:
 correct format, enough values, correct range, fixed cells are legal*/
-int read_file_to_board (Board* board, const char* path, int check_errors){
+int read_file_to_board(Board* board, const char* path, int check_errors){
     int row,col,size;
     int value,count,count_scan,count_dot,count_char;
     int i,j;
     char ch;
     FILE* fptr;
     const char* r = "r";
+    int count_dots;
 
     fptr = fopen(path,r); 
     if(fptr ==NULL){
         fclose(fptr);
         return -1;
     }
 
+    count_dots = check_only_digits(path);
+    if(count_dots==-1){ /*contain unwelcome chars!*/
+        fclose(fptr);
+        return -1;
+    }
+
     row = 0;
     col = 0;
     count = 0;
@@ -107,7 +117,8 @@ int read_file_to_board (Board* board, const char* path, int check_errors){
             }
             if(count_dot == 1){
                 if(value == 0){
-                    board->fixed_board[i][j]=BOARD_NULL_VALUE;
+                    fclose(fptr);
+                    return 0;
                 }
                 else{
                     if(check_errors == 0){
@@ -145,6 +156,56 @@ int read_file_to_board (Board* board, const char* path, int check_errors){
         fclose(fptr);
         return 0;
     }
+    if(count_dots != count_fixed(board)){
+        fclose(fptr);
+        return 0;
+    }
     fclose(fptr);
     return 1;
+}
+
+/* check if there are chars which different than spaces, numbers and dot
+return -1 if there is, otherwise return counter of dots in file*/
+int check_only_digits(const char* path){
+    int count_dots = 0;
+    FILE* fptr;
+    const char* r = "r";
+    char ch;
+    unsigned char ch1;
+
+    fptr = fopen(path,r); 
+    /*called if opened ok, but to make sure:*/
+    if(fptr ==NULL){
+        fclose(fptr);
+        return -1;
+    }
+
+    while ((ch=getc(fptr))!=EOF)
+     {
+        ch1= (unsigned char) ch;  
+        if((ch1 < '0' || ch1 > '9') && ch1 != ' ' && ch1 != '\n' && ch1!='\t' && ch1!='.'){
+            fclose(fptr);
+            return -1;
+        }
+        if(ch1 == '.'){
+            count_dots++;
+        }
+    }       
+    fclose(fptr);
+    return count_dots;
+}
+
+/* in order to check if equal to counter of dot in file*/
+int count_fixed(Board* board){
+    int i, j;
+    int count = 0;
+    int size = (board->num_of_rows)*(board->num_of_columns);
+    for (i=0; i<size; i++){
+        for (j=0; j<size; j++){
+            if(board->fixed_board[i][j]!=BOARD_NULL_VALUE){
+                count++;
+            }
+        }
+    }
+    return count;
 }

sudoku_board_actions.c

@@ -120,7 +120,7 @@ void print_board(Board* board){
 
         for(b = 0; b < board->num_of_rows; b++){
             row = b + a*(board->num_of_rows);
-            printf("| ");
+            printf("|");
             for(c = 0; c < board->num_of_rows; c++){
                 for(d = 0; d < board->num_of_columns; d++){
                     col = d + c*board->num_of_columns;
@@ -142,7 +142,7 @@ void print_board(Board* board){
                     } 
                 }
                 if(c != (board->num_of_rows-1))
-                    printf("| ");
+                    printf("|");
             }
             printf("|\n");
         }     

testnine

@@ -0,0 +1,10 @@
+3 3
+1. 0 0 0 0 0 0 0 0 
+0 2. 0 0 0 0 0 0 0 
+0 0 3. 0 0 0 0 0 0 
+0 0 0 4. 0 0 0 0 0 
+0 0 0 0 5. 0 0 0 0 
+0 0 0 0 0 6. 0 0 0 
+0 0 0 0 0 0 7. 0 0 
+0 0 0 0 0 0 0 8. 0 
+0 0 0 0 0 0 0 0 9. 

testspaces

@@ -0,0 +1,9 @@
+2 3
+1. 0 0
+           0     0 0             0 2 0 0             
+           0 0 5        0 3      0 0
+           
+           
+           
+           
+                         0 0     0 0 4 0     0 0 2 0 0  0 0 0        0 0 0                   0 0

winner renamed to testwinner

@@ -1,5 +1,5 @@
 2 2
-2. 0 0 0 
-0 1 0 0 
+2 0 0 0
+0 1. 0 0 
 0 0 0 0 
-0 1 0 3 
+0 1 0 3