Changeset 2624

Timestamp:

08/01/08 15:44:49 (5 years ago)

Author:

pterjan

Message:

• Move all server creatio ninto server.c

Location:

neercs/trunk/src

Files:

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

neercs/trunk/src/main.c

@@ -332 +332 @@
     if(!attach)
     {
-        pid_t pid;
-        char * sess;
-
-        pid = fork();
-        if(pid < 0)
-        {
-            fprintf(stderr, "Failed to create child process\n");
-            goto end;
-        }
-        if(pid == 0)
-        {
-            int fd;
-            close(0);
-            close(1);
-            close(2);
-            fd = open("/dev/null", O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
-            dup2(fd, 0);
-#ifndef DEBUG
-            dup2(fd, 1);
-            dup2(fd, 2);
-            if (fd > 2)
-                close(fd);
-#else
-            if(fd != 0)
-                close(fd);
-            fd = open("/tmp/log.txt", O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
-            dup2(fd, 1);
-            dup2(fd, 2);
-            if (fd > 2)
-                close(fd);
-#endif
-            setsid();
-            return server_main(to_grab, to_start, screen_list);
-        }
-        create_socket(screen_list, SOCK_CLIENT);
-        while((sess = connect_socket(screen_list, SOCK_SERVER)) == NULL)
-            usleep(100);
-        free(sess);
-
-        /* Create main canvas and associated caca window */
-        screen_list->cv = cucul_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);
-
-        request_attach(screen_list);
+        if(start_server(to_grab, to_start, screen_list))
+            goto end;
     }
 

neercs/trunk/src/neercs.h

@@ -228 +228 @@
 char * connect_socket(struct screen_list* screen_list, enum socket_type socktype);
 char ** list_sockets(char *socket_dir, char *session_name);
-int server_main(int *to_grab, char **to_start, struct screen_list *screen_list);
+int start_server(int *to_grab, char **to_start, struct screen_list *screen_list);
 int send_event(caca_event_t ev, struct screen_list* screen_list);
 

neercs/trunk/src/server.c

@@ -106 +106 @@
 }
 
-int server_main(int *to_grab, char **to_start, struct screen_list *screen_list)
+static int server_main(int *to_grab, char **to_start, struct screen_list *screen_list)
 {
     int i;
@@ -390 +390 @@
 }
 
+int start_server(int *to_grab, char **to_start, struct screen_list *screen_list)
+{
+    pid_t pid;
+    char * sess;
+
+    pid = fork();
+    if(pid < 0)
+    {
+        fprintf(stderr, "Failed to create child process\n");
+        return 1;
+    }
+    if(pid == 0)
+    {
+        int fd;
+        close(0);
+        close(1);
+        close(2);
+        fd = open("/dev/null", O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
+        dup2(fd, 0);
+#ifndef DEBUG
+        dup2(fd, 1);
+        dup2(fd, 2);
+        if (fd > 2)
+            close(fd);
+#else
+        if(fd != 0)
+            close(fd);
+        fd = open("/tmp/log.txt", O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
+        dup2(fd, 1);
+        dup2(fd, 2);
+        if (fd > 2)
+            close(fd);
+#endif
+        setsid();
+        return server_main(to_grab, to_start, screen_list);
+    }
+    create_socket(screen_list, SOCK_CLIENT);
+    while((sess = connect_socket(screen_list, SOCK_SERVER)) == NULL)
+        usleep(100);
+    free(sess);
+
+    /* Create main canvas and associated caca window */
+    screen_list->cv = cucul_create_canvas(0, 0);
+    screen_list->dp = caca_create_display(screen_list->cv);
+    if(!screen_list->dp)
+        return 1;
+    caca_set_cursor(screen_list->dp, 1);
+
+    request_attach(screen_list);
+
+    return 0;
+}
+
 long long get_us(void)
 {