Merge branch 'rm/strchrnul-not-strlen'

diff --git a/diff.c b/diff.c
index 9ae8116fcab890872a725121f37f69a277271783..e343191bdaba0dbf63a841a79287cbb5f56fc18a 100644 (file)
--- 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))