Changeset 3324Tweet

Timestamp:

Nov 15, 2008, 12:50:48 AM (14 years ago)

Author:

Pascal Terjan

Message:

• Move attaching logic to a separate function

Location:

neercs/trunk/src

Files:

• attach.c (modified) (1 diff)
• main.c (modified) (2 diffs)
• neercs.h (modified) (1 diff)

neercs/trunk/src/attach.c

@@ -163 +163 @@
 }
 
+void attach(struct screen_list* screen_list)
+{
+    char **sockets;
+    int i;
+
+    sockets = list_sockets(screen_list->socket_dir, screen_list->session_name);
+    if(sockets && sockets[0])
+    {
+        char *session;
+        for(i=0; sockets[i]; i++);
+        i--;
+        screen_list->socket_path[SOCK_SERVER] = strdup(sockets[i]);
+        session = connect_socket(screen_list, SOCK_SERVER);
+        while(!session && i > 0)
+        {
+            free(screen_list->socket_path[SOCK_SERVER]);
+            i--;
+            screen_list->socket_path[SOCK_SERVER] = strdup(sockets[i]);
+            session = connect_socket(screen_list, SOCK_SERVER);
+        }
+        debug("Connected to session %s", session);
+        if(session)
+        {
+            /* Create main canvas and associated caca window */
+            screen_list->cv = caca_create_canvas(0, 0);
+            screen_list->dp = caca_create_display(screen_list->cv);
+            if(!screen_list->dp)
+                return;
+            caca_set_cursor(screen_list->dp, 1);
+
+            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)
+                free(screen_list->session_name);
+            screen_list->session_name = session;
+        }
+        else
+        {
+            fprintf(stderr, "Failed to attach!\n");
+            free(screen_list->socket_path[SOCK_SERVER]);
+            screen_list->socket_path[SOCK_SERVER] = NULL;
+            screen_list->attach = 0;
+        }
+        for(i=0; sockets[i]; i++)
+            free(sockets[i]);
+        free(sockets);
+    }
+    else
+    {
+        fprintf(stderr, "No socket found!\n");
+        screen_list->attach = 0;
+    }
+}
+
 int send_event(caca_event_t ev, struct screen_list* screen_list)
 {

neercs/trunk/src/main.c

@@ -110 +110 @@
     if(screen_list->attach)
     {
-        char **sockets;
         if(screen_list->nb_to_grab || screen_list->to_start)
         {
@@ -117 +116 @@
         }
 
-        sockets = list_sockets(screen_list->socket_dir, screen_list->session_name);
-        if(sockets && sockets[0])
-        {
-            char *session;
-            for(i=0; sockets[i]; i++);
-            i--;
-            screen_list->socket_path[SOCK_SERVER] = strdup(sockets[i]);
-            session = connect_socket(screen_list, SOCK_SERVER);
-            while(!session && i > 0)
-            {
-                free(screen_list->socket_path[SOCK_SERVER]);
-                i--;
-                screen_list->socket_path[SOCK_SERVER] = strdup(sockets[i]);
-                session = connect_socket(screen_list, SOCK_SERVER);
-            }
-            debug("Connected to session %s", session);
-            if(session)
-            {
-                /* Create main canvas and associated caca window */
-                screen_list->cv = caca_create_canvas(0, 0);
-                screen_list->dp = caca_create_display(screen_list->cv);
-                if(!screen_list->dp)
-                    goto end;
-                caca_set_cursor(screen_list->dp, 1);
-
-                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)
-                    free(screen_list->session_name);
-                screen_list->session_name = session;
-            }
-            else
-            {
-                fprintf(stderr, "Failed to attach!\n");
-                free(screen_list->socket_path[SOCK_SERVER]);
-                screen_list->socket_path[SOCK_SERVER] = NULL;
-                screen_list->attach = 0;
-            }
-            for(i=0; sockets[i]; i++)
-                free(sockets[i]);
-            free(sockets);
-        }
-        else
-        {
-            fprintf(stderr, "No socket found!\n");
-            screen_list->attach = 0;
-        }
+        attach(screen_list);
+
         if(screen_list->forceattach && !screen_list->attach)
             goto end;

neercs/trunk/src/neercs.h

@@ -232 +232 @@
 long long get_us(void);
 
+void attach(struct screen_list* screen_list);
 int detach(struct screen_list* screen_list);
 int request_attach(struct screen_list* screen_list);