Ignore:
Timestamp:
Jun 17, 2012, 10:45:31 PM (13 years ago)
Author:
bird
Message:

kmk: Merged in changes from GNU make 3.82. Previous GNU make base version was gnumake-2008-10-28-CVS.

Location:
trunk/src/kmk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kmk

    • Property svn:ignore

      •  

        old new  
        1313stamp-*
        1414makebook*
         15
        1516.*gdbinit
         17.gdb_history
         18
        1619*.dep
        1720*.dvi
        … …  
        3134*.pg
        3235*.pgs
         36
        3337README
        3438README.DOS
        3539README.W32
         40README.OS2
        3641aclocal.m4
        3742autom4te.cache
        … …  
        5257config.h.W32
        5358config.h-vms
         59
        5460loadavg
        5561loadavg.c
        5662make
         63
        5764.deps
        5865.dep_segment
         66ID
         67TAGS
         68
        5969_*
        6070sun4
        … …  
        7282sol2
        7383i486-linux
         84
        7485customs
         86
        7587install-sh
        7688mkinstalldirs
         89
         90.directive.asc

  • trunk/src/kmk/expand.c

    r2548 r2591  
    11/* Variable expansion functions for GNU Make.
    22Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
    3 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
    4 Foundation, Inc.
     31998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
     42010 Free Software Foundation, Inc.
    55This file is part of GNU Make.
    66
    … …  
    539539      if (*p == '\0')
    540540        break;
    541       else
    542         ++p;
     541
     542      ++p;
    543543    }
    544544
    … …  
    845845{
    846846#ifndef CONFIG_WITH_VALUE_LENGTH
    847   char *tmp;
     847  char *tmp, *alloc = NULL;
     848  char *r;
    848849#endif
    849850
    … …  
    855856    return allocated_variable_expand (str);
    856857
    857   tmp = alloca (end - str + 1);
     858  if (end - str + 1 > 1000)
     859    tmp = alloc = xmalloc (end - str + 1);
     860  else
     861    tmp = alloca (end - str + 1);
     862
    858863  memcpy (tmp, str, end - str);
    859864  tmp[end - str] = '\0';
    860865
    861   return allocated_variable_expand (tmp);
     866  r = allocated_variable_expand (tmp);
     867
     868  if (alloc)
     869    free (alloc);
     870
     871  return r;
    862872#else  /* CONFIG_WITH_VALUE_LENGTH */
    863873  if (!end)
    … …  
    11031113  value = variable_expand_for_file (line, file);
    11041114
    1105 #if 0
    1106   /* Waste a little memory and save time.  */
    1107   value = xrealloc (value, strlen (value))
    1108 #endif
    1109 
    11101115  variable_buffer = obuf;
    11111116  variable_buffer_length = olen;
Note: See TracChangeset for help on using the changeset viewer.