return def;
}
-FontSpec platform_default_fontspec(const char *name)
+FontSpec *platform_default_fontspec(const char *name)
{
- FontSpec ret;
- *ret.name = '\0';
- return ret;
+ return fontspec_new("");
}
Filename platform_default_filename(const char *name)
}
bufchain stdout_data, stderr_data;
+enum { EOF_NO, EOF_PENDING, EOF_SENT } outgoingeof;
int try_output(int is_stderr)
{
void *senddata;
int sendlen, ret, fl;
- if (bufchain_size(chain) == 0)
- return bufchain_size(&stdout_data) + bufchain_size(&stderr_data);
-
- fl = fcntl(fd, F_GETFL);
- if (fl != -1 && !(fl & O_NONBLOCK))
- fcntl(fd, F_SETFL, fl | O_NONBLOCK);
- do {
- bufchain_prefix(chain, &senddata, &sendlen);
- ret = write(fd, senddata, sendlen);
- if (ret > 0)
- bufchain_consume(chain, ret);
- } while (ret == sendlen && bufchain_size(chain) != 0);
- if (fl != -1 && !(fl & O_NONBLOCK))
- fcntl(fd, F_SETFL, fl);
- if (ret < 0 && errno != EAGAIN) {
- perror(is_stderr ? "stderr: write" : "stdout: write");
- exit(1);
+ if (bufchain_size(chain) > 0) {
+ fl = fcntl(fd, F_GETFL);
+ if (fl != -1 && !(fl & O_NONBLOCK))
+ fcntl(fd, F_SETFL, fl | O_NONBLOCK);
+ do {
+ bufchain_prefix(chain, &senddata, &sendlen);
+ ret = write(fd, senddata, sendlen);
+ if (ret > 0)
+ bufchain_consume(chain, ret);
+ } while (ret == sendlen && bufchain_size(chain) != 0);
+ if (fl != -1 && !(fl & O_NONBLOCK))
+ fcntl(fd, F_SETFL, fl);
+ if (ret < 0 && errno != EAGAIN) {
+ perror(is_stderr ? "stderr: write" : "stdout: write");
+ exit(1);
+ }
+ }
+ if (outgoingeof == EOF_PENDING && bufchain_size(&stdout_data) == 0) {
+ close(STDOUT_FILENO);
+ outgoingeof = EOF_SENT;
}
return bufchain_size(&stdout_data) + bufchain_size(&stderr_data);
}
bufchain_add(&stderr_data, data, len);
return try_output(TRUE);
} else {
+ assert(outgoingeof == EOF_NO);
bufchain_add(&stdout_data, data, len);
return try_output(FALSE);
}
return 0; /* not reached */
}
+int from_backend_eof(void *frontend_handle)
+{
+ assert(outgoingeof == EOF_NO);
+ outgoingeof = EOF_PENDING;
+ try_output(FALSE);
+ return FALSE; /* do not respond to incoming EOF with outgoing */
+}
+
int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
{
int ret;
default_protocol = PROT_SSH;
default_port = 22;
+ bufchain_init(&stdout_data);
+ bufchain_init(&stderr_data);
+ outgoingeof = EOF_NO;
+
flags = FLAG_STDERR | FLAG_STDERR_TTY;
stderr_tty_init();