Changeset 2906Tweet

Timestamp:

Oct 10, 2008, 12:24:51 AM (14 years ago)

Author:

Pascal Terjan

Message:

• Cleanup my term after a grab

Location:

neercs/trunk/src

Files:

• grab.c (modified) (4 diffs)
• mytrace.c (modified) (3 diffs)
• mytrace.h (modified) (2 diffs)

neercs/trunk/src/grab.c

@@ -40 +40 @@
     char fdstr[1024];
     struct mytrace *parent, *child;
-    int i, fd = 0, mode, ret;
+    int i, fd = 0, ret;
     char to_open[3];
+    int mode[3];
     struct stat stat_buf;
+    struct termios tos;
 
     debug("pty is %s", ptyname);
@@ -54 +56 @@
 
     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, "\x1b[H\x1b[2J", 7);
     mytrace_write(parent, 1, "\n[Process stolen by neercs]\n", 28);
-    /* FIXME Reset the term */
+    mytrace_tcgets(parent, 1, &tos);
+    tos.c_lflag |= ICANON|ECHO;
+    mytrace_tcsets(parent, 1, &tos);
     mytrace_close(parent, 1);
-
     mytrace_exit(parent, 0);
     mytrace_detach(parent);
@@ -72 +73 @@
         lstat(fdstr, &stat_buf);
         if((stat_buf.st_mode & S_IRUSR) && (stat_buf.st_mode & S_IWUSR))
-            mode = O_RDWR;
+            mode[i] = O_RDWR;
         else if(stat_buf.st_mode & S_IWUSR)
-            mode = O_WRONLY;
+            mode[i] = O_WRONLY;
         else
-            mode = O_RDONLY;
+            mode[i] = O_RDONLY;
 
         if(stat(fdstr, &stat_buf) < 0)
@@ -128 +129 @@
         if(!to_open[i])
             continue;
-        fd = mytrace_open(child, ptyname, mode);
+        fd = mytrace_open(child, ptyname, mode[i]);
         if(fd < 0)
         {

neercs/trunk/src/mytrace.c

@@ -165 +165 @@
 #define MYCALL_FORK     7
 #define MYCALL_EXIT     8
+#define MYCALL_IOCTL    9
 
 #if defined __x86_64__
 /* from unistd_32.h on an amd64 system */
-int syscalls32[] = { 5, 6, 4, 63, 57, 66, 37, 2, 1 };
+int syscalls32[] = { 5, 6, 4, 63, 57, 66, 37, 2, 1, 54 };
 int syscalls64[] =
 #else
@@ -174 +175 @@
 #endif
     { SYS_open, SYS_close, SYS_write, SYS_dup2, SYS_setpgid, SYS_setsid,
-      SYS_kill, SYS_fork, SYS_exit };
+      SYS_kill, SYS_fork, SYS_exit, SYS_ioctl };
 
 char const *syscallnames[] =
     { "open", "close", "write", "dup2", "setpgid", "setsid", "kill", "fork",
-      "exit" };
+      "exit", "ioctl" };
 
 struct mytrace
@@ -394 +395 @@
     ptrace(PTRACE_SETOPTIONS, t->pid, NULL, PTRACE_O_TRACEEXIT);
     return remote_syscall(t, MYCALL_EXIT, status, 0, 0);
+#else
+    errno = ENOSYS;
+    return -1;
+#endif
+}
+
+int mytrace_tcgets(struct mytrace *t, int fd, struct termios *tos)
+{
+#if defined USE_GRAB
+    struct user_regs_struct regs;
+    struct termios mytos;
+    int ret;
+
+    if(ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
+    {
+        fprintf(stderr, "PTRACE_GETREGS failed\n");
+        return errno;
+    }
+
+    /* Backup the data that we will use */
+    if(memcpy_from_target(t, (char *)&mytos, regs.RSP, sizeof(struct termios)) < 0)
+        return -1;
+
+    ret = remote_syscall(t, MYCALL_IOCTL, fd, TCGETS, regs.RSP);
+
+    memcpy_from_target(t, (char *)tos, regs.RSP, sizeof(struct termios));
+
+    /* Restore the data */
+    memcpy_into_target(t, regs.RSP, (char *)&mytos, sizeof(struct termios));
+
+    if(ret < 0)
+    {
+        errno = ret;
+        return -1;
+    }
+
+    return ret;
+#else
+    errno = ENOSYS;
+    return -1;
+#endif
+}
+
+int mytrace_tcsets(struct mytrace *t, int fd, struct termios *tos)
+{
+#if defined USE_GRAB
+    struct user_regs_struct regs;
+    struct termios mytos;
+    int ret;
+
+    if(ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
+    {
+        fprintf(stderr, "PTRACE_GETREGS failed\n");
+        return errno;
+    }
+
+    /* Backup the data that we will use */
+    if(memcpy_from_target(t, (char *)&mytos, regs.RSP, sizeof(struct termios)) < 0)
+        return -1;
+
+    memcpy_into_target(t, regs.RSP, (char *)tos, sizeof(struct termios));
+
+    ret = remote_syscall(t, MYCALL_IOCTL, fd, TCSETS, regs.RSP);
+
+    /* Restore the data */
+    memcpy_into_target(t, regs.RSP, (char *)&mytos, sizeof(struct termios));
+
+    if(ret < 0)
+    {
+        errno = ret;
+        return -1;
+    }
+
+    return ret;
 #else
     errno = ENOSYS;

neercs/trunk/src/mytrace.h

@@ -12 +12 @@
  *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
+
+#include <termios.h>
 
 struct mytrace;
@@ -28 +30 @@
 int mytrace_kill(struct mytrace *t, long pid, int sig);
 int mytrace_exit(struct mytrace *t, int status);
-
+int mytrace_tcgets(struct mytrace *t, int fd, struct termios *tos);
+int mytrace_tcsets(struct mytrace *t, int fd, struct termios *tos);