mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rm/strchrnul-not-strlen'

Browse Source 
* rm/strchrnul-not-strlen:
  use strchrnul() in place of strchr() and strlen()
This commit is contained in:
Junio C Hamano
2014-03-18 13:51:18 -07:00
parent 884377c128 2c5495f7b6
commit 6f75e48323
9 changed files with 31 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
diff.c
View File

@ -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))