diff --git a/src/modules/Image/togif.c b/src/modules/Image/togif.c
index 0274a461e0a0b2e79c9bdb0c62b3b1b0b8070980..4b31aeb62647b0c78891b127348e9de04f84c9d9 100644
--- a/src/modules/Image/togif.c
+++ b/src/modules/Image/togif.c
@@ -4,7 +4,7 @@ togif
Pontus Hagland, law@infovav.se
-$Id: togif.c,v 1.9 1997/05/05 21:35:06 mirar Exp $
+$Id: togif.c,v 1.10 1997/05/07 23:07:14 per Exp $
*/
@@ -751,13 +751,12 @@ CHRONO("gif add init");
low_my_putchar( 0, &buf ); /* terminate block */
}
- ct=colortable_quant(THIS,256);
+ if(!ct)
+ ct=colortable_quant(THIS,256);
colors=4; bpp=2;
while (colors<ct->numcol) { colors<<=1; bpp++; }
-
-
low_my_putchar( ',', &buf ); /* image separator */
diff --git a/src/modules/Image/x.c b/src/modules/Image/x.c
index dd23f9a933edb4dda813afc8c571f2a58f5832bb..2df655b808bdc0831040b0ae150a7df9417754da 100644
--- a/src/modules/Image/x.c
+++ b/src/modules/Image/x.c
@@ -1,4 +1,4 @@
-/* $Id: x.c,v 1.7 1997/05/05 21:35:10 mirar Exp $ */
+/* $Id: x.c,v 1.8 1997/05/07 23:07:16 per Exp $ */
/*
**! module Image
@@ -12,7 +12,7 @@
#include "stralloc.h"
#include "global.h"
-RCSID("$Id: x.c,v 1.7 1997/05/05 21:35:10 mirar Exp $");
+RCSID("$Id: x.c,v 1.8 1997/05/07 23:07:16 per Exp $");
#include "types.h"
#include "pike_macros.h"
#include "object.h"
@@ -370,6 +370,7 @@ void image_to8bit_rgbcube_rdither(INT32 args)
int r=(s->r*red)+(tal&255);
int g=(s->g*green)+((tal>>8)&255);
int b=(s->b*blue+((tal>>16)&255));
+
if(r>rmax) r=rmax; if(g>gmax) g=gmax; if(b>bmax) b=bmax;
*(d++)= (unsigned char)((r>>8)+(g>>8)*red+(b>>8)*redgreen);
s++;
@@ -382,6 +383,7 @@ void image_to8bit_rgbcube_rdither(INT32 args)
int r=(s->r*red)+(tal&255);
int g=(s->g*green)+((tal>>8)&255);
int b=(s->b*blue+((tal>>16)&255));
+
if(r>rmax) r=rmax; if(g>gmax) g=gmax; if(b>bmax) b=bmax;
*(d++)= map[ (r>>8)+(g>>8)*red+(b>>8)*redgreen ];
s++;
diff --git a/src/modules/Pipe/pipe.c b/src/modules/Pipe/pipe.c
index 340c89dd0031d219023a8302393f5f03dc74fd65..9de668125daa96120cb746305b3b70a05533abf4 100644
--- a/src/modules/Pipe/pipe.c
+++ b/src/modules/Pipe/pipe.c
@@ -20,7 +20,7 @@
#include <fcntl.h>
#include "global.h"
-RCSID("$Id: pipe.c,v 1.6 1997/04/16 03:11:06 hubbe Exp $");
+RCSID("$Id: pipe.c,v 1.7 1997/05/07 23:07:17 per Exp $");
#include "stralloc.h"
#include "types.h"
@@ -592,9 +592,10 @@ static void pipe_input(INT32 args)
if (fd != -1 && fstat(fd,&s)==0)
{
+ int filep=lseek(fd, 0L, SEEK_CUR); /* keep the file pointer */
if(S_ISREG(s.st_mode) /* regular file */
- && ((long)(m=(char *)mmap(0,s.st_size,PROT_READ,
- MAP_FILE|MAP_SHARED,fd,0))!=-1))
+ && ((long)(m=(char *)mmap(0,s.st_size - filep,PROT_READ,
+ MAP_FILE|MAP_SHARED,fd,filep))!=-1))
{
mmapped += s.st_size;
diff --git a/src/modules/spider/Makefile.in b/src/modules/spider/Makefile.in
index 520a0e9ef0beffeb619adaaa675e2e4f42ce7bd1..c0e03637a7ac661b1c467cb20c6297b2fa0879e6 100644
--- a/src/modules/spider/Makefile.in
+++ b/src/modules/spider/Makefile.in
@@ -1,6 +1,7 @@
SRCDIR=@srcdir@
VPATH=@srcdir@:@srcdir@/../..:../..
-OBJS=spider.o discdate.o stardate.o dumudp.o streamed_parser.o accesseddb.o
+OBJS=spider.o discdate.o stardate.o dumudp.o accesseddb.o
+# streamed_parser.o
@dynamic_module_makefile@
@dependencies@
diff --git a/src/modules/spider/spider.c b/src/modules/spider/spider.c
index cdcde3642d5386fc1101b2a5e05d035da24df3a5..2ebc6e02ff98b4e26443888300bd6428634225f8 100644
--- a/src/modules/spider/spider.c
+++ b/src/modules/spider/spider.c
@@ -26,6 +26,7 @@
#include "global.h"
#include "types.h"
#include "pike_macros.h"
+#include "machine.h"
#include "object.h"
#include "constants.h"
#include "interpret.h"
@@ -1193,6 +1194,28 @@ void f__dump_obj_table(INT32 args)
f_aggregate(n);
}
+#ifndef MIN
+#define MIN(A,B) ((A)<(B)?(A):(B))
+#endif
+
+#if 0
+extern char **ARGV;
+void f_name_process(INT32 args)
+{
+ char *title;
+ int len, i;
+#ifdef SOLARIS
+ int fd;
+#endif
+ get_all_args("name_process", args, "%s", &title);
+
+ len = MIN(strlen(ARGV[0]),strlen(title));
+ for(i=0; i<len; i++) ARGV[0][i]=title[i];
+
+ pop_n_elems(args);
+}
+#endif
+
#include "streamed_parser.h"
static struct program *streamed_parser;
@@ -1241,6 +1264,9 @@ void pike_module_init(void)
add_efun("timezone",f_timezone,"function(:int)",0);
add_efun("get_all_active_fd",f_get_all_active_fd,"function(:array(int))",0);
+#if 0
+ add_efun("name_process",f_name_process,"function(string:void)",0);
+#endif
add_efun("fd_info",f_fd_info,"function(int:string)",0);
add_efun("mark_fd",f_mark_fd,"function(int,void|mixed:mixed)",0);
@@ -1258,17 +1284,19 @@ void pike_module_init(void)
init_udp();
init_accessdb_program(); /* Accessed database */
+ /*
start_new_program();
add_storage( sizeof (struct streamed_parser) );
add_function( "init", streamed_parser_set_data,
"function(mapping(string:function(string,mapping(string:string),mixed:mixed)),mapping(string:function(string,mapping(string:string),string,mixed:mixed)),mapping(string:function(string,mixed:mixed)):void)", 0 );
- add_function( "parse", streamed_parser_parse, "function(string,mixed:string)", 0 );
- add_function( "finish", streamed_parser_finish, "function(void:string)", 0 );
- set_init_callback( streamed_parser_init );
- set_exit_callback( streamed_parser_destruct );
+ add_function( "parse", streamed_parser_parse, "function(string,mixed:string)", 0 );
+ add_function( "finish", streamed_parser_finish, "function(void:string)", 0 );
+ set_init_callback( streamed_parser_init );
+ set_exit_callback( streamed_parser_destruct );
- streamed_parser = end_program();
- add_program_constant("streamed_parser", streamed_parser,0);
+ streamed_parser = end_program();
+ add_program_constant("streamed_parser", streamed_parser,0);
+ */
}
diff --git a/tutorial/tutorial.wmml b/tutorial/tutorial.wmml
index 0f656851f9eef334e2eac1a60b9da5a84b1ce93c..337dfb061be590efaf2b1880c5c3780de98534fb 100644
--- a/tutorial/tutorial.wmml
+++ b/tutorial/tutorial.wmml
@@ -65,7 +65,7 @@ examples and explanations about some of the basics.
<a name=uLPC> <!-- FIXME replace uLPC with (micro)LPC -->
In the beginning, there was Zork. Then a bunch of people decided to make
multiplayer adventure games. One of those people was Lars Pensjö at the
-Chalmers university in Gothemburg, Sweden. For his game he needed simple,
+Chalmers university in Gothenburg, Sweden. For his game he needed a simple,
memory-efficient language, and thus LPC (Lars Pensjö C) was born. About a
year later I started playing one of these games and found that the language
was the most easy-to-use language I had ever encountered. I liked the language
@@ -415,7 +415,7 @@ you could simply put: <tt>sqr(17)</tt> and that would return the integer value
As the example above shows that <tt>return</tt> is used to specify the
return value of a function. The value after <tt>return</tt> must be of the
type specified before the function name. If the function is specified to
-return <tt>void</tt> nothing at all should be written after <tt>return</tt>.
+return <tt>void</tt>, nothing at all should be written after <tt>return</tt>.
Note that when a return statement is executed, the function will finish
immediately. Any statements following the return will be ignored.
<p>
@@ -976,7 +976,7 @@ This would call show_record with the values 1, 2, 3 and 4.
<section title="for">
-<tt>For</tt> is simply an extention of <tt>while</tt> it provides an
+<tt>For</tt> is simply an extention of <tt>while</tt>. It provides an
even shorter and more compact way of writing loops. The syntax looks
like this:
<pre>
@@ -1185,7 +1185,7 @@ constant can be written in several ways:
</pre>
All of the above represent the number 78. Octal notation means that
each digit is worth 8 times as much as the one after. Hexadecimal notation
-means that each digit is wirth 16 times as much as the one after.
+means that each digit is worth 16 times as much as the one after.
Hexadecimal notation uses the letters a, b, c, d, e and f to represent the
numbers 10, 11, 12, 13, 14 and 15. The ASCII notation gives the ASCII
value of the character between the single quotes. In this case the character
@@ -1293,7 +1293,7 @@ of how:
s=s[..5]+"w"+s[7..];
</pre>
<p>
-All the comparison operators plus those listed here can be used on strings:
+All the comparison operators plus the operators listed here can be used on strings:
<dl>
<dt> Summation
<dd> Adding strings together will simply concatenate them.
@@ -1313,7 +1313,7 @@ All the comparison operators plus those listed here can be used on strings:
character. For instance if you do <tt>"foobargazonk" / "o"</tt> the
result would be <tt>({"f","","bargaz","nk"})</tt>.
<dt> Multiplication
-<dd> The opposit of the division operator can be accoplished by multiplying
+<dd> The reverse of the division operator can be accoplished by multiplying
an array with a string. So if you evaluate
<tt>({"f","","bargaz","nk"}) * "o"</tt> the result would be
<tt>"foobargazonk"</tt>.
@@ -1430,7 +1430,7 @@ use the operators <tt>></tt>, <tt>>=</tt>, <tt><</tt> or <tt><=</tt>
return <tt>({1,2,3,5})</tt>.
<dt> Xor (<tt><i>a</i> ^ <i>b</i></tt>)
-<dd> This is also called symmetric differance. It returns an array with all
+<dd> This is also called symmetric difference. It returns an array with all
elements present in <i>a</i> or <i>b</i> but the element must NOT
be present in both. Example: <tt>({1,3,5,6}) ^ ({4,5,6,7})</tt> will
return <tt>({1,3,4,7})</tt>.
@@ -1459,7 +1459,7 @@ use the operators <tt>></tt>, <tt>>=</tt>, <tt><</tt> or <tt><=</tt>
<dt><tt>int equal(mixed <i>a</i>, mixed <i>b</i>)</tt>
<dd> This function returns 1 if if <i>a</i> and <i>b</i> look the same. They
do not have to be pointers to the same array, as long as they are the same
- size and containi equal data.
+ size and contain equal data.
<dt><tt>array filter(array <i>a</i>, mixed <i>func</i>, mixed ... <i>args</i>)</tt>
<dd> <tt>filter</tt> returns every element in <i>a</i> for which <i>func</i> returns <b>true</b> when called with that element as first argument, and <i>args</i> for the second, third, etc. arguments.
@@ -1526,7 +1526,7 @@ Writing a constant mapping is easy:
<pre>
([ ]) // Empty mapping
([ 1:2 ]) // Mapping with one index-value pair, the 1 is the index
- ([ "one":1, "two" ]) // Mapping which maps words to numbers
+ ([ "one":1, "two":2 ]) // Mapping which maps words to numbers
([ 1:({2.0}), "":([]), ]) // Mapping with lots of different types
</pre>
<p>
@@ -1767,12 +1767,12 @@ better to write it like this:
string artist;
array(string) songs;
- void show_record()
+ void show()
{
write("Record name: "+title+"\n");
write("Artist: "+artist+"\n");
write("Songs:\n");
- foreach(rec->songs, string song)
+ foreach(songs, string song)
write(" "+song+"\n");
}
}
@@ -1786,10 +1786,10 @@ better to write it like this:
void show_record(object rec)
{
- rec->show_record();
+ rec->show();
}
</pre>
-Here we can clearly see how the function <tt>show_record</tt> prints the
+Here we can clearly see how the function <tt>show</tt> prints the
contents of the variables in that object. In essence, instead of accessing
the data in the object with the <tt>-></tt> operator, we call a function
in the object and have it write the information itself. This type of
@@ -1800,12 +1800,12 @@ the <tt>record</tt> program.
Functions and operators relevant to objects:
<dl>
<dt> indexing
-<dd> Objects can be indexed on strings access identifiers. If the identifier
+<dd> Objects can be indexed on strings to access identifiers. If the identifier
is a variable, the value can also be set using indexing. If the identifier
is a function, a pointer to that function will be returned. If the
identifier is a constant, the value of that constant will be returned.
Note that the <tt>-></tt> operator is actually the same as indexing.
- This means that <tt>o->foo</tt> is the same as to <tt>o["foo"]</tt>
+ This means that <tt>o->foo</tt> is the same as <tt>o["foo"]</tt>
<dt> cloning
<dd> As discussed in the section about programs, cloning a program can be done
in two different ways:
@@ -1820,8 +1820,8 @@ Functions and operators relevant to objects:
<dd> This function invalidates all references to the object <i>o</i> and
frees all variables in that object. This function is also called when
<i>o</i> runs out of references. If there is a function named
- <tt>destroy</tt> in the object, it will be called before actually
- destructing the object.
+ <tt>destroy</tt> in the object, it will be called before the actually
+ destruction of the object.
<dt> <tt>array(string) indices(object <i>o</i>)</tt>
<dd> This function returns a list of all identifiers in the object <i>o</i>.
<dt> <tt>program object_program(object <i>o</i>)</tt>
@@ -1851,6 +1851,7 @@ in the object a <tt>function</tt> is returned. Despite is name, a
<img src=function.gif><br>
fig 4.6
</center>
+
When the function pointer is called, the interpreter sets
<tt>this_object()</tt> to the object in which the function is located and
procedes to execute the function it points to. Also note that function pointers
@@ -1913,7 +1914,7 @@ As mention in the beginning of this chapter, the assignment operator
(<tt>=</tt>) does not copy anything when you use it on a pointer type.
Instead it just creates another reference to the memory object.
In most situations this does not present a problem, and it speeds up
-Pike performance. However, you must be aware of this when programming.
+Pikes performance. However, you must be aware of this when programming.
This can be illustrated with an example:
<pre>
int main(int argc, array(string) argv)
@@ -1968,7 +1969,8 @@ As you can see there are some interesting ways to specify types.
Here is a list of what is possible:
<dl>
<dt> <tt>mixed</tt>
-<dt> This means that the variable can contain any type.
+<dt> This means that the variable can contain any type, or the
+ function return any value
<dt> <tt>array( <i>type</i> )</tt>
<dd> This means an array of <i>type</i>.
<dt> <tt><i>type</i> *</tt>
@@ -2172,7 +2174,7 @@ the complete list of combinations of types you can use with these operators:
</center>
</section>
-<section title="Comparing operators">
+<section title="Comparison operators">
The arithmetic operators would be hard to use for something interesting
without the ability to compare them to each other. For this purpose there
are six comparison operators:
@@ -5414,7 +5416,7 @@ show up in the future.
<section title="String">
The module <tt>String</tt> contains some extra string functionality which
is not always used. These functions are mostly implemented in Pike as a
-compliment to those written in C.
+complement to those written in C.
<hr noshade size=1>
<a name=String.implode_nicely>
@@ -5640,7 +5642,7 @@ return res;<br>
This function sorts an array after a compare-function 'fun'
which takes two arguments and should return 1 if the first argument
is larger then the second. The rest of the arguments 'args' will be
-sent as 3rd, 4th etc. argument to fun. If fun is omitted, `< is unsed
+sent as 3rd, 4th etc. argument to fun. If fun is omitted, `< is used
instead.
<p>
<dt><encaps>KEYWORDS</encaps><dd>