mwtkrayer
/
splex
forked from github/abduco
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Suffix session names with '@hostname'

This commit is contained in:
Marc André Tanner 2014-09-08 19:39:46 +02:00
parent 450062468c
commit b2f2dc810d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
abduco.c
View File

@ -106,10 +106,11 @@ typedef struct {
volatile sig_atomic_t running; volatile sig_atomic_t running;
const char *name; const char *name;
const char *session_name; const char *session_name;
char host[255];
bool read_pty; bool read_pty;
} Server; } Server;
static Server server = { .running = true, .exit_status = -1 }; static Server server = { .running = true, .exit_status = -1, .host = "@localhost" };
static Client client; static Client client;
static struct termios orig_term, cur_term; static struct termios orig_term, cur_term;
bool has_term; bool has_term;
@ -258,10 +259,11 @@ static int create_socket(const char *name) {
if (len < 0 || (size_t)len >= maxlen) if (len < 0 || (size_t)len >= maxlen)
return -1; return -1;
} else { } else {
int len = create_socket_dir(), rem = strlen(name); int dir_len = create_socket_dir();
if (len == -1 || maxlen - len - rem <= 0) if (dir_len == -1 || dir_len + strlen(name) + strlen(server.host) >= maxlen)
return -1; return -1;
strncat(sockaddr.sun_path, name, maxlen - len - 1); strncat(sockaddr.sun_path, name, maxlen - strlen(sockaddr.sun_path) - 1);
strncat(sockaddr.sun_path, server.host, maxlen - strlen(sockaddr.sun_path) - 1);
} }
return socket(AF_LOCAL, SOCK_STREAM, 0); return socket(AF_LOCAL, SOCK_STREAM, 0);
} }
@ -426,7 +428,7 @@ static bool attach_session(const char *name) {
} }
static int session_filter(const struct dirent *d) { static int session_filter(const struct dirent *d) {
return d->d_name[0] != '.'; return strstr(d->d_name, server.host) != NULL;
} }
static int session_comparator(const struct dirent **a, const struct dirent **b) { static int session_comparator(const struct dirent **a, const struct dirent **b) {
@ -467,6 +469,7 @@ static int list_session() {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
char **cmd = NULL, action = '\0'; char **cmd = NULL, action = '\0';
server.name = basename(argv[0]); server.name = basename(argv[0]);
gethostname(server.host+1, sizeof(server.host) - 1);
if (argc == 1) if (argc == 1)
exit(list_session()); exit(list_session());
for (int arg = 1; arg < argc; arg++) { for (int arg = 1; arg < argc; arg++) {