Pfadexpansion mit normalize_path()
Expansion von Pfadplatzhaltern und Normalisieren der Pfade
via normalize_path() aus /std/util/path
Change-Id: If42304c030f0725f13786454bbb71e5c594ba4bd
diff --git a/std/shells/magier/magier_ext.c b/std/shells/magier/magier_ext.c
index a5d30b2..e563ca9 100644
--- a/std/shells/magier/magier_ext.c
+++ b/std/shells/magier/magier_ext.c
@@ -5,6 +5,8 @@
#pragma no_clone
#pragma pedantic
+protected functions virtual inherit "/std/util/path";
+
#include <wizlevels.h>
#include <logging.h>
#include <magier.h>
@@ -259,14 +261,14 @@
if (this_player()!=this_interactive()) return 0;
if (this_player()!=this_object()) return 0;
if (!(filename=_unparsed_args())) return USAGE("exec <objektname>");
- filename=(string)"secure/master"->_get_path(filename,getuid());
+ filename=normalize_path(filename, getuid(), 1);
if (file_size(filename)<0&&(!to_filename(filename+".c"))||
file_size(to_filename(filename+".c"))<0)
{
printf("exec: %s: Datei nicht vorhanden oder ein Verzeichnis.\n",filename);
return 1;
}
- if (catch(call_other(filename,"????")))
+ if (catch(load_object(filename)))
{
printf("exec: Fehler beim Laden von %s.\n",filename);
return 1;