From 04150a407f65b63ea5117bc8b7297a5fbefc7487 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Mon, 15 May 2023 10:57:33 -0400 Subject: refactor cmd names --- src/command.h | 50 +++++++++++++++++++++++++------------------------- src/main.c | 50 +++++++++++++++++++++++++------------------------- 2 files changed, 50 insertions(+), 50 deletions(-) (limited to 'src') diff --git a/src/command.h b/src/command.h index 3a84784..00c34ca 100644 --- a/src/command.h +++ b/src/command.h @@ -5,30 +5,30 @@ #define NEXT_ARGS argc - 1, &argv[1] #define COMMAND(name) int name (ARGUMENTS) -COMMAND(dd); -COMMAND(cat); -COMMAND(yes); -COMMAND(echo); -COMMAND(print); -COMMAND(groups); -COMMAND(user_id); -COMMAND(ls); -COMMAND(tail); -COMMAND(head); -COMMAND(ed); -COMMAND(tee_cmd); -COMMAND(whoami); -COMMAND(wc); -COMMAND(xargs); -COMMAND(tac); -COMMAND(rm); -COMMAND(cp); -COMMAND(makedir); -COMMAND(mv); -COMMAND(grep); -COMMAND(chown_cmd); -COMMAND(chmod_cmd); -COMMAND(sync_cmd); -COMMAND(su); +COMMAND(dd_main); +COMMAND(cat_main); +COMMAND(yes_main); +COMMAND(echo_main); +COMMAND(printf_main); +COMMAND(groups_main); +COMMAND(id_main); +COMMAND(ls_main); +COMMAND(tail_main); +COMMAND(head_main); +COMMAND(ed_main); +COMMAND(tee_main); +COMMAND(whoami_main); +COMMAND(wc_main); +COMMAND(xargs_main); +COMMAND(tac_main); +COMMAND(rm_main); +COMMAND(cp_main); +COMMAND(mkdir_main); +COMMAND(mv_main); +COMMAND(grep_main); +COMMAND(chown_main); +COMMAND(chmod_main); +COMMAND(sync_main); +COMMAND(su_main); #endif diff --git a/src/main.c b/src/main.c index 7db2135..4ae97da 100644 --- a/src/main.c +++ b/src/main.c @@ -37,61 +37,61 @@ int main (ARGUMENTS) { } if (streql(cmd, "dd")) { - return dd(NEXT_ARGS); + return dd_main(NEXT_ARGS); } else if (streql(cmd, "cat")) { - return cat(NEXT_ARGS); + return cat_main(NEXT_ARGS); } else if (streql(cmd, "yes")) { - return yes(NEXT_ARGS); + return yes_main(NEXT_ARGS); } else if (streql(cmd, "echo")) { - return echo(NEXT_ARGS); + return echo_main(NEXT_ARGS); } else if (streql(cmd, "printf")) { - return print(NEXT_ARGS); + return printf_main(NEXT_ARGS); } else if (streql(cmd, "groups")) { - return groups(NEXT_ARGS); + return groups_main(NEXT_ARGS); } else if (streql(cmd, "id")) { - return user_id(NEXT_ARGS); + return id_main(NEXT_ARGS); } else if (streql(cmd, "ls") || streql(cmd, "dir")) { - return ls(NEXT_ARGS); + return ls_main(NEXT_ARGS); } else if (streql(cmd, "lsd")) { printf("look at all the funny colors\n"); } else if (streql(cmd, "tail")) { - return tail(NEXT_ARGS); + return tail_main(NEXT_ARGS); } else if (streql(cmd, "head")) { - return head(NEXT_ARGS); + return head_main(NEXT_ARGS); } else if (streql(cmd, "ed")) { - return ed(NEXT_ARGS); + return ed_main(NEXT_ARGS); } else if (streql(cmd, "tee")) { - return tee_cmd(NEXT_ARGS); + return tee_main(NEXT_ARGS); } else if (streql(cmd, "true")) { return EXIT_SUCCESS; } else if (streql(cmd, "false")) { return EXIT_FAILURE; } else if (streql(cmd, "whoami")) { - return whoami(NEXT_ARGS); + return whoami_main(NEXT_ARGS); } else if (streql(cmd, "wc")) { - return wc(NEXT_ARGS); + return wc_main(NEXT_ARGS); } else if (streql(cmd, "xargs")) { - return xargs(NEXT_ARGS); + return xargs_main(NEXT_ARGS); } else if (streql(cmd, "tac")) { - return tac(NEXT_ARGS); + return tac_main(NEXT_ARGS); } else if (streql(cmd, "rm")) { - return rm(NEXT_ARGS); + return rm_main(NEXT_ARGS); } else if (streql(cmd, "cp")) { - return cp(NEXT_ARGS); + return cp_main(NEXT_ARGS); } else if (streql(cmd, "mkdir")) { - return makedir(NEXT_ARGS); + return mkdir_main(NEXT_ARGS); } else if (streql(cmd, "mv")) { - return mv(NEXT_ARGS); + return mv_main(NEXT_ARGS); } else if (streql(cmd, "grep")) { - return grep(NEXT_ARGS); + return grep_main(NEXT_ARGS); } else if (streql(cmd, "chown")) { - return chown_cmd(NEXT_ARGS); + return chown_main(NEXT_ARGS); } else if (streql(cmd, "chmod")) { - return chmod_cmd(NEXT_ARGS); + return chmod_main(NEXT_ARGS); } else if (streql(cmd, "sync")) { - return sync_cmd(NEXT_ARGS); + return sync_main(NEXT_ARGS); } else if (streql(cmd, "su")) { - return su(NEXT_ARGS); + return su_main(NEXT_ARGS); } else { fprintf(stderr, "lazysphere: invalid command %s\n", cmd); return EXIT_FAILURE; -- cgit v1.2.3-freya