Changeset 2451 for neercs/trunk/srcTweet

Timestamp:

Jun 18, 2008, 11:08:44 PM (14 years ago)

Author:

Pascal Terjan

Message:

• Remove termios stuff, does not do anything currently

Location:

neercs/trunk/src

Files:

• grab.c (modified) (4 diffs)
• main.c (modified) (1 diff)
• neercs.h (modified) (1 diff)
• term.c (modified) (2 diffs)

neercs/trunk/src/grab.c

@@ -5 +5 @@
 #include <stdlib.h>
 #include <string.h>
-#include <termios.h>
 #include <unistd.h>
 
@@ -180 +179 @@
 }
 
-static int do_get_termios(pid_t pid, int fd, struct termios *t) {
-    struct user_regs_struct regs;
-    void *backup_page;
-    void *target_page = (void*)(0x08048000);
-    size_t size = (1<<12)*2; /* 8K */
-    int ret;
-
-    /* Backup the pages that we will use */
-    backup_page = malloc(size);
-    if (memcpy_from_target(pid, backup_page, target_page, size) < 0)
-        return -1;
-
-    if(ptrace(PTRACE_GETREGS, pid, NULL, &regs) < 0)
-    {
-        fprintf(stderr, "PTRACE_GETREGS failed\n");
-        return errno;
-    }
-
-    regs.eax = SYS_ioctl;
-    regs.ebx = fd;
-    regs.ecx = TCGETS;
-    regs.edx = ((long)target_page);
-
-    if((ret = do_syscall(pid, &regs)) != 0)
-    {
-        return ret;
-    }
-
-    if (regs.eax < 0) {
-        fprintf(stderr, "ioctl failed\n");
-        return (-regs.eax);
-    }
-
-    memcpy_from_target(pid, t, (void*)(target_page), sizeof(struct termios));
-
-    /* Restore the pages */
-    memcpy_into_target(pid, target_page, backup_page, size);
-
-    return 0;
-}
-
 static int do_setsid(pid_t pid) {
     struct user_regs_struct regs;
@@ -266 +224 @@
 int grab_process(pid_t pid, char *ptyname, int ptyfd)
 {
-    struct termios t;
     int i, fd = 0, mode, ret;
     char fdstr[1024];
@@ -302 +259 @@
 
         debug("fd %d is a pty", i);
-        if((ret = do_get_termios(pid, i, &t)))
-        {
-            fprintf(stderr, "do_get_termios %s\n", strerror(ret));
-        }
         if((ret = do_close(pid, i)))
         {

neercs/trunk/src/main.c

@@ -211 +211 @@
         if(ret && (caca_get_event_type(&ev) & CACA_EVENT_KEY_PRESS))
         {
-            unsigned int c = caca_get_event_key_ch(&ev);
+            unsigned int c = caca_get_event_key_utf32(&ev);
 
             if(command)

neercs/trunk/src/neercs.h

@@ -170 +170 @@
 
 
-#if 0
+#if 1
 #   define debug(f, z...) fprintf(stderr, f "\n", z)
 #else

neercs/trunk/src/term.c

@@ -344 +344 @@
         {
             unsigned int bytes;
+            char tmp[7];
 
             if(i + 6 < size)
@@ -350 +351 @@
             {
                 /* Add a trailing zero to what we're going to read */
-                char tmp[7];
                 memcpy(tmp, buffer + i, size - i);
                 tmp[size - i] = '\0';
                 ch = cucul_utf8_to_utf32(tmp, &bytes);
             }
-
+            /* FIXME awful for perfs
+               should get a better way to know if utf8 was valid */
+            memset(tmp, 0, 7);
+            cucul_utf32_to_utf8(tmp, ch);
+            if(strncmp(tmp, (char const *)(buffer + i), strlen(tmp)))
+                bytes = 0;
             if(!bytes)
             {
                 /* If the Unicode is invalid, assume it was latin1. */
                 ch = buffer[i];
+                debug("Invalid UTF-8 : %c", ch);
                 bytes = 1;
             }