Merge pull request #270 from matled/master

use /bin/sh to run the pager
This commit is contained in:
John Wiegley 2014-04-02 19:12:23 -05:00
commit 8ca2ecd914

View file

@ -80,18 +80,10 @@ namespace {
close(pfd[1]); close(pfd[1]);
close(pfd[0]); close(pfd[0]);
// Find command name: its the substring starting right of the execlp("/bin/sh", "/bin/sh", "-c", pager_path.string().c_str(), NULL);
// rightmost '/' character in the pager pathname. See manpage for
// strrchr.
#if BOOST_VERSION >= 103700
path basename(pager_path.filename());
#else
path basename(pager_path.leaf());
#endif
execlp(pager_path.string().c_str(), basename.string().c_str(), NULL);
// We should never, ever reach here // We should never, ever reach here
perror((std::string("execlp: ") + pager_path.string()).c_str()); perror("execlp: /bin/sh");
exit(1); exit(1);
} }
else { // parent else { // parent