/[make]/make/function.c
ViewVC logotype

Diff of /make/function.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.84 by bosk, Sun Feb 27 21:40:24 2005 UTC revision 1.85 by psmith, Mon Feb 28 07:48:22 2005 UTC
# Line 1082  func_error (char *o, char **argv, const Line 1082  func_error (char *o, char **argv, const
1082      }      }
1083    strcpy (p, *argvp);    strcpy (p, *argvp);
1084    
1085    if (*funcname == 'e')    switch (*funcname) {
1086      fatal (reading_file, "%s", msg);      case 'e':
1087          fatal (reading_file, "%s", msg);
1088    
1089        case 'w':
1090          error (reading_file, "%s", msg);
1091          break;
1092    
1093        case 'i':
1094          printf ("%s\n", msg);
1095          break;
1096    
1097    /* The warning function expands to the empty string.  */      default:
1098    error (reading_file, "%s", msg);        fatal (reading_file, "Internal error: func_error: '%s'", funcname);
1099      }
1100    
1101      /* The warning function expands to the empty string.  */
1102    return o;    return o;
1103  }  }
1104    
# Line 1472  func_shell (char *o, char **argv, const Line 1483  func_shell (char *o, char **argv, const
1483    envp = environ;    envp = environ;
1484    
1485    /* For error messages.  */    /* For error messages.  */
1486    if (reading_file != 0)    if (reading_file && reading_file->filenm)
1487      {      {
1488        error_prefix = (char *) alloca (strlen (reading_file->filenm)+11+4);        error_prefix = (char *) alloca (strlen (reading_file->filenm)+11+4);
1489        sprintf (error_prefix,        sprintf (error_prefix,
# Line 1752  abspath (const char *name, char *apath) Line 1763  abspath (const char *name, char *apath)
1763    if (name[0] == '\0' || apath == NULL)    if (name[0] == '\0' || apath == NULL)
1764      return NULL;      return NULL;
1765    
1766    apath_limit = apath + PATH_MAX;    apath_limit = apath + GET_PATH_MAX;
1767    
1768    if (name[0] != '/')    if (name[0] != '/')
1769      {      {
# Line 1826  func_realpath (char *o, char **argv, con Line 1837  func_realpath (char *o, char **argv, con
1837    char *path = 0;    char *path = 0;
1838    int doneany = 0;    int doneany = 0;
1839    unsigned int len = 0;    unsigned int len = 0;
1840      PATH_VAR (in);
1841    char in[PATH_MAX];    PATH_VAR (out);
   char out[PATH_MAX];  
1842    
1843    while ((path = find_next_token (&p, &len)) != 0)    while ((path = find_next_token (&p, &len)) != 0)
1844      {      {
1845        if (len < PATH_MAX)        if (len < GET_PATH_MAX)
1846          {          {
1847            strncpy (in, path, len);            strncpy (in, path, len);
1848            in[len] = '\0';            in[len] = '\0';
# Line 1868  func_abspath (char *o, char **argv, cons Line 1878  func_abspath (char *o, char **argv, cons
1878    char *path = 0;    char *path = 0;
1879    int doneany = 0;    int doneany = 0;
1880    unsigned int len = 0;    unsigned int len = 0;
1881      PATH_VAR (in);
1882    char in[PATH_MAX];    PATH_VAR (out);
   char out[PATH_MAX];  
1883    
1884    while ((path = find_next_token (&p, &len)) != 0)    while ((path = find_next_token (&p, &len)) != 0)
1885      {      {
1886        if (len < PATH_MAX)        if (len < GET_PATH_MAX)
1887          {          {
1888            strncpy (in, path, len);            strncpy (in, path, len);
1889            in[len] = '\0';            in[len] = '\0';
# Line 1939  static struct function_table_entry funct Line 1948  static struct function_table_entry funct
1948    { STRING_SIZE_TUPLE("origin"),        0,  1,  1,  func_origin},    { STRING_SIZE_TUPLE("origin"),        0,  1,  1,  func_origin},
1949    { STRING_SIZE_TUPLE("foreach"),       3,  3,  0,  func_foreach},    { STRING_SIZE_TUPLE("foreach"),       3,  3,  0,  func_foreach},
1950    { STRING_SIZE_TUPLE("call"),          1,  0,  1,  func_call},    { STRING_SIZE_TUPLE("call"),          1,  0,  1,  func_call},
1951      { STRING_SIZE_TUPLE("info"),          0,  1,  1,  func_error},
1952    { STRING_SIZE_TUPLE("error"),         0,  1,  1,  func_error},    { STRING_SIZE_TUPLE("error"),         0,  1,  1,  func_error},
1953    { STRING_SIZE_TUPLE("warning"),       0,  1,  1,  func_error},    { STRING_SIZE_TUPLE("warning"),       0,  1,  1,  func_error},
1954    { STRING_SIZE_TUPLE("if"),            2,  3,  0,  func_if},    { STRING_SIZE_TUPLE("if"),            2,  3,  0,  func_if},

Legend:
Removed from v.1.84  
changed lines
  Added in v.1.85

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26