From 17cd2020c4f52cb368cc0c7c49582f07363abd62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=88=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=82=D0=BE=D0=BA=D0=B8?= =?UTF-8?q?=D1=9B-=D0=A8=D1=83=D0=BC=D0=B0=D1=80=D0=B0=D1=86?= Date: Thu, 13 May 2021 16:09:45 +0200 Subject: [PATCH] Hopefully getting debian-based-distro package count --- fetchy | Bin 0 -> 21712 bytes fetchy.c | 47 ++++++++++++++++++++++++++--------------------- 2 files changed, 26 insertions(+), 21 deletions(-) create mode 100755 fetchy diff --git a/fetchy b/fetchy new file mode 100755 index 0000000000000000000000000000000000000000..e2a8e73d657e6ebcd39b48267fddd358ad92980d GIT binary patch literal 21712 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 L8dus3Y%KdPqGB*T literal 0 HcmV?d00001 diff --git a/fetchy.c b/fetchy.c index bb4b4e5..9713ade 100644 --- a/fetchy.c +++ b/fetchy.c @@ -11,7 +11,7 @@ void truncate_spaces_leading(char *str); void truncate_spaces_trailing(char *str); void read_line(char x); -int count_files(char *path); +static int count_files(DIR *package_dir); static char *get_sys(char *sys, char *os_name); @@ -58,7 +58,7 @@ int main(int argc, char *argv[]){ fprintf(FCache, "GPU : %s\n", get_gpu(gpu)); fclose(FCache); - printf("\n\n\aFILE CACHING DONE!! \n\nValues returned : \nCPU -> %s\nGPU -> %s\n\n Caching occurs only once, every subsequent execution will run program normally. Enjoy!\n\n", get_cpu(cpu_name), get_gpu(gpu)); + printf("\n\aFILE CACHING DONE!! \n\nValues returned : \nCPU -> %s\nGPU -> %s\n\n Caching occurs only once, every subsequent execution will run program normally. Enjoy!\n\n", get_cpu(cpu_name), get_gpu(gpu)); exit(0); } @@ -92,7 +92,7 @@ int main(int argc, char *argv[]){ printf("\x1b[1m .-. \x1b[36mOS\x1b[0m -> %s\n", os); printf("\x1b[1m .-'``(|||) \x1b[36mKERNEL\x1b[0m -> %s\n", get_kernel(kern_name)); printf("\x1b[1m ,`\\ \\ `-`. \x1b[36mUPTIME\x1b[0m -> %s\n", get_uptime(uptime)); - printf("\x1b[1m / \\ '``-. ` \x1b[36mPACKAGES\x1b[0m -> *W.I.P.*\n"); //%d\n", get_packages(sys)); + printf("\x1b[1m / \\ '``-. ` \x1b[36mPACKAGES\x1b[0m -> %s\n", get_packages(sys)); //%d\n", get_packages(sys)); printf("\x1b[1m .-. , `___: \x1b[36m\x1b[0m \n"); printf("\x1b[1m (:::) : ___ \x1b[36mCPU\x1b[0m -> %s\n", cpu_name); printf("\x1b[1m `-` ` , : \x1b[36mGPU\x1b[0m -> %s\n", gpu); @@ -164,6 +164,23 @@ void truncate_spaces_trailing(char *str){ } +static int count_files(DIR *package_dir){ + + struct dirent * entry; + int file_count = 0; + + while ((entry = readdir(package_dir)) != NULL) { + if (entry->d_type == DT_DIR) { + file_count++; + } + } + closedir(package_dir); + + return file_count; +} + + + static char *get_sys(char *sys, char *os_name){ os_name = malloc(BUF_SIZE); char *name = malloc(BUF_SIZE); @@ -255,34 +272,22 @@ static char *get_uptime(char *uptime){ static int get_packages(char sys){ - DIR *packageDir; - int fileCount = 0; - struct dirent * entry; + //DIR *package_dir; + int pkg_count = 0; + switch (sys){ case 'a': - packageDir = opendir("/var/lib/pacman/local"); + pkg_count = count_files(opendir("/var/lib/pacman/local")); break; case 'u': - + pkg_count = count_files(opendir("/usr/bin")) + count_files(opendir("/sbin")); break; default: printf("\n\n\aUnable to find package list\n\n"); } - - - while ((entry = readdir(packageDir)) != NULL) { - if (entry->d_type == DT_DIR) { - fileCount++; - } - } - closedir(packageDir); - - - - return fileCount; - + return pkg_count; }