Changeset 4033 for neercs/trunk/src/server.cTweet

Timestamp:

Nov 25, 2009, 12:47:40 PM (14 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added basic and non-working python interpreter

File:

• neercs/trunk/src/server.c (modified) (7 diffs)

neercs/trunk/src/server.c

@@ -212 +212 @@
 
 
-    
+
     screen_list->last_key_time = 0;
     screen_list->attached = 0;
@@ -220 +220 @@
 
     server_init(screen_list);
+#ifdef USE_PYTHON
+    python_init(screen_list);
+#endif
 
     for (;;)
@@ -300 +303 @@
     free_screen_list(screen_list);
 
+#ifdef USE_PYTHON
+    python_close(screen_list);
+#endif
+    
     exit(0);
 }
@@ -453 +460 @@
     if (screen_list->help)
     {
-        return help_handle_key(screen_list, c);  
+        return help_handle_key(screen_list, c);
     }
 #ifdef USE_PYTHON
-        if(screen_list->python_command)
-    {
-        return python_command_handle_key(screen_list, c);   
-    }
-#endif
-    
+    if (screen_list->python_command)
+    {
+        return python_command_handle_key(screen_list, c);
+    }
+#endif
+
     /* CTRL-A has been pressed before, handle this as a command, except that
-     CTRL-A a sends literal CTRL-A */
+       CTRL-A a sends literal CTRL-A */
     if (screen_list->command && (c != 'a'))
     {
@@ -527 +534 @@
 }
 
+
+int install_fds(struct screen_list *screen_list)
+{
+    int fd;
+    close(0);
+    close(1);
+    close(2);
+    fd = open("/dev/null", O_RDWR, 0);
+    if (fd < 0)
+    {
+        perror("Failed to open /dev/null");
+        return -2;
+    }
+    dup2(fd, 0);
+#ifndef DEBUG
+    dup2(fd, 1);
+    dup2(fd, 2);
+    if (fd > 2)
+        close(fd);
+#else
+    if (fd != 0)
+        close(fd);
+    screen_list->outfd =
+        open("/tmp/neercs-debug.txt", O_TRUNC | O_RDWR | O_CREAT,
+             S_IRUSR | S_IWUSR);
+    dup2(screen_list->outfd, 1);
+    dup2(screen_list->outfd, 2);
+    if (screen_list->outfd > 2)
+        close(screen_list->outfd);
+#endif
+        return 0;
+}
+
 int start_server(struct screen_list *screen_list)
 {
@@ -539 +579 @@
     if (pid == 0)
     {
-        int fd;
-        close(0);
-        close(1);
-        close(2);
-        fd = open("/dev/null", O_RDWR, 0);
-        if (fd < 0)
-        {
-            perror("Failed to open /dev/null");
-            return -2;
-        }
-        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/neercs-debug.txt", O_TRUNC | O_RDWR | O_CREAT,
-                  S_IRUSR | S_IWUSR);
-        dup2(fd, 1);
-        dup2(fd, 2);
-        if (fd > 2)
-            close(fd);
-#endif
+        int r = install_fds(screen_list);
+        if(r) return r;
         setsid();
 
@@ -570 +586 @@
         /* Never returns */
     }
-    
+
     return 0;
 }