Sync with dmake as found on https://sourceforge.net/projects/oooextras.mirror/files/dmake-4.12.tar.bz2/download

Author: jimjag

Makefile.am

@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: Makefile.am,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.12 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: kz $ $Date: 2008-03-05 18:26:19 $
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 

Makefile.in

@@ -16,36 +16,28 @@
 
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: Makefile.in,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.15 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: kz $ $Date: 2008-03-05 18:26:33 $
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 

config.h.in

@@ -55,6 +55,9 @@
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 
+/* Define to 1 if you have the `setenv' function. */
+#undef HAVE_SETENV
+
 /* Define to 1 if you have the `settz' function. */
 #undef HAVE_SETTZ
 

configure

@@ -7437,7 +7437,7 @@ done
 
 
 
-for ac_func in getcwd getwd strerror setvbuf tzset settz mkstemp tempnam gettimeofday
+for ac_func in getcwd getwd strerror setvbuf tzset settz mkstemp tempnam gettimeofday setenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5

configure.in

@@ -211,7 +211,7 @@ AC_FUNC_MEMCMP
 AC_TYPE_SIGNAL
 AC_FUNC_UTIME_NULL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(getcwd getwd strerror setvbuf tzset settz mkstemp tempnam gettimeofday)
+AC_CHECK_FUNCS(getcwd getwd strerror setvbuf tzset settz mkstemp tempnam gettimeofday setenv)
 # Usefull, but special to newlib/MSVC
 AC_CHECK_FUNCS(strlwr)
 

dag.c

@@ -369,14 +369,17 @@ int     flags;			/* initial ht_flags	*/
 	 /* strip out any \<nl> combinations where \ is the current
 	  * CONTINUATION char */
 	 for(p=q; (p=strchr(p,CONTINUATION_CHAR))!=NIL(char); )
-	    if( p[1] == '\n' )
-	       strcpy( p, p+2 );
+	    if( p[1] == '\n' ) {
+	       size_t len = strlen(p+2)+1;
+	       memmove ( p, p+2, len );
+	    }
 	    else
 	       p++;
 
 	 p = DmStrSpn(q ," \t");	/* Strip white space before ... */
 	 if( p != q ) {
-	    strcpy( q, p);
+	    size_t len = strlen(p)+1;
+	    memmove( q, p, len );
 	    p = q;
 	 }
 

dmake.c

@@ -380,16 +380,19 @@ char **argv;
    _warn = TRUE;
 
    /* If -r was not given find and parse startup-makefile. */
-   if( Rules ) {
-      char *fname;
-
-      /* Search_file() also checks the environment variable. */
-      if( (mkfil=Search_file("MAKESTARTUP", &fname)) != NIL(FILE) ) {
-         Parse(mkfil);
-	 Def_macro( "MAKESTARTUP", fname, M_EXPANDED|M_MULTI|M_FORCE );
-      }
-      else
-         Fatal( "Configuration file `%s' not found", fname );
+   if( Rules )
+   {
+     char *fname = NIL(char);
+
+     /* Search_file() also checks the environment variable. */
+     if( (mkfil=Search_file("MAKESTARTUP", &fname)) != NIL(FILE) )
+     {
+       Parse(mkfil);
+       Def_macro( "MAKESTARTUP", fname, M_EXPANDED|M_MULTI|M_FORCE );
+     }
+     else
+       Fatal( "Configuration file `%s' not found", fname );
+     if ( fname != NIL(char)) { FREE( fname ); fname = NIL(char); }
    }
 
    /* Define the targets set on the command line now. */
@@ -428,8 +431,7 @@ char **argv;
       char *p;
 
       if( strcmp(f, "stdin") == 0 ) f = "-";
-      p = DmStrAdd( "-f", f, FALSE );
-      Def_macro( "MAKEFILE", p, M_PRECIOUS|M_NOEXPORT );
+      Def_macro( "MAKEFILE", p = DmStrAdd( "-f", f, FALSE ), M_PRECIOUS|M_NOEXPORT ); FREE(p);
       Parse( mkfil );
    }
    else if( !Rules )
@@ -663,23 +665,25 @@ char **rname;
     */
 
    if( (hp = GET_MACRO(macname)) != NIL(HASH) ) {
-      /* Only expand if needed. */
-      if( hp->ht_flag & M_EXPANDED ) {
-	 ename = fname = DmStrDup(hp->ht_value);
-      } else {
-	 ename = fname = Expand(hp->ht_value);
-      }
-
-      if( hp->ht_flag & M_PRECIOUS ) fil = Openfile(fname, FALSE, FALSE);
+     /* Only expand if needed. */
+     if( hp->ht_flag & M_EXPANDED ) {
+       ename = fname = DmStrDup(hp->ht_value);
+     } else {
+       ename = fname = Expand(hp->ht_value);
+     }
+
+     if( hp->ht_flag & M_PRECIOUS ) fil = Openfile(fname, FALSE, FALSE);
    }
 
    if( fil == NIL(FILE) ) {
-      fname=Expand(Read_env_string(macname));
-      if( (fil = Openfile(fname, FALSE, FALSE)) != NIL(FILE) ) FREE(ename);
+     fname=Expand(Read_env_string(macname));
+     if( (fil = Openfile(fname, FALSE, FALSE)) != NIL(FILE) ) FREE(ename);
    }
 
-   if( fil == NIL(FILE) && hp != NIL(HASH) )
-      fil = Openfile(fname=ename, FALSE, FALSE);
+   if( fil == NIL(FILE) && hp != NIL(HASH) ) {
+     if ( fname != NIL(char) ) { FREE(fname); fname = NIL(char); }
+     fil = Openfile(fname=ename, FALSE, FALSE);
+   }
 
    if( rname ) *rname = fname;