fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-03 11:44:18 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Faster removal of \n when loading a custom logo

Browse Source
This commit is contained in:
alborrajo
2021-05-27 16:38:41 +02:00
parent a10aa36b72
commit 53389850c2
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/logo.c
+11 -9
View File
@@ -269,7 +269,7 @@ static void loadGarudaLogo(FFlogo* logo, bool doColor)
sprintf(logo->chars[19], FASTFETCH_TEXT_MODIFIER_BOLT"%s "FASTFETCH_TEXT_MODIFIER_RESET, color);
}
static void loadLogoFromFile(FFlogo* logo, bool doColor, FFstrbuf* configColor, char* pathToFile)
static void loadLogoFromFile(FFlogo* logo, bool doColor, FFstrbuf* configColor, const char* pathToFile)
{
const char* color = doColor ? configColor->chars : "";
strcpy(logo->color, color);
@@ -277,18 +277,20 @@ static void loadLogoFromFile(FFlogo* logo, bool doColor, FFstrbuf* configColor,
FILE* fp = fopen(pathToFile, "r");
char* buff = NULL;
size_t buffLen = 0;
char* normalizedBuff;
int len;
int lineBytes;
int lineLength;
int logoWidth = 0, logoHeight = 0;
while(getline(&buff, &buffLen, fp) != -1) {
normalizedBuff = strtok(buff, "\n");
while( (lineBytes=getline(&buff, &buffLen, fp)) != -1 ) {
// Remove trailing newline
if(buff[lineBytes-1] == '\n')
buff[lineBytes-1] = '\0';
sprintf(logo->chars[logoHeight++], FASTFETCH_TEXT_MODIFIER_BOLT"%s%s"FASTFETCH_TEXT_MODIFIER_RESET, color, normalizedBuff);
sprintf(logo->chars[logoHeight++], FASTFETCH_TEXT_MODIFIER_BOLT"%s%s"FASTFETCH_TEXT_MODIFIER_RESET, color, buff);
len = utf8_strlen(normalizedBuff);
logoWidth = len > logoWidth
? len
lineLength = utf8_strlen(buff);
logoWidth = lineLength > logoWidth
? lineLength
: logoWidth;
}