Show More
@@ -252,7 +252,7 b' static void handlesystemrequest(hgclient' | |||
|
252 | 252 | ctx->datasize = sizeof(r_n); |
|
253 | 253 | writeblock(hgc); |
|
254 | 254 | } else if (strcmp(args[0], "pager") == 0) { |
|
255 | setuppager(args[1]); | |
|
255 | setuppager(args[1], args + 3); | |
|
256 | 256 | if (hgc->capflags & CAP_ATTACHIO) |
|
257 | 257 | attachio(hgc); |
|
258 | 258 | /* unblock the server */ |
@@ -177,7 +177,7 b' error:' | |||
|
177 | 177 | |
|
178 | 178 | /* This implementation is based on hgext/pager.py (post 369741ef7253) |
|
179 | 179 | * Return 0 if pager is not started, or pid of the pager */ |
|
180 | pid_t setuppager(const char *pagercmd) | |
|
180 | pid_t setuppager(const char *pagercmd, const char *envp[]) | |
|
181 | 181 | { |
|
182 | 182 | assert(pagerpid == 0); |
|
183 | 183 | if (!pagercmd) |
@@ -205,7 +205,8 b' pid_t setuppager(const char *pagercmd)' | |||
|
205 | 205 | close(pipefds[0]); |
|
206 | 206 | close(pipefds[1]); |
|
207 | 207 | |
|
208 |
int r = execl |
|
|
208 | int r = execle("/bin/sh", "/bin/sh", "-c", pagercmd, NULL, | |
|
209 | envp); | |
|
209 | 210 | if (r < 0) { |
|
210 | 211 | abortmsgerrno("cannot start pager '%s'", pagercmd); |
|
211 | 212 | } |
General Comments 0
You need to be logged in to leave comments.
Login now