Changeset 2488 for neercs/trunk/src/attach.cTweet

Timestamp:

Jun 25, 2008 12:33:40 AM (7 years ago)

Author:

pterjan

Message:

• Have -r/-R/-S like screen

File:

• neercs/trunk/src/attach.c (modified) (5 diffs)

neercs/trunk/src/attach.c

@@ -14 +14 @@
 #include "neercs.h"
 
-static char * build_socket_path(char *socket_dir)
+static char * build_socket_path(char *socket_dir, char *session_name)
 {
     char *path, *dir;
@@ -26 +26 @@
         dir = "/tmp";
     if(path)
-        snprintf(path, PATH_MAX+1, "%s/neercs.%d.sock", dir, getpid());
+        snprintf(path, PATH_MAX+1, "%s/neercs.%s.sock", dir, session_name);
     return path;
 }
@@ -46 +46 @@
 
     myaddr.sun_family = AF_UNIX;
-    screen_list->socket_path = build_socket_path(screen_list->socket_path);
+    screen_list->socket_path = build_socket_path(screen_list->socket_path, screen_list->session_name);
     strncpy(myaddr.sun_path, screen_list->socket_path, sizeof(myaddr.sun_path) - 1);
     unlink(myaddr.sun_path);
@@ -159 +159 @@
 }
 
-char ** list_sockets(char *socket_dir)
+char ** list_sockets(char *socket_dir, char *session_name)
 {
     char *pattern, *dir;
@@ -179 +179 @@
         return globbuf.gl_pathv;
 
-    snprintf(pattern, PATH_MAX, "%s/neercs.*.sock", dir);
+    if(session_name && strlen(session_name)+strlen(dir)+13<PATH_MAX)
+        sprintf(pattern, "%s/neercs.%s.sock", dir, session_name);
+    else
+        snprintf(pattern, PATH_MAX, "%s/neercs.*.sock", dir);
     pattern[PATH_MAX] = '\0';