From 44549e32d94cb01d22aa30fe29c7ee4227643ef9 Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Sat, 27 Mar 2021 18:35:30 +0100 Subject: [PATCH] removed remaining strcat --- src/common.c | 12 +++++++----- src/fastfetch.c | 24 +++++++++++++----------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/common.c b/src/common.c index d13caf1ad..4de891fc0 100644 --- a/src/common.c +++ b/src/common.c @@ -134,12 +134,14 @@ void ffParsePropFile(const char* fileName, const char* regex, char* buffer) void ffParsePropFileHome(FFinstance* instance, const char* relativeFile, const char* regex, char* buffer) { - char absolutePath[512]; - strcpy(absolutePath, instance->state.passwd->pw_dir); - strcat(absolutePath, "/"); - strcat(absolutePath, relativeFile); + FF_STRBUF_CREATE(absolutePath); + ffStrbufAppendS(&absolutePath, instance->state.passwd->pw_dir); + ffStrbufAppendC(&absolutePath, '/'); + ffStrbufAppendS(&absolutePath, relativeFile); - ffParsePropFile(absolutePath, regex, buffer); + ffParsePropFile(absolutePath.chars, regex, buffer); + + ffStrbufDestroy(&absolutePath); } static inline bool strSet(const char* str) diff --git a/src/fastfetch.c b/src/fastfetch.c index f123204f3..b128686ff 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -387,34 +387,34 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con static void parseConfigFile(FFinstance* instance, FFdata* data) { - char fileName[256]; + FF_STRBUF_CREATE(filename); const char* xdgConfig = getenv("XDG_CONFIG_HOME"); if(xdgConfig == NULL) { - strcpy(fileName, instance->state.passwd->pw_dir); - strcat(fileName, "/.config"); + ffStrbufAppendS(&filename, instance->state.passwd->pw_dir); + ffStrbufAppendS(&filename, "/.config"); } else { - strcpy(fileName, xdgConfig); + ffStrbufAppendS(&filename, xdgConfig); } - mkdir(fileName, S_IRWXU | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH); //I hope everybody has a config folder but whow knews + mkdir(filename.chars, S_IRWXU | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH); //I hope everybody has a config folder but whow knews - strcat(fileName, "/fastfetch/"); - mkdir(fileName, S_IRWXU | S_IRGRP | S_IROTH); + ffStrbufAppendS(&filename, "/fastfetch/"); + mkdir(filename.chars, S_IRWXU | S_IRGRP | S_IROTH); - strcat(fileName, "config.conf"); + ffStrbufAppendS(&filename, "config.conf"); - if(access(fileName, F_OK) != 0) + if(access(filename.chars, F_OK) != 0) { - FILE* file = fopen(fileName, "w"); + FILE* file = fopen(filename.chars, "w"); fputs(FASTFETCH_DEFAULT_CONFIG, file); fclose(file); return; } - FILE* file = fopen(fileName, "r"); + FILE* file = fopen(filename.chars, "r"); char* lineStart = NULL; size_t len = 0; @@ -467,6 +467,8 @@ static void parseConfigFile(FFinstance* instance, FFdata* data) free(lineStart); fclose(file); + + ffStrbufDestroy(&filename); } static void parseArguments(FFinstance* instance, FFdata* data, int argc, const char** argv)