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

[Caolan McNamara]

Author: caolanm

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

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

openoffice.org-3.1.1.oooXXXXX.dmake.patch:
 dmake/dag.c      |    9 ++++++---
 dmake/expand.c   |   20 +++++++++++++++-----
 dmake/getinp.c   |    6 ++++--
 dmake/path.c     |   10 +++++++---
 dmake/rulparse.c |    5 +++--
 expand.c         |    4 +++-
 make.c           |   15 ++++++++++-----
 7 files changed, 48 insertions(+), 21 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.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openoffice.org-3.1.1.oooXXXXX.dmake.patch	10 Aug 2009 14:18:24 -0000	1.4
+++ openoffice.org-3.1.1.oooXXXXX.dmake.patch	10 Aug 2009 15:33:17 -0000	1.5
@@ -47,26 +47,68 @@ diff -ru dmake.orig/dag.c dmake/dag.c
 diff -ru dmake.orig/expand.c dmake/expand.c
 --- dmake.orig/expand.c	2009-08-07 20:18:34.000000000 +0100
 +++ dmake/expand.c	2009-08-07 20:42:40.000000000 +0100
-@@ -365,7 +365,8 @@
-       if( (e = Basename(s)) != s) {
- 	 if( !(mod & DIRECTORY_FLAG) ) {
- 	    /* Move the basename to the start. */
--	    strcpy(s, e);
-+	    size_t len = strlen(e)+1;
-+	    memmove(s, e, len);
+@@ -230,6 +230,7 @@
+ char *tok;
+ {
+    if( strchr( "\"\\vantbrf01234567", tok[1] ) ) {
++      size_t len;
+       switch( tok[1] ) {
+ 	 case 'a' : *tok = 0x07; break;
+ 	 case 'b' : *tok = '\b'; break;
+@@ -246,13 +247,15 @@
+ 	    register int j = 0;
+ 	    for( ; i<2 && isdigit(tok[2]); i++ ) {
+ 	       j = (j << 3) + (tok[1] - '0');
+-	       strcpy( tok+1, tok+2 );
++	       len = strlen(tok+2)+1;
++	       memmove( tok+1, tok+2, len );
+ 	    }
+ 	    j = (j << 3) + (tok[1] - '0');
+ 	    *tok = j;
  	 }
- 	 else
- 	    s = e;
-@@ -382,7 +383,8 @@
- 
-       if( !(mod & FILE_FLAG) ) {
- 	 /* Move the suffix to the start. */
--	 strcpy( s, e );
-+	 size_t len = strlen(e)+1;
-+	 memmove( s, e, len );
        }
-       else
- 	 s = e;
+-      strcpy( tok+1, tok+2 );
++      len = strlen(tok+2)+1;
++      memmove( tok+1, tok+2, len );
+    }
+ }
+ 
+@@ -727,8 +730,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 ' ':
+@@ -837,8 +842,10 @@
+        * converted them to a real space. Let's verify this. */
+       for( p=s; *p && *p != edelim && *p; p++ ) {
+ 	if( p[0] == '\\' && p[1] == '\n' ) {
++	  size_t len;
+ 	  p[1] = ' ';
+-	  strcpy( p, p+1 );
++	  len = strlen(p+1)+1;
++	  memmove( p, p+1, len );
+ 	}
+       }
+       if( !*p )
+@@ -1122,7 +1129,10 @@
+       *flag = 1;
+       res   = Expand( start );
+ 
+-      if( (t = DmStrSpn( res, " \t" )) != res ) strcpy( res, t );
++      if( (t = DmStrSpn( res, " \t" )) != res ) {
++          size_t len = strlen(t)+1;
++          memmove( res, t, len );
++      }
+    }
+ 
+    FREE( start );       /* this is ok! start is assigned a DmSubStr above */
 diff -ru dmake.orig/getinp.c dmake/getinp.c
 --- dmake.orig/getinp.c	2009-08-07 20:18:31.000000000 +0100
 +++ dmake/getinp.c	2009-08-07 20:27:08.000000000 +0100