Changeset 3870Tweet

Timestamp:

11/02/09 15:30:15 (4 years ago)

Author:

pterjan

Message:

• Preserve errno when needed, and return -1 when it is set

File:

• neercs/trunk/src/mytrace.c (modified) (5 diffs)

neercs/trunk/src/mytrace.c

@@ -194 +194 @@
     struct user_regs_struct regs;
     size_t size = strlen(path) + 1;
-    int ret;
+    int ret, err;
 
     if(ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
     {
         perror("PTRACE_GETREGS (open)\n");
-        return errno;
+        return -1;
     }
 
@@ -209 +209 @@
 
     ret = remote_syscall(t, MYCALL_OPEN, regs.RSP, O_RDWR, 0755);
+    err = errno;
 
     /* Restore the data */
     memcpy_into_target(t, regs.RSP, backup_data, size);
 
+    errno = err;
     return ret;
 #else
@@ -235 +237 @@
     struct user_regs_struct regs;
     char *backup_data;
-    int ret;
+    int ret, err;
 
     if(ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
     {
         perror("PTRACE_GETREGS (write)\n");
-        return errno;
+        return -1;
     }
 
@@ -252 +254 @@
 
     ret = remote_syscall(t, MYCALL_WRITE, fd, regs.RSP, len);
+    err = errno;
 
     /* Restore the data */
     memcpy_into_target(t, regs.RSP, backup_data, len);
 
+    errno = err;
     return ret;
 #else
@@ -331 +335 @@
     {
         perror("PTRACE_GETREGS (exec)\n");
-        return errno;
+        return -1;
     }