Branch: Tag:

2001-05-31

2001-05-31 00:14:22 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Backported handler fixes from Pike 7.3.

Rev: lib/master.pike.in:1.147
Rev: src/program.c:1.294

5:   \*/   /**/   #include "global.h" - RCSID("$Id: program.c,v 1.293 2001/04/24 15:03:41 leif Exp $"); + RCSID("$Id: program.c,v 1.294 2001/05/31 00:14:22 grubba Exp $");   #include "program.h"   #include "object.h"   #include "dynamic_buffer.h"
423:       ref_push_string(ident);    ref_push_string(lex.current_file); +  if (error_handler) { +  ref_push_object(error_handler); +  } else { +  push_int(0); +  }    -  if(error_handler && (i=find_identifier("resolv",error_handler->prog))!=-1) +  if(error_handler && +  (i = find_identifier("resolv", error_handler->prog))!=-1)    { -  safe_apply_low(error_handler, i, 2); +  safe_apply_low(error_handler, i, 3);    } -  if(compat_handler && (i=find_identifier("resolv",compat_handler->prog))!=-1) +  else if(compat_handler && +  (i = find_identifier("resolv", compat_handler->prog))!=-1)    { -  safe_apply_low(compat_handler, i, 2); +  safe_apply_low(compat_handler, i, 3);    }    else    { -  SAFE_APPLY_MASTER("resolv", 2); +  SAFE_APPLY_MASTER("resolv", 3);    }       if(throw_value.type == T_STRING)