Merge branch 'rm/strchrnul-not-strlen'

* rm/strchrnul-not-strlen:
  use strchrnul() in place of strchr() and strlen()

1 files changed, 3 insertions, 6 deletions

diff --git a/diff.c b/diff.c
index 9ae8116fca..e343191bda 100644
--- a/diff.c
+++ b/diff.c
@@ -3362,14 +3362,11 @@ static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *va
 	if (c != '-')
 		return 0;
 	arg++;
-	eq = strchr(arg, '=');
-	if (eq)
-		len = eq - arg;
-	else
-		len = strlen(arg);
+	eq = strchrnul(arg, '=');
+	len = eq - arg;
 	if (!len || strncmp(arg, arg_long, len))
 		return 0;
-	if (eq) {
+	if (*eq) {
 		int n;
 		char *end;
 		if (!isdigit(*++eq))