exhq/neowofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #138 from Joshix-1/replacement-fix

Browse source 
fix replacing ignorecase with multiple things to replace
This commit is contained in:
TheDarkBug 2021-10-03 13:52:50 +02:00 committed by GitHub
commit 9f32cc1a6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
uwufetch.c
View file

@ -188,9 +188,10 @@ void parse_config()
// opening and reading the config file // opening and reading the config file
FILE *config; FILE *config;
if (config_directory == NULL) if (config_directory == NULL) {
if (homedir != NULL) if (homedir != NULL)
config = fopen(strcat(homedir, "/.config/uwufetch/config"), "r"); config = fopen(strcat(homedir, "/.config/uwufetch/config"), "r");
}
else else
config = fopen(config_directory, "r"); config = fopen(config_directory, "r");
if (config == NULL) if (config == NULL)
@ -708,11 +709,12 @@ replace("Hello World!", "World", "everyone")
*/ */
void replace(char *original, char *search, char *replacer) void replace(char *original, char *search, char *replacer)
{ {
char buffer[1024];
char *ch; char *ch;
if (!(ch = strstr(original, search))) if (!(ch = strstr(original, search)))
return; return;
char buffer[1024];
strncpy(buffer, original, ch - original); strncpy(buffer, original, ch - original);
buffer[ch - original] = 0; buffer[ch - original] = 0;
sprintf(buffer + (ch - original), "%s%s", replacer, ch + strlen(search)); sprintf(buffer + (ch - original), "%s%s", replacer, ch + strlen(search));
@ -724,17 +726,19 @@ void replace(char *original, char *search, char *replacer)
void replace_ignorecase(char *original, char *search, char *replacer) void replace_ignorecase(char *original, char *search, char *replacer)
{ {
char buffer[1024];
char *ch; char *ch;
if (!(ch = strcasestr(original, search))) if (!(ch = strcasestr(original, search)))
return; return;
char buffer[1024];
strncpy(buffer, original, ch - original); strncpy(buffer, original, ch - original);
buffer[ch - original] = 0; buffer[ch - original] = 0;
sprintf(buffer + (ch - original), "%s%s", replacer, ch + strlen(search)); sprintf(buffer + (ch - original), "%s%s", replacer, ch + strlen(search));
original[0] = 0; original[0] = 0;
strcpy(original, buffer); strcpy(original, buffer);
replace(original, search, replacer);
return replace(original, search, replacer); return replace(original, search, replacer);
} }