pike.git/ lib/ master.pike.in

2001-11-12

2001-11-12 13:38:04 by Martin Stjernholm <mast@lysator.liu.se>

• 5be4aaa5b3f034c28194144657138a64a8b0d232 (46 lines) (+33/-13) ^{[ Show | Annotate ]}
  Branch: 7.9

Better error handling when directories cannot be listed. If describe_backtrace
gets something it doesn't recognize, it prints it in the returned string.

Rev: lib/master.pike.in:1.177

1:   /* -*- Pike -*-    * -  * $Id: master.pike.in,v 1.176 2001/11/09 14:06:49 mast Exp $ +  * $Id: master.pike.in,v 1.177 2001/11/12 13:38:04 mast Exp $    *    * Master-file for Pike.    *
888:    }       if( !files ) -  files = get_dir(fakeroot(dirname)); +  if (!(files = get_dir(fakeroot(dirname)))) { +  werror ("Error listing module directory %O: %s\n", +  dirname, strerror (errno())); +  files = ({}); +  }       int ret;    foreach( files, string s )
962:    }       if( !files ) -  files = get_dir(fakeroot(dirname)); +  if (!(files = get_dir(fakeroot(dirname)))) { +  werror ("Error listing module directory %O: %s\n", +  dirname, strerror (errno())); +  files = ({}); +  } +     foreach(files, string fname) {    mixed err = catch {    if (((< ".pike", ".pmod" >)[fname[sizeof(fname)-5..]]) &&
2279:   string describe_backtrace(mixed trace, void|int linewidth)   {    int e; -  string ret; +  string ret = "";    int backtrace_len=((int)getenv("PIKE_BACKTRACE_LEN")) || bt_max_string_len;       if(!linewidth)
2301:    }) {    return "Error indexing backtrace!\n";    } -  }else{ -  ret=""; -  } -  +     if(!arrayp(trace)) -  +  return ret + "No backtrace.\n"; +  }else +  if (!arrayp (trace)) +  return sprintf ("Unrecognized backtrace format: %O\n", trace); +     { -  ret+="No backtrace.\n"; -  }else{ +     Describer desc = Describer();    desc->identify_parts (trace);   
2451:    ret += frames * "";    }    -  return ret || "No backtrace!\n";; +  return ret;   }      //! @appears describe_error
2623:       if(!zero_type(ret=compat_handler_cache[v])) return ret;    +  array files;    array(Version) available=({});      #if "¤share_prefix¤"[0]!='¤' -  foreach(get_dir("¤share_prefix¤"), string ver) +  if (!(files = get_dir("¤share_prefix¤"))) { +  werror ("Error listing directory %O: %s\n", +  "¤share_prefix¤", strerror (errno())); +  files = ({}); +  } +  foreach(files, string ver)    {    if(sscanf(ver,"%d.%d",int maj, int min))    {
2638:   #endif      #if "¤lib_prefix¤"[0]!='¤' -  foreach(get_dir("¤lib_prefix¤"), string ver) +  if (!(files = get_dir("¤lib_prefix¤"))) { +  werror ("Error listing directory %O: %s\n", +  "¤lib_prefix¤", strerror (errno())); +  files = ({}); +  } +  foreach(files, string ver)    {    if(sscanf(ver,"%d.%d",int maj, int min))    {