mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-10 04:27:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

client/server: client sends its CWD to server

Browse source
This commit is contained in:
Daniel Eklöf 2019-12-21 19:56:37 +01:00
parent 0bb15d3d16
commit 277735db65
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client.c
View file

@ -127,10 +127,15 @@ main(int argc, char *const *argv)
}
}
char cwd[4096];
getcwd(cwd, sizeof(cwd));
const uint16_t cwd_len = strlen(cwd) + 1;
const uint16_t term_len = strlen(term) + 1;
uint32_t total_len = 0;
/* Calculate total length */
total_len += sizeof(cwd_len) + cwd_len;
total_len += sizeof(term_len) + term_len;
total_len += sizeof(argc);
@ -147,6 +152,13 @@ main(int argc, char *const *argv)
goto err;
}
if (send(fd, &cwd_len, sizeof(cwd_len), 0) != sizeof(cwd_len) ||
send(fd, cwd, cwd_len, 0) != cwd_len)
{
LOG_ERRNO("failed to send CWD to server");
goto err;
}
if (send(fd, &term_len, sizeof(term_len), 0) != sizeof(term_len) ||
send(fd, term, term_len, 0) != term_len)
{

9
server.c
View file

@ -175,7 +175,14 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
const uint8_t *end = &client->buffer.data[client->buffer.idx];
CHECK_BUF(sizeof(uint16_t));
uint16_t term_env_len = *(uint16_t *)p; p += sizeof(term_env_len);
uint16_t cwd_len = *(uint16_t *)p; p += sizeof(cwd_len);
CHECK_BUF(cwd_len);
const char *cwd = (const char *)p; p += cwd_len;
LOG_DBG("CWD = %.*s", cwd_len, cwd);
CHECK_BUF(sizeof(uint16_t));
uint16_t term_env_len = *(uint16_t *)p; p += term_env_len;
CHECK_BUF(term_env_len);
const char *term_env = (const char *)p; p += strlen(term_env) + 1;