rpms/openoffice.org/devel openoffice.org-3.1.1.oooXXXXX.dmake.patch, 1.3, 1.4

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17304

Modified Files:
	openoffice.org-3.1.1.oooXXXXX.dmake.patch 
Log Message:
fix dmake bustage, round 3

openoffice.org-3.1.1.oooXXXXX.dmake.patch:
 dmake/dag.c      |    9 ++++++---
 dmake/expand.c   |    6 ++++--
 dmake/getinp.c   |    6 ++++--
 dmake/path.c     |   10 +++++++---
 dmake/rulparse.c |    5 +++--
 expand.c         |    4 +++-
 make.c           |   15 ++++++++++-----
 7 files changed, 37 insertions(+), 18 deletions(-)

Index: openoffice.org-3.1.1.oooXXXXX.dmake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.oooXXXXX.dmake.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-3.1.1.oooXXXXX.dmake.patch	8 Aug 2009 09:04:29 -0000	1.3
+++ openoffice.org-3.1.1.oooXXXXX.dmake.patch	10 Aug 2009 14:18:24 -0000	1.4
@@ -10,6 +10,16 @@ diff -ru dmake.orig/rulparse.c dmake/rul
  
  #ifdef DBUG
  	 DB_PRINT( "%", ("Handling %%-target [%s : : <prerequisites follow, maybe empty>]",
+@@ -915,7 +915,8 @@
+ 
+ 	    if( *name == '\'' && name[len-1]=='\'' ){
+ 	       name[len-1] = '\0';
+-	       strcpy(name,name+1);
++	       len = strlen(name+1)+1;
++	       memmove(name,name+1,len);
+ 	       /* add indirect prerequisite */
+ 	       _add_indirect_prereq( cur );
+ 	    }
 diff -ru dmake.orig/dag.c dmake/dag.c
 --- dmake.orig/dag.c	2009-08-07 20:18:31.000000000 +0100
 +++ dmake/dag.c	2009-08-07 20:30:59.000000000 +0100
@@ -159,3 +169,17 @@ diff -ru dmake.orig/path.c dmake/path.c
  	 p = n;
        }
        /* Look for an escape sequence and replace it by it's corresponding
+--- dmake.orig/expand.c	2009-08-10 15:02:31.000000000 +0100
++++ dmake/expand.c	2009-08-10 15:02:36.000000000 +0100
+@@ -727,8 +727,10 @@
+ 	      done = !lev;
+ 	      break;
+             } else {
++	      size_t len;
+ 	      s[1] = ' ';
+-	      strcpy( s, s+1 );
++	      len = strlen(s+1)+1;
++	      memmove( s, s+1, len );
+ 	    }
+ 	    /*FALLTHRU*/
+ 	 case ' ':