From 0f2dc2b60cf684f58eefda51b7442c44c10aa492 Mon Sep 17 00:00:00 2001 From: Bruce Beare Date: Tue, 31 May 2011 10:26:08 -0700 Subject: [PATCH] ptrace.c Fix source file format to unix from dos Orig-Change-Id: Ia771b457eec7f9575d4631fb1c12a7062ebcc7de Signed-off-by: Bruce Beare --- libc/bionic/ptrace.c | 126 +++++++++++++++++++++---------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/libc/bionic/ptrace.c b/libc/bionic/ptrace.c index b1ca00ccd..863fac73f 100644 --- a/libc/bionic/ptrace.c +++ b/libc/bionic/ptrace.c @@ -1,63 +1,63 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include - -extern long __ptrace(int request, pid_t pid, void *addr, void *data); - -long ptrace(int request, pid_t pid, void * addr, void * data) -{ - switch (request) { - case PTRACE_PEEKUSR: - case PTRACE_PEEKTEXT: - case PTRACE_PEEKDATA: - { - long word; - long ret; - - ret = __ptrace(request, pid, addr, &word); - if (ret == 0) { - return word; - } else { - // __ptrace will set errno for us - return -1; - } - } - - default: - return __ptrace(request, pid, addr, data); - } -} - -/* - * Hook for gdb to get notified when a thread is created - */ -void _thread_created_hook(pid_t thread_id) __attribute__((noinline)); -void _thread_created_hook(pid_t thread_id) -{ -} +/* + * Copyright (C) 2008 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#include +#include + +extern long __ptrace(int request, pid_t pid, void *addr, void *data); + +long ptrace(int request, pid_t pid, void * addr, void * data) +{ + switch (request) { + case PTRACE_PEEKUSR: + case PTRACE_PEEKTEXT: + case PTRACE_PEEKDATA: + { + long word; + long ret; + + ret = __ptrace(request, pid, addr, &word); + if (ret == 0) { + return word; + } else { + // __ptrace will set errno for us + return -1; + } + } + + default: + return __ptrace(request, pid, addr, data); + } +} + +/* + * Hook for gdb to get notified when a thread is created + */ +void _thread_created_hook(pid_t thread_id) __attribute__((noinline)); +void _thread_created_hook(pid_t thread_id) +{ +}