From 69474d09da74fafcc90a5cd6919a1fd514458efb Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 10 Oct 2020 21:26:30 +0200 Subject: [PATCH] Write new --help text from scratch, so that we have nothing from mlocate except some structs. --- plocate.cpp | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/plocate.cpp b/plocate.cpp index 54d3c79..5b9db18 100644 --- a/plocate.cpp +++ b/plocate.cpp @@ -1,6 +1,7 @@ #include "db.h" #include "io_uring_engine.h" #include "parse_trigrams.h" +#include "turbopfor.h" #include "unique_sort.h" #include @@ -39,9 +40,9 @@ using namespace std::chrono; } \ } while (false) -#include "turbopfor.h" +#define DEFAULT_DBPATH "/var/lib/mlocate/plocate.db" -const char *dbpath = "/var/lib/mlocate/plocate.db"; +const char *dbpath = DEFAULT_DBPATH; bool ignore_case = false; bool only_count = false; bool print_nul = false; @@ -574,17 +575,17 @@ string unescape_glob_to_plain_string(const string &needle) void usage() { - // The help text comes from mlocate. - printf("Usage: plocate [OPTION]... PATTERN...\n"); - printf("\n"); - printf(" -c, --count only print number of found entries\n"); - printf(" -d, --database DBPATH use DBPATH instead of default database (which is\n"); - printf(" %s)\n", dbpath); - printf(" -h, --help print this help\n"); - printf(" -i, --ignore-case ignore case distinctions when matching patterns\n"); - printf(" -l, --limit, -n LIMIT limit output (or counting) to LIMIT entries\n"); - printf(" -0, --null separate entries with NUL on output\n"); - printf(" -V, --version print version information\n"); + printf( + "Usage: plocate [OPTION]... PATTERN...\n" + "\n" + " -c, --count print number of matches instead of the matches\n" + " -d, --database DBPATH search for files in DBPATH\n" + " (default is " DEFAULT_DBPATH ")\n" + " -i, --ignore-case search case-insensitively\n" + " -l, --limit LIMIT stop after LIMIT matches\n" + " -0, --null delimit matches by NUL instead of newline\n" + " --help print this help\n" + " --version print version information\n"); } void version() -- 2.39.2