Changeset 3891Tweet

Timestamp:

Nov 6, 2009, 6:46:05 PM (11 years ago)

Author:

Pascal Terjan

Message:

• Store real pid in screen struct (even if not used) and properly set control terminal (even if not needed)

Location:

neercs/trunk/src

Files:

• grab.c (modified) (3 diffs)
• mytrace.c (modified) (1 diff)
• mytrace.h (modified) (1 diff)
• neercs.h (modified) (1 diff)
• screens.c (modified) (1 diff)
• term.c (modified) (2 diffs)

neercs/trunk/src/grab.c

@@ -39 +39 @@
 #include "mytrace.h"
 
-int grab_process(long pid, char *ptyname, int ptyfd)
+int grab_process(long pid, char *ptyname, int ptyfd, int *newpid)
 {
 #if defined HAVE_LINUX_KDEV_T_H
@@ -117 +117 @@
     }
 
-    if(parent)
-    {
-        ret = mytrace_exec(parent, "/usr/bin/reset");
-        if(ret < 0)
-            mytrace_exit(parent, 0);
-        mytrace_detach(parent);
-        waitpid(pid, NULL, 0); /* Wait for reset to finish before displaying */
-        mytrace_write(child, 2, "\x1b[H\x1b[2J", 7);
-        mytrace_write(child, 2, "\n[Process stolen by neercs]\r\n\n", 30);
-    }
+    ret = mytrace_exec(parent, "/usr/bin/reset");
+    if(ret < 0)
+        mytrace_exit(parent, 0);
+    mytrace_detach(parent);
+    waitpid(pid, NULL, 0); /* Wait for reset to finish before displaying */
+    mytrace_write(child, 2, "\x1b[H\x1b[2J", 7);
+    mytrace_write(child, 2, "\n[Process stolen by neercs]\r\n\n", 30);
+
+    pid = mytrace_getpid(child);
+    *newpid = pid;
 
     /* Set the process's session ID */
@@ -173 +173 @@
             continue;
         }
+        
+        /* FIXME Only needed once */
+        mytrace_sctty(child, fd);
+
         if(validtos)
         {

neercs/trunk/src/mytrace.c

@@ -474 +474 @@
     errno = err;
     return ret;
+#else
+    errno = ENOSYS;
+    return -1;
+#endif
+}
+
+int mytrace_sctty(struct mytrace *t, int fd)
+{
+#if defined USE_GRAB
+    ptrace(PTRACE_SETOPTIONS, t->pid, NULL, PTRACE_O_TRACEEXIT);
+    return remote_syscall(t, MYCALL_IOCTL, fd, TIOCSCTTY, 0);
 #else
     errno = ENOSYS;

neercs/trunk/src/mytrace.h

@@ -33 +33 @@
 int mytrace_tcgets(struct mytrace *t, int fd, struct termios *tos);
 int mytrace_tcsets(struct mytrace *t, int fd, struct termios *tos);
+int mytrace_sctty(struct mytrace *t, int fd);

neercs/trunk/src/neercs.h

@@ -227 +227 @@
 
 int create_pty(char *cmd, unsigned int w, unsigned int h, int *cpid);
-int create_pty_grab(long pid, unsigned int w, unsigned int h);
-int grab_process(long pid, char *ptyname, int ptyfd);
+int create_pty_grab(long pid, unsigned int w, unsigned int h, int *cpid);
+int grab_process(long pid, char *ptyname, int ptyfd, int *newpid);
 long select_process(struct screen_list* screen_list);
 

neercs/trunk/src/screens.c

@@ -45 +45 @@
     s->h = h+1;
     s->bell = 0;
-    s->pid = pid;
-
-    s->fd = create_pty_grab(pid, w, h);
+
+    s->fd = create_pty_grab(pid, w, h, &s->pid);
 
     if(s->fd < 0)

neercs/trunk/src/term.c

@@ -831 +831 @@
 }
 
-int create_pty_grab(long pid, unsigned int w, unsigned int h)
+int create_pty_grab(long pid, unsigned int w, unsigned int h, int *newpid)
 {
     int fdm, fds;
@@ -844 +844 @@
 
     set_tty_size(0, w, h);
-    grab_process(pid, ptsname(fdm), fds);
+    grab_process(pid, ptsname(fdm), fds, newpid);
 
     fcntl(fdm, F_SETFL, O_NDELAY);