Release plocate 1.1.22.

[plocate] / database-builder.cpp

diff --git a/database-builder.cpp b/database-builder.cpp
index 066b60eaeb56ecd6ccc556fb1a091d2faff40d8b..f9dfb715391b3be7c4c521710d48f86b3b10795b 100644 (file)
--- a/database-builder.cpp
+++ b/database-builder.cpp
@@ -36,7 +36,8 @@ public:
        void finish();
 
        vector<unsigned char> encoded;
-       size_t get_num_docids() const {
+       size_t get_num_docids() const
+       {
                // Updated only when we flush, so check that we're finished.
                assert(pending_deltas.empty());
                return num_docids;
@@ -220,7 +221,6 @@ private:
        std::string dir_times_compressed;
 };
 
-
 EncodingCorpus::EncodingCorpus(FILE *outfp, size_t block_size, ZSTD_CDict *cdict, bool store_dir_times)
        : invindex(new PostingListBuilder *[NUM_TRIGRAMS]), outfp(outfp), outfp_pos(ftell(outfp)), block_size(block_size), store_dir_times(store_dir_times), cdict(cdict)
 {
@@ -319,7 +319,7 @@ void EncodingCorpus::flush_block()
                        ptr += 3;
                        continue;
                }
-               for ( ;; ) {
+               for (;;) {
                        // NOTE: Will read one byte past the end of the trigram, but it's OK,
                        // since we always call it from contexts where there's a terminating zero byte.
                        uint32_t trgm;
@@ -490,7 +490,7 @@ DatabaseBuilder::DatabaseBuilder(const char *outfile, gid_t owner, int block_siz
        int fd = -1;
 #ifdef O_TMPFILE
        fd = open(path.c_str(), O_WRONLY | O_TMPFILE, 0640);
-       if (fd == -1 && errno != EOPNOTSUPP) {
+       if (fd == -1 && errno != EOPNOTSUPP && errno != EISDIR) {
                perror(path.c_str());
                exit(1);
        }
@@ -683,6 +683,10 @@ void DatabaseBuilder::finish_corpus()
        fseek(outfp, 0, SEEK_SET);
        fwrite(&hdr, sizeof(hdr), 1, outfp);
 
+       // This is needed on systems that simulate linkat() by copying
+       // the contents of the file instead of linking.
+       fflush(outfp);
+
        if (!temp_filename.empty()) {
                if (rename(temp_filename.c_str(), outfile.c_str()) == -1) {
                        perror("rename");