commit - ef9e2ed740d8ce0c6a790f813d768db9b3fcc4ed
commit + 59d5e252cee2c78ee6217704af2c93d99b282572
blob - 4ad71dd6e0d4b14735e7bc5eb66696a792e2d6a4
blob + 8ef36ea24722ce33ed0f15376b6bb415e2712e37
--- lib/fetch.c
+++ lib/fetch.c
int pid, pfd[2];
char cmd[64];
char *argv[11];
- int i = 0;
+ int i = 0, j;
*fetchpid = -1;
*fetchfd = -1;
- if (port == NULL)
- port = "22";
-
- argv[0] = GOT_FETCH_PATH_SSH;
- argv[1] = "-p";
- argv[2] = (char *)port;
+ argv[i++] = GOT_FETCH_PATH_SSH;
+ if (port != NULL) {
+ argv[i++] = "-p";
+ argv[i++] = (char *)port;
+ }
if (verbosity == -1) {
- argv[3 + i++] = "-q";
+ argv[i++] = "-q";
} else {
/* ssh(1) allows up to 3 "-v" options. */
- for (i = 0; i < MIN(3, verbosity); i++)
- argv[3 + i] = "-v";
+ for (j = 0; j < MIN(3, verbosity); j++)
+ argv[i++] = "-v";
}
- argv[3 + i] = "--";
- argv[4 + i] = (char *)host;
- argv[5 + i] = (char *)cmd;
- argv[6 + i] = (char *)path;
- argv[7 + i] = NULL;
+ argv[i++] = "--";
+ argv[i++] = (char *)host;
+ argv[i++] = (char *)cmd;
+ argv[i++] = (char *)path;
+ argv[i++] = NULL;
if (pipe(pfd) == -1)
return got_error_from_errno("pipe");