version 1.41, 2015/09/10 08:58:14 |
version 1.42, 2015/09/16 22:29:30 |
|
|
session_set_current(s, wl); |
session_set_current(s, wl); |
} |
} |
|
|
|
if (cflag != NULL) { |
|
ft = format_create(); |
|
format_defaults(ft, cmd_find_client(cmdq, NULL, 1), s, |
|
NULL, NULL); |
|
cp = format_expand(ft, cflag); |
|
format_free(ft); |
|
|
|
fd = open(cp, O_RDONLY|O_DIRECTORY); |
|
free(cp); |
|
if (fd == -1) { |
|
cmdq_error(cmdq, "bad working directory: %s", |
|
strerror(errno)); |
|
return (CMD_RETURN_ERROR); |
|
} |
|
close(s->cwd); |
|
s->cwd = fd; |
|
} |
|
|
if (c->session != NULL) { |
if (c->session != NULL) { |
if (dflag) { |
if (dflag) { |
/* |
/* |
|
|
} |
} |
} |
} |
|
|
if (cflag != NULL) { |
|
ft = format_create(); |
|
format_defaults(ft, cmd_find_client(cmdq, NULL, 1), s, |
|
NULL, NULL); |
|
cp = format_expand(ft, cflag); |
|
format_free(ft); |
|
|
|
fd = open(cp, O_RDONLY|O_DIRECTORY); |
|
free(cp); |
|
if (fd == -1) { |
|
cmdq_error(cmdq, "bad working directory: %s", |
|
strerror(errno)); |
|
return (CMD_RETURN_ERROR); |
|
} |
|
close(s->cwd); |
|
s->cwd = fd; |
|
} |
|
|
|
if (!Eflag) { |
if (!Eflag) { |
update = options_get_string(&s->options, |
update = options_get_string(&s->options, |
"update-environment"); |
"update-environment"); |
|
|
cmdq_error(cmdq, "open terminal failed: %s", cause); |
cmdq_error(cmdq, "open terminal failed: %s", cause); |
free(cause); |
free(cause); |
return (CMD_RETURN_ERROR); |
return (CMD_RETURN_ERROR); |
} |
|
|
|
if (cflag != NULL) { |
|
ft = format_create(); |
|
format_defaults(ft, cmd_find_client(cmdq, NULL, 1), s, |
|
NULL, NULL); |
|
cp = format_expand(ft, cflag); |
|
format_free(ft); |
|
|
|
fd = open(cp, O_RDONLY|O_DIRECTORY); |
|
free(cp); |
|
if (fd == -1) { |
|
cmdq_error(cmdq, "bad working directory: %s", |
|
strerror(errno)); |
|
return (CMD_RETURN_ERROR); |
|
} |
|
close(s->cwd); |
|
s->cwd = fd; |
|
} |
} |
|
|
if (rflag) |
if (rflag) |