From owner-freebsd-emulation  Sat Jun 10 17:34:58 2000
Delivered-To: freebsd-emulation@freebsd.org
Received: from vexpert.dbai.tuwien.ac.at (vexpert.dbai.tuwien.ac.at [128.130.111.12])
	by hub.freebsd.org (Postfix) with ESMTP id 9A6D937B86D
	for <freebsd-emulation@freebsd.org>; Sat, 10 Jun 2000 17:34:54 -0700 (PDT)
	(envelope-from pfeifer@dbai.tuwien.ac.at)
Received: from [128.130.111.2] (deneb [128.130.111.2])
	by vexpert.dbai.tuwien.ac.at (8.9.3/8.9.3) with ESMTP id CAA07666;
	Sun, 11 Jun 2000 02:34:37 +0200 (MET DST)
Date: Sun, 11 Jun 2000 02:34:36 +0200 (CEST)
From: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
To: wine-devel@winehq.com
Cc: freebsd-emulation@freebsd.org
Subject: Wine server/ptrace.c, please help reviewing!
Message-ID: <Pine.BSF.4.21.0006110225470.69787-100000@deneb.dbai.tuwien.ac.at>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: owner-freebsd-emulation@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

I found, in the FreeBSD ports collection (where I became maintainer of
the Wine port which I'm plan to ``minimize''), the following patch which
is superflous as far as can see.

Am I missing something obvious here, or is this just a historic relict?

(Originally that patch was much larger, but I changes in Wine essentially
made those parts obsolete, so I removed them with my first update for the
port.)

Gerald

*** server/ptrace.c.orig        Tue Apr  4 21:55:28 2000
--- server/ptrace.c     Thu May 18 09:40:09 2000
***************
*** 36,41 ****
--- 36,46 ----
  #ifndef PTRACE_POKEDATA
  #define PTRACE_POKEDATA PT_WRITE_D
  #endif
+ #ifdef __FreeBSD__
+ #define PTRACE_KEEPIP 1
+ #else
+ #define PTRACE_KEEPIP 0
+ #endif
  
  static const int use_ptrace = 1;  /* set to 0 to disable ptrace */
  
*************** void wait4_thread( struct thread *thread
*** 109,115 ****
  static int attach_thread( struct thread *thread )
  {
      /* this may fail if the client is already being debugged */
!     if (!use_ptrace || (ptrace( PTRACE_ATTACH, thread->unix_pid, 0, 0) == -1)) return 0;
      if (debug_level) fprintf( stderr, "%08x: *attached*\n", (unsigned int)thread );
      thread->attached = 1;
      wait4_thread( thread, SIGSTOP );
--- 114,120 ----
  static int attach_thread( struct thread *thread )
  {
      /* this may fail if the client is already being debugged */
!     if (!use_ptrace || (ptrace( PTRACE_ATTACH, thread->unix_pid, PTRACE_KEEPIP, 0 ) == -1)) return 0;
      if (debug_level) fprintf( stderr, "%08x: *attached*\n", (unsigned int)thread );
      thread->attached = 1;



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-emulation" in the body of the message