From 9921ad5cfff545f9f118a6e2c865b05efbecaaa6 Mon Sep 17 00:00:00 2001 From: Ruthenic Date: Thu, 21 Oct 2021 13:23:34 -0400 Subject: [PATCH] all: change main funcs to respectively named ones first big change to help with moving to a single binary :) --- src/arch.c | 2 +- src/basename.c | 2 +- src/cat.c | 2 +- src/chroot.c | 4 ++-- src/cp.c | 2 +- src/ls.c | 2 +- src/pwd.c | 2 +- src/rm.c | 2 +- src/uname.c | 2 +- src/whoami.c | 2 +- src/yes.c | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/arch.c b/src/arch.c index 549af24..6f8ed01 100644 --- a/src/arch.c +++ b/src/arch.c @@ -41,7 +41,7 @@ Available arguments: --version: show the version of the program (WIP) */ -int main(int argc, char **argv) { +int arch(int argc, char **argv) { if (argc == 1) { struct utsname e; uname(&e); diff --git a/src/basename.c b/src/basename.c index 53c6f2f..740e7c9 100644 --- a/src/basename.c +++ b/src/basename.c @@ -44,7 +44,7 @@ Available arguments: --uid: print the users numeric UID, instead of username */ -int main(int argc, char **argv) { +int bn(int argc, char **argv) { char *wd; char *upname = NULL; if (argc == 1) { diff --git a/src/cat.c b/src/cat.c index a02228a..f46e19e 100644 --- a/src/cat.c +++ b/src/cat.c @@ -58,7 +58,7 @@ static int concatFileToStdoutWithOptions(char *file, bool showLineEnds) { return 0; } -int main(int argc, char **argv) { +int cat(int argc, char **argv) { if (argc == 1) { char ch; while (read(STDIN_FILENO, &ch, 1) > 0) { diff --git a/src/chroot.c b/src/chroot.c index 8b91707..5a7f8c5 100644 --- a/src/chroot.c +++ b/src/chroot.c @@ -61,7 +61,7 @@ int runChroot(char *executable, char *directory) { return 0; } -int main(int argc, char *argv[]) { +int chr(int argc, char *argv[]) { int i; char *executable = "/bin/sh"; char *directory = argv[argc - 1]; @@ -90,4 +90,4 @@ int main(int argc, char *argv[]) { } } return runChroot(executable, directory); -} \ No newline at end of file +} diff --git a/src/cp.c b/src/cp.c index bd4c378..fc669be 100644 --- a/src/cp.c +++ b/src/cp.c @@ -59,7 +59,7 @@ static int copyFile(const char *src, const char *dst) { return 0; } -int main(int argc, char **argv) { +int cp(int argc, char **argv) { int isDst = 0; char *src; char *dst; diff --git a/src/ls.c b/src/ls.c index b7a3726..4a0284d 100644 --- a/src/ls.c +++ b/src/ls.c @@ -139,7 +139,7 @@ static int listDirs(char *thatpath, bool specpath, bool colour, bool showdot, // lots o' code ~~stolen~~ borrowed from // https://pubs.opengroup.org/onlinepubs/9699919799/functions/readdir.html -int main(int argc, char **argv) { +int ls(int argc, char **argv) { // define default options bool colour = false; bool showdot = false; diff --git a/src/pwd.c b/src/pwd.c index 594ca39..5475c45 100644 --- a/src/pwd.c +++ b/src/pwd.c @@ -43,7 +43,7 @@ Available arguments: --uid: print the users numeric UID, instead of username */ -int main(int argc, char **argv) { +int pwd(int argc, char **argv) { char wd[PATH_MAX]; getcwd(wd, sizeof(wd)); if (argc == 1) { diff --git a/src/rm.c b/src/rm.c index f947b7a..650d5be 100644 --- a/src/rm.c +++ b/src/rm.c @@ -118,7 +118,7 @@ int removeFileOrDirectory(char *path, bool recursive, bool force, } } -int main(int argc, char **argv) { +int rm(int argc, char **argv) { bool recursive = false; bool force = false; bool followSymlink = false; diff --git a/src/uname.c b/src/uname.c index 5962e5a..c8c1a7d 100644 --- a/src/uname.c +++ b/src/uname.c @@ -54,7 +54,7 @@ bool startsWithChar(const char *pre, const char str) { return index == 0; } -int main(int argc, char **argv) { +int un(int argc, char **argv) { struct utsname uts; uname(&uts); char hostname[HOST_NAME_MAX + 1]; diff --git a/src/whoami.c b/src/whoami.c index 4ee5d63..41b964d 100644 --- a/src/whoami.c +++ b/src/whoami.c @@ -43,7 +43,7 @@ Available arguments: --uid: print the users numeric UID, instead of username */ -int main(int argc, char **argv) { +int whoami(int argc, char **argv) { uid_t userid = geteuid(); char *username = getpwuid(userid)->pw_name; if (argc == 1) { diff --git a/src/yes.c b/src/yes.c index e626a10..e1c360f 100644 --- a/src/yes.c +++ b/src/yes.c @@ -43,7 +43,7 @@ Usage: yes [--help] [--version] [message] */ -int main(int argc, char **argv) { +int yes(int argc, char **argv) { char *spammy = malloc((sizeof(char) * 16) * 2); int len = 2048; // max length of buffer char buf[len];