Updated sources to v1.1 with mudlib support

rritoch · Sep 18, 2013 · bc3d418 · bc3d418
1 parent 183fa1e
commit bc3d418
Show file tree

Hide file tree

Showing 188 changed files with 31,128 additions and 1,189 deletions.
diff --git a/bin/cat.pike b/bin/cat.pike
@@ -9,30 +9,35 @@
 
 #include <stdio.h>
 
-int main(int argc, array(string) argv, mixed env) {
+int main(int argc, array(string) argv, mixed env) 
+{
 
- mixed paths;
- string msg; 
- string cwd;
- string p;
-
+    mixed paths;
+    string msg; 
+    string cwd;
+    string p;
+    string fn;
 
- if (argc < 2) {
-  fprintf(stderr,"usage: %s [path] (path2) ... \n",argv[0]);
-  return 1;
- }
+    if (argc < 2) {
+        fprintf(stderr,"usage: %s [path] (path2) ... \n",argv[0]);
+        return 1;
+    }
 
- cwd = env["CWD"];
- paths = argv[1..];
+    cwd = this_shell()->get_cwd();
+
+    paths = argv[1..];
 
- foreach(paths, p) {
-  msg = read_file(combine_path(cwd,p));
-  if (0 == msg) {
-      fprintf(stderr,"Error: Unable to read file \"%s\"\n",p);
-  } else {
-      printf("%s",msg);
-  }
- }
+    foreach(paths, p) {
+        fn =  combine_path(cwd,p);
+
+        msg = read_file(fn);
+
+        if (0 == msg) {
+            fprintf(stderr,"Error: Unable to read file \"%s\"\n",p);
+        } else {
+            printf("%s",msg);
+        }
+    }
 
  return 0;
 }
diff --git a/bin/cd.pike b/bin/cd.pike
@@ -8,27 +8,31 @@
 /* ========================================================================== */
 
 
-int main(int argc, array(string) argv, mixed env) {
- string cwd;
+int main(int argc, array(string) argv, mixed env) 
+{
+    string cwd;
+    mixed s;
 
- if (argc > 2) {
-  write("usage: %s (path)\n",argv[0]);
-  return 1;
- }
+    if (argc > 2) {
+        write("usage: %s (path)\n",argv[0]);
+        return 1;
+    }
 
- if (argc == 1) {
-  write("Not implemented\n");
-  return 0;
- }
- cwd = this_shell()->environment()["CWD"];
- cwd = combine_path(cwd,argv[1]);
+    if (argc == 1) {
+        write("Not implemented\n");
+        return 0;
+    }
+    cwd = this_shell()->get_cwd();
+    cwd = combine_path(cwd,argv[1]);
 
- if (file_stat(cwd)->isdir) {
-  this_shell()->set_env("CWD",cwd);
-  write("%s\n",cwd);
- } else {
-  write("No such directory! %s\n",cwd);
- }
+    s = file_stat(cwd);
 
+    if (s && s->isdir) {
+        this_shell()->set_cwd(cwd);
+        write("%s\n",cwd);
+    } else {
+        write("No such directory! %s\n",cwd);
+    }
 
+    return 0; 
 }
diff --git a/bin/dest.pike b/bin/dest.pike
@@ -40,6 +40,13 @@ int main(int argc, array(string) argv, mixed env) {
   return 0;
  }
 
+    if ((p = kernel()->find_program(argv[1]+".pike",cwd)) != -1) {
+        name = sprintf("%O",p);
+        kernel()->unload_program(p);
+        write("Program %O destroyed!\n",name);
+        return 0;
+    }
+
  write("Object or Program not found!\n");
  return 1;
 }
diff --git a/bin/gtktest.pike b/bin/gtktest.pike
@@ -0,0 +1,10 @@
+int main()
+{
+
+  GTK2.Window mainwindow;
+  mainwindow=GTK2.Window(GTK2.WindowToplevel);
+  mainwindow->set_title("GTK Test");
+  mainwindow->show_all();
+
+  return -1;
+}
diff --git a/bin/here.pike b/bin/here.pike
@@ -0,0 +1,26 @@
+/**
+ * here.pike
+ *
+ * Report where body is located
+ * 
+ * @author Ralph Ritoch <rritoch@gmail.com> 
+ * @copyright Ralph Ritoch 2011 - ALL RIGHTS RESERVED  
+ */
+
+#define SECURITY_KEY "xxx123"
+
+#include <stdio.h>
+
+int main(int argc, array(string) argv, mixed env) 
+{
+
+    if (!this_body()) {
+        printf("Your body is missing!\n");
+        return 1;
+    }
+
+    printf("%O\n",environment(this_body()));
+
+
+    return 0;
+}
diff --git a/bin/ls.pike b/bin/ls.pike
@@ -9,55 +9,59 @@
 
 #include <stdio.h>
 
-int main(int argc, array(string) argv, mixed env) {
+int main(int argc, array(string) argv, mixed env) 
+{
 
- string cwd;
- cwd = "/";
+    string cwd;
+
 
- if (argc > 2) {
-  printf("usage: %s [path]\n",argv[0]);
-  return 1;
- }
- if (!zero_type(env["CWD"])) {
-  cwd = env["CWD"];
- }
-
+    if (argc > 2) {
+        printf("usage: %s [path]\n",argv[0]);
+        return 1;
+    }
 
- string pth = cwd;
- if (argc > 1) {
-  pth = combine_path(cwd,argv[1]);
- }
+    cwd = this_shell()->get_cwd();
 
- array(string) files;
+    string pth = cwd;
+    if (argc > 1) {
+        pth = combine_path(cwd,argv[1]);
+    }
+
+    mixed files;
 
- files = get_dir(pth);
- if (!files) {
-  printf("File not found!\n");
-  return 1;
- }
+    files = get_dir(pth);
+    if (!files) {
+        printf("File not found!\n");
+        return 1;
+    }
 
- string fn;
- mixed s;
- string ft;
- string fullname;
- mixed p;
+    string fn;
+    mixed s;
+    string ft;
+    string fullname;
+    mixed p;
 
- foreach (files,fn) {
-  fullname = combine_path(pth,fn);
-  s = file_stat(fullname);
-  ft = " ";
-  if (s->isdir) {
-   ft = "d";
-  } else {
-   if ((p = kernel()->find_program(fullname)) != -1) {
-    if (programp(p)) {
-     ft = "*";
-    } else {
-     ft = "-";
+ //foreach (files,fn) {
+  //fullname = combine_path(pth,fn);
+    foreach(files,fullname) {
+        fn = basename(fullname);
+        s = file_stat(fullname);
+        ft = " ";
+        if (!s) {
+        	ft = "e";
+        } else if (s->isdir) {
+            ft = "d";
+
+        } else {
+            if ((p = kernel()->find_program(fullname)) != -1) {
+                if (programp(p)) {
+                    ft = "*";
+                } else {
+                    ft = "-";
+                }
+            }
+        }  
+        printf("%s %s\n",ft,fn);
     }
-   }
-  }  
-  printf("%s %s\n",ft,fn);
- }
- return 0;
+    return 0;
 }
diff --git a/bin/pwd.pike b/bin/pwd.pike
@@ -1,14 +1,11 @@
-/* ========================================================================== */
-/*                                                                            */
-/*   Filename.c                                                               */
-/*   (c) 2001 Author                                                          */
-/*                                                                            */
-/*   Description                                                              */
-/*                                                                            */
-/* ========================================================================== */
-
-
-int main(int argc, array(string) argv, mixed env) {
- write("%s\n",this_shell()->environment()["CWD"]);
- return 0;
+/**
+ * Print working directory
+ *
+ */
+
+int main(int argc, array(string) argv, mixed env) 
+{
+    write("%s\n",this_shell()->get_cwd());
+    return 0;
 }
+
diff --git a/bin/save.pike b/bin/save.pike
@@ -10,6 +10,7 @@
 #include <stdio.h>
 
 int main(int argc, array(string) argv, mixed env) {
-    this_user()->save();    
+    this_user()->save_me();
+    write("Saved.\n");    
     return 0;
 }
diff --git a/bin/sh.pike b/bin/sh.pike
@@ -13,7 +13,7 @@
 #include "/includes/master.h"
 
 
-private mapping(string:string) shell_env;
+private mapping(string:mixed) shell_env;
 
 #ifdef OVERRIDE_HANDLE_IMPORT
 
@@ -127,22 +127,35 @@ string get_cwd() {
  return ".";
 }
 
+void set_cwd(string path) 
+{
+    shell_env["CWD"] = path;
+}
+
 mapping(string:string) environment() {
  return copy_value(shell_env);
 }
 
-string set_env(string vname, string val) {
+string set_env(string vname, mixed val) {
  shell_env[vname] = val;
  return val;
 }
 
-string get_env(string vname) {
+mixed get_env(string vname) {
  if (zero_type(shell_env[vname])) {
   return "";
  }
  return shell_env[vname];
 }
 
+mixed get_variable(string vname) {
+    return get_env(vname);
+}
+
+void set_variable(string vname, mixed value) {
+    set_env(vname,value);
+}
+
 string shell_combine_path(string path1, string path2) {
  string pth1;
  string pth2;
@@ -161,6 +174,7 @@ string shell_combine_path(string path1, string path2) {
 
 int execute(string cmd_line) {
 
+ //kernel()->console_write(sprintf("execute %O\n",cmd_line));
  string cur_path;
  string path;
  string cur_cmd;
@@ -195,13 +209,14 @@ int execute(string cmd_line) {
     files = get_dir(cur_path);    
     if (files && sizeof(files)) {
      foreach (files, cur_file) {
-      if (cur_file == cmd) {
+      if (basename(cur_file) == cmd) {
        cur_cmd = shell_combine_path(cur_path,cur_file);
       }
      }
+
      if (!sizeof(cur_cmd)) {
       foreach (files, cur_file) {
-       if (cur_file == (cmd + ".pike")) {
+       if (basename(cur_file) == (cmd + ".pike")) {
         cur_cmd = shell_combine_path(cur_path,cur_file);
        }
       }
@@ -226,9 +241,7 @@ void shell_loop(string raw_cmd) {
  mixed err;
  array(string) split_cmd;
  string cmd;
-
-
-
+
  if (has_prefix(raw_cmd,"@")) {
   program p;
   object ob;
@@ -241,7 +254,12 @@ void shell_loop(string raw_cmd) {
    write("\nReturned: %O\n",ob->foo());
   };
   if (err) {
-   write("\nError: %O\n",err);
+     if (objectp(err)) {
+          write("\nError: %O %O\n",err,err->backtrace());
+      } else {
+          write("\nError: %O\n",err);
+      }
+
   }
   destruct(ob);
   } else {