Changeset 2614 for neercs/trunk/src/main.c

Timestamp:

07/31/08 01:34:55 (5 years ago)

Author:

pterjan

Message:

• Factorize some code in attach.c

File:

• neercs/trunk/src/main.c (modified) (8 diffs)

neercs/trunk/src/main.c

@@ -261 +261 @@
             for(i=0; sockets[i]; i++);
             i--;
-            screen_list->s_socket_path = strdup(sockets[i]);
-            session = connect_server(screen_list);
+            screen_list->socket_path[SOCK_SERVER] = strdup(sockets[i]);
+            session = connect_socket(screen_list, SOCK_SERVER);
             while(!session && i > 0)
             {
-                free(screen_list->s_socket_path);
+                free(screen_list->socket_path[SOCK_SERVER]);
                 i--;
-                screen_list->s_socket_path = strdup(sockets[i]);
-                session = connect_server(screen_list);
+                screen_list->socket_path[SOCK_SERVER] = strdup(sockets[i]);
+                session = connect_socket(screen_list, SOCK_SERVER);
             }
             debug("Connected to session %s", session);
@@ -280 +280 @@
                 caca_set_cursor(screen_list->dp, 1);
 
-                screen_list->c_socket_path = build_socket_path(screen_list->socket_dir, session, 1);
-                create_client_socket(screen_list);
+                screen_list->socket_path[SOCK_CLIENT] =
+                    build_socket_path(screen_list->socket_dir, session, SOCK_CLIENT);
+                create_socket(screen_list, SOCK_CLIENT);
                 request_attach(screen_list);
                 if(screen_list->session_name)
@@ -290 +291 @@
             {
                 fprintf(stderr, "Failed to attach!\n");
-                free(screen_list->s_socket_path);
-                screen_list->s_socket_path = NULL;
+                free(screen_list->socket_path[SOCK_SERVER]);
+                screen_list->socket_path[SOCK_SERVER] = NULL;
                 attach = 0;
             }
@@ -320 +321 @@
         }
     }
-    if(!screen_list->c_socket_path)
-        screen_list->c_socket_path =
-            build_socket_path(screen_list->socket_dir, screen_list->session_name, 1);
-
-    if(!screen_list->s_socket_path)
-        screen_list->s_socket_path =
-            build_socket_path(screen_list->socket_dir, screen_list->session_name, 0);
+    if(!screen_list->socket_path[SOCK_CLIENT])
+        screen_list->socket_path[SOCK_CLIENT] =
+            build_socket_path(screen_list->socket_dir, screen_list->session_name, SOCK_CLIENT);
+
+    if(!screen_list->socket_path[SOCK_SERVER])
+        screen_list->socket_path[SOCK_SERVER] =
+            build_socket_path(screen_list->socket_dir, screen_list->session_name, SOCK_SERVER);
 
     /* Fork the server if needed */
@@ -365 +366 @@
             return server_main(to_grab, to_start, screen_list);
         }
-        create_client_socket(screen_list);
-        while((sess = connect_server(screen_list)) == NULL)
+        create_socket(screen_list, SOCK_CLIENT);
+        while((sess = connect_socket(screen_list, SOCK_SERVER)) == NULL)
             usleep(100);
         free(sess);
@@ -389 +390 @@
         char buf[128*1024];
 
-        if (screen_list->c_socket && (n = read(screen_list->c_socket, buf, sizeof(buf)-1)) > 0)
+        if (screen_list->socket[SOCK_CLIENT] && (n = read(screen_list->socket[SOCK_CLIENT], buf, sizeof(buf)-1)) > 0)
         {
             buf[n] = 0;
@@ -445 +446 @@
         }
 
-        if(screen_list->s_socket_path)
-            free(screen_list->s_socket_path);
-
-        if(screen_list->c_socket_path)
-        {
-            unlink(screen_list->c_socket_path);
-            free(screen_list->c_socket_path);
-        }
-
-        if(screen_list->c_socket)
-            close(screen_list->c_socket);
-
-        if(screen_list->s_socket)
-            close(screen_list->s_socket);
+        if(screen_list->socket_path[SOCK_SERVER])
+            free(screen_list->socket_path[SOCK_SERVER]);
+
+        if(screen_list->socket_path[SOCK_CLIENT])
+        {
+            unlink(screen_list->socket_path[SOCK_CLIENT]);
+            free(screen_list->socket_path[SOCK_CLIENT]);
+        }
+
+        if(screen_list->socket[SOCK_CLIENT])
+            close(screen_list->socket[SOCK_CLIENT]);
+
+        if(screen_list->socket[SOCK_SERVER])
+            close(screen_list->socket[SOCK_SERVER]);
 
         if(screen_list->screen)
@@ -529 +530 @@
     screen_list->lock_offset = 0;
     screen_list->attached = 1;
-    screen_list->s_socket = 0;
-    screen_list->c_socket = 0;
+    screen_list->socket[SOCK_SERVER] = 0;
+    screen_list->socket[SOCK_CLIENT] = 0;
     screen_list->socket_dir    = NULL;
-    screen_list->s_socket_path = NULL;
-    screen_list->c_socket_path = NULL;
+    screen_list->socket_path[SOCK_SERVER] = NULL;
+    screen_list->socket_path[SOCK_CLIENT] = NULL;
     screen_list->session_name  = NULL;
     screen_list->default_shell = NULL;