From 3286d9ac9384556b515db327439ac05dc75b8db4 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Sat, 13 Apr 2019 10:16:54 -0500
Subject: [PATCH] Use strchr?

---
 src/command.c | 45 +++++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/src/command.c b/src/command.c
index 543df6ce..8e2d0037 100644
--- a/src/command.c
+++ b/src/command.c
@@ -543,38 +543,31 @@ static void COM_ExecuteString(char *ptext)
 				char buf[1024];
 				char *write = buf, *read = a->value, *seek = read;
 
-				while (*seek != '\0')
+				while ((seek = strchr(seek, '$')) != NULL)
 				{
-					if (*seek == '$')
+					memcpy(write, read, seek-read);
+					write += seek-read;
+
+					seek++;
+
+					if (*seek >= '1' && *seek <= '9')
 					{
-						memcpy(write, read, seek-read);
-						write += seek-read;
-
+						if (com_argc > (size_t)(*seek - '0'))
+						{
+							memcpy(write, com_argv[*seek - '0'], strlen(com_argv[*seek - '0']));
+							write += strlen(com_argv[*seek - '0']);
+						}
 						seek++;
-
-						if (*seek >= '1' && *seek <= '9')
-						{
-							if (com_argc > (size_t)(*seek - '0'))
-							{
-								memcpy(write, com_argv[*seek - '0'], strlen(com_argv[*seek - '0']));
-								write += strlen(com_argv[*seek - '0']);
-							}
-							seek++;
-						}
-						else
-						{
-							*write = '$';
-							write++;
-						}
-
-						read = seek;
 					}
 					else
-						seek++;
+					{
+						*write = '$';
+						write++;
+					}
+
+					read = seek;
 				}
-				memcpy(write, read, seek-read);
-				write += seek-read;
-				*write = '\0';
+				WRITESTRING(write, read);
 
 				recursion++;
 				COM_BufInsertText(buf);