cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

regen so that it applies

Browse Source
This commit is contained in:
downsj 1998-07-06 06:36:45 +00:00
parent a97ffbfcd3
commit 67010f5f84
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
emulators/wine/patches/patch-ap
View File

@ -1,5 +1,5 @@
*** debugger/memory.c.orig Sun Feb 2 13:57:44 1997
--- debugger/memory.c Tue Mar 25 07:52:12 1997
*** debugger/memory.c.orig Sat Jun 13 05:30:46 1998
--- debugger/memory.c Sun Jul 5 23:31:40 1998
***************
*** 19,25 ****
* write (rwflag == 0)
@ -29,30 +29,42 @@
08000000-08002000 r-xp 00000000 03:41 2361
***************
*** 41,52 ****
Only permissions start and end are used here
*/
!
if (!(fp = fopen("/proc/self/maps", "r")))
return FALSE;
while (fgets( buf, 79, fp)) {
sscanf(buf, "%x-%x %3s", (int *) &start, (int *) &end, prot);
if ( end <= addr)
continue;
if (start <= addr && addr+size < end) {
--- 42,75 ----
Only permissions start and end are used here
*/
+ #else
+ /*
+ % cat /proc/curproc/map
+ start end resident private perm type
+ 0x1000 0xe000 12 0 r-x COW vnode
+ 0xe000 0x10000 2 2 rwx COW vnode
+ 0x10000 0x27000 4 4 rwx default
+ 0x800e000 0x800f000 1 1 rw- default
+ 0xefbde000 0xefbfe000 1 1 rwx default
+
+ COW = "copy on write"
+ */
+ #endif
+
+ #ifdef linux
! #else
! /*
! % cat /proc/curproc/map
! start end resident private perm type
! 0x1000 0xe000 12 0 r-x COW vnode
! 0xe000 0x10000 2 2 rwx COW vnode
! 0x10000 0x27000 4 4 rwx default
! 0x800e000 0x800f000 1 1 rw- default
! 0xefbde000 0xefbfe000 1 1 rwx default
!
! COW = "copy on write"
! */
! #endif
!
! #ifdef linux
if (!(fp = fopen("/proc/self/maps", "r")))
+ #else
+ if (!(fp = fopen("/proc/curproc/map", "r")))
+ #endif
+
return FALSE;
while (fgets( buf, 79, fp)) {
@ -61,6 +73,6 @@
+ #else
+ sscanf(buf, "%x %x %*d %*d %3s", (int *) &start, (int *) &end, prot);
+ #endif
if ( end < addr)
if ( end <= addr)
continue;
if (start <= addr && addr+size < end) {