folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

SCP: Use explicit filename compare when built without HAVE_GLOB & HAVE_FNMATCH

Browse source
This commit is contained in:
Mark Pizzolato 2018-01-07 16:54:39 -08:00
parent 0fc41cb3bd
commit 2cd2f8c1d3
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scp.c
View file

@ -5575,9 +5575,7 @@ if (dir) {
#endif #endif
t_offset FileSize; t_offset FileSize;
char FileName[PATH_MAX + 1]; char FileName[PATH_MAX + 1];
#if defined (HAVE_FNMATCH)
char *MatchName = 1 + strrchr (cptr, '/');; char *MatchName = 1 + strrchr (cptr, '/');;
#endif
char *p_name; char *p_name;
struct tm *local; struct tm *local;
#if defined (HAVE_GLOB) #if defined (HAVE_GLOB)
@ -5592,6 +5590,9 @@ if (dir) {
#if defined (HAVE_FNMATCH) #if defined (HAVE_FNMATCH)
if (fnmatch(MatchName, ent->d_name, 0)) if (fnmatch(MatchName, ent->d_name, 0))
continue; continue;
#else
if (strcmp(MatchName, ent->d_name) != 0)
continue;
#endif #endif
sprintf (FileName, "%s/%s", DirName, ent->d_name); sprintf (FileName, "%s/%s", DirName, ent->d_name);
#endif #endif