Add sorting of fractions based on index and organize folder structure

src/client/Makefile → client/Makefile

@@ -1,6 +1,6 @@
 CC = gcc
 FLAGS = -Wall -Wextra -Wshadow
-SRC = main.c sock.c http.c utils.c fraction.c
+SRC = src/main.c src/sock.c src/http.c src/utils.c src/fraction.c
 OUT = client
 
 all:

src/client/fraction.h → client/include/fraction.h

@@ -26,4 +26,5 @@ int fraction_parse(char *data, size_t size, fraction_t *fraction);
 int check_magic(uint32_t data);
 void print_fraction(fraction_t fraction);
 void fraction_free(fraction_t *fraction);
+int compare_fractions(const void* a, const void* b);
 #endif

src/client/utils.h → client/include/utils.h

@@ -1,7 +1,7 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#include <cstdint>
+#include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>

src/client/fraction.c → client/src/fraction.c

@@ -1,4 +1,4 @@
-#include "fraction.h"
+#include "../include/fraction.h"
 #include <stdint.h>
 
 
@@ -108,3 +108,15 @@ void fraction_free(fraction_t *fraction) {
   fraction->index = 0;
   fraction->crc = 0;
 }
+
+// Function used by qsort() to compare the index of our fractions
+int compare_fractions(const void* a, const void* b) {
+  const fraction_t* frac_a = (const fraction_t*)a;
+  const fraction_t* frac_b = (const fraction_t*)b;
+
+  if (frac_a->index < frac_b->index) {
+    return -1;
+  } else {
+    return 1;
+  }
+}

src/client/http.c → client/src/http.c

@@ -1,4 +1,4 @@
-#include "http.h"
+#include "../include/http.h"
 
 #define HTTP_BUFFER_SIZE 1024
 

src/client/main.c → client/src/main.c

@@ -2,16 +2,16 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "fraction.h"
-#include "http.h"
-#include "sock.h"
-#include "utils.h"
+#include "../include/fraction.h"
+#include "../include/http.h"
+#include "../include/sock.h"
+#include "../include/utils.h"
 
 /* Networking constants */
 #define SERVER_IP "127.0.0.1"
 #define SERVER_PORT "8000"
 
-int main() {
+int main(void) {
   struct addrinfo hints, *ainfo;
   int sfd; // socket file descriptor
   char hostname[NI_MAXHOST];
@@ -66,6 +66,7 @@ int main() {
     goto cleanup_socket;
   }
 
+  // Storing the fractions in a array
   fraction_t *fractions = malloc(lines_read * sizeof(fraction_t));
   for (int i=0; i<lines_read; i++) {
     if (download_fraction(sfd, fraction_links[i], &fractions[i]) != 0) {
@@ -88,6 +89,9 @@ int main() {
   http_free(&http_fraction_res);
   http_free(&http_post_res);
 
+  // Sort the fractions based on index
+  qsort(fractions, lines_read, sizeof(fraction_t), compare_fractions);
+
   // Free fractions and links
   for (int i = 0; i < lines_read; i++) {
 

src/client/sock.c → client/src/sock.c

@@ -1,4 +1,4 @@
-#include "sock.h"
+#include "../include/sock.h"
 /* Wrapper for getaddrinfo, handles error */
 int h_getaddrinfo(const char *ip, const char *port, struct addrinfo *hints,
                   struct addrinfo **ainfo) {

src/client/utils.c → client/src/utils.c

@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "../include/utils.h"
 
 // if this dont work Skelly is to blame ;)
 int split_fraction_links(char *data, char *data_arr[], int maxlines) {