Index: /neercs/trunk/src/mytrace.c
===================================================================
--- /neercs/trunk/src/mytrace.c	(revision 2784)
+++ /neercs/trunk/src/mytrace.c	(revision 2785)
@@ -127,6 +127,8 @@
 #define STRINGIFY(x) X(x)
 
-#define SYSCALL_X86   0x80cd  /* CD 80 = int $0x80 */
-#define SYSCALL_AMD64 0x050fL /* 0F 05 = syscall */
+#define SYSCALL_X86     0x80cd  /* CD 80 = int $0x80 */
+#define SYSCALL_X86_NEW 0xf3eb  /* EB F3 = jmp <__kernel_vsyscall+0x3> */
+#define SYSENTER        0x340f  /* 0F 34 = sysenter */
+#define SYSCALL_AMD64   0x050fL /* 0F 05 = syscall */
 
 #if defined __x86_64__
@@ -481,4 +483,5 @@
     long oinst;
     int bits;
+    int offset = 2;
 
     if(call < 0 || call >= (long)(sizeof(syscallnames)/sizeof(*syscallnames)))
@@ -508,9 +511,10 @@
 
         oinst = ptrace(PTRACE_PEEKTEXT, t->pid, oldregs.RIP - 2, 0) & 0xffff;
+        fprintf(stderr, "%lx\n", oinst);
 
 #if defined __x86_64__
         if(oinst == SYSCALL_AMD64)
             break;
-        if(oinst == SYSCALL_X86)
+        if(oinst == SYSCALL_X86 || oinst == SYSCALL_X86_NEW)
         {
             bits = 32;
@@ -518,5 +522,5 @@
         }
 #else
-        if(oinst == SYSCALL_X86)
+        if(oinst == SYSCALL_X86 || oinst == SYSCALL_X86_NEW)
             break;
 #endif
@@ -528,5 +532,4 @@
         }
         waitpid(t->pid, NULL, 0);
-
         if(ptrace(PTRACE_SYSCALL, t->pid, NULL, 0) < 0)
         {
@@ -539,6 +542,14 @@
     print_registers(t->pid);
 
+    if(oinst == SYSCALL_X86_NEW)
+    {
+        /*  Get back to sysenter */
+        while((ptrace(PTRACE_PEEKTEXT, t->pid, oldregs.RIP - offset, 0) & 0xffff) != 0x340f)
+            offset++;
+        oldregs.ebp = oldregs.esp;
+    }
+
     regs = oldregs;
-    regs.RIP = regs.RIP - 2;
+    regs.RIP = regs.RIP - offset;
 #if defined __x86_64__
     if(bits == 64)
@@ -592,6 +603,8 @@
                 return -1;
             }
+            debug("PTRACE_GETEVENTMSG %d", t->child);
             continue;
         case PTRACE_EVENT_EXIT:
+            debug("PTRACE_EVENT_EXIT");
             /* The process is about to exit, don't do anything else */
             return 0;
Index: /neercs/trunk/src/grab.c
===================================================================
--- /neercs/trunk/src/grab.c	(revision 2784)
+++ /neercs/trunk/src/grab.c	(revision 2785)
@@ -54,4 +54,13 @@
 
     child = mytrace_fork(parent);
+    mytrace_write(parent, 1, "\x1b]0;\x07", 5);
+    mytrace_write(parent, 1, "\x1b[1000l", 7);
+    mytrace_write(parent, 1, "\x1b[?12l\x1b[?25h", 12);
+    mytrace_write(parent, 1, "\n[Process stolen by neercs]\n", 28);
+    /* FIXME Reset the term */
+    mytrace_close(parent, 1);
+
+    mytrace_exit(parent, 0);
+    mytrace_detach(parent);
     pid = mytrace_getpid(child);
 
@@ -76,13 +85,5 @@
             continue;
 
-        debug("found pty %d", i);
-
-        if(i == 2)
-        {
-            mytrace_write(parent, i, "\x1b]0;\x07", 5);
-            mytrace_write(parent, i, "\x1b[1000l", 7);
-            mytrace_write(parent, i, "\x1b[?12l\x1b[?25h", 12);
-            mytrace_write(parent, i, "\n[Process stolen by neercs]\n", 28);
-        }
+        debug("found pty %d for pid %d", i, pid);
 
         ret = mytrace_close(child, i);
@@ -122,7 +123,4 @@
     debug("pid %ld has now sid %d", pid, getsid(pid));
 
-    mytrace_exit(parent, 0);
-    mytrace_detach(parent);
-
     /* Reopen PTY file descriptors */
     for(i = 0; i <= 2; i++)