Support the --require-visibility flag in plocate-build.

diff --git a/plocate-build.8 b/plocate-build.8
index a34a45795019501d36efe218fffb70c75e06c05d..a90f264fb2e0e8503c5943c74fdc246e39134d87 100644 (file)
--- a/plocate-build.8
+++ b/plocate-build.8
@@ -49,6 +49,13 @@ Setting it to 1 makes one (compressed) block per filename.
 Treat the input as plain text, with entries delimited by newlines,
 instead of an mlocate database.
 
 Treat the input as plain text, with entries delimited by newlines,
 instead of an mlocate database.
 

+.TP
+\fB\-l\fR, \fB\-\-require\-visibility\fR \fIFLAG\fR
+Set the \*(lqrequire file visibility before reporting it\*(rq flag in the
+generated database to \fIFLAG\fR. The default is on, even for an mlocate
+database with the flag originally set to false (although the latter may
+change in the future).
+

 .TP
 .B \-\-help
 Print out usage information, then exit successfully.
 .TP
 .B \-\-help
 Print out usage information, then exit successfully.

diff --git a/plocate-build.cpp b/plocate-build.cpp
index b69954596a4b941afe9504594c001f224abc46db..198a4e683fa92f716990d246ff00251c642dccb7 100644 (file)
--- a/plocate-build.cpp
+++ b/plocate-build.cpp
@@ -147,7 +147,7 @@ void read_mlocate(FILE *fp, DatabaseReceiver *receiver)
        }
 }
 
        }
 }
 

-void do_build(const char *infile, const char *outfile, int block_size, bool plaintext)
+void do_build(const char *infile, const char *outfile, int block_size, bool plaintext, bool check_visibility)

 {
        FILE *infp = fopen(infile, "rb");
        if (infp == nullptr) {
 {
        FILE *infp = fopen(infile, "rb");
        if (infp == nullptr) {


@@ -167,7 +167,7 @@ void do_build(const char *infile, const char *outfile, int block_size, bool plai
        }
        string dictionary = builder.train(1024);
 
        }
        string dictionary = builder.train(1024);
 

-       DatabaseBuilder db(outfile, /*owner=*/-1, block_size, dictionary, /*check_visibility=*/true);
+       DatabaseBuilder db(outfile, /*owner=*/-1, block_size, dictionary, check_visibility);

        DatabaseReceiver *corpus = db.start_corpus(/*store_dir_times=*/false);
        if (plaintext) {
                read_plaintext(infp, corpus);
        DatabaseReceiver *corpus = db.start_corpus(/*store_dir_times=*/false);
        if (plaintext) {
                read_plaintext(infp, corpus);


@@ -190,6 +190,7 @@ void usage()
                "\n"
                "  -b, --block-size SIZE  number of filenames to store in each block (default 32)\n"
                "  -p, --plaintext        input is a plaintext file, not an mlocate database\n"
                "\n"
                "  -b, --block-size SIZE  number of filenames to store in each block (default 32)\n"
                "  -p, --plaintext        input is a plaintext file, not an mlocate database\n"

+               "  -l, --require-visibility FLAG  check visibility before reporting files\n"

                "      --help             print this help\n"
                "      --version          print version information\n");
 }
                "      --help             print this help\n"
                "      --version          print version information\n");
 }


@@ -203,11 +204,25 @@ void version()
        printf("There is NO WARRANTY, to the extent permitted by law.\n");
 }
 
        printf("There is NO WARRANTY, to the extent permitted by law.\n");
 }
 

+bool parse_bool(const string &str, bool *result)
+{
+       if (str == "0" || str == "no") {
+               *result = false;
+               return true;
+       }
+       if (str == "1" || str == "yes") {
+               *result = true;
+               return true;
+       }
+       return false;
+}
+

 int main(int argc, char **argv)
 {
        static const struct option long_options[] = {
                { "block-size", required_argument, 0, 'b' },
                { "plaintext", no_argument, 0, 'p' },
 int main(int argc, char **argv)
 {
        static const struct option long_options[] = {
                { "block-size", required_argument, 0, 'b' },
                { "plaintext", no_argument, 0, 'p' },

+               { "require-visibility", required_argument, 0, 'l' },

                { "help", no_argument, 0, 'h' },
                { "version", no_argument, 0, 'V' },
                { "debug", no_argument, 0, 'D' },  // Not documented.
                { "help", no_argument, 0, 'h' },
                { "version", no_argument, 0, 'V' },
                { "debug", no_argument, 0, 'D' },  // Not documented.


@@ -216,11 +231,12 @@ int main(int argc, char **argv)
 
        int block_size = 32;
        bool plaintext = false;
 
        int block_size = 32;
        bool plaintext = false;

+       bool check_visibility = true;

 
        setlocale(LC_ALL, "");
        for (;;) {
                int option_index = 0;
 
        setlocale(LC_ALL, "");
        for (;;) {
                int option_index = 0;

-               int c = getopt_long(argc, argv, "b:hpVD", long_options, &option_index);
+               int c = getopt_long(argc, argv, "b:hpl:VD", long_options, &option_index);

                if (c == -1) {
                        break;
                }
                if (c == -1) {
                        break;
                }


@@ -231,6 +247,13 @@ int main(int argc, char **argv)
                case 'p':
                        plaintext = true;
                        break;
                case 'p':
                        plaintext = true;
                        break;

+               case 'l':
+                       if (!parse_bool(optarg, &check_visibility) != 0) {
+                               fprintf(stderr, "plocate-build: invalid value `%s' for --%s",
+                                        optarg, "require-visibility");
+                               exit(EXIT_FAILURE);
+                       }
+                       break;

                case 'h':
                        usage();
                        exit(0);
                case 'h':
                        usage();
                        exit(0);


@@ -250,6 +273,6 @@ int main(int argc, char **argv)
                exit(1);
        }
 
                exit(1);
        }
 

-       do_build(argv[optind], argv[optind + 1], block_size, plaintext);
+       do_build(argv[optind], argv[optind + 1], block_size, plaintext, check_visibility);

        exit(EXIT_SUCCESS);
 }
        exit(EXIT_SUCCESS);
 }