From abaf170f963f3ce40f1a773e0080c0deb1162ad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Tue, 27 Jan 1998 17:52:51 -0800
Subject: [PATCH] maybe works better now?
Rev: lib/master.pike:1.65
Rev: lib/modules/Stdio.pmod:1.12
---
lib/master.pike | 8 ++++----
lib/modules/Stdio.pmod | 10 +++++++---
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/lib/master.pike b/lib/master.pike
index 1277bad8bd..ee1d30dd91 100644
--- a/lib/master.pike
+++ b/lib/master.pike
@@ -1,4 +1,4 @@
-/* $Id: master.pike,v 1.64 1998/01/28 00:28:18 hubbe Exp $
+/* $Id: master.pike,v 1.65 1998/01/28 01:52:39 hubbe Exp $
*
* Master-file for Pike.
*/
@@ -57,7 +57,7 @@ program compile_string(string data, void|string name)
program compile_file(string file)
{
- return compile(cpp(_static_modules.files()->File(file,"r")->read(),file));
+ return compile(cpp(_static_modules.files()->file(file,"r")->read(),file));
}
@@ -488,7 +488,7 @@ void _main(string *argv, string *env)
add_constant("getenv",getenv);
add_constant("putenv",putenv);
- add_constant("write",_static_modules.files()->File("stdout")->write);
+ add_constant("write",_static_modules.files()->file("stdout")->write);
_master_file_name=backtrace()[-1][0];
q=explode_path(_master_file_name);
@@ -727,7 +727,7 @@ string handle_include(string f,
string read_include(string f)
{
- return _static_modules->files()->File(f,"r")->read();
+ return _static_modules->files()->file(f,"r")->read();
}
// FIXME
diff --git a/lib/modules/Stdio.pmod b/lib/modules/Stdio.pmod
index 1cb747a255..df2b35ad7b 100644
--- a/lib/modules/Stdio.pmod
+++ b/lib/modules/Stdio.pmod
@@ -1,8 +1,12 @@
#include <string.h>
-inherit files;
-constant File=file;
-constant Port=port;
+constant PROP_IPC=files.PROP_IPC;
+constant PROP_NONBLOCk=files.PROP_NONBLOCK;
+constant PROP_SHUTDOWN=files.PROP_SHUTDOWN;
+constant PROP_BUFFERED=files.PROP_BUFFERED;
+constant PROP_BIDIRECTIONAL=files.PROP_BIDIRECTIONAL;
+constant File=files.file;
+constant Port=files.port;
object stderr=File("stderr");
object stdout=File("stdout");
--
GitLab