From 271fefa2916f65d5964e21c7c752bea2e6d1689b Mon Sep 17 00:00:00 2001 From: rafa_99 Date: Thu, 31 Dec 2020 13:21:44 +0000 Subject: Updated Clang Format Style and Replaced APT order due to gentoo emerge-select java --- flags.c | 191 ++++++++++++++++++++++++++++++++++------------------------------ flags.h | 18 +++--- pkg.c | 16 +++--- utils.c | 60 ++++++++++---------- utils.h | 20 +++---- 5 files changed, 161 insertions(+), 144 deletions(-) diff --git a/flags.c b/flags.c index e7741f5..fafa297 100644 --- a/flags.c +++ b/flags.c @@ -1,237 +1,248 @@ +#include "flags.h" +#include "utils.h" +#include #include #include -#include "flags.h" -void flags(char flag, char* packages) +void +flags (char flag, char *packages) { - int os = detectOsType(); + int os = detectOsType (); switch (flag) { case 'c': - cleanPackages(os); + cleanPackages (os); break; case 'h': - help(); + help (); break; case 'i': - installPackages(os, packages); + installPackages (os, packages); break; case 'q': - queryPackages(os); + queryPackages (os); break; case 'r': - removePackages(os, packages); + removePackages (os, packages); break; case 's': - searchPackages(os, packages); + searchPackages (os, packages); break; case 'u': - updatePackages(os); + updatePackages (os); break; default: - puts("Command not found"); - help(); + puts ("Command not found"); + help (); } } -void cleanPackages(int os) +void +cleanPackages (int os) { - switch(os) + switch (os) { - case apt: - system("apt autoremove --purge || apt clean"); - break; - case dnf: - system("dnf clean all && dnf autoremove"); + system ("dnf clean all && dnf autoremove"); break; case emerge: - system("emerge -caq"); + system ("emerge -caq"); break; case pacman: - system("pacman -Rns \"$(pacman -Qtdq)\" || pacman -Scc"); + system ("pacman -Rns \"$(pacman -Qtdq)\" || pacman -Scc"); break; case xbps: - system("xbps-remove -ROo"); + system ("xbps-remove -ROo"); break; case zypper: - system("zypper cc -a"); + system ("zypper cc -a"); + break; + + case apt: + system ("apt autoremove --purge || apt clean"); } } -void help() +void +help () { - printf("PKG Options:\n" - "c - removes orphans and cleans the package cache\n" - "h - display this message\n" - "i - installs selected packages\n" - "q - display installed packages\n" - "r - remove a selected package\n" - "s - look up for a package in the available repositories\n" - "u - updates repos and packages\n\n"); + printf ("PKG Options:\n" + "c - removes orphans and cleans the package cache\n" + "h - display this message\n" + "i - installs selected packages\n" + "q - display installed packages\n" + "r - remove a selected package\n" + "s - look up for a package in the available repositories\n" + "u - updates repos and packages\n\n"); } -void installPackages(int os, char *packages) +void +installPackages (int os, char *packages) { - if ( strlen(packages) > 0 ) + if (strlen (packages) > 0) { - switch(os) + switch (os) { - case apt: - commandProcessor(packages, "apt install "); - break; - case dnf: - commandProcessor(packages, "dnf install "); + commandProcessor (packages, "dnf install "); break; case emerge: - commandProcessor(packages, "emerge -aq "); + commandProcessor (packages, "emerge -aq "); break; case pacman: - commandProcessor(packages, "pacman -S "); + commandProcessor (packages, "pacman -S "); break; case xbps: - commandProcessor(packages, "xbps-install -S "); + commandProcessor (packages, "xbps-install -S "); break; case zypper: - commandProcessor(packages, "zypper install "); + commandProcessor (packages, "zypper install "); + break; + + case apt: + commandProcessor (packages, "apt install "); } } } -void queryPackages(int os) +void +queryPackages (int os) { - switch(os) + switch (os) { - case apt: - system("apt list --installed"); - break; - case dnf: - system("dnf list --installed"); + system ("dnf list --installed"); break; case emerge: - system("cd /var/db/pkg/ && ls -d */* | sed 's:\\/$::'"); + system ("cd /var/db/pkg/ && ls -d */* | sed 's:\\/$::'"); break; case pacman: - system("pacman -Qs"); + system ("pacman -Qs"); break; case xbps: - system("xbps-query -l"); + system ("xbps-query -l"); break; case zypper: - system("zypper packages -i"); + system ("zypper packages -i"); + break; + + case apt: + system ("apt list --installed"); } } -void removePackages(int os, char *packages) +void +removePackages (int os, char *packages) { - if ( strlen(packages) > 0 ) + if (strlen (packages) > 0) { - switch(os) + switch (os) { - case apt: - commandProcessor(packages, "apt autoremove --purge "); - break; - case dnf: - commandProcessor(packages, "dnf remove "); + commandProcessor (packages, "dnf remove "); break; case emerge: - commandProcessor(packages, "emerge -caq "); + commandProcessor (packages, "emerge -caq "); break; case pacman: - commandProcessor(packages, "pacman -Rnsc "); + commandProcessor (packages, "pacman -Rnsc "); break; case xbps: - commandProcessor(packages, "xbps-remove -ROo "); + commandProcessor (packages, "xbps-remove -ROo "); break; case zypper: - commandProcessor(packages, "zypper remove -u "); + commandProcessor (packages, "zypper remove -u "); + break; + + case apt: + commandProcessor (packages, "apt autoremove --purge "); } } } -void searchPackages(int os, char *packages) +void +searchPackages (int os, char *packages) { - if ( strlen(packages) > 0 ) + if (strlen (packages) > 0) { - switch(os) + switch (os) { - case apt: - commandProcessor(packages, "apt search "); - break; - case dnf: - commandProcessor(packages, "dnf search "); + commandProcessor (packages, "dnf search "); break; case emerge: - commandProcessor(packages, "emerge -s "); + commandProcessor (packages, "emerge -s "); break; case pacman: - commandProcessor(packages, "pacman -Ss "); + commandProcessor (packages, "pacman -Ss "); break; case xbps: - commandProcessor(packages, "xbps-query -Rs "); + commandProcessor (packages, "xbps-query -Rs "); break; case zypper: - commandProcessor(packages, "zypper search "); + commandProcessor (packages, "zypper search "); + break; + + case apt: + commandProcessor (packages, "apt search "); } } } -void updatePackages(int os) +void +updatePackages (int os) { - switch(os) + switch (os) { - case apt: - system("apt update && apt upgrade -y"); - break; - case dnf: - system("dnf update"); + system ("dnf update"); break; case emerge: - system("emerge-webrsync && emerge -uaqDU --keep-going --with-bdeps=y --newuse @world"); + system ("emerge-webrsync && emerge -uaqDU --keep-going --with-bdeps=y " + "--newuse @world"); break; case pacman: - system("pacman -Syyuu"); + system ("pacman -Syyuu"); break; case xbps: - system("xbps-install -Su"); + system ("xbps-install -Su"); break; case zypper: - system("zypper update && zypper dist-upgrade"); + system ("zypper update && zypper dist-upgrade"); + break; + + case apt: + system ("apt update && apt upgrade -y"); } } diff --git a/flags.h b/flags.h index 065bdc5..bb9995b 100644 --- a/flags.h +++ b/flags.h @@ -1,10 +1,10 @@ -#include "utils.h" +#include -void flags(char flag, char* packages); -void cleanPackages(int os); -void help(); -void installPackages(int os, char* packages); -void queryPackages(int os); -void removePackages(int os, char* packages); -void searchPackages(int os, char* packages); -void updatePackages(int os); +void flags (char flag, char *packages); +void cleanPackages (int os); +void help (); +void installPackages (int os, char *packages); +void queryPackages (int os); +void removePackages (int os, char *packages); +void searchPackages (int os, char *packages); +void updatePackages (int os); diff --git a/pkg.c b/pkg.c index fb03186..d0c7ab8 100644 --- a/pkg.c +++ b/pkg.c @@ -1,17 +1,19 @@ -#include #include "flags.h" +#include "utils.h" +#include -int main(int argc, char **argv) +int +main (int argc, char **argv) { - if ( argc > 1 ) + if (argc > 1) { - char* arg = stringedArgument(argc, argv); - flags(*(argv[1]), arg); - free(arg); + char *arg = stringedArgument (argc, argv); + flags (*(argv[1]), arg); + free (arg); } else { - flags('h', ""); + flags ('h', ""); } return 0; diff --git a/utils.c b/utils.c index 181b4c2..ad09c4f 100644 --- a/utils.c +++ b/utils.c @@ -4,85 +4,89 @@ #include #include -int checkIfFileExists(char *path) +int +checkIfFileExists (char *path) { - return access(path, F_OK); + return access (path, F_OK); } -int detectOsType() +int +detectOsType () { int exists = ERROR; - for ( int i = 0; i < ENUMSIZE && exists == ERROR; i++ ) + for (int i = 0; i < ENUMSIZE && exists == ERROR; i++) { switch (i) { - case apt: - if ( checkIfFileExists("/usr/bin/apt" ) == 0 ) - { - exists = i; - } - break; - case dnf: - if ( checkIfFileExists("/usr/bin/dnf" ) == 0 ) + if (checkIfFileExists ("/usr/bin/dnf") == 0) { exists = i; } break; case emerge: - if ( checkIfFileExists("/usr/bin/emerge" ) == 0 ) + if (checkIfFileExists ("/usr/bin/emerge") == 0) { exists = i; } break; case pacman: - if ( checkIfFileExists("/usr/bin/pacman" ) == 0 ) + if (checkIfFileExists ("/usr/bin/pacman") == 0) { exists = i; } break; case xbps: - if ( checkIfFileExists("/usr/bin/xbps-install" ) == 0 ) + if (checkIfFileExists ("/usr/bin/xbps-install") == 0) { exists = i; } break; case zypper: - if ( checkIfFileExists("/usr/bin/zypper" ) == 0 ) + if (checkIfFileExists ("/usr/bin/zypper") == 0) + { + exists = i; + } + break; + + case apt: + if (checkIfFileExists ("/usr/bin/apt") == 0) { exists = i; } break; default: - puts("Unrecognized Package Manager" ); + puts ("Unrecognized Package Manager"); } } return exists; } -char* stringedArgument(int argc, char** argv) +char * +stringedArgument (int argc, char **argv) { int numberOfTotalPackages = argc - 2; - char* arg = (char *) calloc((numberOfTotalPackages * 80), sizeof(char)); + char *arg = (char *)calloc ((numberOfTotalPackages * 80), sizeof (char)); - for( int i = 2; i < argc; i++ ) + for (int i = 2; i < argc; i++) { - strcat(arg, argv[i]); - strcat(arg, " "); + strcat (arg, argv[i]); + strcat (arg, " "); } return arg; } -void commandProcessor(char* packages, char* initCommand) +void +commandProcessor (char *packages, char *initCommand) { - char* command = (char *) calloc(strlen(packages) + 80, sizeof(char)); - strcpy(command, initCommand); - strcat(command, packages); - system(command); - free(command); + char *command = (char *)calloc (strlen (packages) + 80, sizeof (char)); + strcpy (command, initCommand); + strcat (command, packages); + system (command); + free (command); } diff --git a/utils.h b/utils.h index f939095..9f03659 100644 --- a/utils.h +++ b/utils.h @@ -4,16 +4,16 @@ enum os { - apt, /* Debian */ - dnf, /* Fedora */ - emerge, /* Gentoo */ - pacman, /* Arch */ - xbps, /* Void */ - zypper, /* OpenSUSE */ + dnf, /* Fedora */ + emerge, /* Gentoo */ + pacman, /* Arch */ + xbps, /* Void */ + zypper, /* OpenSUSE */ + apt, /* Debian */ ENUMSIZE }; -int checkIfFileExists(char *path); -int detectOsType(); -char* stringedArgument(int argc, char** argv); -void commandProcessor(char* packages, char* initCommand); +int checkIfFileExists (char *path); +int detectOsType (); +char *stringedArgument (int argc, char **argv); +void commandProcessor (char *packages, char *initCommand); -- cgit v1.2.3