Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix + API: when printing SYNOPSIS, make sure the application name is printed instead of its entire path (Windows) #63

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix + API: when printing SYNOPSIS, make sure the application name is printed instead of its entire path (Windows) #63

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
386fe9a
fix: when printing SYNOPSIS, make sure the application **name** is pr…
GerHobbelt May 7, 2021
d209162
- added man_page::program_basename(path) API
GerHobbelt May 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions include/clipp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6815,17 +6815,41 @@ class man_page

//---------------------------------------------------------------
man_page& program_name(const string& n) {
progName_ = n;
progName_ = program_basename(n);
return *this;
}
man_page& program_name(string&& n) {
progName_ = std::move(n);
progName_ = program_basename(n);
return *this;
}
const string& program_name() const noexcept {
return progName_;
}

static const string program_basename(const string& progname) {
// clip off the exe path, i.e. execute equivalent of basename(progname, ".exe")
auto sep_pos = progname.find_last_of(":/\\");
auto end_pos = progname.size();
const doc_string exe = ".exe";
if (exe.size() < progname.size() && std::equal(exe.rbegin(), exe.rend(), progname.rbegin()))
{
end_pos -= exe.size();
}
if (sep_pos == doc_string::npos)
{
sep_pos = 0;
}
else
{
sep_pos++;
}

if (sep_pos > 0 || end_pos < progname.size())
{
return progname.substr(sep_pos, end_pos - sep_pos);
}
return progname;
}

//---------------------------------------------------------------
man_page& section_row_spacing(int rows) {
Expand Down Expand Up @@ -6855,7 +6879,8 @@ make_man_page(const group& cli,
const doc_formatting& fmt = doc_formatting{})
{
man_page man;
man.append_section("SYNOPSIS", usage_lines(cli,progname,fmt).str());
man.program_name(progname);
man.append_section("SYNOPSIS", usage_lines(cli, man.program_name(),fmt).str());
man.append_section("OPTIONS", documentation(cli,fmt).str());
return man;
}
Expand Down