philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

execl: cast NULL sentinel to (char *), per man page and compiler warning

Browse source 
From exec(3):

> The list of arguments must be terminated by a null pointer, and, since these
> are variadic functions, this pointer must be cast (char *) NULL
This commit is contained in:
Will Dietz 2018-03-20 13:29:29 -05:00
parent bed22114bf
commit 02d36fdab7
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libmain/shared.cc
View file

@ -263,7 +263,7 @@ void showManPage(const string & name)
{ {
restoreSignals(); restoreSignals();
setenv("MANPATH", settings.nixManDir.c_str(), 1); setenv("MANPATH", settings.nixManDir.c_str(), 1);
execlp("man", "man", name.c_str(), NULL); execlp("man", "man", name.c_str(), (char *)NULL);
throw SysError(format("command 'man %1%' failed") % name.c_str()); throw SysError(format("command 'man %1%' failed") % name.c_str());
} }
@ -325,10 +325,10 @@ RunPager::RunPager()
setenv("LESS", "FRSXMK", 1); setenv("LESS", "FRSXMK", 1);
restoreSignals(); restoreSignals();
if (pager) if (pager)
execl("/bin/sh", "sh", "-c", pager, NULL); execl("/bin/sh", "sh", "-c", pager, (char *)NULL);
execlp("pager", "pager", NULL); execlp("pager", "pager", (char *)NULL);
execlp("less", "less", NULL); execlp("less", "less", (char *)NULL);
execlp("more", "more", NULL); execlp("more", "more", (char *)NULL);
throw SysError(format("executing '%1%'") % pager); throw SysError(format("executing '%1%'") % pager);
}); });