1 files changed, 3 insertions, 3 deletions
diff --git a/util.c b/util.c
index 5a9c7b81c2..2bf225bc12 100644
--- a/util.c
+++ b/util.c
@@ -75,14 +75,14 @@ get_args_as_string(int argc, char **argv, int optind)
 	/*
 	 * Now construct the string.
 	 */
-	strcpy(argstring, "");
+	argstring[0] = '\0';
 	i = optind;
 	for (;;) {
-		strcat(argstring, argv[i]);
+		strncat(argstring, argv[i], len - strlen(argstring));
 		i++;
 		if (i == argc)
 			break;
-		strcat(argstring, " ");
+		strncat(argstring, " ", len - strlen(argstring));
 	}
 	return argstring;
 }