fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

use strcasecmp in some cases

Browse Source
This commit is contained in:
Linus Dierheimer
2021-02-27 21:10:27 +01:00
parent d1cec7d1e5
commit e06aab6836
4 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fastfetch.c
+13 -13
View File
@@ -45,7 +45,7 @@ static void printCommandHelpColor()
static void printCommandHelp(const char* command)
{
if(strcmp(command, "c") == 0 || strcmp(command, "-c") == 0 || strcmp(command, "color") == 0 || strcmp(command, "--color") == 0)
if(strcasecmp(command, "c") == 0 || strcasecmp(command, "-c") == 0 || strcasecmp(command, "color") == 0 || strcasecmp(command, "--color") == 0)
printCommandHelpColor();
else
printf("No specific help for command %s provided\n", command);
@@ -58,7 +58,7 @@ static void parseArguments(int argc, char** argv, FFconfig* config)
for(int i = 1; i < argc; i++)
{
if(strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0)
if(strcasecmp(argv[i], "-h") == 0 || strcasecmp(argv[i], "--help") == 0)
{
if(i == argc - 1)
printHelp();
@@ -67,26 +67,26 @@ static void parseArguments(int argc, char** argv, FFconfig* config)
exit(0);
}
else if(strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--version") == 0)
else if(strcasecmp(argv[i], "-v") == 0 || strcasecmp(argv[i], "--version") == 0)
{
puts(FASTFETCH_PROJECT_NAME" "FASTFETCH_PROJECT_VER);
exit(0);
}
else if(strcmp(argv[i], "--list-logos") == 0)
else if(strcasecmp(argv[i], "--list-logos") == 0)
{
ffListLogos();
exit(0);
}
else if(strcmp(argv[i], "--print-logos") == 0)
else if(strcasecmp(argv[i], "--print-logos") == 0)
{
ffPrintLogos(config->colorLogo);
exit(0);
}
else if(strcmp(argv[i], "--show-errors") == 0)
else if(strcasecmp(argv[i], "--show-errors") == 0)
{
config->showErrors = true;
}
else if(strcmp(argv[i], "-l") == 0 || strcmp(argv[i], "--logo") == 0)
else if(strcasecmp(argv[i], "-l") == 0 || strcasecmp(argv[i], "--logo") == 0)
{
if(i == argc - 1)
{
@@ -97,7 +97,7 @@ static void parseArguments(int argc, char** argv, FFconfig* config)
logoIndex = i + 1;
++i;
}
else if(strcmp(argv[i], "-c") == 0 || strcmp(argv[i], "--color") == 0)
else if(strcasecmp(argv[i], "-c") == 0 || strcasecmp(argv[i], "--color") == 0)
{
if(i == argc - 1)
{
@@ -113,7 +113,7 @@ static void parseArguments(int argc, char** argv, FFconfig* config)
sprintf(config->color, "\033[%sm", argv[i + 1]);
++i;
}
else if(strcmp(argv[i], "-s") == 0 || strcmp(argv[i], "--seperator") == 0)
else if(strcasecmp(argv[i], "-s") == 0 || strcasecmp(argv[i], "--seperator") == 0)
{
if(i == argc -1)
{
@@ -127,7 +127,7 @@ static void parseArguments(int argc, char** argv, FFconfig* config)
}
++i;
}
else if(strcmp(argv[i], "-x") == 0 || strcmp(argv[i], "--offsetx") == 0)
else if(strcasecmp(argv[i], "-x") == 0 || strcasecmp(argv[i], "--offsetx") == 0)
{
if(i == argc -1)
{
@@ -141,16 +141,16 @@ static void parseArguments(int argc, char** argv, FFconfig* config)
}
++i;
}
else if(strcmp(argv[i], "-r") == 0 || strcmp(argv[i], "--recache") == 0)
else if(strcasecmp(argv[i], "-r") == 0 || strcasecmp(argv[i], "--recache") == 0)
{
config->recache = true;
}
else if(strcmp(argv[i], "--no-color") == 0)
else if(strcasecmp(argv[i], "--no-color") == 0)
{
colorText = false;
config->colorLogo = false;
}
else if(strcmp(argv[i], "--no-color-logo") == 0)
else if(strcasecmp(argv[i], "--no-color-logo") == 0)
{
config->colorLogo = false;
}
src/modules/desktopenvironment.c
+5 -5
View File
@@ -26,7 +26,7 @@ void ffPrintDesktopEnvironment(FFinstance* instance)
ffPrintLogoAndKey(instance, "DE");
if(strcmp(currentDesktop, "KDE") == 0)
if(strcasecmp(currentDesktop, "KDE") == 0)
printKDE();
else
printf("%s", currentDesktop);
@@ -34,13 +34,13 @@ void ffPrintDesktopEnvironment(FFinstance* instance)
const char* sessionType = getenv("XDG_SESSION_TYPE");
if(sessionType == NULL)
putchar('\n');
else if(strcmp(sessionType, "wayland") == 0)
else if(strcasecmp(sessionType, "wayland") == 0)
puts(" (Wayland)");
else if(strcmp(sessionType, "x11") == 0)
else if(strcasecmp(sessionType, "x11") == 0)
puts(" (X11)");
else if(strcmp(sessionType, "tty") == 0)
else if(strcasecmp(sessionType, "tty") == 0)
puts(" TTY");
else if(strcmp(sessionType, "mir") == 0)
else if(strcasecmp(sessionType, "mir") == 0)
puts(" (Mir)");
else
printf(" (%s)\n", sessionType);
src/modules/gpu.c
+4 -4
View File
@@ -19,7 +19,7 @@ static void handleGPU(FFinstance* instance, struct pci_access* pacc, struct pci_
char name[512];
pci_lookup_name(pacc, name, sizeof(name), PCI_LOOKUP_DEVICE, dev->vendor_id, dev->device_id);
if(strcmp(vendor, "Advanced Micro Devices, Inc. [AMD/ATI]") == 0)
if(strcasecmp(vendor, "Advanced Micro Devices, Inc. [AMD/ATI]") == 0)
{
strcpy(gpu, "AMD ATI ");
}
@@ -50,9 +50,9 @@ void ffPrintGPU(FFinstance* instance)
char class[1024];
pci_lookup_name(pacc, class, sizeof(class), PCI_LOOKUP_CLASS, dev->device_class);
if(
strcmp("VGA compatible controller", class) == 0 ||
strcmp("3D controller", class) == 0 ||
strcmp("Display controller", class) == 0 )
strcasecmp("VGA compatible controller", class) == 0 ||
strcasecmp("3D controller", class) == 0 ||
strcasecmp("Display controller", class) == 0 )
{
handleGPU(instance, pacc, dev, counter++);
}
src/modules/terminal.c
+12 -12
View File
@@ -27,15 +27,15 @@ void printTerminalName(FFinstance* instance, const char* pid)
fclose(stat);
if (
strcmp(name, "bash") == 0 ||
strcmp(name, "sh") == 0 ||
strcmp(name, "zsh") == 0 ||
strcmp(name, "ksh") == 0 ||
strcmp(name, "fish") == 0 ||
strcmp(name, "sudo") == 0 ||
strcmp(name, "su") == 0 ||
strcmp(name, "doas") == 0 ||
strcmp(name, "strace") == 0 )
strcasecmp(name, "bash") == 0 ||
strcasecmp(name, "sh") == 0 ||
strcasecmp(name, "zsh") == 0 ||
strcasecmp(name, "ksh") == 0 ||
strcasecmp(name, "fish") == 0 ||
strcasecmp(name, "sudo") == 0 ||
strcasecmp(name, "su") == 0 ||
strcasecmp(name, "doas") == 0 ||
strcasecmp(name, "strace") == 0 )
{
printTerminalName(instance, ppid);
return;
@@ -44,9 +44,9 @@ void printTerminalName(FFinstance* instance, const char* pid)
ffPrintLogoAndKey(instance, "Terminal");
if(
strcmp(name, "systemd") == 0 ||
strcmp(name, "init") == 0 ||
strcmp(ppid, "0") == 0 )
strcasecmp(name, "systemd") == 0 ||
strcasecmp(name, "init") == 0 ||
strcasecmp(ppid, "0") == 0 )
{
puts("TTY");
}