Changeset 2502 for neercs/trunkTweet

Timestamp:

Jul 1, 2008, 1:26:17 AM (13 years ago)

Author:

Sam Hocevar

Message:

• Coding style.

File:

• neercs/trunk/src/grab.c (modified) (12 diffs)

neercs/trunk/src/grab.c

@@ -63 +63 @@
     s = (long*) src;
     n /= sizeof(long);
-    for (i = 0; i < n; i++) {
-        d[i] = ptrace(PTRACE_PEEKTEXT, pid, s+i, 0);
-        if (errno) {
+    for(i = 0; i < n; i++)
+    {
+        d[i] = ptrace(PTRACE_PEEKTEXT, pid, s + i, 0);
+        if(errno)
+        {
             perror("ptrace(PTRACE_PEEKTEXT)");
             return -1;
@@ -79 +81 @@
     d = (long*) dest;
     s = (long*) src;
-    for (i = 0; i < n / sizeof(long); i++) {
-        if (ptrace(PTRACE_POKETEXT, pid, d+i, s[i]) == -1) {
+    for(i = 0; i < n / sizeof(long); i++)
+    {
+        if(ptrace(PTRACE_POKETEXT, pid, d + i, s[i]) == -1)
+        {
             perror("ptrace(PTRACE_POKETEXT)");
             return -1;
@@ -90 +94 @@
 static int do_syscall(pid_t pid, struct user_regs_struct *regs)
 {
-
     struct user_regs_struct oregs;
     long oinst;
@@ -102 +105 @@
 
     oinst = ptrace(PTRACE_PEEKTEXT, pid, regs->RSP, 0);
-    if (errno) {
+    if(errno)
+    {
         fprintf(stderr, "PTRACE_PEEKTEXT failed\n");
         return errno;
     }
 
-    if (ptrace(PTRACE_POKETEXT, pid, regs->RSP, 0x80cd) < 0) { /* int 0x80 */
+    if(ptrace(PTRACE_POKETEXT, pid, regs->RSP, 0x80cd) < 0) /* int 0x80 */
+    {
         fprintf(stderr, "PTRACE_POKETEXT failed\n");
         return errno;
@@ -135 +140 @@
     }
 
-    if(ptrace(PTRACE_POKETEXT, pid, oregs.RSP-4 , oinst) < 0)
+    if(ptrace(PTRACE_POKETEXT, pid, oregs.RSP - 4 , oinst) < 0)
     {
         fprintf(stderr, "PTRACE_POKETEXT failed\n");
@@ -180 +185 @@
     void *backup_page;
     void *target_page = (void*)(0x08048000);
-    size_t size = (1<<12); /* 4K */
+    size_t size = (1 << 12); /* 4K */
     int ret;
 
     /* Backup the page that we will use */
     backup_page = malloc(size);
-    if (memcpy_from_target(pid, backup_page, target_page, size) < 0)
+    if(memcpy_from_target(pid, backup_page, target_page, size) < 0)
         return -1;
 
@@ -194 +199 @@
     }
 
-    /* +4 because it's trcuncated on a multiple of 4 and we need 1 */
-    memcpy_into_target(pid, target_page, path, strlen(path)+4);
+    /* +4 because it's truncated on a multiple of 4 and we need 1 */
+    memcpy_into_target(pid, target_page, path, strlen(path) + 4);
 
     regs.RAX = SYS_open;
@@ -215 +220 @@
 }
 
-static int do_setsid(pid_t pid) {
+static int do_setsid(pid_t pid)
+{
     struct user_regs_struct regs;
     int ret;
@@ -236 +242 @@
     }
 
-    if (regs.RAX != 0) {
+    if(regs.RAX != 0)
+    {
         fprintf(stderr, "setpgid failed\n");
         return -regs.RAX;
@@ -250 +257 @@
     debug("pid %d has now sid %d", pid, getsid(pid));
 
-    if (regs.RAX == -1) {
+    if((long int)regs.RAX == -1L)
+    {
         fprintf(stderr, "getsid failed\n");
         return -regs.RAX;
@@ -278 +286 @@
     waitpid(pid, NULL, 0);
 
-    for(i=0; i<=2; i++)
+    for(i = 0; i <= 2; i++)
     {
         snprintf(fdstr, sizeof(fdstr), "/proc/%d/fd/%d", pid, i);
         to_open[i]=0;
         lstat(fdstr, &stat_buf);
-        if ((stat_buf.st_mode & S_IRUSR) && (stat_buf.st_mode & S_IWUSR))
+        if((stat_buf.st_mode & S_IRUSR) && (stat_buf.st_mode & S_IWUSR))
             mode = O_RDWR;
-        else if (stat_buf.st_mode & S_IWUSR)
+        else if(stat_buf.st_mode & S_IWUSR)
             mode = O_WRONLY;
         else
             mode = O_RDONLY;
 
-        if (stat(fdstr, &stat_buf) < 0)
+        if(stat(fdstr, &stat_buf) < 0)
             continue;
 
-        if (!S_ISCHR(stat_buf.st_mode) || MAJOR(stat_buf.st_rdev) != UNIX98_PTY_SLAVE_MAJOR)
+        if(!S_ISCHR(stat_buf.st_mode) || MAJOR(stat_buf.st_rdev) != UNIX98_PTY_SLAVE_MAJOR)
             continue;
 
@@ -309 +317 @@
     }
 
-    for(i=0; i<=2; i++)
+    for(i = 0; i <= 2; i++)
     {
         if(!to_open[i])