Kouhei Sutou
null+****@clear*****
Wed Jan 4 16:02:32 JST 2017
Kouhei Sutou 2017-01-04 16:02:32 +0900 (Wed, 04 Jan 2017) New Revision: 351a1a12accc072919afebe3f7e2bad789038e15 https://github.com/pgroonga/pgroonga/commit/351a1a12accc072919afebe3f7e2bad789038e15 Message: check: fix path resolving Modified files: src/pgroonga-check.c Modified: src/pgroonga-check.c (+7 -8) =================================================================== --- src/pgroonga-check.c 2017-01-04 15:58:58 +0900 (b80da87) +++ src/pgroonga-check.c 2017-01-04 16:02:32 +0900 (0d3ea6b) @@ -31,9 +31,13 @@ PGrnRemoveAllRelatedFiles(const char *databaseDirectoryPath) { do { + char targetPathPrefix[MAXPGPATH]; + join_path_components(targetPathPrefix, + databaseDirectoryPath, + PGrnDatabaseBasename); if (strncmp(data.cFileName, - PGrnDatabaseBasename, - strlen(PGrnDatabaseBasename)) == 0) + targetPathPrefix, + strlen(targetPathPrefix)) == 0) { unlink(data.cFileName); } @@ -102,16 +106,11 @@ PGrnCheck(grn_ctx *ctx) { do { - char databaseDirectoryPath[MAXPGPATH]; - if (!(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { continue; } - join_path_components(databaseDirectoryPath, - baseDirectoryPath, - data.cFileName); - PGrnCheckDatabaseDirectory(ctx, databaseDirectoryPath); + PGrnCheckDatabaseDirectory(ctx, data.cFileName); } while (FindNextFile(finder, &data) != 0); FindClose(finder); } -------------- next part -------------- HTML����������������������������...Download