generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 25907058: Merge "Sync current upstream fnmatch.c."

Browse Source 
* commit '259070585820b4900622363dd7f968d6b644d75d':
  Sync current upstream fnmatch.c.
This commit is contained in:
Elliott Hughes 2015-08-01 15:48:05 +00:00 committed by Android Git Automerger
commit 90acccbd97
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libc/upstream-openbsd/lib/libc/gen/fnmatch.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: fnmatch.c,v 1.17 2013/11/24 23:51:29 deraadt Exp $ */ /* $OpenBSD: fnmatch.c,v 1.18 2014/12/11 16:25:34 millert Exp $ */
/* Copyright (c) 2011, VMware, Inc. /* Copyright (c) 2011, VMware, Inc.
* All rights reserved. * All rights reserved.
@ -88,7 +88,6 @@
#include <fnmatch.h> #include <fnmatch.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <limits.h>
#include "charclass.h" #include "charclass.h"
@ -294,10 +293,6 @@ int fnmatch(const char *pattern, const char *string, int flags)
const char *mismatch = NULL; const char *mismatch = NULL;
int matchlen = 0; int matchlen = 0;
if (strnlen(pattern, PATH_MAX) == PATH_MAX ||
strnlen(string, PATH_MAX) == PATH_MAX)
return (FNM_NOMATCH);
if (*pattern == '*') if (*pattern == '*')
goto firstsegment; goto firstsegment;