From e078a1023acd3d616e231f78b96818d6aebd8ebc Mon Sep 17 00:00:00 2001 From: legonzaur Date: Fri, 28 Feb 2025 11:40:57 +0100 Subject: [PATCH] Move into directory --- Dockerfile | 2 +- quotes.txt | 3 +-- config.h => server/config.h | 0 main.c => server/main.c | 0 quote.c => server/quote.c | 33 +++++++++++++++++++++------------ quote.h => server/quote.h | 0 server.c => server/server.c | 0 server.h => server/server.h | 0 8 files changed, 23 insertions(+), 15 deletions(-) rename config.h => server/config.h (100%) rename main.c => server/main.c (100%) rename quote.c => server/quote.c (56%) rename quote.h => server/quote.h (100%) rename server.c => server/server.c (100%) rename server.h => server/server.h (100%) diff --git a/Dockerfile b/Dockerfile index 85e8f90..3cfb169 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM git.legonzaur.fr/legonzaur/qotd/builder:latest AS builder WORKDIR /opt/builder -COPY . . +COPY .server . RUN cmake -B build -DSTATIC_BUILD=true WORKDIR build RUN make diff --git a/quotes.txt b/quotes.txt index 3302d58..221e6b8 100644 --- a/quotes.txt +++ b/quotes.txt @@ -1,2 +1 @@ -Test1 -Test2 \ No newline at end of file +première ligne \n Deuxième ligne diff --git a/config.h b/server/config.h similarity index 100% rename from config.h rename to server/config.h diff --git a/main.c b/server/main.c similarity index 100% rename from main.c rename to server/main.c diff --git a/quote.c b/server/quote.c similarity index 56% rename from quote.c rename to server/quote.c index 9645269..5afbee9 100644 --- a/quote.c +++ b/server/quote.c @@ -5,28 +5,33 @@ #include "quote.h" #include "config.h" -void getRandomQuote(char quote[2048]) { +void getRandomQuote(char quote[2048]) +{ int lineCount; long line; - if ((lineCount = getFileLineCount(QUOTES_FILE)) == -1) { + if ((lineCount = getFileLineCount(QUOTES_FILE)) == -1) + { puts("file does not exist"); exit(-1); } - line = random() % lineCount; + line = rand() % lineCount; getQuote(line, quote); } -void getQuote(long line, char quote[2048]) { - FILE* list; +void getQuote(long line, char quote[2048]) +{ + FILE *list; list = fopen(QUOTES_FILE, "r"); /*skip lines*/ - while (line > 0) { - if (fgetc(list) == '\n') { + while (line > 0) + { + if (fgetc(list) == '\n') + { line--; } } @@ -36,18 +41,22 @@ void getQuote(long line, char quote[2048]) { fclose(list); } -int getFileLineCount(char *filename) { +int getFileLineCount(char *filename) +{ char c; int lineCount = 0; - FILE* quotesFile = fopen(filename, "r"); + FILE *quotesFile = fopen(filename, "r"); - if (quotesFile == NULL) { + if (quotesFile == NULL) + { printf("no quote file found at \"%s\"\n", filename); return -1; } - while ((c = (char) fgetc(quotesFile)) != EOF) { - if (c == '\n') { + while ((c = (char)fgetc(quotesFile)) != EOF) + { + if (c == '\n') + { lineCount++; } } diff --git a/quote.h b/server/quote.h similarity index 100% rename from quote.h rename to server/quote.h diff --git a/server.c b/server/server.c similarity index 100% rename from server.c rename to server/server.c diff --git a/server.h b/server/server.h similarity index 100% rename from server.h rename to server/server.h