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

Merge pull request #148 from elegantShock2258/main

Browse source 
[OPTIMIZE] Fixed some warnings on code.
This commit is contained in:
TheDarkBug 2021-10-14 22:39:43 +02:00 committed by GitHub
commit de28cf483d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
uwufetch.c
View file

@ -122,11 +122,13 @@ void remove_brackets(char *str);
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
char *cache_env = getenv("UWUFETCH_CACHE_ENABLED"); char *cache_env = getenv("UWUFETCH_CACHE_ENABLED");
int cache_enabled = 0;
if (cache_env != NULL) if (cache_env != NULL)
{ {
int cache_enabled = 0;
char buffer[128]; char buffer[128];
sscanf(cache_env, "%[TRUEtrue1]", buffer);
sscanf(cache_env, "%4[TRUEtrue1]", buffer);
cache_enabled = (strcmp(buffer, "true") == 0 || strcmp(buffer, "TRUE") == 0 || strcmp(buffer, "1") == 0); cache_enabled = (strcmp(buffer, "true") == 0 || strcmp(buffer, "TRUE") == 0 || strcmp(buffer, "1") == 0);
if (cache_enabled) if (cache_enabled)
{ {
@ -205,7 +207,6 @@ int main(int argc, char *argv[])
void parse_config() void parse_config()
{ {
char line[256]; char line[256];
char homedir[512];
// opening and reading the config file // opening and reading the config file
FILE *config=NULL; FILE *config=NULL;
@ -213,6 +214,7 @@ void parse_config()
{ {
if (getenv("HOME") != NULL) if (getenv("HOME") != NULL)
{ {
char homedir[512];
sprintf(homedir, "%s/.config/uwufetch/config", getenv("HOME")); sprintf(homedir, "%s/.config/uwufetch/config", getenv("HOME"));
config = fopen(homedir, "r"); config = fopen(homedir, "r");
} }
@ -313,7 +315,7 @@ int pkgman()
comma_separator++; comma_separator++;
char spkg_count[16]; char spkg_count[16];
sprintf(spkg_count, "%d", pkg_count); sprintf(spkg_count, "%u", pkg_count);
strcat(pkgman_name, spkg_count); strcat(pkgman_name, spkg_count);
strcat(pkgman_name, " "); strcat(pkgman_name, " ");
strcat(pkgman_name, current->pkgman_name); // this is the line that breaks mac os, but something strange happens before strcat(pkgman_name, current->pkgman_name); // this is the line that breaks mac os, but something strange happens before
@ -495,7 +497,6 @@ int read_cache()
void print_cache() void print_cache()
{ {
char line[256];
// ram // ram
#ifndef __APPLE__ #ifndef __APPLE__
#ifndef __CYGWIN__ #ifndef __CYGWIN__
@ -506,6 +507,7 @@ void print_cache()
#else #else
meminfo = popen("LANG=EN_us free -m 2> /dev/null", "r"); meminfo = popen("LANG=EN_us free -m 2> /dev/null", "r");
#endif #endif
char line[256];
while (fgets(line, sizeof(line), meminfo)) while (fgets(line, sizeof(line), meminfo))
// free command prints like this: "Mem:" total used free shared buff/cache available // free command prints like this: "Mem:" total used free shared buff/cache available
sscanf(line, "Mem: %d %d", &ram_total, &ram_used); sscanf(line, "Mem: %d %d", &ram_total, &ram_used);