From: Trent Huber <trentmhuber@gmail.com>
Date: Sat, 20 Dec 2025 20:49:06 +0000 (-0500)
Subject: Clean up whitespace and pointer/array operations
X-Git-Url: https://trenthuber.com/code?a=commitdiff_plain;h=aa063e0f8bfa20d6fcba712d11d2af81b0a5f8e9;p=thus.git

Clean up whitespace and pointer/array operations
---

diff --git a/src/builtins/alias.c b/src/builtins/alias.c
index 42105a8..c5229a6 100644
--- a/src/builtins/alias.c
+++ b/src/builtins/alias.c
@@ -29,6 +29,7 @@ char *getalias(char *name) {
 	size_t i;
 
 	if ((i = getindex(name)) == aliases.size) return NULL;
+
 	return aliases.entries[i].value;
 }
 
@@ -54,7 +55,8 @@ int removealias(char *name) {
 	struct entry *entry;
 
 	if ((i = getindex(name)) == aliases.size) return 0;
-	entry = &aliases.entries[i];
+
+	entry = aliases.entries + i;
 	memmove(entry, entry + 1, (--aliases.size - i) * sizeof*entry);
 	for (; i < aliases.size; ++i, ++entry)
 		entry->value = (void *)entry->value - sizeof*entry;
@@ -87,7 +89,7 @@ int alias(char **args, size_t numargs) {
 			*end = '\0';
 		}
 
-		entry = &aliases.entries[i = getindex(args[1])];
+		entry = aliases.entries + (i = getindex(args[1]));
 		if (i == aliases.size) {
 			strcpy(entry->name, args[1]);
 			++aliases.size;
diff --git a/src/builtins/bg.c b/src/builtins/bg.c
index 028a51f..1191c24 100644
--- a/src/builtins/bg.c
+++ b/src/builtins/bg.c
@@ -62,7 +62,7 @@ void initbg(void) {
 	bgaction = (struct sigaction){.sa_handler = sigchldbghandler};
 
 	for (i = 0; i < MAXBG - 1; ++i)
-		bgjobs.entries[i].next = &bgjobs.entries[i + 1];
+		bgjobs.entries[i].next = bgjobs.entries + i + 1;
 	bgjobs.free = bgjobs.entries;
 }
 
@@ -89,7 +89,6 @@ int pushbgid(pid_t id) {
 
 int peekbg(struct bgjob *job) {
 	if (bgjobs.active && job) *job = bgjobs.active->job;
-
 	return bgjobs.active != NULL;
 }
 
diff --git a/src/builtins/builtin.c b/src/builtins/builtin.c
index 1e005bf..870c22f 100644
--- a/src/builtins/builtin.c
+++ b/src/builtins/builtin.c
@@ -18,6 +18,5 @@ int usage(char *program, char *options) {
 	fprintf(stderr, "usage: %s", program);
 	if (options) fprintf(stderr, " %s", options);
 	fputc('\n', stderr);
-
 	return EXIT_FAILURE;
 }
diff --git a/src/builtins/exec.c b/src/builtins/exec.c
index 4976c70..dd07207 100644
--- a/src/builtins/exec.c
+++ b/src/builtins/exec.c
@@ -28,7 +28,7 @@ int exec(char **args, size_t numargs) {
 	if (numargs < 2) return usage(args[0], "command [args ...]");
 
 	clear(&c);
-	memcpy(c.tokens, &args[1], (numargs - 1) * sizeof*args);
+	memcpy(c.tokens, args + 1, (numargs - 1) * sizeof*args);
 	strcpy(c.current.name, args[1]);
 	if (!(c.current.builtin = getbuiltin(args[1]))
 	    && !(c.current.path = getpath(c.current.name))) {
@@ -40,5 +40,5 @@ int exec(char **args, size_t numargs) {
 
 	/* execute() is guaranteed not to return, this statement just appeases the
 	 * compiler */
-	exit(EXIT_SUCCESS);
+	exit(EXIT_FAILURE);
 }
diff --git a/src/builtins/exeunt.c b/src/builtins/exeunt.c
index 877ea34..afaba43 100644
--- a/src/builtins/exeunt.c
+++ b/src/builtins/exeunt.c
@@ -7,5 +7,6 @@ int exeunt(char **args, size_t numargs) {
 	if (numargs != 1) return usage(args[0], NULL);
 
 	deinit();
+
 	exit(EXIT_SUCCESS);
 }
diff --git a/src/builtins/mode.c b/src/builtins/mode.c
index fcbf67c..a875c27 100644
--- a/src/builtins/mode.c
+++ b/src/builtins/mode.c
@@ -18,6 +18,5 @@ int mode(char **args, size_t numargs) {
 		default:
 			return usage(args[0], "[verbose | quiet]");
 	}
-
 	return EXIT_SUCCESS;
 }
diff --git a/src/builtins/set.c b/src/builtins/set.c
index 49bdd96..fb85866 100644
--- a/src/builtins/set.c
+++ b/src/builtins/set.c
@@ -15,6 +15,5 @@ int set(char **args, size_t numargs) {
 	default:
 		return usage(args[0], "name [value]");
 	}
-
 	return EXIT_SUCCESS;
 }
diff --git a/src/builtins/unalias.c b/src/builtins/unalias.c
index 55581ba..2e18ad0 100644
--- a/src/builtins/unalias.c
+++ b/src/builtins/unalias.c
@@ -5,6 +5,5 @@
 
 int unalias(char **args, size_t numargs) {
 	if (numargs != 2) return usage(args[0], "name");
-
 	return removealias(args[1]) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
diff --git a/src/builtins/unset.c b/src/builtins/unset.c
index 9d49f5d..f3b0061 100644
--- a/src/builtins/unset.c
+++ b/src/builtins/unset.c
@@ -6,8 +6,10 @@
 int unset(char **args, size_t numargs) {
 	if (numargs != 2) return usage(args[0], "name");
 
-	if (unsetenv(args[1]) != -1) return EXIT_SUCCESS;
+	if (unsetenv(args[1]) == -1) {
+		note("Unable to unset `%s'", args[1]);
+		return EXIT_FAILURE;
+	}
 
-	note("Unable to unset `%s'", args[1]);
-	return EXIT_FAILURE;
+	return EXIT_SUCCESS;
 }
diff --git a/src/builtins/which.c b/src/builtins/which.c
index 242659b..3016d87 100644
--- a/src/builtins/which.c
+++ b/src/builtins/which.c
@@ -46,9 +46,8 @@ char *getpath(char *file) {
 		if (errno != ENOENT) note("Unable to expand `%s'", file); else errno = 0;
 		return NULL;
 	}
-	if (exists(path)) return path;
 
-	return NULL;
+	return exists(path) ? path : NULL;
 }
 
 int which(char **args, size_t numargs) {
diff --git a/src/run.c b/src/run.c
index 9fd4e0c..ed0da59 100644
--- a/src/run.c
+++ b/src/run.c
@@ -92,7 +92,7 @@ int run(struct context *c) {
 			putchar('&');
 		default:
 			putchar('\n');
-		}	
+		}
 	}
 
 	islist = c->previous.term > BG || c->current.term > BG;
@@ -167,7 +167,7 @@ int run(struct context *c) {
 			return quit(c);
 		}
 		jobid = pipeid;
-	} else if (!c->r && (c->current.builtin = getbuiltin(c->current.name))) {
+	} else if (c->current.builtin && !c->r) {
 		status = c->current.builtin(c->tokens, c->numtokens);
 		cpid = 0;
 	} else if ((jobid = cpid = fork()) == -1) {
diff --git a/src/utils.c b/src/utils.c
index 6665eaa..af3f85d 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -73,8 +73,8 @@ void init(void) {
 		note("Unable to append trailing slash to $PWD$");
 
 	if (shlvl == 1
-	    && setenv("PATH", "/usr/local/bin/:/usr/local/sbin/:"
-	                      "/usr/bin/:/usr/sbin/:/bin/:/sbin/", 1) == -1)
+	    && setenv("PATH", "/usr/local/bin/:/usr/local/sbin/"
+	                      ":/usr/bin/:/usr/sbin/:/bin/:/sbin/", 1) == -1)
 		note("Unable to initialize $PATH$");
 
 	getcolumns();
@@ -113,7 +113,7 @@ char *quoted(char *token) {
 	} degree;
 	static char buffer[MAXCHARS + 1];
 
-	if (!*token) return "\"\"";
+	if (!token[0]) return "\"\"";
 
 	degree = NONE;
 	for (p = token; *p; ++p) switch(*p) {