From d50a399db09e9187562236cd469306624cad06a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Sat, 14 Aug 1999 02:02:44 -0700
Subject: [PATCH] better error messages in some cases...
Rev: src/object.c:1.74
---
src/object.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/object.c b/src/object.c
index 1c2d2e132c..c0cb64c4ae 100644
--- a/src/object.c
+++ b/src/object.c
@@ -5,7 +5,7 @@
\*/
/**/
#include "global.h"
-RCSID("$Id: object.c,v 1.73 1999/07/16 22:54:23 hubbe Exp $");
+RCSID("$Id: object.c,v 1.74 1999/08/14 09:02:44 hubbe Exp $");
#include "object.h"
#include "dynamic_buffer.h"
#include "interpret.h"
@@ -274,9 +274,18 @@ struct object *get_master(void)
if(!master_program)
{
struct pike_string *s,*s2;
- char *tmp=xalloc(strlen(master_file)+3);
+ char *tmp;
struct stat stat_buf;
+ if(!simple_mapping_string_lookup(get_builtin_constants(),
+ "_static_modules"))
+ {
+ fprintf(stderr,"Cannot load master object yet!\n");
+ return 0; /* crash? */
+ }
+
+ tmp=xalloc(strlen(master_file)+3);
+
MEMCPY(tmp, master_file, strlen(master_file)+1);
strcat(tmp,".o");
--
GitLab