mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-09 11:41:00 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: mworker: don't copy -x argument anymore in copy_argv()

Browse Source 
Don't copy the -x argument anymore in copy_argv() since it's already
allocated in mworker_reload().

Make the copy_argv() more consistent when used with multiple arguments
to strip.

It prevents multiple -x on reload, which is not supported.
This commit is contained in:
William Lallemand 2017-06-20 11:20:23 +02:00 committed by Willy Tarreau
parent 4fc09693d6
commit 2bf6d62916
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/haproxy.c
View File

@ -596,23 +596,12 @@ static void mworker_reload()
} }
next_argv[next_argc] = NULL; next_argv[next_argc] = NULL;
/* if -x was used, try to update the stat socket if not available anymore */ /* add the -x option with the stat socket */
if (cur_unixsocket) { if (cur_unixsocket) {
if (old_unixsocket) { next_argv[next_argc++] = "-x";
next_argv[next_argc++] = (char *)cur_unixsocket;
/* look for -x <path> */ next_argv[next_argc++] = NULL;
for (j = 0; next_argv[j]; j++) {
if (!strcmp(next_argv[j], "-x"))
next_argv[j + 1] = (char *)cur_unixsocket;
}
} else {
/* if -x is not specified but we know the socket, add -x with it */
next_argv[next_argc++] = "-x";
next_argv[next_argc++] = (char *)cur_unixsocket;
next_argv[next_argc++] = NULL;
}
} }
deinit(); /* we don't want to leak FD there */ deinit(); /* we don't want to leak FD there */
@ -1101,7 +1090,7 @@ out:
static char **copy_argv(int argc, char **argv) static char **copy_argv(int argc, char **argv)
{ {
char **newargv; char **newargv;
int i, j; int i = 0, j = 0;
newargv = calloc(argc + 2, sizeof(char *)); newargv = calloc(argc + 2, sizeof(char *));
if (newargv == NULL) { if (newargv == NULL) {
@ -1109,19 +1098,20 @@ static char **copy_argv(int argc, char **argv)
return NULL; return NULL;
} }
for (i = 0, j = 0; i < argc; i++, j++) { while (i < argc) {
char *flag = *(argv + i) + 1; /* -sf or -st or -x */
if ((argv[i][1] == 's' && (argv[i][2] == 'f' || argv[i][2] == 't')) || argv[i][1] == 'x' ) {
/* -sf or -st */ /* list of pids to finish ('f') or terminate ('t') or unix socket (-x) */
if (*flag == 's' && (flag[1] == 'f' || flag[1] == 't')) {
/* list of pids to finish ('f') or terminate ('t') */
i++; i++;
while (i < argc && argv[i][0] != '-') { while (i < argc && argv[i][0] != '-') {
i++; i++;
} }
continue;
} }
newargv[j] = argv[i];
newargv[j++] = argv[i++];
} }
return newargv; return newargv;
} }