diff --git a/.gitattributes b/.gitattributes
index d27c86aae2e715013bd04da4b99de0f317010ed2..75857e50351748e7edbc82c14218137034060f28 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -55,6 +55,7 @@ testfont binary
/src/modules/Image/togif.c foreign_ident
/src/modules/Image/x.c foreign_ident
/src/modules/MIME/mime.c foreign_ident
+/src/modules/MIME/module.pmod.in foreign_ident
/src/modules/Mysql/Makefile.in foreign_ident
/src/modules/Mysql/acconfig.h foreign_ident
/src/modules/Mysql/configure.in foreign_ident
diff --git a/lib/modules/Process.pmod b/lib/modules/Process.pmod
index 18759713dd284f548ac3a63204f9d64abeb0c89b..1bde2c7e19d854744bb4ef56a3d1f439c2bff347 100644
--- a/lib/modules/Process.pmod
+++ b/lib/modules/Process.pmod
@@ -28,16 +28,19 @@ varargs object spawn(string s,object stdin,object stdout,object stderr)
if(stdin) {
stdin->dup2(File("stdin"));
stdin->close();
+ destruct(stdin);
}
if(stdout) {
stdout->dup2(File("stdout"));
stdout->close();
+ destruct(stdout);
}
if(stderr) {
stderr->dup2(File("stderr"));
stderr->close();
+ destruct(stderr);
}
::close();
exec("/bin/sh","-c",s);
diff --git a/lib/modules/Stdio.pmod b/lib/modules/Stdio.pmod
index 5499910414920d028d6656ae9b289a470aa39873..231b76b8b990ae92470c7ad2be413015c4d10e7b 100644
--- a/lib/modules/Stdio.pmod
+++ b/lib/modules/Stdio.pmod
@@ -58,6 +58,11 @@ class FILE {
return file::seek(pos);
}
+ int tell()
+ {
+ return bpos;
+ }
+
int close(void|string mode)
{
bpos=0;
diff --git a/src/backend.c b/src/backend.c
index 588f28bde266695fbaf24dcb9d74350bd16c2e16..e0754176b8f284b761f339dca39ab8b990df3cea 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -4,7 +4,7 @@
||| See the files COPYING and DISCLAIMER for more information.
\*/
#include "global.h"
-RCSID("$Id: backend.c,v 1.10.2.1 1997/05/10 12:56:54 hubbe Exp $");
+RCSID("$Id: backend.c,v 1.10.2.2 1997/05/19 09:04:55 hubbe Exp $");
#include "backend.h"
#include <errno.h>
#ifdef HAVE_SYS_TYPES_H
@@ -94,11 +94,13 @@ void wait_for_signal()
wakeup_callback(wakeup_pipe[0], 0);
}
+extern int pike_make_pipe(int *);
+
void init_backend()
{
FD_ZERO(&selectors.read);
FD_ZERO(&selectors.write);
- if(pipe(wakeup_pipe) < 0)
+ if(pike_make_pipe(wakeup_pipe) < 0)
fatal("Couldn't create backend wakup pipe, errno=%d.\n",errno);
set_nonblocking(wakeup_pipe[0],1);
set_nonblocking(wakeup_pipe[1],1);
diff --git a/src/lex.c b/src/lex.c
index e6dcfed7987511ac9f7f28bf4561e5e4ec7dac63..a5a99a7f3e59e90cbddec3f08575fbe53a1da954 100644
--- a/src/lex.c
+++ b/src/lex.c
@@ -4,7 +4,7 @@
||| See the files COPYING and DISCLAIMER for more information.
\*/
#include "global.h"
-RCSID("$Id: lex.c,v 1.21 1997/04/16 03:09:12 hubbe Exp $");
+RCSID("$Id: lex.c,v 1.21.2.1 1997/05/19 09:04:55 hubbe Exp $");
#include "language.h"
#include "array.h"
#include "lex.h"
@@ -1477,7 +1477,10 @@ static int do_lex2(int literal, YYSTYPE *yylval)
case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
{
- char *p;
+ char *p, *p2;
+ int isfloat=0;
+ double d;
+
UNGETC(c);
READBUF(isdigit(C) || C=='.');
@@ -1495,12 +1498,38 @@ static int do_lex2(int literal, YYSTYPE *yylval)
UNGETSTR(p,strlen(p));
*p=0;
}
+
if((p=STRCHR(buf,'.')))
{
- yylval->fnum=STRTOD(buf,NULL);
- return F_FLOAT;
+ isfloat=1;
}
}
+
+ d=STRTOD(buf, NULL);
+
+ if(GOBBLE('e') || GOBBLE('E'))
+ {
+ int neg;
+ if(GOBBLE('-'))
+ neg=1;
+ else if(GOBBLE('+'))
+ neg=0;
+ else
+ neg=0;
+
+ READBUF(isdigit(C));
+ if(neg)
+ d /= pow(10.0,STRTOD(buf,NULL));
+ else
+ d *= pow(10.0,STRTOD(buf,NULL));
+ isfloat=1;
+ }
+ if(isfloat)
+ {
+ yylval->fnum=(float)d;
+ return F_FLOAT;
+ }
+
if(buf[0]=='0')
yylval->number=STRTOL(buf,NULL,8);
else
diff --git a/src/modules/Gmp/Makefile.in b/src/modules/Gmp/Makefile.in
index 889ccbd4c4248f68466775b41c281739a75ad9c6..8ea511eab2195fe17a65fdbe0d06388ad2841dfc 100644
--- a/src/modules/Gmp/Makefile.in
+++ b/src/modules/Gmp/Makefile.in
@@ -12,8 +12,8 @@ next_prime.o: prime_table.out
prime_table.out: prime_table
./prime_table $(PRIME_LIMIT) >prime_table.out
-prime_table: prime_table.c
- $(CC) prime_table.c -o prime_table
+prime_table: $(SRCDIR)/prime_table.c
+ $(CC) $(SRCDIR)/prime_table.c -o prime_table
depend: prime_table.out
diff --git a/src/modules/Gz/configure.in b/src/modules/Gz/configure.in
index 607731762eed35b8615c38da44e325c1c474aef6..2b45a60b5ef6d906178040648286f531cddf6d1a 100644
--- a/src/modules/Gz/configure.in
+++ b/src/modules/Gz/configure.in
@@ -7,11 +7,22 @@ sinclude(../module_configure.in)
if test x$with_zlib = xyes ; then
AC_CHECK_HEADERS(zlib.h)
if test $ac_cv_header_zlib_h = yes ; then
- AC_CHECK_LIB(z, compress, [
+ AC_MSG_CHECKING([if libz.h is new enough])
+ AC_TRY_LINK([
+#include <zlib.h>
+ ],[
+int main(int argc, char **argv)
+{
+ return((Z_NO_COMPRESSION|Z_VERSION_ERROR) & 0);
+}
+ ],[ AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no); ac_cv_header_zlib_h=no ])
+ if test $ac_cv_header_zlib_h = yes ; then
+ AC_CHECK_LIB(z, compress, [
AC_DEFINE(HAVE_LIBZ)
LIBS="${LIBS-} -lz"
] ,
AC_CHECK_LIB(gz, compress))
+ fi
fi
fi
diff --git a/src/modules/MIME/module.pmod.in b/src/modules/MIME/module.pmod.in
new file mode 100644
index 0000000000000000000000000000000000000000..98c6c7384bc1a4c3e231b75a720a10241b52f5c1
--- /dev/null
+++ b/src/modules/MIME/module.pmod.in
@@ -0,0 +1,367 @@
+/*
+ * $Id: module.pmod.in,v 1.1.2.1 1997/05/19 09:06:39 hubbe Exp $
+ *
+ * RFC1521 functionality for Pike
+ *
+ * Marcus Comstedt 1996-1997
+ */
+
+class support {
+
+ inherit @module@;
+
+ string generate_boundary( )
+ {
+ return "'ThIs-RaNdOm-StRiNg-/=_."+random( 1000000000 )+":";
+ }
+
+ string decode( string data, string encoding )
+ {
+ switch (lower_case( encoding || "binary" )) {
+ case "base64":
+ return decode_base64( data );
+ case "quoted-printable":
+ return decode_qp( data );
+ case "x-uue":
+ return decode_uue( data );
+ case "7bit":
+ case "8bit":
+ case "binary":
+ return data;
+ default:
+ throw(({ "unknown transfer encoding "+encoding+"\n",
+ backtrace() }));
+ }
+ }
+
+ string encode( string data, string encoding, void|string filename,
+ void|int stripcrlf )
+ {
+ switch (lower_case( encoding || "binary" )) {
+ case "base64":
+ return encode_base64( data, stripcrlf );
+ case "quoted-printable":
+ return encode_qp( data, stripcrlf );
+ case "x-uue":
+ return encode_uue( data, filename );
+ case "7bit":
+ case "8bit":
+ case "binary":
+ return data;
+ default:
+ throw(({ "unknown transfer encoding "+encoding+"\n",
+ backtrace() }));
+ }
+ }
+
+ array(string) decode_word( string word )
+ {
+ string charset, encoding, encoded_text;
+ if (sscanf( word,
+ "=?%[^][ \t()<>@,;:\"\\/?.=]?%[^][ \t()<>@,;:\"\\/?.=]?%s?=",
+ charset, encoding, encoded_text) == 3 ) {
+ switch (lower_case( encoding )) {
+ case "b":
+ encoding = "base64";
+ break;
+ case "q":
+ encoding = "quoted-printable";
+ break;
+ default:
+ throw (({ "invalid rfc1522 encoding "+encoding+"\n", backtrace() }));
+ }
+ return ({ decode( replace( encoded_text, "_", " " ), encoding ),
+ lower_case( charset ) });
+ } else
+ return ({ word, 0 });
+ }
+
+ string encode_word( array(string) word, string encoding )
+ {
+ if (!encoding || !word[1])
+ return word[0];
+ switch (lower_case(encoding)) {
+ case "b":
+ case "base64":
+ encoding = "base64";
+ break;
+ case "q":
+ case "quoted-printable":
+ encoding = "quoted-printable";
+ break;
+ default:
+ throw (({ "invalid rfc1522 encoding "+encoding+"\n", backtrace() }));
+ }
+ return "=?"+word[1]+"?"+encoding[0..0]+"?"+
+ replace( encode( word[0], encoding, 0, 1 ),
+ ({ "?", "_" }), ({ "=3F", "=5F" }))+"?=";
+ }
+
+ string guess_subtype( string typ )
+ {
+ switch (typ) {
+ case "text":
+ return "plain";
+ case "message":
+ return "rfc822";
+ case "multipart":
+ return "mixed";
+ }
+ return 0;
+ }
+
+};
+
+inherit support;
+
+class Message {
+
+ inherit support;
+ import Array;
+
+ string encoded_data;
+ string decoded_data;
+ mapping(string:string) headers;
+ array(object) body_parts;
+
+ string type, subtype, charset, boundary, transfer_encoding;
+ mapping (string:string) params;
+
+ string disposition;
+ mapping (string:string) disp_params;
+
+
+ string get_filename( )
+ {
+ return disp_params["filename"] || params["name"];
+ }
+
+ void setdata( string data )
+ {
+ if (data != decoded_data) {
+ decoded_data = data;
+ encoded_data = 0;
+ }
+ }
+
+ string getdata( )
+ {
+ if (encoded_data && !decoded_data)
+ decoded_data = decode( encoded_data, transfer_encoding );
+ return decoded_data;
+ }
+
+ string getencoded( )
+ {
+ if (decoded_data && !encoded_data)
+ encoded_data = encode( decoded_data, transfer_encoding, get_filename() );
+ return encoded_data;
+ }
+
+ void setencoding( string encoding )
+ {
+ if(encoded_data && !decoded_data)
+ decoded_data = getdata( );
+ headers["content-transfer-encoding"] = transfer_encoding =
+ lower_case( encoding );
+ encoded_data = 0;
+ }
+
+ void setparam( string param, string value )
+ {
+ param = lower_case(param);
+ params[param] = value;
+ switch(param) {
+ case "charset":
+ charset = value;
+ break;
+ case "boundary":
+ boundary = value;
+ break;
+ case "name":
+ if(transfer_encoding != "x-uue")
+ break;
+ if(encoded_data && !decoded_data)
+ decoded_data = getdata( );
+ encoded_data = 0;
+ break;
+ }
+ headers["content-type"] =
+ quote(({ type, '/', subtype })+
+ `+(@map(indices(params), lambda(string param) {
+ return ({ ';', param, '=', params[param] });
+ })));
+ }
+
+ void setdisp_param( string param, string value )
+ {
+ param = lower_case( param );
+ disp_params[param] = value;
+ switch (param) {
+ case "filename":
+ if (transfer_encoding != "x-uue")
+ break;
+ if (encoded_data && !decoded_data)
+ decoded_data = getdata( );
+ encoded_data = 0;
+ break;
+ }
+ headers["content-disposition"] =
+ quote(({ disposition || "attachment" })+
+ `+(@map(indices(disp_params), lambda(string param) {
+ return ({ ';', param, '=', disp_params[param] });
+ })));
+ }
+
+ void setcharset( string charset )
+ {
+ setparam( "charset", charset );
+ }
+
+ void setboundary( string boundary )
+ {
+ setparam( "boundary", boundary );
+ }
+
+ string cast( string dest_type )
+ {
+ string data;
+ object body_part;
+
+ if (dest_type != "string")
+ throw(({ "can't cast Message to "+dest_type+"\n", backtrace() }));
+
+ data = getencoded( );
+
+ if (body_parts) {
+
+ if (!boundary) {
+ if (type != "multipart") {
+ type = "multipart";
+ subtype = "mixed";
+ }
+ setboundary( generate_boundary( ) );
+ }
+
+ data += "\r\n";
+ foreach( body_parts, body_part )
+ data += "--"+boundary+"\r\n"+((string)body_part)+"\r\n";
+ data += "--"+boundary+"--\r\n";
+ }
+
+ headers["content-length"] = ""+strlen(data);
+
+ return map( indices(headers),
+ lambda(string hname){
+ return replace(map(hname/"-", String.capitalize)*"-", "Mime", "MIME")+
+ ": "+headers[hname];
+ } )*"\r\n" + "\r\n\r\n" + data;
+ }
+
+ void create(void | string message,
+ void | mapping(string:string) hdrs,
+ void | array(object) parts)
+ {
+ encoded_data = 0;
+ decoded_data = 0;
+ headers = ([ ]);
+ params = ([ ]);
+ disp_params = ([ ]);
+ body_parts = 0;
+ type = "text";
+ subtype = "plain";
+ charset = "us-ascii";
+ boundary = 0;
+ disposition = 0;
+ if (hdrs || parts) {
+ string hname;
+ if (message)
+ decoded_data = message;
+ else
+ decoded_data = (parts?
+ "This is a multi-part message in MIME format.\r\n":
+ "");
+ if (hdrs)
+ foreach( indices(hdrs), hname )
+ headers[lower_case(hname)] = hdrs[hname];
+ body_parts = parts;
+ } else if (message) {
+ string head, body, header, hname, hcontents;
+ int mesgsep;
+ {
+ int mesgsep1 = search(message, "\r\n\r\n");
+ int mesgsep2 = search(message, "\n\n");
+ mesgsep = (mesgsep1<0? mesgsep2 :
+ (mesgsep2<0? mesgsep1 :
+ (mesgsep1<mesgsep2? mesgsep1 : mesgsep2)));
+ }
+ if (mesgsep<0) {
+ head = message;
+ body = "";
+ } else {
+ head = (mesgsep>0? message[..mesgsep-1]:"");
+ body = message[mesgsep+(message[mesgsep]=='\r'? 4:2)..];
+ }
+ foreach( replace(head, ({"\r", "\n ", "\n\t"}),
+ ({"", " ", " "}))/"\n", header ) {
+ if(4==sscanf(header, "%[!-9;-~]%*[ \t]:%*[ \t]%s", hname, hcontents))
+ headers[lower_case(hname)] = hcontents;
+ }
+ encoded_data = body;
+ }
+ if (headers["content-type"]) {
+ array(array(string|int)) arr =
+ tokenize(headers["content-type"]) / ({';'});
+ array(string|int) p;
+ if(sizeof(arr[0])!=3 || arr[0][1]!='/' ||
+ !stringp(arr[0][0]) || !stringp(arr[0][2]))
+ if(sizeof(arr[0])==1 && stringp(arr[0][0]) &&
+ (subtype = guess_subtype(lower_case(type = arr[0][0]))))
+ arr = ({ ({ type, '/', subtype }) }) + arr[1..];
+ else
+ throw(({ "invalid Content-Type in message\n", backtrace() }));
+ type = lower_case(arr[0][0]);
+ subtype = lower_case(arr[0][2]);
+ foreach( arr[1..], p ) {
+ if(sizeof(p)<3 || p[1]!='=' || !stringp(p[0]))
+ throw(({ "invalid parameter in Content-Type\n", backtrace() }));
+ params[ lower_case(p[0]) ] = p[2..]*"";
+ }
+ charset = lower_case(params["charset"] || charset);
+ boundary = params["boundary"];
+ }
+ if (headers["content-disposition"]) {
+ array(array(string|int)) arr =
+ tokenize(headers["content-disposition"]) / ({';'});
+ array(string|int) p;
+ if(sizeof(arr[0])!=1 || !stringp(arr[0][0]))
+ throw(({ "invalid Content-Disposition in message\n", backtrace() }));
+ disposition = lower_case(arr[0][0]);
+ foreach( arr[1..], p ) {
+ if(sizeof(p)<3 || p[1]!='=' || !stringp(p[0]))
+ throw(({ "invalid parameter in Content-Disposition\n",
+ backtrace() }));
+ disp_params[ lower_case(p[0]) ] = p[2..]*"";
+ }
+ }
+ if (headers["content-transfer-encoding"]) {
+ array(string) arr=tokenize(headers["content-transfer-encoding"]);
+ if (sizeof(arr)!=1 || !stringp(arr[0]))
+ throw (({ "invalid Content-Transfer-Encoding in message\n",
+ backtrace() }));
+ transfer_encoding = lower_case(arr[0]);
+ }
+ if (boundary && type=="multipart" && !body_parts &&
+ (encoded_data || decoded_data)) {
+ array(string) parts = ("\n"+getdata())/("\n--"+boundary);
+ if (parts[-1][0..3]!="--\n" && parts[-1][0..3]!="--\r\n")
+ throw(({ "multipart message improperly terminated\n", backtrace() }));
+ encoded_data = 0;
+ decoded_data = parts[0][1..];
+ body_parts = map(parts[1..sizeof(parts)-2], lambda(string part){
+ return object_program(this_object())(part[1..]);
+ });
+ }
+ }
+
+}
diff --git a/src/modules/_Crypto/lib/Makefile.in b/src/modules/_Crypto/lib/Makefile.in
index 85c0cc1b5a3f248b23d78378925d7ce64d29e7de..387fcc95dc85a9a5ce5ea67083e23544a0e947a1 100644
--- a/src/modules/_Crypto/lib/Makefile.in
+++ b/src/modules/_Crypto/lib/Makefile.in
@@ -11,7 +11,7 @@ VPATH=$(SRCDIR):$(SRCDIR)/../include
CRYPTO_INCLUDES=$(SRCDIR)/../include
# Additional C preprocessor flags
-PREFLAGS=$(DEFINES) $(EXTRA_CPP_FLAGS) -I$(CRYPTO_INCLUDES) -I. -I$(SRCDIR)
+PREFLAGS=$(EXTRA_CPP_FLAGS) -I$(CRYPTO_INCLUDES) -I. -I$(SRCDIR) $(DEFINES)
# The flags to generate a shared library
CFLAGS=$(PREFLAGS) $(OTHERFLAGS) $(EXTRA_CFLAGS)
@@ -67,11 +67,11 @@ desCore.a: $O
ar cru $@ $O
$(RANLIB) $@
-desdata.o: desinfo.h des.h
+desdata.o: desinfo.h $(SRCDIR)/../include/des.h
desUtil.o: $(GH)
-$(SO): des.h
-$(GI): desCode.h des.h Makefile
-desTest.o: des.h
+$(SO): $(SRCDIR)/../include/des.h
+$(GI): desCode.h $(SRCDIR)/../include/des.h Makefile
+desTest.o: $(SRCDIR)/../include/des.h
$(GH): desdata
./desdata $@ > $@
diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in
index 261f97dc8b0cfc141baa522279117a3414a14017..c13e808f11ea2ba6ce0d0946a42c8ceda2ea8987 100644
--- a/src/modules/dynamic_module_makefile.in
+++ b/src/modules/dynamic_module_makefile.in
@@ -9,7 +9,10 @@ subdirs:
for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) ) ; fi ; done
dummy: $(DUMMY) linker_options modlist_headers modlist_segment module.so
- tmp="$(INSTALL_NAME)" ; if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ; $(INSTALL) module.so $(TMP_LIBDIR)/modules/$$tmp.so
+ tmp="$(INSTALL_NAME)" ; \
+ if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ;\
+ $(INSTALL) module.so $(TMP_LIBDIR)/modules/$$tmp.so ;\
+ if [ -f $(SRCDIR)/module.pmod.in ]; then sed -e "s/@module@/\"$$tmp\"/" <$(SRCDIR)/module.pmod.in >$(TMP_LIBDIR)/modules/$$tmp.pmod ; fi
linker_options: Makefile
echo "$(LINKER_OPTIONS)" >linker_options
@@ -57,3 +60,4 @@ gdb_verify: module_testsuite
install:
$(INSTALL) module.so @prefix@/lib/pike/modules/$(MODNAME).so
+
diff --git a/src/modules/files/configure.in b/src/modules/files/configure.in
index 5f0033be194e0968c529f64f94f5a256f62ec795..8d3b02504c1158984e6ffa7b8716ac403ca832dd 100644
--- a/src/modules/files/configure.in
+++ b/src/modules/files/configure.in
@@ -8,7 +8,7 @@ AC_HAVE_HEADERS(arpa/inet.h sys/socketvar.h netinet/in.h \
AC_HEADER_DIRENT
AC_CHECK_LIB(socket, socket)
-AC_HAVE_FUNCS(socketpair getwd perror fork1 readdir_r)
+AC_HAVE_FUNCS(getwd perror fork1 readdir_r)
if test x$ac_cv_func_readdir_r = xyes ; then
AC_MSG_CHECKING(if readdir_r takes 2(Solaris & HPUX) or 3(Posix) arguments)
@@ -127,6 +127,45 @@ else
AC_MSG_RESULT(no)
fi
+AC_MSG_CHECKING(for select on AF_UNIX sockets)
+AC_CACHE_VAL(pike_cv_select_on_unix_sockets,
+[
+AC_TRY_RUN([
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include <netinet/in.h>
+#include <errno.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+int main()
+{
+ fd_set tmp;
+ int fds[2];
+ if(socketpair(AF_UNIX, SOCK_STREAM, 0, fds)<0)
+ exit(1);
+
+ while(write(fds[0],"foo",3)<0 && errno==EINTR);
+
+ FD_ZERO(&tmp);
+ FD_SET(fds[1], &tmp);
+ alarm(5);
+ if(select(fds[1]+1,&tmp, 0,0,0)>0 && FD_ISSET(fds[1]))
+ exit(0);
+ exit(1);
+}
+
+],pike_cv_select_on_unix_sockets=yes,pike_cv_select_on_unix_sockets=no)
+])
+
+AC_MSG_RESULT($pike_cv_select_on_unix_sockets)
+if test x$pike_cv_select_on_unix_sockets = xyes ; then
+ AC_DEFINE(HAVE_SOCKETPAIR)
+fi
+
AC_MSG_CHECKING(size of socket buffers)
AC_CACHE_VAL(pike_cv_socket_buffer_max,
diff --git a/src/modules/files/file.c b/src/modules/files/file.c
index a31053a664619c41b1dd1608b1df690fe624861f..9ae0b999862deb9e89b540dd4a134fd4ecaa1b9a 100644
--- a/src/modules/files/file.c
+++ b/src/modules/files/file.c
@@ -6,7 +6,7 @@
#define READ_BUFFER 8192
#include "global.h"
-RCSID("$Id: file.c,v 1.37.2.1 1997/05/10 12:57:28 hubbe Exp $");
+RCSID("$Id: file.c,v 1.37.2.2 1997/05/19 09:07:32 hubbe Exp $");
#include "types.h"
#include "interpret.h"
#include "svalue.h"
@@ -1511,3 +1511,8 @@ void pike_module_init()
add_gc_callback(mark_ids, 0, 0);
}
+/* Used from backend */
+int pike_make_pipe(int *fds)
+{
+ return socketpair(AF_UNIX, SOCK_STREAM, 0, fds);
+}
diff --git a/src/modules/static_module_makefile.in b/src/modules/static_module_makefile.in
index 13c5a8647d6652c32ef8e18eab14b1910ebaebcd..9e050bb326ffec876460b5355cd6bddea108c8d3 100644
--- a/src/modules/static_module_makefile.in
+++ b/src/modules/static_module_makefile.in
@@ -9,7 +9,9 @@ subdirs:
for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) ) ; fi ; done
dummy: linker_options modlist_headers modlist_segment module.pmod module.a
- tmp="$(INSTALL_NAME)" ; if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ; $(INSTALL) module.pmod $(TMP_LIBDIR)/modules/$$tmp.pmod
+ tmp="$(INSTALL_NAME)" ;\
+ if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ;\
+ $(INSTALL) module.pmod $(TMP_LIBDIR)/modules/$$tmp.pmod
linker_options: Makefile $(MODULE_ARCHIVES)
echo >linker_options modules/$(MODNAME)/module.a $(MODULE_LDFLAGS)
@@ -27,7 +29,11 @@ Makefile: $(SRCDIR)/Makefile.in $(SRCDIR)/dependencies
@exit 1
module.pmod: Makefile
- echo >module.pmod "inherit _static_modules.$(MODNAME);"
+ if [ -f $(SRCDIR)/module.pmod.in ]; then \
+ sed -e "s/@module@/_static_modules.$(MODNAME)/" <$(SRCDIR)/module.pmod.in >module.pmod ;\
+ else \
+ echo >module.pmod "inherit _static_modules.$(MODNAME);" ;\
+ fi
module.a: $(OBJS)
-rm -f module.a
diff --git a/src/signal_handler.c b/src/signal_handler.c
index 3ec72ecd328e74bbc7240da4c9bd6a586fa40377..ed4ceec1a391cfd67fb02b4205b6d350e6e72e6e 100644
--- a/src/signal_handler.c
+++ b/src/signal_handler.c
@@ -14,6 +14,7 @@
#include "callback.h"
#include "mapping.h"
#include "object.h"
+#include "threads.h"
#include <signal.h>
#include <sys/wait.h>
@@ -28,11 +29,21 @@
#endif
#define SIGNAL_BUFFER 16384
+#define WAIT_BUFFER 4096
+
+struct wait_data {
+ pid_t pid;
+ int status;
+};
static struct svalue signal_callbacks[MAX_SIGNALS];
static unsigned char sigbuf[SIGNAL_BUFFER];
-static int firstsig, lastsig;
+static int firstsig=0, lastsig=0;
+
+static struct wait_data wait_buf[WAIT_BUFFER];
+static int firstwait=0, lastwait=0;
+
static struct callback *signal_evaluator_callback =0;
static int sigchild_arrived=0;
@@ -202,50 +213,47 @@ static RETSIGTYPE receive_signal(int signum)
tmp=firstsig+1;
if(tmp == SIGNAL_BUFFER) tmp=0;
if(tmp != lastsig)
- sigbuf[firstsig=tmp]=signum;
+ {
+ sigbuf[tmp]=signum;
+ firstsig=tmp;
+ }
if(signum==SIGCHLD)
- sigchild_arrived++;
-
- wake_up_backend();
-
-#ifndef SIGNAL_ONESHOT
- my_signal(signum, receive_signal);
+ {
+ pid_t pid;
+ int status;
+ /* We carefully reap what we saw */
+#ifdef HAVE_WAITPID
+ pid=waitpid(-1,& status,WNOHANG);
+#else
+#ifdef HAVE_WAIT3
+ pid=wait3(&status,WNOHANG,0);
+#else
+#ifdef HAVE_WAIT4
+ pid=wait4(-1,&status,WNOHANG,0);
+#else
+ pid=-1;
#endif
-}
-
-static int signalling=0;
-
-static void unset_signalling(void *notused) { signalling=0; }
-
-void check_signals(struct callback *foo, void *bar, void *gazonk)
-{
- ONERROR ebuf;
-#ifdef DEBUG
- extern int d_flag;
- if(d_flag>5) do_debug(0);
#endif
-
- if(firstsig != lastsig && !signalling)
- {
- int tmp=firstsig;
- signalling=1;
-
- SET_ONERROR(ebuf,unset_signalling,0);
-
- while(lastsig != tmp)
+#endif
+ if(pid>0)
{
- if(++lastsig == SIGNAL_BUFFER) lastsig=0;
-
- push_int(sigbuf[lastsig]);
- apply_svalue(signal_callbacks + sigbuf[lastsig], 1);
- pop_stack();
+ int tmp2=firstwait+1;
+ if(tmp2 == WAIT_BUFFER) tmp=0;
+ if(tmp2 != lastwait)
+ {
+ wait_buf[tmp2].pid=pid;
+ wait_buf[tmp2].status=status;
+ firstwait=tmp2;
+ }
}
+ }
- UNSET_ONERROR(ebuf);
+ wake_up_backend();
- signalling=0;
- }
+#ifndef SIGNAL_ONESHOT
+ my_signal(signum, receive_signal);
+#endif
}
#define PROCESS_UNKNOWN 0
@@ -254,7 +262,6 @@ void check_signals(struct callback *foo, void *bar, void *gazonk)
#define THIS ((struct pid_status *)fp->current_storage)
-static struct callback *children_evaluator_callback =0;
struct mapping *pid_mapping=0;;
struct program *pid_status_program=0;
@@ -283,94 +290,103 @@ static void exit_pid_status(struct object *o)
}
}
-static RETSIGTYPE sig_child(int arg)
+static void report_child(int pid,
+ int status)
{
- wake_up_backend();
- sigchild_arrived++;
-
-#ifdef SIGNAL_ONESHOT
- my_signal(SIGCHLD, sig_child);
-#endif
+ if(pid_mapping)
+ {
+ struct svalue *s, key;
+ key.type=T_INT;
+ key.u.integer=pid;
+ if((s=low_mapping_lookup(pid_mapping, &key)))
+ {
+ if(s->type == T_OBJECT)
+ {
+ struct pid_status *p;
+ if((p=(struct pid_status *)get_storage(s->u.object,
+ pid_status_program)))
+ {
+ p->state = PROCESS_EXITED;
+ p->result = WEXITSTATUS(status);
+ }
+ }
+ map_delete(pid_mapping, &key);
+ }
+ }
}
-static void check_children(struct callback *foo, void *bar, void *gazonk)
+static int signalling=0;
+
+static void unset_signalling(void *notused) { signalling=0; }
+
+void check_signals(struct callback *foo, void *bar, void *gazonk)
{
- if(sigchild_arrived)
- {
-#ifdef HAVE_SIGPROCMASK
- sigset_t set, oset;
- sigemptyset(&set);
- sigaddset(&set, SIGCHLD);
- sigprocmask(SIG_BLOCK, &set, &oset);
-#else
-#ifdef HAVE_SIGBLOCK
- int oset;
- oset=siggetmask();
- sigblock(sigmask(SIGCHLD));
-#endif
+ ONERROR ebuf;
+#ifdef DEBUG
+ extern int d_flag;
+ if(d_flag>5) do_debug(0);
#endif
- while(sigchild_arrived>0)
+
+ if(firstsig != lastsig && !signalling)
+ {
+ int tmp=firstsig;
+ signalling=1;
+
+ SET_ONERROR(ebuf,unset_signalling,0);
+
+ while(lastsig != tmp)
{
- sigchild_arrived--;
- while(1)
+ if(++lastsig == SIGNAL_BUFFER) lastsig=0;
+
+ if(sigbuf[lastsig]==SIGCHLD)
{
- pid_t pid;
- int status;
- /* We carefully reap what we saw */
-#ifdef HAVE_WAITPID
- pid=waitpid(-1,& status,WNOHANG);
-#else
-#ifdef HAVE_WAIT3
- pid=wait3(&status,WNOHANG,0);
-#else
-#ifdef HAVE_WAIT4
- pid=wait4(-1,&status,WNOHANG,0);
-#else
- pid=-1;
-#endif
-#endif
-#endif
- if(pid>0)
+ int tmp2 = firstwait;
+ while(lastwait != tmp2)
{
- if(pid_mapping)
- {
- struct svalue *s, key;
- key.type=T_INT;
- key.u.integer=pid;
- if((s=low_mapping_lookup(pid_mapping, &key)))
- {
- if(s->type == T_OBJECT)
- {
- struct pid_status *p;
- if((p=(struct pid_status *)get_storage(s->u.object,
- pid_status_program)))
- {
- p->state = PROCESS_EXITED;
- p->result = WEXITSTATUS(status);
- }
- }
- map_delete(pid_mapping, &key);
- }
- }
- }else{
- break;
+ if(++lastwait == WAIT_BUFFER) lastwait=0;
+ report_child(wait_buf[lastwait].pid,
+ wait_buf[lastwait].status);
}
}
+
+ if(signal_callbacks[sigbuf[lastsig]].type != T_INT)
+ {
+ push_int(sigbuf[lastsig]);
+ apply_svalue(signal_callbacks + sigbuf[lastsig], 1);
+ pop_stack();
+ }
}
-#ifdef HAVE_SIGPROCMASK
- sigprocmask(SIG_SETMASK, &oset, 0);
-#else
-#ifdef HAVE_SIGBLOCk
- sigsetmask(oset);
-#endif
-#endif
+ UNSET_ONERROR(ebuf);
+
+ signalling=0;
}
}
static void f_pid_status_wait(INT32 args)
{
pop_n_elems(args);
+#if 1
+ while(THIS->state == PROCESS_RUNNING)
+ {
+ int pid, status;
+ pid=THIS->pid;
+ THREADS_ALLOW();
+#ifdef HAVE_WAITPID
+ pid=waitpid(pid,& status,WNOHANG);
+#else
+#ifdef HAVE_WAIT4
+ pid=wait4(pid,&status,WNOHANG,0);
+#else
+ pid=-1;
+#endif
+#endif
+ THREADS_DISALLOW();
+ if(pid >= -1)
+ report_child(pid, status);
+ check_signals(0,0,0);
+ }
+#else
init_signal_wait();
while(THIS->state == PROCESS_RUNNING)
{
@@ -378,6 +394,7 @@ static void f_pid_status_wait(INT32 args)
check_threads_etc();
}
exit_signal_wait();
+#endif
push_int(THIS->result);
}
@@ -408,11 +425,11 @@ void f_fork(INT32 args)
if(pid)
{
struct pid_status *p;
- if(!children_evaluator_callback)
+ if(!signal_evaluator_callback)
{
- children_evaluator_callback=add_to_callback(&evaluator_callbacks,
- check_children,
- 0,0);
+ signal_evaluator_callback=add_to_callback(&evaluator_callbacks,
+ check_signals,
+ 0,0);
}
o=clone_object(pid_status_program,0);
p=(struct pid_status *)get_storage(o,pid_status_program);
@@ -489,7 +506,7 @@ static void f_signal(int args)
switch(signum)
{
case SIGCHLD:
- func=sig_child;
+ func=receive_signal;
break;
case SIGPIPE:
@@ -624,7 +641,7 @@ void init_signals()
{
int e;
- my_signal(SIGCHLD, sig_child);
+ my_signal(SIGCHLD, receive_signal);
my_signal(SIGPIPE, SIG_IGN);
for(e=0;e<MAX_SIGNALS;e++)
diff --git a/src/testsuite.in b/src/testsuite.in
index 6ddc9a4898adceef9f05802cf44161281c548c9f..176e186b97653187e0b3b388f312c298476963dc 100644
--- a/src/testsuite.in
+++ b/src/testsuite.in
@@ -1,4 +1,9 @@
-test_true([["$Id: testsuite.in,v 1.40 1997/04/28 23:48:42 hubbe Exp $"]])
+test_true([["$Id: testsuite.in,v 1.40.2.1 1997/05/19 09:04:56 hubbe Exp $"]])
+test_eq(1e1,10.0)
+test_eq(1E1,10.0)
+test_eq(1e+1,10.0)
+test_eq(1.1e1,11.0)
+test_eq(1e-1,0.1)
test_any([[class foo { constant x=17; }; class bar { inherit foo; constant x=18; }; return bar()->x;]],18)
test_program([[inline string foo(string s){ while(s[0] == ' ' || s[0] == '\t') s = s[1..]; return(s); } string a() { return foo(" bar"); }]])
test_true([[lambda(function f) {return 1;}(object_program(this_object()));]])
diff --git a/src/threads.c b/src/threads.c
index 0f1af7aa4d2c179560f67a98a9a8117ef7f73585..8640eb2a11ac1133e578dcac4e5284d810bae862 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -1,5 +1,5 @@
#include "global.h"
-RCSID("$Id: threads.c,v 1.23.2.1 1997/05/10 12:56:57 hubbe Exp $");
+RCSID("$Id: threads.c,v 1.23.2.2 1997/05/19 09:04:57 hubbe Exp $");
int num_threads = 1;
int threads_disabled = 0;
@@ -119,7 +119,6 @@ void *new_thread_func(void * data)
arg.args=0;
f_call_function(args);
- fprintf(stderr,"Done ");
/* copy return value to the thread_id here */
object_low_set_index(thread_id,
thread_id_result_variable,
diff --git a/tutorial/tutorial.wmml b/tutorial/tutorial.wmml
index c6f042cbda410f61beda92f37f53fe08b4988e1a..8f0afda2a4b80f9cac51fdbced4efefda22eaf60 100644
--- a/tutorial/tutorial.wmml
+++ b/tutorial/tutorial.wmml
@@ -25,8 +25,9 @@ like it does from this book. It also teaches you how to write your own
extentions to Pike. I have been trying for years to get someone else to
write this book, but since it seems impossible without paying a fortune for
it I will have to do it myself.
-A big thanks goes to Ian Carr-de Avelon for helping me iron out some
-of the rough spots.
+A big thanks goes to
+<a href="http://www.emit.com.pl/ian.html">Ian Carr-de Avelon</a> for helping
+me iron out some of the rough spots.
The book assumes that
you have programmed some other programming language before and that you
@@ -165,7 +166,7 @@ data type.
<p>
First you need to have pike installed on your computer. See <link to=install>
"how to install Pike" if this is not already done. It is also vital
-for the following examples that the pike binary is in your UNIX search
+for the first of the following examples that the pike binary is in your UNIX search
path. If you have problems with this, consult the manual for your shell
or go buy a beginners book about UNIX.
<p>
@@ -204,7 +205,7 @@ Now let's examine the body of <tt>main</tt>;
return 0;
}
</pre>
-Within the function body, programming instructions, statements, are grouped together in blocks. A block is as series of statements placed between curly brackets. Every statement has to end in a semicolon. This group of statements will
+Within the function body, programming instructions, statements, are grouped together in blocks. A block is a series of statements placed between curly brackets. Every statement has to end in a semicolon. This group of statements will
be executed every time the function is called.
<p>
<pre>
@@ -396,7 +397,7 @@ modifiers. The <i>type </i> specifies what kind of data the function returns.
For example, the word <tt>int</tt> would signify that the function returns
an integer number. The <i>name </i> is used to identify the function when
calling it. The names between the parenthesis are the arguments to the
-function. They will be defined as local variabels inside the function. Each
+function. They will be defined as local variables inside the function. Each
variable will be declared to contain values of the preceeding type.
The three dots signifies that you can have anything from zero to 256 arguments
to a function. The <i> statements </i> between the brackets are the function
@@ -436,8 +437,8 @@ looking at this. The number 0 is false and everything else is true.
As you saw in our first examples we have to indicate the type of value returned by a functions or contained in a variable. We used integers (<tt>int</tt>.), strings (<tt>string</tt>), and arrays (with the * notation).
The others are <tt>mapping</tt>, <tt>mixed</tt>, <tt>void</tt>, <tt>float</tt>, <tt>multiset</tt>, <tt>function</tt>, <tt>object</tt> and <tt>program</tt>.
Neither <tt>mixed</tt> nor <tt>void</tt> are really types, <tt>void</tt> signifies that no value should be returned and <tt>mixed</tt> that the return value can be of any type, or that the variable can contain any type of value.
-<tt>Function</tt>, <tt>object</tt> and <tt>program</tt> are all types related to object orientation. We will not discuss the last three in any great detail here, for more details,
-in this short Pike overview. You can, however, read more at <a href=http://pike.infovav.se/>the pike home page</a>. There you'll also find more details on the other data types and the possible operations that are possible to perform on each of them.
+<tt>Function</tt>, <tt>object</tt> and <tt>program</tt> are all types related to object orientation. We will not discuss the last three in any great detail here,
+in this short Pike overview. You can, however, read more at <a href=http://pike.infovav.se/>the pike home page</a>. There you'll also find more details on the other data types and the operations that it is possible to perform on each of them.
<dl>
<dt>Int
@@ -469,7 +470,7 @@ will declare one array of strings and one string. However, it's much clearer to
<dt>String
<dd>A string contains a sequence of characters, a text, i.e. a word, a sentence, or a book. Note that this is not simply the letters A to Z; special characters, null characters, newlines and so on can all be stored in a string. Any 8-bit character is allowed. String is a basic type in Pike, as opposed to C where strings are represented by an array of char. This means that you cannot assign new values to individual characters in a string.
-Also, all strings are "shared", i.e. if the same string is used in several places, only one will be stored in memory.
+Also, all strings are "shared", i.e. if the same string is used in several places, it will be stored in memory only once.
When writing a string in a program, you enclose it in doublequotes. To write special characters you need to use the following syntax;
<table>
<tr><td><li>\n</td><td>newline</td></tr>
@@ -642,25 +643,30 @@ If the command given is "quit" the <tt>exit(0)</tt> statement stops the executio
<section title="Communicating with files">
Now if we want to save the database and also be able to retrieve previously stored data we have to communicate with the environment, i.e. with files on disk.
-Now we have to introduce objects. To open a file, be it for writing or for reading, we need to use the builtin program <tt>Stdio.File</tt>.
-A program is a data type which contains code, function and variables.
-A program can be <i>cloned</i>, i.e. we can create an data area for the program and initialize it with the physical file in question. The methods and variables in the file object enables us to perform actions on the associated file.
+Now we will introduce you to programming with objects. To open a file, be it for writing or for reading, we will use one of the programs which is builtin in Pike, it is called <tt>Stdio.File</tt>.
+To Pike, a program is a data type which contans code, functions and variables.
+A program can be <i>cloned</i>, i.e. Pike can create an data area in memory for the program, place a reference to the program in the data area, and initialize it to act on the data file in question. The methods (ie. functions in the objct) and variables in the object Stdio.File enables us to perform actions on the associated data file.
The methods we need to use are open, read, write and close. See <link to=io>
for more details.
<p>
<section title="save()">
-First we clone a <tt>Stdio.File</tt> program to the object <tt>o</tt>. Then we use it to open the file named file for writing, using the fact that if there's an error during opening, o will return a false value which we can detect and act upon by exiting. The arrow operator is what you use to access methods and variables in an object.
-If there's no error we use yet another control structure, <tt>foreach</tt>, to go through the mapping records one record at a time. We precede record names with the string "Record: " and song names with "Song: ". We also put every entry, be it song or record, on its own line by adding a newline to everything we write to the file.<br>
+First we clone a <tt>Stdio.File</tt> program to the object <tt>o</tt>.
+Then we use it to open the file whose name is given in the string file_name for writing.
+We use the fact that if there is an error during opening, open() will return a false value which we can detect and act upon by exiting.
+The arrow operator (->) is what you use to access methods and variables in an object.
+If there is no error we use yet another control structure, <tt>foreach</tt>, to go through the mapping <tt>records</tt> one record at a time.
+We precede record names with the string "Record: " and song names with "Song: ".
+We also put every entry, be it song or record, on its own line by adding a newline to everything we write to the file.<br>
Finally, remember to close the file.
<pre>
- void save(string file)
+ void save(string file_name)
{
string name, song;
object o;
o=Stdio.File();
- if(!o->open(file,"wct"))
+ if(!o->open(file_name,"wct"))
{
write("Failed to open file.\n");
return;
@@ -686,14 +692,14 @@ When receiving data from the file we put it in the string <tt>file_contents</tt>
The abscense of arguments to the method o->read means that the reading should not end until the end of the file.
After having closed the file we initialise our database, i.e. the mapping records. Then we have to put <tt>file_contents</tt> into the mapping and we do this by splitting the string on newlines (cf. the split operator in Perl) using the division operator. Yes, that's right: by dividing one string with another we can obtain an array consisting of parts from the first. And by using a <tt>foreach</tt> statement we can take the string <tt>file_contents</tt> apart piece by piece, putting each piece back in its proper place in the mapping records.
<pre>
- void load(string file)
+ void load(string file_nae)
{
object o;
string name="ERROR";
string file_contents,line;
o=Stdio.File();
- if(!o->open(file,"r"))
+ if(!o->open(file_name,"r"))
{
write("Failed to open file.\n");
return;
@@ -1206,7 +1212,7 @@ Also note these functions:
</section>
<section title="float">
-Although most programs only use ingegers, they are unpractical when doing
+Although most programs only use integers, they are unpractical when doing
trigonometric caluculations, transformations or anything else where you
need decimals. For this purpose you use <tt>float</tt>. Floats are normally
32 bit floating point numbers, which means that they can represent very large
@@ -1413,7 +1419,7 @@ use the operators <tt>></tt>, <tt>>=</tt>, <tt><</tt> or <tt><=</tt>
<dd> As with strings, summation concatenates arrays. <tt>({1})+({2})</tt> returns <tt>({1,2})</tt>.
<dt> Subtractions (<tt><i>a</i> - <i>b</i></tt>)
-<dd> Subtracting one array from another returns an array returns a copy of
+<dd> Subtracting one array from another returns a copy of
<i>a</i> with all the elements that are also present in <i>b</i> removed.
So <tt>({1,3,8,3,2}) - ({3,1})</tt> returns <tt>({8,2})</tt>.
@@ -2210,7 +2216,7 @@ used and the value of the environment variables <tt>LC_CTYPE</tt> and
Logical operators are operators that operate with truth values. In Pike any value
except zero is considered <b>true</b>. Logical operators are a very basic part
of Pike. They can also decide which arguments to evaluate and which not to
-evaluate. Becuase of this the logical operators do not have any identifiers and
+evaluate. Because of this the logical operators do not have any identifiers and
can not be called as normal functions. There are four logical operators:
<center>
@@ -2445,9 +2451,8 @@ already seen many examples of this operator, although you might not have
realized it was an operator at the time. The function call operator can
do more than just calling functions though; if the 'function' is in fact
an array, the operator will loop over the array and call each element in
-the array and return an array with the results. In fact,
-<tt>({ foo, bar, gaznonk }) (1, 2, 3)</tt> is the same as
-<tt>map(({ foo, bar, gaznonk }), call_function, 1, 2, 3)</tt>.
+the array and return an array with the results.
+<!-- In fact, <tt>({ foo, bar, gaznonk }) (1, 2, 3)</tt> is the same as <tt>map(({ foo, bar, gaznonk }), call_function, 1, 2, 3)</tt>. -->
If on the other hand, the 'function' is a program, the operator will
clone an object from the program and call create() in the new object
with the arguments given. In fact, the function <tt>clone</tt> is
@@ -2463,13 +2468,13 @@ should always be an array. The splice operator sends each of the elements
in the array as a separate argument to the function call. The splice operator
can only be used in an argument list for a function call.
<p>
-Then there is the increment and decrement operators. The increment and
+Then there are the increment and decrement operators. The increment and
decrement operators are somwhat limited: they can only be used on
integers. They provide a short and fast way to add or subtract one
-to an integer. If the operator is written before the lvalue
+to an integer. If the operator is written before the variable
((tt>++<i>a</i></tt>) the returned value will be what the variable
is after the operator has added/subtracted one to it. If the operator
-is after the lvalue (<tt><i>a</i>++</tt>) it will instead return the
+is after the variable (<tt><i>a</i>++</tt>) it will instead return the
value of the variable before it was incremented/decremented.
<p>
Casting is used to convert one type to another, not all casts are
@@ -2574,7 +2579,7 @@ it is identical to C++ in any way. Pike uses a less strict approach to
object orientation which creates a more relaxed programming style. For you
who have never come in contact with object oriented programming before, be
warned that the ideas expressed in Pike and in this chapter are my own and
-does not nessecarily reflect what other people think about object
+do not nessecarily reflect what other people think about object
orientated programming.
<section title="The approach">
@@ -2738,7 +2743,7 @@ that works by just changing what an identifier is pointing at.
</section>
<sectrion title="Multiple inherit">
-You can inherit any amount of programs in one program, you can even inherit the
+You can inherit any number of programs in one program, you can even inherit the
same thing more than once. If you do this you will a separate set of functions
and variables for each inherit. To access a specific function you need to name
your inherits. Here is an example of named inherits:
@@ -2761,7 +2766,7 @@ your inherits. Here is an example of named inherits:
</pre>
As you can see it would be impossible to separate the different read and
-main functions without using inherit names. If you would try to calling
+main functions without using inherit names. If you tried calling
just <tt>read</tt> without any <tt>::</tt> or inherit name in front of it
Pike will call the last read defined, in this case it will call read in
the fourth inherit.
@@ -3158,12 +3163,12 @@ modules.
<section title="The . operator">
The period operator is not really an operator, as it is always evaluated
-during the compilation. It works similar to the index and arrow operators,
+during the compilation. It works similarly to the index and arrow operators,
but can only be used on constant values such as modules. In most cases,
modules are simply a clone of a program, in which case the identifiers in
the module will be the same as those in the program. But some modules,
like those created from directories, overload the index operator so that
-the identifiers in the module can be something else than those in the program.
+the identifiers in the module can be something other than those in the program.
For directory modules, the index operator looks in the directory it was
cloned for to find the identifiers.
</section>
@@ -3722,7 +3727,7 @@ copied from this file. Note that all variables, even id, is copied.
</tt>
<p>
<dt><encaps>DESCRIPTION</encaps><dd>
-This function works similar to Stdio.File->assign, but instead of making
+This function works similarly to Stdio.File->assign, but instead of making
the argument a reference to the same file, it creates a new file
with the same properties and places it in the argument.
<p>
@@ -3751,7 +3756,7 @@ o->dup2(Stdio.File("stdin"));<br>
<p>
<dt><encaps>DESCRIPTION</encaps><dd>
This function takes a clone of /precompiled/file and assigns all
-variables this file from it. It can be used together with file->dup
+variables of this file from it. It can be used together with file->dup
to move files around.
<p>
<dt><encaps>SEE ALSO</encaps><dd>
@@ -4528,7 +4533,7 @@ read only that many bytes will be returned.
werror("Error: "+socket::errno()+".\n");
}
</pre>
- If something went wront during writing, or there was nothing left to read
+ If something went wrong during writing, or there was nothing left to read
we destruct this instance of this class.
<p>
<pre>
@@ -4751,6 +4756,8 @@ instead. (like someone connecting)
That's it, this simple program can be used as the basis for a simple
WWW-server. Note that today most WWW servers are very complicated programs,
and the above program can never replace a modern WWW server.
+However, it is very fast if you only want a couple of web pages and have
+a slow machine available for the server.
<p>
</section>
</chapter>
@@ -4807,16 +4814,7 @@ both threads will discover that <tt>map[i]</tt> is zero and both threads will
then do <tt>map[i]=({j});</tt> and one value of <tt>j</tt> will be lost.
This type of bug can be extremely hard to debug.
-<dt> Deadlocks
-<dd> Deadlocks arise when two threads are waiting for each other to do something.
- This bug can often arise when several threads needs access to a number of
- resources such as files or other I/O devices. What may happen is that one
- thread has locked device #1 and is trying to lock device #2 while another
- thread has locked device #2 and is trying to lock device #1. This type
- of bug is generally easier to find, but may require a lot of work to fix.
-</dl>
-
-The above problems can all be solved with the help of Mutexes and Condition
+The above problem can be solved with the help of Mutexes and Condition
variables. Mutexes are basically a way to keep other threads out while a task
is being performed. Conditions, or <b>condition variables</b>, are used to inform
other threads that they don't have to wait any longer. Pike also provides
@@ -4864,6 +4862,16 @@ given as first argument to the program in the files given as the rest
of the arguments. Don't worry if you do not understand it yet. Read the
descriptions of the functions and classes below and come back and read
this example again.
+
+<dt> Deadlocks
+<dd> Deadlocks arise when two threads are waiting for each other to do something.
+ This bug can often arise when several threads needs access to a number of
+ resources such as files or other I/O devices. What may happen is that one
+ thread has locked device #1 and is trying to lock device #2 while another
+ thread has locked device #2 and is trying to lock device #1. This type
+ of bug is generally easier to find, but may require a lot of work to fix.
+</dl>
+
</section>
@@ -5258,7 +5266,7 @@ Queues are only available on systems with POSIX or UNIX threads support.
<p>
<dt><encaps>DESCRIPTION</encaps><dd>
This function puts a value last in the queue. If the queue is
-to small to hold the value the queue will be expanded to make
+too small to hold the value the queue will be expanded to make
room for it.
<p>
</dl>
@@ -6481,7 +6489,7 @@ You can only have 40 subregexps.
Gmp is short for GNU MultiPrecision library. It is a set of routines that
can manipulate very large numbers. Although much slower than regular integers
they are very useful when you need to handle extremly large numbers.
-Billions and billions as Mr Attenburrow would have said..
+Billions and billions as Mr Attenborough would have said..
<p>
The Gmp library can handle large integers, floats and rational numbers, but
currently Pike only has support for large integers. The others will be added
@@ -6916,7 +6924,7 @@ The 'longform' is an alternative and maybe more readable way to
give the same option. If you give "foo" as longform your program
will accept --foo as argument. The envvar argument specifies what
environment variable can be used to specify the same option. The
-envvar option exists to make it easier to custimizer program usage.
+envvar option exists to make it easier to customize program usage.
The 'def' has two functions: It specifies that the option takes an
argument and it tells find_option what to return if the option is
not present. If 'def' is given and the option does not have an
@@ -6997,7 +7005,7 @@ Only the first three elements has to be included.
This would make find_all_options look for <tt>-t</tt>,
<tt>-T</tt> and <tt>--test</tt>.
<dt> <i>env_var</i>
-<dd> This is a string or an array of strings containging names of
+<dd> This is a string or an array of strings containing names of
environment variables that can be used instead of the
command line option.
<dt> <i>default</i>
@@ -7168,7 +7176,7 @@ so it can be re-used.
<dt><encaps>DESCRIPTION</encaps><dd>
This function performs gzip style compression on a string and
returns the packed data. Streaming can be done by calling this
-functon several time and concatenating the returned data.
+functon several times and concatenating the returned data.
The optional 'flush' argument should be one f the following:
<p><table border=0 cellpadding=0 cellspacing=0>
<tr valign=top><td> Gz.NO_FLUSH </td><td> Only data that doesn't fit in the </td></tr>
@@ -11869,7 +11877,7 @@ quote the included file.
<dt><encaps>DESCRIPTION</encaps><dd>
This function adds another directory to the search for modules.
This is the same as the command line option <tt>-M</tt>. For more
-more information about modules, see <link to=modules>.
+information about modules, see <link to=modules>.
<p>
<dt><encaps>SEE ALSO</encaps><dd>
<a href=#remove_module_path>remove_module_path</a>
@@ -11890,7 +11898,7 @@ more information about modules, see <link to=modules>.
<dt><encaps>DESCRIPTION</encaps><dd>
This function adds another directory to the search for programs.
This is the same as the command line option <tt>-P</tt>. For more
-more information about programs, see <link to=programs>.
+information about programs, see <link to=programs>.
<p>
<dt><encaps>SEE ALSO</encaps><dd>
<a href=#remove_program_path>remove_program_path</a>
@@ -12434,7 +12442,7 @@ Result: /foo/bar/sune.c<br>
</tt>
<p>
<dt><encaps>DESCRIPTION</encaps><dd>
-This function will compile the filename to an Pike program that can
+This function will compile the filename to a Pike program that can
later be used for cloning.
<p>
<dt><encaps>KEYWORDS</encaps><dd>
@@ -12457,7 +12465,7 @@ later be used for cloning.
</tt>
<p>
<dt><encaps>DESCRIPTION</encaps><dd>
-Compile_string takes a complete Pike program as an argument in a the
+Compile_string takes a complete Pike program as an argument in the
string prog and compiles it to clonable program. The second argument
will be used as the file name of the program and will be used for
error messages and such.
@@ -13125,7 +13133,7 @@ string *glob(string <I>glob</I>, string *<I>arr</I>);<br>
</tt>
<p>
<dt><encaps>DESCRIPTION</encaps><dd>
-This function matches "globs". A in the glob string a question sign
+This function matches "globs". A the the glob string a question sign
matches any character and an asterisk matches any string. When
given two strings as argument a true/false value is returned
which reflects if the 'str' matches 'glob'. When given an array as
@@ -13954,7 +13962,7 @@ This function can do several kinds replacement operations, the
different syntaxes do different things as follow:
<p>string replace(string s, string from, string to);
<p><dl><dt><dd>When given strings as second and third argument, a copy of<br>
-s with every occurance of 'from' return 'to' is returned.<br>
+s with every occurance of 'from' replaced with 'to' is returned.<br>
</dl>
<p>string replace(string s, string *from, string *to);
<p><dl><dt><dd>When given arrays of strings as second and third argument,<br>
@@ -14700,7 +14708,7 @@ int time(1);<br>
</tt>
<p>
<dt><encaps>DESCRIPTION</encaps><dd>
-This function returns the number of secons since 1 Jan 1970.
+This function returns the number of seconds since 1 Jan 1970.
The function ctime() converts this integer to a readable string.
<p>The second syntax does not call the system call time() as often,
but is only updated in the backed. (when pike code isn't running)
@@ -14967,7 +14975,7 @@ in the <b>master object</b>:
argument is called. It is expected to return the program to inherit.
<dt> <tt>void handle_error(mixed *<i>trace</i>)</tt>
<dd> This function is expected to write the error messages when a
- run time error occurs. The argument is on the form
+ run time error occurs. The argument is of the form
<tt>({"<i>error_description</i>", backtrace() })</tt>. If any error
occurs in this routine Pike will dump core.
<dt> <tt>program cast_to_program(string <i>program_name</i>, string <i>current_file</i>)</tt>
@@ -15101,9 +15109,9 @@ instead of writing them to stderr.
<appendix title="Terms and jargon">
<dl>
<dt> HTTP <dd> HyperText Transfer Protocol, the protocol used by WWW to transfer HTML from the server to the client. Based on TCP.
- <dt> WWW <dd> World Wide Web, popularly known as 'the internet' :)
+ <dt> WWW <dd> World Wide Web, popularly known as 'the Internet' :)
<dt> TCP <dd> Transmission Control Protocol, the internet standard for computer communication
- <dt> ASCII <dd> <!-- FIXME -->
+ <dt> ASCII <dd> American Standard Code for Information Interchange. Standard set by the American Standards Authority for encoding English letters, numbers , some symbols and control characters in 7 bits. There are also some "semi-standard" systems which add other characters by using 8 bits, which are also loosly called ASCII.
<dt> UNIX <dd> A group of operating systems. Some noteworthy unixes are: Solaris, Linux, HP-UX, Digital Unix, SunOs, BSD and Unixware.
<dt> clone <dd> To create an object from a program. Or to use C++ jargon: to instanciate a class.
<dt> command line <dd> The line you write to execute a program
@@ -15183,13 +15191,13 @@ void add_record()
}
}
-void save(string file)
+void save(string file_name)
{
string name, song;
object o;
o=Stdio.File();
- if(!o->open(file,"wct"))
+ if(!o->open(file_name,"wct"))
{
write("Failed to open file.\n");
return;
@@ -15205,14 +15213,14 @@ void save(string file)
o->close();
}
-void load(string file)
+void load(string file_name)
{
object o;
string name="ERROR";
string file_contents,line;
o=Stdio.File();
- if(!o->open(file,"r"))
+ if(!o->open(file_name,"r"))
{
write("Failed to open file.\n");
return;