Add files via upload

get_next_lineFI/get_next_line.c

@@ -1,7 +1,3 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include "get_next_line.h"
 
 char *get_next_line(const int fd)
@@ -31,7 +27,7 @@ char *get_next_line(const int fd)
     if (result <= 0 && (!valueholder || !*valueholder))
     {
         freeler(&valueholder, NULL, NULL);
-        return NULL;  // Indicate EOF or error
+        return NULL;
     }
 
     line = insert_line(&valueholder);
@@ -43,30 +39,30 @@ char *get_next_line(const int fd)
 // #include <fcntl.h> // For open()
 // #include <unistd.h> // For close()
 
-// int main(void)
-// {
-//     int fd;
-//     char *line;
-//     int lines_read = 0;
-//     // Open a file to test with
-//     fd = open("gnlTester-master/files/42_with_nl", O_RDONLY);
-//     if (fd == -1)
-//     {
-//         perror("Error opening file");
-//         return 1;
-//     }
-//     // Keep reading lines until EOF or an error occurs
-//     while ((line = get_next_line(fd)) != NULL)
-//     {
-//         printf("Line %d: %s", lines_read, line);
-//         // printf("\n");
-//         lines_read++;
-//         free(line); // Free the line returned by get_next_line
-//     }
-//     // Check if the last call to get_next_line failed
-//     if (line == NULL && lines_read == 0)
-//         printf("No lines read or error occurred.\n");
-//     // Close the file
-//     close(fd);
-//     return 0;
-// }
+int main(void)
+{
+    int fd;
+    char *line;
+    int lines_read = 0;
+    // Open a file to test with
+    fd = open("gnlTester-master/files/42_with_nl", O_RDONLY);
+    if (fd == -1)
+    {
+        perror("Error opening file");
+        return 1;
+    }
+    // Keep reading lines until EOF or an error occurs
+    while ((line = get_next_line(fd)) != NULL)
+    {
+        printf("Line %d: %s", lines_read, line);
+        // printf("\n");
+        lines_read++;
+        free(line); // Free the line returned by get_next_line
+    }
+    // Check if the last call to get_next_line failed
+    if (line == NULL && lines_read == 0)
+        printf("No lines read or error occurred.\n");
+    // Close the file
+    close(fd);
+    return 0;
+}

get_next_lineFI/get_next_line.h

@@ -1,8 +1,11 @@
 #include "libft/libft.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
 
 #define BUFF_SIZE 42
 
-char *get_next_line(const int fd);
 char *insert_line(char **valueholder);
 void update_holder(char **valueholder);
 int freeler(char **s1, char **s2, char **s3);

get_next_lineFI/get_next_line_utils.c

@@ -90,13 +90,10 @@ void update_holder(char **valueholder)
 // Inserts a line into the line buffer
 char *insert_line(char **valueholder)
 {
-    int i;
-    int j;
-    char *line;
-    char *indicator;
+    int i, j;
+    char *line,*indicator;
 
-    i = 0;
-    j = 0;
+    j = i = 0;
     line = (char *)malloc(ft_strlen(*valueholder) + 1);
     if (line == NULL)
         return NULL;
@@ -107,16 +104,13 @@ char *insert_line(char **valueholder)
             line[j++] = (*valueholder)[i++];
         line[j++] = (*valueholder)[i++];
         line[j] = '\0';
-    }
-    else
-    {
-        while ((*valueholder)[i] != '\0')
-            line[j++] = (*valueholder)[i++];
-        line[j] = '\0';
-        freeler(valueholder, NULL, NULL);
+        update_holder(valueholder);
         return line;
     }
-    update_holder(valueholder);
+    while ((*valueholder)[i] != '\0')
+        line[j++] = (*valueholder)[i++];
+    line[j] = '\0';
+    freeler(valueholder, NULL, NULL);
     return line;
 }
 
@@ -137,8 +131,6 @@ int read_file(char **valueholder, int bytes, int fd)
         free(temp);
         free(*valueholder);
         *valueholder = newline;
-        if (*valueholder == NULL)
-            return -1;
         if (strchr(*valueholder, '\n'))
             return 1;
     }