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

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org-3.1.1.oooXXXXX.dmake.patch 
Log Message:
second round of dmake fixes

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 |    2 +-
 make.c           |   15 ++++++++++-----
 6 files changed, 32 insertions(+), 16 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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-3.1.1.oooXXXXX.dmake.patch	7 Aug 2009 19:50:44 -0000	1.2
+++ openoffice.org-3.1.1.oooXXXXX.dmake.patch	8 Aug 2009 09:04:29 -0000	1.3
@@ -120,3 +120,42 @@ diff -ru dmake.orig/path.c dmake/path.c
  	 q = tpath;
        }
        else
+--- dmake.orig/make.c	2009-08-08 09:56:10.000000000 +0100
++++ dmake/make.c	2009-08-08 10:00:04.000000000 +0100
+@@ -1352,8 +1352,10 @@
+        * Nothing in Expand() should be able to change dynamic macros. */
+       cmnd = Expand( rp->st_string );
+ 
+-      if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd )
+-	 strcpy(cmnd,p);
++      if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
++	 size_t len = strlen(p)+1;
++	 memmove(cmnd,p,len);
++      }
+ 
+       /* COMMAND macro is set to "$(CMNDNAME) $(CMNDARGS)" by default, it is
+        * possible for the user to reset it to, for example
+@@ -1381,8 +1383,10 @@
+ 	 shell  = ((l_attr & A_SHELL) != 0);
+ 
+ 	 /* clean up the attributes that we may have just added. */
+-	 if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd )
+-	    strcpy(cmnd,p);
++	 if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
++	    size_t len = strlen(p)+1;
++	    memmove(cmnd,p,len);
++	 }
+       }
+ 
+ #if defined(MSDOS)
+@@ -1477,8 +1481,9 @@
+    for( p=cmnd; *(n = DmStrPbrk(p,tmp)) != '\0'; )
+       /* Remove the \<nl> sequences. */
+       if(*n == CONTINUATION_CHAR && n[1] == '\n') {
++	 size_t len = strlen(n+2)+1;
+ 	 DB_PRINT( "make", ("fixing [%s]", p) );
+-	 strcpy( n, n+2 );
++	 memmove( n, n+2, len );
+ 	 p = n;
+       }
+       /* Look for an escape sequence and replace it by it's corresponding