Make Codestyle consistent

When more and more people started contributing to uwufetch, consistent codestyle was quickly lost. Some people used tabs, some people used spaces.
Even brace style was different for different contributors.
This patch makes the codystyle consistent again, using the codestyle used by TheDarkBug on commit f12c1be5fe because this was the last commit where TheDarkBug was the only contributor.
Commands used:
 - indent -kr -slc -br -brf -brs -i4 -cli4 uwufetch.c
 - some emacs macros
This commit is contained in:
Emily 2021-04-06 15:56:09 +02:00
parent e923244c97
commit 5ad00b16c8

View file

@ -37,6 +37,11 @@
#define PINK "\x1b[38;5;201m"
#define LPINK "\x1b[38;5;213m"
struct package_manager {
char command_string[128]; // command to get number of packages installed
char pkgman_name[16]; // name of the package manager
};
struct utsname sys_var;
struct sysinfo sys;
struct winsize win;
@ -45,7 +50,9 @@ struct winsize win;
int ram_total, ram_used = 0;
// initialise the variables to store data, gpu array can hold up to 8 gpus
int pkgs, a_i_flag = 0, target_width = 0;
char user[32], host[256], shell[64], version_name[64], cpu_model[256], gpu_model[8][256] = {{'0'},{'0'},{'0'},{'0'},{'0'},{'0'},{'0'},{'0'}}, pkgman_name[64], image_name[32];
char user[32], host[256], shell[64], version_name[64], cpu_model[256],
gpu_model[8][256] = { { '0' }, { '0' }, { '0' }, { '0' }, { '0' }, { '0' }, { '0' }, { '0' } },
pkgman_name[64], image_name[32];
int pkgman();
void get_info();
@ -104,13 +111,6 @@ int main(int argc, char *argv[]) {
int pkgman() { // this is just a function that returns the total of installed packages
int total = 0;
// TODO: should this be at the top of the program? maybe in a config.c file?
// TODO: do we need to `free()` this? I have no idea how to do memory management in C...
struct package_manager {
char command_string[128]; // command to get number of packages installed
char pkgman_name[16]; // name of the package manager
};
struct package_manager pkgmans[] = {
{ "apt list --installed 2> /dev/null | wc -l", "(apt)" },
{ "apk info 2> /dev/null | wc -l", "(apk)" },
@ -144,34 +144,24 @@ int pkgman() { // this is just a function that returns the total of installed pa
void print_info() {
// print collected info - from host to cpu info
printf( "\033[9A\033[18C%s%s%s@%s\n",
NORMAL, BOLD, user, host);
printf( "\033[18C%s%sOWOS %s%s\n",
NORMAL, BOLD, NORMAL, version_name);
printf( "\033[18C%s%sKEWNEL %s%s %s\n",
NORMAL, BOLD, NORMAL, sys_var.release, sys_var.machine);
printf( "\033[18C%s%sCPUWU %s%s\n",
NORMAL, BOLD, NORMAL, cpu_model);
printf("\033[9A\033[18C%s%s%s@%s\n", NORMAL, BOLD, user, host);
printf("\033[18C%s%sOWOS %s%s\n", NORMAL, BOLD, NORMAL, version_name);
printf("\033[18C%s%sKEWNEL %s%s %s\n", NORMAL, BOLD, NORMAL, sys_var.release, sys_var.machine);
printf("\033[18C%s%sCPUWU %s%s\n", NORMAL, BOLD, NORMAL, cpu_model);
// print the gpus
int gpu_iter = 0;
while (gpu_model[gpu_iter][0] != '0') {
printf( "\033[18C%s%sGPUWU %s%s\n",
NORMAL, BOLD, NORMAL, gpu_model[gpu_iter]);
printf("\033[18C%s%sGPUWU %s%s\n", NORMAL, BOLD, NORMAL, gpu_model[gpu_iter]);
gpu_iter++;
}
// print ram to uptime and colors
printf("\033[18C%s%sWAM %s%i MB/%i MB\n",
NORMAL, BOLD, NORMAL, (ram_used), ram_total);
printf("\033[18C%s%sSHELL %s%s\n",
NORMAL, BOLD, NORMAL, shell);
printf("\033[18C%s%sPKGS %s%s%d %s\n",
NORMAL, BOLD, NORMAL, NORMAL, pkgs, pkgman_name);
printf("\033[18C%s%sUWUPTIME %s"/*"%lid, "*/"%lih, %lim\n",
NORMAL, BOLD, NORMAL, /*sys.uptime/60/60/24,*/ sys.uptime/60/60, sys.uptime/60%60);
printf("\033[18C%s%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\n",
BOLD, BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, NORMAL);
printf("\033[18C%s%sWAM %s%i MB/%i MB\n", NORMAL, BOLD, NORMAL, (ram_used), ram_total);
printf("\033[18C%s%sSHELL %s%s\n", NORMAL, BOLD, NORMAL, shell);
printf("\033[18C%s%sPKGS %s%s%d %s\n", NORMAL, BOLD, NORMAL, NORMAL, pkgs, pkgman_name);
printf("\033[18C%s%sUWUPTIME %s" /*"%lid, " */ "%lih, %lim\n", NORMAL, BOLD, NORMAL, /*sys.uptime/60/60/24, */ sys.uptime / 60 / 60, sys.uptime / 60 % 60);
printf("\033[18C%s%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\n", BOLD, BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, NORMAL);
}
void get_info() { // get all necessary info
@ -186,8 +176,10 @@ void get_info() { // get all necessary info
FILE *os_release = fopen("/etc/os-release", "r");
FILE *cpuinfo = fopen("/proc/cpuinfo", "r");
if (os_release) { // get normal vars
while (fgets(line, sizeof(line), os_release)) if (sscanf(line, "\nID=%s", version_name)) break;
while (fgets(line, sizeof(line), cpuinfo)) if (sscanf(line, "model name : %[^\n]", cpu_model)) break;
while (fgets(line, sizeof(line), os_release))
if (sscanf(line, "\nID=%s", version_name)) break;
while (fgets(line, sizeof(line), cpuinfo))
if (sscanf(line, "model name : %[^\n]", cpu_model)) break;
sprintf(user, "%s", getenv("USER"));
fclose(os_release);
} else { // try for android vars, or unknown system
@ -201,8 +193,11 @@ void get_info() { // get all necessary info
FILE *whoami = popen("whoami", "r");
if (fscanf(whoami, "%s", user) == 3) sprintf(user, "unknown");
fclose(whoami);
while (fgets(line, sizeof(line), cpuinfo)) if (sscanf(line, "Hardware : %[^\n]", cpu_model)) break;
} else sprintf(version_name, "unknown");
while (fgets(line, sizeof(line), cpuinfo))
if (sscanf(line, "Hardware : %[^\n]", cpu_model)) break;
} else {
sprintf(version_name, "unknown");
}
}
fclose(cpuinfo);
gethostname(host, 256);
@ -220,14 +215,11 @@ void get_info() { // get all necessary info
truncate_name(sys_var.machine);
// ram
FILE *meminfo;
meminfo = popen("LANG=EN_us free 2> /dev/null", "r");
while (fgets(line, sizeof(line), meminfo)) {
// free command prints like this: "Mem:" total used free shared buff/cache available
if (sscanf(line, "Mem: %d %d", &ram_total, &ram_used)) {
// convert to megabytes
if (ram_total > 0 && ram_used > 0) {
@ -247,15 +239,22 @@ void get_info() { // get all necessary info
gpu = popen("lshw -class display 2> /dev/null", "r");
// add all gpus to the array gpu_model (up to 8 gpus)
while (fgets(line, sizeof(line), gpu)) if (sscanf(line, " product: %[^\n]", gpu_model[gpun])) gpun++;
while (fgets(line, sizeof(line), gpu))
if (sscanf(line, " product: %[^\n]", gpu_model[gpun]))
gpun++;
if (strlen(gpu_model[0]) < 2) {
// get gpus with lspci command
if (strcmp(version_name, "android") != 0) gpu = popen("lspci -mm 2> /dev/null | grep \"VGA\" | cut --fields=4,6 -d '\"' --output-delimiter=\" \" | sed \"s/ Controller.*//\"", "r");
else gpu = popen("getprop ro.hardware.vulkan 2> /dev/null", "r");
if (strcmp(version_name, "android") != 0) {
gpu = popen("lspci -mm 2> /dev/null | grep \"VGA\" | cut --fields=4,6 -d '\"' --output-delimiter=\" \" | sed \"s/ Controller.*//\"", "r");
} else {
gpu = popen("getprop ro.hardware.vulkan 2> /dev/null", "r");
}
}
// get all the gpus
while (fgets(line, sizeof(line), gpu)) if (sscanf(line, "%[^\n]", gpu_model[gpun])) gpun++;
while (fgets(line, sizeof(line), gpu)) {
if (sscanf(line, "%[^\n]", gpu_model[gpun])) gpun++;
}
fclose(gpu);
@ -269,19 +268,10 @@ void get_info() { // get all necessary info
}
void list(char *arg) { // prints distribution list
/* distributions are listed by distribution branch
to make the output easier to understand by the user.*/
printf( "%s -d <options>\n"
" Available distributions:\n"
" %sArch linux %sbased:\n"
" %sarch, artix, %smanjaro, \"manjaro-arm\"\n\n"
" %sDebian/%sUbuntu %sbased:\n"
" %sdebian, %slinuxmint, %spop, %sraspbian\n\n"
" %sOther/spare distributions:\n"
" %salpine, %sfedora, %sgentoo, %s\"void\", android, %sunknown\n\n"
" %sBSD:\n"
" freebsd, %sopenbsd\n",
arg, BLUE, NORMAL, BLUE, GREEN, // Arch based colors
// distributions are listed by distribution branch
// to make the output easier to understand by the user.
printf("%s -d <options>\n" " Available distributions:\n" " %sArch linux %sbased:\n" " %sarch, artix, %smanjaro, \"manjaro-arm\"\n\n" " %sDebian/%sUbuntu %sbased:\n" " %sdebian, %slinuxmint, %spop, %sraspbian\n\n" " %sOther/spare distributions:\n" " %salpine, %sfedora, %sgentoo, %s\"void\", android, %sunknown\n\n" " %sBSD:\n" " freebsd, %sopenbsd\n", arg,
BLUE, NORMAL, BLUE, GREEN, // Arch based colors
RED, YELLOW, NORMAL, RED, GREEN, BLUE, RED, // Debian based colors
NORMAL, BLUE, BLUE, PINK, GREEN, WHITE, // Other/spare distributions colors
RED, YELLOW); // BSD colors
@ -290,36 +280,30 @@ void list(char* arg) { // prints distribution list
void print_ascii() { // prints logo (as ascii art) of the given system. distributions listed alphabetically.
// linux
if (strcmp(version_name, "alpine") == 0) {
printf("\033[2E\033[4C%s. .___.\n"
" / \\/ \\ /\n"
" /OwO\\ɛU\\/ __\n"
" / \\ \\__/ \\\n"
"/ \\ \\\n\n\n", BLUE);
" / \\ \\__/ \\\n" "/ \\ \\\n\n\n", BLUE);
} else if (strcmp(version_name, "arch") == 0) {
printf("\033[1E\033[8C%s/\\\n"
" / \\\n"
" /\\ \\\n"
" / > w <\\\n"
" / __ \\\n"
" / __| |__-\\\n"
" /_-'' ''-_\\\n\n", BLUE);
" / __| |__-\\\n" " /_-'' ''-_\\\n\n", BLUE);
} else if (strcmp(version_name, "artix") == 0) {
printf("\033[1E\033[8C%s/\\\n"
" / \\\n"
" /`'.,\\\n"
" /\u2022 w \u2022 \\\n"
" / ,`\\\n"
" / ,.'`. \\\n"
" /.,'` `'.\\\n\n", BLUE);
" / ,.'`. \\\n" " /.,'` `'.\\\n\n", BLUE);
} else if (strcmp(version_name, "debian") == 0) {
printf("\033[1E\033[6C%s______\n"
" / ___ \\\n"
" | / OwO |\n"
" | \\____-\n"
" -_\n"
" --_\n\n\n", RED);
" | \\____-\n" " -_\n" " --_\n\n\n", RED);
} else if (strcmp(version_name, "fedora") == 0) {
printf("\033[1E\033[8C%s_____\n"
" / __)%s\\\n"
@ -328,17 +312,19 @@ void print_ascii() { // prints logo (as ascii art) of the given system. distribu
" / %s(_ _)%s_/\n"
" / / %s| |\n"
" %s\\ \\%s__/ |\n"
" %s\\%s(_____/\n", BLUE, CYAN, WHITE, BLUE, WHITE, CYAN, BLUE, CYAN, BLUE, CYAN, BLUE, CYAN, BLUE, CYAN, BLUE, CYAN, BLUE);
" %s\\%s(_____/\n", BLUE, CYAN, WHITE, BLUE, WHITE, CYAN,
BLUE, CYAN, BLUE, CYAN, BLUE, CYAN, BLUE, CYAN, BLUE, CYAN,
BLUE);
} else if (strcmp(version_name, "gentoo") == 0) {
printf("\033[1E\033[3C%s_-----_\n"
" ( \\\n"
" \\ OwO \\\n"
"%s \\ )\n"
" / _/\n"
" ( _-\n"
" \\____-\n\n", MAGENTA, WHITE);
" ( _-\n" " \\____-\n\n", MAGENTA, WHITE);
} else if (strcmp(version_name, "manjaro") == 0) {
printf( "\033[0E\033[1C\u25b3 \u25b3 \u25e0\u25e0\u25e0\u25e0\n"
printf
("\033[0E\033[1C\u25b3 \u25b3 \u25e0\u25e0\u25e0\u25e0\n"
" \e[0;42m \e[0m \e[0;42m \e[0m\n"
" \e[0;42m \e[0m\e[0;42m\e[1;30m > w < \e[0m\e[0;42m \e[0m \e[0;42m \e[0m\n"
" \e[0;42m \e[0m \e[0;42m \e[0m\n"
@ -347,7 +333,8 @@ void print_ascii() { // prints logo (as ascii art) of the given system. distribu
" \e[0;42m \e[0m \e[0;42m \e[0m \e[0;42m \e[0m\n"
" \e[0;42m \e[0m \e[0;42m \e[0m \e[0;42m \e[0m\n");
} else if (strcmp(version_name, "\"manjaro-arm\"") == 0) {
printf( "\033[0E\033[1C\u25b3 \u25b3 \u25e0\u25e0\u25e0\u25e0\n"
printf
("\033[0E\033[1C\u25b3 \u25b3 \u25e0\u25e0\u25e0\u25e0\n"
" \e[0;42m \e[0m \e[0;42m \e[0m\n"
" \e[0;42m \e[0m\e[0;42m\e[1;30m > w < \e[0m\e[0;42m \e[0m \e[0;42m \e[0m\n"
" \e[0;42m \e[0m \e[0;42m \e[0m\n"
@ -361,12 +348,13 @@ void print_ascii() { // prints logo (as ascii art) of the given system. distribu
" %s, %s¯| %s| UwU| %s|\n"
" %s|| %s| %s| | %s|\n"
" %s | %s| %s---- %s|\n"
" %s --%s'--------'\n\n",GREEN, WHITE, GREEN, WHITE, GREEN, WHITE, GREEN, WHITE, GREEN, WHITE, GREEN, WHITE, GREEN, WHITE, GREEN, WHITE, GREEN);
} else if (strcmp(version_name, "\"opensuse-leap\"") == 0 || strcmp(version_name, "\"opensuse-tumbleweed\"") == 0) {
printf("\033[3E\033[3C%s|\\----/|\n"
" _ / %sO O%s\\\n"
" __. W /\n"
" '----'\n\n\n", GREEN, WHITE, GREEN);
" %s --%s'--------'\n\n", GREEN, WHITE, GREEN, WHITE,
GREEN, WHITE, GREEN, WHITE, GREEN, WHITE, GREEN, WHITE,
GREEN, WHITE, GREEN, WHITE, GREEN);
} else if (strcmp(version_name, "\"opensuse-leap\"") == 0
|| strcmp(version_name, "\"opensuse-tumbleweed\"") == 0) {
printf("\033[3E\033[3C%s|\\----/|\n" " _ / %sO O%s\\\n"
" __. W /\n" " '----'\n\n\n", GREEN, WHITE, GREEN);
} else if (strcmp(version_name, "pop") == 0) {
printf("\033[2E\033[6C%s|\\.-----./|\n"
" |/ \\|\n"
@ -379,15 +367,15 @@ void print_ascii() { // prints logo (as ascii art) of the given system. distribu
" (_\\)(/_)\n"
" %s(>(__)<)\n"
" (_(_)(_)_)\n"
" (_(__)_)\n"
" (__)\n\n\n", GREEN, RED);
" (_(__)_)\n" " (__)\n\n\n", GREEN, RED);
} else if (strcmp(version_name, "ubuntu") == 0) {
printf("\033[1E\033[9C%s_\n"
" %s\u25E3%s__(_)%s\u25E2%s\n"
" _/ --- \\\n"
" (_) |>w<| |\n"
" \\ --- _/\n"
" %sC__/%s---(_)\n\n\n", LPINK, PINK, LPINK, PINK, LPINK, PINK, LPINK);
" %sC__/%s---(_)\n\n\n", LPINK, PINK, LPINK, PINK, LPINK,
PINK, LPINK);
} else if (strcmp(version_name, "\"void\"") == 0) {
printf("\033[2E\033[2C%s |\\_____/|\n"
" _\\____ |\n"
@ -409,8 +397,7 @@ void print_ascii() { // prints logo (as ascii art) of the given system. distribu
" \\_) (_/\n"
" | \\ / |\n"
" | O w O |\n"
" ; ;\n"
" '-_____-'\n\n", RED);
" ; ;\n" " '-_____-'\n\n", RED);
} else if (strcmp(version_name, "openbsd") == 0) {
printf("\033[1E\033[3C%s ______ \n"
@ -419,23 +406,27 @@ void print_ascii() { // prints logo (as ascii art) of the given system. distribu
"| %s> < %s| \n"
"|_ < %s// %sW %s// \n"
"%s/ \\ / \n"
" /-________-\\ \n\n", YELLOW, RED, YELLOW, WHITE, YELLOW, LPINK, WHITE, LPINK, YELLOW);
" /-________-\\ \n\n", YELLOW, RED, YELLOW, WHITE,
YELLOW, LPINK, WHITE, LPINK, YELLOW);
}
// everything else
else printf("\033[0E\033[2C%s._.--._.\n"
" \\|>%s_%s< |/\n"
" |%s:_/%s |\n"
" // \\ \\ ?\n"
" (| | ) /\n"
" %s/'\\_ _/`\\%s-\n"
" %s\\___)=(___/\n\n", WHITE, YELLOW, WHITE, YELLOW, WHITE, YELLOW, WHITE, YELLOW);
" %s\\___)=(___/\n\n", WHITE, YELLOW, WHITE, YELLOW, WHITE,
YELLOW, WHITE, YELLOW);
}
void print_image() { // prints logo (as an image) of the given system. distributions listed alphabetically.
char command[256];
if (strlen(image_name) > 1) sprintf(command, "viu -t -w 18 -h 8 %s 2> /dev/null", image_name);
else {
if (strlen(image_name) > 1) {
sprintf(command, "viu -t -w 18 -h 8 %s 2> /dev/null", image_name);
} else {
if (strcmp(version_name, "android") == 0) sprintf(command, "viu -t -w 18 -h 8 /data/data/com.termux/files/usr/lib/uwufetch/%s.png 2> /dev/null", version_name);
else sprintf(command, "viu -t -w 18 -h 8 /usr/lib/uwufetch/%s.png 2> /dev/null", version_name);
}
@ -447,8 +438,7 @@ void print_image() { // prints logo (as an image) of the given system. distribut
" is not installed\n"
" or the image\n"
" is not fount\n"
" Read IMAGES.md\n"
" for more info.\n\n", RED);
" Read IMAGES.md\n" " for more info.\n\n", RED);
}
}
@ -468,6 +458,7 @@ void usage(char* arg) {
void uwu_name() { // changes distro name to uwufied(?) name
#define STRING_TO_UWU(original, uwufied) if (strcmp(version_name, original) == 0) sprintf(version_name, "%s", uwufied)
// linux
STRING_TO_UWU("alpine", "Nyalpine");
else STRING_TO_UWU("arch", "Nyarch Linuwu");
@ -493,8 +484,10 @@ void uwu_name() { // changes distro name to uwufied(?) name
else STRING_TO_UWU("android", "Nyandroid"); // android at the end because it could be not considered as an actual distribution of gnu/linux
// BSD
else STRING_TO_UWU("freebsd", "FweeBSD");
else STRING_TO_UWU("openbsd", "OwOpenBSD");
else STRING_TO_UWU
("freebsd", "FweeBSD");
else STRING_TO_UWU
("openbsd", "OwOpenBSD");
else {
@ -514,18 +507,15 @@ void truncate_name(char* name) {
}
// remove square brackets (for gpu names)
void remove_brackets(char *str)
{
int i,j;
i = 0;
while(i < (int)strlen(str))
{
if (str[i] == '[' || str[i] == ']')
{
for (j = i; j < (int)strlen(str); j++)
{
void remove_brackets(char *str) {
int i = 0, j;
while (i < (int) strlen(str)) {
if (str[i] == '[' || str[i] == ']') {
for (j = i; j < (int) strlen(str); j++) {
str[j] = str[j + 1];
}
} else i++;
} else {
i++;
}
}
}