Initializacia

cv7/program.c

@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <assert.h>
 #include <stdlib.h>
 
 #define SIZE 100
@@ -12,17 +13,24 @@ struct tree {
 
 struct tree* read_tree() {
     char buffer[SIZE];
-    memset(buffer, 0, SIZE);
+    
-    char* r = fgets(buffer, SIZE, stdin);
+    while (fgets(buffer, SIZE, stdin)) {
-    if (!r || buffer[0] == '\n') {
-        return NULL;
-    }
         buffer[strcspn(buffer, "\n")] = 0; 
+        
+        if (buffer[0] == '\0') {
+            continue; 
+        }
+        
         struct tree* node = calloc(1, sizeof(struct tree));
         strncpy(node->value, buffer, SIZE - 1);
         return node;
     }
     
+    return NULL;
+}
+
+
+
 struct tree* load_tree() {
     struct tree* node = read_tree();
     if (!node) {
@@ -32,17 +40,25 @@ struct tree* load_tree() {
     if (node->value[0] != '*') { 
         node->left = load_tree();
         node->right = load_tree();
+    } else { 
+        node->left = NULL;
+        node->right = NULL;
     }
+
     return node;
 }
 
+
+
+
+
 void run_tree(struct tree* tree) {
     if (!tree) {
         return;
     }
 
     if (tree->value[0] == '*') {
-        printf("%s\nKoniec\n", tree->value + 1); 
+        printf("*%s\nKoniec\n", tree->value + 1);
         return;
     }
 
@@ -75,13 +91,11 @@ void destroy_tree(struct tree* tree) {
 }
 
 void count_items(struct tree* tree, int* count) {
-    if (!tree) return;
+    if (tree->left == NULL && tree->right == NULL) {
-
-    if (tree->value[0] == '*') {
         (*count)++;
     } else {
-        if (tree->left) count_items(tree->left, count);
+        count_items(tree->left, count);
-        if (tree->right) count_items(tree->right, count);
+        count_items(tree->right, count);
     }
 }
 
@@ -100,7 +114,8 @@ int main() {
     printf("Odpovedajte 'a' pre prvu moznost alebo 'n' pre druhu moznost.\n");
 
     run_tree(root);
-
     destroy_tree(root);
     return 0;
 }
+
+