smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-23 15:16:25 +01:00
Code Issues Projects Releases Wiki Activity

tracking down concurrency issus is fun.

Browse source
This commit is contained in:
Robin Gareus 2014-06-14 16:38:47 +02:00
parent 51b475467a
commit 62ba8d23e3
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/pbd/pathscanner.cc
View file

@ -24,6 +24,7 @@
using PBD::readdir; using PBD::readdir;
using PBD::opendir; using PBD::opendir;
using PBD::closedir; using PBD::closedir;
#define strtok_r strtok_s // @john: this should probably go to msvc_extra_headers/ardourext/misc.h.input instead of the current define there
#else #else
#include <dirent.h> #include <dirent.h>
#include <cstdlib> #include <cstdlib>
@ -105,8 +106,9 @@ PathScanner::run_scan_internal (vector<string *> *result,
string search_str; string search_str;
string *newstr; string *newstr;
long nfound = 0; long nfound = 0;
char *saveptr;
if ((thisdir = strtok (pathcopy, G_SEARCHPATH_SEPARATOR_S)) == 0 || if ((thisdir = strtok_r (pathcopy, G_SEARCHPATH_SEPARATOR_S, &saveptr)) == 0 ||
strlen (thisdir) == 0) { strlen (thisdir) == 0) {
free (pathcopy); free (pathcopy);
return 0; return 0;
@ -170,7 +172,7 @@ PathScanner::run_scan_internal (vector<string *> *result,
} }
closedir (dir); closedir (dir);
} while ((limit < 0 || (nfound < limit)) && (thisdir = strtok (0, G_SEARCHPATH_SEPARATOR_S))); } while ((limit < 0 || (nfound < limit)) && (thisdir = strtok_r (0, G_SEARCHPATH_SEPARATOR_S, &saveptr)));
free (pathcopy); free (pathcopy);
return result; return result;