diff -r 85895476fecf lib/theo --- a/lib/theo Tue Mar 02 22:56:58 2021 -0500 +++ b/lib/theo Fri Mar 05 20:37:37 2021 -0800 @@ -927,7 +927,10 @@ For now, no. I'm think you don't get it. I hear "me me me". +<<<<<<< local +======= If you guys aren't part of the solution, you are part of the precipitate. Nothing is perfect. Some users really are their own worst enemy. Sorry no you are wrong. +>>>>>>> other diff -r 85895476fecf lib/vgadb --- a/lib/vgadb Tue Mar 02 22:56:58 2021 -0500 +++ b/lib/vgadb Fri Mar 05 20:37:37 2021 -0800 @@ -437,6 +437,7 @@ vid=0x8086 did=0x2a42 # Intel 4 Series Mobile vid=0x8086 did=0x0a16 # Intel 4th Gen Core (HD 4400) vid=0x8086 did=0x0412 # Intel 4th Gen Core (HD 4600) + vid=0x8086 did=0x1916 # Intel Skylake link=vga hwgc=igfxhwgc ctlr=igfx linear=1 diff -r 85895476fecf rc/bin/newt --- a/rc/bin/newt Tue Mar 02 22:56:58 2021 -0500 +++ b/rc/bin/newt Fri Mar 05 20:37:37 2021 -0800 @@ -25,6 +25,7 @@ if(~ $yn y) cat /tmp/post >$mnt/$group/post } +fn f { du -a $* | sed 's/^.* //g' } fn fmtd{ date=`{cat} if(! ~ $date(1) [0-9]*) @@ -95,7 +96,7 @@ fn h{ sed -n $1^p /tmp/h } fn k{ kmnt=`{echo $mnt | sed 's/\//\\\//g'} - walk $mnt/$* | + f $mnt/$* | grep -v -e '\/([0-9]+|article|body|header|post|xover)$' | sed 's/^'$"kmnt'\// g /g' | sort | diff -r 85895476fecf rc/bin/umem --- a/rc/bin/umem Tue Mar 02 22:56:58 2021 -0500 +++ b/rc/bin/umem Fri Mar 05 20:37:37 2021 -0800 @@ -16,6 +16,8 @@ addr=$6 size=$3 alloc=$4 + totalsum += size + totalcnt++ total[alloc] += size count[alloc]++ } @@ -23,10 +25,14 @@ alloc=$2 cnt=$3 size=$4 + allmem += size + totalsum += size + totalcnt++ total[alloc] += size count[alloc] += cnt } END{ + printf("%6d %11d total\n", totalcnt, totalsum) for(i in count) printf("%6d %11d %s\n", count[i], total[i], i); } diff -r 85895476fecf sys/games/lib/fortunes --- a/sys/games/lib/fortunes Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/games/lib/fortunes Fri Mar 05 20:37:37 2021 -0800 @@ -5253,5 +5253,3 @@ On the Internet, we are all Poland. -- Michael Hayden By the way, BBCNews site makes corrupt the browser. -- Kenji As much as I'd love to I feel I have to let it go -- rminnich -You need a UNIX system to run SATAN. -That depends on how you define native. -- Andre Garzia diff -r 85895476fecf sys/include/ape/inttypes.h --- a/sys/include/ape/inttypes.h Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/include/ape/inttypes.h Fri Mar 05 20:37:37 2021 -0800 @@ -1,3 +1,7 @@ +#ifndef _SUSV2_SOURCE +#error "inttypes.h is SUSV2" +#endif + #ifndef _INTTYPES_H_ #define _INTTYPES_H_ 1 diff -r 85895476fecf sys/include/ape/qlock.h --- a/sys/include/ape/qlock.h Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/include/ape/qlock.h Fri Mar 05 20:37:37 2021 -0800 @@ -34,6 +34,18 @@ extern void qunlock(QLock*); extern int canqlock(QLock*); +typedef +struct Rendez +{ + QLock *l; + QLp *head; + QLp *tail; +} Rendez; + +extern void rsleep(Rendez*); /* unlocks r->l, sleeps, locks r->l again */ +extern int rwakeup(Rendez*); +extern int rwakeupall(Rendez*); + #ifdef __cplusplus } #endif diff -r 85895476fecf sys/include/ape/sys/stat.h --- a/sys/include/ape/sys/stat.h Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/include/ape/sys/stat.h Fri Mar 05 20:37:37 2021 -0800 @@ -58,6 +58,7 @@ #define S_IFIFO 0010000 #define S_IFLNK 0120000 #define S_IFSOCK S_IFIFO +#define S_ISSOCK(m) S_ISFIFO(m) #endif #ifdef __cplusplus diff -r 85895476fecf sys/include/ape/zlib.h --- a/sys/include/ape/zlib.h Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/include/ape/zlib.h Fri Mar 05 20:37:37 2021 -0800 @@ -1,5 +1,1912 @@ -#ifndef __ZLIB -#define __ZLIB -#pragma lib "/$M/lib/ape/libz.a" -#include "/sys/src/cmd/gs/zlib/zlib.h" -#endif /* __ZLIB */ +/* zlib.h -- interface of the 'zlib' general purpose compression library + version 1.2.11, January 15th, 2017 + + Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + + + The data format used by the zlib library is described by RFCs (Request for + Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950 + (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format). +*/ + +#ifndef ZLIB_H +#define ZLIB_H + +#include "zconf.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define ZLIB_VERSION "1.2.11" +#define ZLIB_VERNUM 0x12b0 +#define ZLIB_VER_MAJOR 1 +#define ZLIB_VER_MINOR 2 +#define ZLIB_VER_REVISION 11 +#define ZLIB_VER_SUBREVISION 0 + +/* + The 'zlib' compression library provides in-memory compression and + decompression functions, including integrity checks of the uncompressed data. + This version of the library supports only one compression method (deflation) + but other algorithms will be added later and will have the same stream + interface. + + Compression can be done in a single step if the buffers are large enough, + or can be done by repeated calls of the compression function. In the latter + case, the application must provide more input and/or consume the output + (providing more output space) before each call. + + The compressed data format used by default by the in-memory functions is + the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped + around a deflate stream, which is itself documented in RFC 1951. + + The library also supports reading and writing files in gzip (.gz) format + with an interface similar to that of stdio using the functions that start + with "gz". The gzip format is different from the zlib format. gzip is a + gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. + + This library can optionally read and write gzip and raw deflate streams in + memory as well. + + The zlib format was designed to be compact and fast for use in memory + and on communications channels. The gzip format was designed for single- + file compression on file systems, has a larger header than zlib to maintain + directory information, and uses a different, slower check method than zlib. + + The library does not install any signal handler. The decoder checks + the consistency of the compressed data, so the library should never crash + even in the case of corrupted input. +*/ + +typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); +typedef void (*free_func) OF((voidpf opaque, voidpf address)); + +struct internal_state; + +typedef struct z_stream_s { + z_const Bytef *next_in; /* next input byte */ + uInt avail_in; /* number of bytes available at next_in */ + uLong total_in; /* total number of input bytes read so far */ + + Bytef *next_out; /* next output byte will go here */ + uInt avail_out; /* remaining free space at next_out */ + uLong total_out; /* total number of bytes output so far */ + + z_const char *msg; /* last error message, NULL if no error */ + struct internal_state FAR *state; /* not visible by applications */ + + alloc_func zalloc; /* used to allocate the internal state */ + free_func zfree; /* used to free the internal state */ + voidpf opaque; /* private data object passed to zalloc and zfree */ + + int data_type; /* best guess about the data type: binary or text + for deflate, or the decoding state for inflate */ + uLong adler; /* Adler-32 or CRC-32 value of the uncompressed data */ + uLong reserved; /* reserved for future use */ +} z_stream; + +typedef z_stream FAR *z_streamp; + +/* + gzip header information passed to and from zlib routines. See RFC 1952 + for more details on the meanings of these fields. +*/ +typedef struct gz_header_s { + int text; /* true if compressed data believed to be text */ + uLong time; /* modification time */ + int xflags; /* extra flags (not used when writing a gzip file) */ + int os; /* operating system */ + Bytef *extra; /* pointer to extra field or Z_NULL if none */ + uInt extra_len; /* extra field length (valid if extra != Z_NULL) */ + uInt extra_max; /* space at extra (only when reading header) */ + Bytef *name; /* pointer to zero-terminated file name or Z_NULL */ + uInt name_max; /* space at name (only when reading header) */ + Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */ + uInt comm_max; /* space at comment (only when reading header) */ + int hcrc; /* true if there was or will be a header crc */ + int done; /* true when done reading gzip header (not used + when writing a gzip file) */ +} gz_header; + +typedef gz_header FAR *gz_headerp; + +/* + The application must update next_in and avail_in when avail_in has dropped + to zero. It must update next_out and avail_out when avail_out has dropped + to zero. The application must initialize zalloc, zfree and opaque before + calling the init function. All other fields are set by the compression + library and must not be updated by the application. + + The opaque value provided by the application will be passed as the first + parameter for calls of zalloc and zfree. This can be useful for custom + memory management. The compression library attaches no meaning to the + opaque value. + + zalloc must return Z_NULL if there is not enough memory for the object. + If zlib is used in a multi-threaded application, zalloc and zfree must be + thread safe. In that case, zlib is thread-safe. When zalloc and zfree are + Z_NULL on entry to the initialization function, they are set to internal + routines that use the standard library functions malloc() and free(). + + On 16-bit systems, the functions zalloc and zfree must be able to allocate + exactly 65536 bytes, but will not be required to allocate more than this if + the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, pointers + returned by zalloc for objects of exactly 65536 bytes *must* have their + offset normalized to zero. The default allocation function provided by this + library ensures this (see zutil.c). To reduce memory requirements and avoid + any allocation of 64K objects, at the expense of compression ratio, compile + the library with -DMAX_WBITS=14 (see zconf.h). + + The fields total_in and total_out can be used for statistics or progress + reports. After compression, total_in holds the total size of the + uncompressed data and may be saved for use by the decompressor (particularly + if the decompressor wants to decompress everything in a single step). +*/ + + /* constants */ + +#define Z_NO_FLUSH 0 +#define Z_PARTIAL_FLUSH 1 +#define Z_SYNC_FLUSH 2 +#define Z_FULL_FLUSH 3 +#define Z_FINISH 4 +#define Z_BLOCK 5 +#define Z_TREES 6 +/* Allowed flush values; see deflate() and inflate() below for details */ + +#define Z_OK 0 +#define Z_STREAM_END 1 +#define Z_NEED_DICT 2 +#define Z_ERRNO (-1) +#define Z_STREAM_ERROR (-2) +#define Z_DATA_ERROR (-3) +#define Z_MEM_ERROR (-4) +#define Z_BUF_ERROR (-5) +#define Z_VERSION_ERROR (-6) +/* Return codes for the compression/decompression functions. Negative values + * are errors, positive values are used for special but normal events. + */ + +#define Z_NO_COMPRESSION 0 +#define Z_BEST_SPEED 1 +#define Z_BEST_COMPRESSION 9 +#define Z_DEFAULT_COMPRESSION (-1) +/* compression levels */ + +#define Z_FILTERED 1 +#define Z_HUFFMAN_ONLY 2 +#define Z_RLE 3 +#define Z_FIXED 4 +#define Z_DEFAULT_STRATEGY 0 +/* compression strategy; see deflateInit2() below for details */ + +#define Z_BINARY 0 +#define Z_TEXT 1 +#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */ +#define Z_UNKNOWN 2 +/* Possible values of the data_type field for deflate() */ + +#define Z_DEFLATED 8 +/* The deflate compression method (the only one supported in this version) */ + +#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */ + +#define zlib_version zlibVersion() +/* for compatibility with versions < 1.0.2 */ + + + /* basic functions */ + +ZEXTERN const char * ZEXPORT zlibVersion OF((void)); +/* The application can compare zlibVersion and ZLIB_VERSION for consistency. + If the first character differs, the library code actually used is not + compatible with the zlib.h header file used by the application. This check + is automatically made by deflateInit and inflateInit. + */ + +/* +ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); + + Initializes the internal stream state for compression. The fields + zalloc, zfree and opaque must be initialized before by the caller. If + zalloc and zfree are set to Z_NULL, deflateInit updates them to use default + allocation functions. + + The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: + 1 gives best speed, 9 gives best compression, 0 gives no compression at all + (the input data is simply copied a block at a time). Z_DEFAULT_COMPRESSION + requests a default compromise between speed and compression (currently + equivalent to level 6). + + deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if level is not a valid compression level, or + Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible + with the version assumed by the caller (ZLIB_VERSION). msg is set to null + if there is no error message. deflateInit does not perform any compression: + this will be done by deflate(). +*/ + + +ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); +/* + deflate compresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may introduce + some output latency (reading input without producing any output) except when + forced to flush. + + The detailed semantics are as follows. deflate performs one or both of the + following actions: + + - Compress more input starting at next_in and update next_in and avail_in + accordingly. If not all input can be processed (because there is not + enough room in the output buffer), next_in and avail_in are updated and + processing will resume at this point for the next call of deflate(). + + - Generate more output starting at next_out and update next_out and avail_out + accordingly. This action is forced if the parameter flush is non zero. + Forcing flush frequently degrades the compression ratio, so this parameter + should be set only when necessary. Some output may be provided even if + flush is zero. + + Before the call of deflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming more + output, and updating avail_in or avail_out accordingly; avail_out should + never be zero before the call. The application can consume the compressed + output when it wants, for example when the output buffer is full (avail_out + == 0), or after each call of deflate(). If deflate returns Z_OK and with + zero avail_out, it must be called again after making room in the output + buffer because there might be more output pending. See deflatePending(), + which can be used if desired to determine whether or not there is more ouput + in that case. + + Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to + decide how much data to accumulate before producing output, in order to + maximize compression. + + If the parameter flush is set to Z_SYNC_FLUSH, all pending output is + flushed to the output buffer and the output is aligned on a byte boundary, so + that the decompressor can get all input data available so far. (In + particular avail_in is zero after the call if enough output space has been + provided before the call.) Flushing may degrade compression for some + compression algorithms and so it should be used only when necessary. This + completes the current deflate block and follows it with an empty stored block + that is three bits plus filler bits to the next byte, followed by four bytes + (00 00 ff ff). + + If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the + output buffer, but the output is not aligned to a byte boundary. All of the + input data so far will be available to the decompressor, as for Z_SYNC_FLUSH. + This completes the current deflate block and follows it with an empty fixed + codes block that is 10 bits long. This assures that enough bytes are output + in order for the decompressor to finish the block before the empty fixed + codes block. + + If flush is set to Z_BLOCK, a deflate block is completed and emitted, as + for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to + seven bits of the current block are held to be written as the next byte after + the next deflate block is completed. In this case, the decompressor may not + be provided enough bits at this point in order to complete decompression of + the data provided so far to the compressor. It may need to wait for the next + block to be emitted. This is for advanced applications that need to control + the emission of deflate blocks. + + If flush is set to Z_FULL_FLUSH, all output is flushed as with + Z_SYNC_FLUSH, and the compression state is reset so that decompression can + restart from this point if previous compressed data has been damaged or if + random access is desired. Using Z_FULL_FLUSH too often can seriously degrade + compression. + + If deflate returns with avail_out == 0, this function must be called again + with the same value of the flush parameter and more output space (updated + avail_out), until the flush is complete (deflate returns with non-zero + avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that + avail_out is greater than six to avoid repeated flush markers due to + avail_out == 0 on return. + + If the parameter flush is set to Z_FINISH, pending input is processed, + pending output is flushed and deflate returns with Z_STREAM_END if there was + enough output space. If deflate returns with Z_OK or Z_BUF_ERROR, this + function must be called again with Z_FINISH and more output space (updated + avail_out) but no more input data, until it returns with Z_STREAM_END or an + error. After deflate has returned Z_STREAM_END, the only possible operations + on the stream are deflateReset or deflateEnd. + + Z_FINISH can be used in the first deflate call after deflateInit if all the + compression is to be done in a single step. In order to complete in one + call, avail_out must be at least the value returned by deflateBound (see + below). Then deflate is guaranteed to return Z_STREAM_END. If not enough + output space is provided, deflate will not return Z_STREAM_END, and it must + be called again as described above. + + deflate() sets strm->adler to the Adler-32 checksum of all input read + so far (that is, total_in bytes). If a gzip stream is being generated, then + strm->adler will be the CRC-32 checksum of the input read so far. (See + deflateInit2 below.) + + deflate() may update strm->data_type if it can make a good guess about + the input data type (Z_BINARY or Z_TEXT). If in doubt, the data is + considered binary. This field is only for information purposes and does not + affect the compression algorithm in any manner. + + deflate() returns Z_OK if some progress has been made (more input + processed or more output produced), Z_STREAM_END if all input has been + consumed and all output has been produced (only when flush is set to + Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example + if next_in or next_out was Z_NULL or the state was inadvertently written over + by the application), or Z_BUF_ERROR if no progress is possible (for example + avail_in or avail_out was zero). Note that Z_BUF_ERROR is not fatal, and + deflate() can be called again with more input and more output space to + continue compressing. +*/ + + +ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); +/* + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any pending + output. + + deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the + stream state was inconsistent, Z_DATA_ERROR if the stream was freed + prematurely (some input or output was discarded). In the error case, msg + may be set but then points to a static string (which must not be + deallocated). +*/ + + +/* +ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); + + Initializes the internal stream state for decompression. The fields + next_in, avail_in, zalloc, zfree and opaque must be initialized before by + the caller. In the current version of inflate, the provided input is not + read or consumed. The allocation of a sliding window will be deferred to + the first call of inflate (if the decompression does not complete on the + first call). If zalloc and zfree are set to Z_NULL, inflateInit updates + them to use default allocation functions. + + inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_VERSION_ERROR if the zlib library version is incompatible with the + version assumed by the caller, or Z_STREAM_ERROR if the parameters are + invalid, such as a null pointer to the structure. msg is set to null if + there is no error message. inflateInit does not perform any decompression. + Actual decompression will be done by inflate(). So next_in, and avail_in, + next_out, and avail_out are unused and unchanged. The current + implementation of inflateInit() does not process any header information -- + that is deferred until inflate() is called. +*/ + + +ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); +/* + inflate decompresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may introduce + some output latency (reading input without producing any output) except when + forced to flush. + + The detailed semantics are as follows. inflate performs one or both of the + following actions: + + - Decompress more input starting at next_in and update next_in and avail_in + accordingly. If not all input can be processed (because there is not + enough room in the output buffer), then next_in and avail_in are updated + accordingly, and processing will resume at this point for the next call of + inflate(). + + - Generate more output starting at next_out and update next_out and avail_out + accordingly. inflate() provides as much output as possible, until there is + no more input data or no more space in the output buffer (see below about + the flush parameter). + + Before the call of inflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming more + output, and updating the next_* and avail_* values accordingly. If the + caller of inflate() does not provide both available input and available + output space, it is possible that there will be no progress made. The + application can consume the uncompressed output when it wants, for example + when the output buffer is full (avail_out == 0), or after each call of + inflate(). If inflate returns Z_OK and with zero avail_out, it must be + called again after making room in the output buffer because there might be + more output pending. + + The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH, + Z_BLOCK, or Z_TREES. Z_SYNC_FLUSH requests that inflate() flush as much + output as possible to the output buffer. Z_BLOCK requests that inflate() + stop if and when it gets to the next deflate block boundary. When decoding + the zlib or gzip format, this will cause inflate() to return immediately + after the header and before the first block. When doing a raw inflate, + inflate() will go ahead and process the first block, and will return when it + gets to the end of that block, or when it runs out of data. + + The Z_BLOCK option assists in appending to or combining deflate streams. + To assist in this, on return inflate() always sets strm->data_type to the + number of unused bits in the last byte taken from strm->next_in, plus 64 if + inflate() is currently decoding the last block in the deflate stream, plus + 128 if inflate() returned immediately after decoding an end-of-block code or + decoding the complete header up to just before the first byte of the deflate + stream. The end-of-block will not be indicated until all of the uncompressed + data from that block has been written to strm->next_out. The number of + unused bits may in general be greater than seven, except when bit 7 of + data_type is set, in which case the number of unused bits will be less than + eight. data_type is set as noted here every time inflate() returns for all + flush options, and so can be used to determine the amount of currently + consumed input in bits. + + The Z_TREES option behaves as Z_BLOCK does, but it also returns when the + end of each deflate block header is reached, before any actual data in that + block is decoded. This allows the caller to determine the length of the + deflate block header for later use in random access within a deflate block. + 256 is added to the value of strm->data_type when inflate() returns + immediately after reaching the end of the deflate block header. + + inflate() should normally be called until it returns Z_STREAM_END or an + error. However if all decompression is to be performed in a single step (a + single call of inflate), the parameter flush should be set to Z_FINISH. In + this case all pending input is processed and all pending output is flushed; + avail_out must be large enough to hold all of the uncompressed data for the + operation to complete. (The size of the uncompressed data may have been + saved by the compressor for this purpose.) The use of Z_FINISH is not + required to perform an inflation in one step. However it may be used to + inform inflate that a faster approach can be used for the single inflate() + call. Z_FINISH also informs inflate to not maintain a sliding window if the + stream completes, which reduces inflate's memory footprint. If the stream + does not complete, either because not all of the stream is provided or not + enough output space is provided, then a sliding window will be allocated and + inflate() can be called again to continue the operation as if Z_NO_FLUSH had + been used. + + In this implementation, inflate() always flushes as much output as + possible to the output buffer, and always uses the faster approach on the + first call. So the effects of the flush parameter in this implementation are + on the return value of inflate() as noted below, when inflate() returns early + when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of + memory for a sliding window when Z_FINISH is used. + + If a preset dictionary is needed after this call (see inflateSetDictionary + below), inflate sets strm->adler to the Adler-32 checksum of the dictionary + chosen by the compressor and returns Z_NEED_DICT; otherwise it sets + strm->adler to the Adler-32 checksum of all output produced so far (that is, + total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described + below. At the end of the stream, inflate() checks that its computed Adler-32 + checksum is equal to that saved by the compressor and returns Z_STREAM_END + only if the checksum is correct. + + inflate() can decompress and check either zlib-wrapped or gzip-wrapped + deflate data. The header type is detected automatically, if requested when + initializing with inflateInit2(). Any information contained in the gzip + header is not retained unless inflateGetHeader() is used. When processing + gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output + produced so far. The CRC-32 is checked against the gzip trailer, as is the + uncompressed length, modulo 2^32. + + inflate() returns Z_OK if some progress has been made (more input processed + or more output produced), Z_STREAM_END if the end of the compressed data has + been reached and all uncompressed output has been produced, Z_NEED_DICT if a + preset dictionary is needed at this point, Z_DATA_ERROR if the input data was + corrupted (input stream not conforming to the zlib format or incorrect check + value, in which case strm->msg points to a string with a more specific + error), Z_STREAM_ERROR if the stream structure was inconsistent (for example + next_in or next_out was Z_NULL, or the state was inadvertently written over + by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR + if no progress was possible or if there was not enough room in the output + buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and + inflate() can be called again with more input and more output space to + continue decompressing. If Z_DATA_ERROR is returned, the application may + then call inflateSync() to look for a good compression block if a partial + recovery of the data is to be attempted. +*/ + + +ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); +/* + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any pending + output. + + inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state + was inconsistent. +*/ + + + /* Advanced functions */ + +/* + The following functions are needed only in some special applications. +*/ + +/* +ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, + int level, + int method, + int windowBits, + int memLevel, + int strategy)); + + This is another version of deflateInit with more compression options. The + fields next_in, zalloc, zfree and opaque must be initialized before by the + caller. + + The method parameter is the compression method. It must be Z_DEFLATED in + this version of the library. + + The windowBits parameter is the base two logarithm of the window size + (the size of the history buffer). It should be in the range 8..15 for this + version of the library. Larger values of this parameter result in better + compression at the expense of memory usage. The default value is 15 if + deflateInit is used instead. + + For the current implementation of deflate(), a windowBits value of 8 (a + window size of 256 bytes) is not supported. As a result, a request for 8 + will result in 9 (a 512-byte window). In that case, providing 8 to + inflateInit2() will result in an error when the zlib header with 9 is + checked against the initialization of inflate(). The remedy is to not use 8 + with deflateInit2() with this initialization, or at least in that case use 9 + with inflateInit2(). + + windowBits can also be -8..-15 for raw deflate. In this case, -windowBits + determines the window size. deflate() will then generate raw deflate data + with no zlib header or trailer, and will not compute a check value. + + windowBits can also be greater than 15 for optional gzip encoding. Add + 16 to windowBits to write a simple gzip header and trailer around the + compressed data instead of a zlib wrapper. The gzip header will have no + file name, no extra data, no comment, no modification time (set to zero), no + header crc, and the operating system will be set to the appropriate value, + if the operating system was determined at compile time. If a gzip stream is + being written, strm->adler is a CRC-32 instead of an Adler-32. + + For raw deflate or gzip encoding, a request for a 256-byte window is + rejected as invalid, since only the zlib header provides a means of + transmitting the window size to the decompressor. + + The memLevel parameter specifies how much memory should be allocated + for the internal compression state. memLevel=1 uses minimum memory but is + slow and reduces compression ratio; memLevel=9 uses maximum memory for + optimal speed. The default value is 8. See zconf.h for total memory usage + as a function of windowBits and memLevel. + + The strategy parameter is used to tune the compression algorithm. Use the + value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a + filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no + string match), or Z_RLE to limit match distances to one (run-length + encoding). Filtered data consists mostly of small values with a somewhat + random distribution. In this case, the compression algorithm is tuned to + compress them better. The effect of Z_FILTERED is to force more Huffman + coding and less string matching; it is somewhat intermediate between + Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as + fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data. The + strategy parameter only affects the compression ratio but not the + correctness of the compressed output even if it is not set appropriately. + Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler + decoder for special applications. + + deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid + method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is + incompatible with the version assumed by the caller (ZLIB_VERSION). msg is + set to null if there is no error message. deflateInit2 does not perform any + compression: this will be done by deflate(). +*/ + +ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, + const Bytef *dictionary, + uInt dictLength)); +/* + Initializes the compression dictionary from the given byte sequence + without producing any compressed output. When using the zlib format, this + function must be called immediately after deflateInit, deflateInit2 or + deflateReset, and before any call of deflate. When doing raw deflate, this + function must be called either before any call of deflate, or immediately + after the completion of a deflate block, i.e. after all input has been + consumed and all output has been delivered when using any of the flush + options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH. The + compressor and decompressor must use exactly the same dictionary (see + inflateSetDictionary). + + The dictionary should consist of strings (byte sequences) that are likely + to be encountered later in the data to be compressed, with the most commonly + used strings preferably put towards the end of the dictionary. Using a + dictionary is most useful when the data to be compressed is short and can be + predicted with good accuracy; the data can then be compressed better than + with the default empty dictionary. + + Depending on the size of the compression data structures selected by + deflateInit or deflateInit2, a part of the dictionary may in effect be + discarded, for example if the dictionary is larger than the window size + provided in deflateInit or deflateInit2. Thus the strings most likely to be + useful should be put at the end of the dictionary, not at the front. In + addition, the current implementation of deflate will use at most the window + size minus 262 bytes of the provided dictionary. + + Upon return of this function, strm->adler is set to the Adler-32 value + of the dictionary; the decompressor may later use this value to determine + which dictionary has been used by the compressor. (The Adler-32 value + applies to the whole dictionary even if only a subset of the dictionary is + actually used by the compressor.) If a raw deflate was requested, then the + Adler-32 value is not computed and strm->adler is not set. + + deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a + parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is + inconsistent (for example if deflate has already been called for this stream + or if not at a block boundary for raw deflate). deflateSetDictionary does + not perform any compression: this will be done by deflate(). +*/ + +ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm, + Bytef *dictionary, + uInt *dictLength)); +/* + Returns the sliding dictionary being maintained by deflate. dictLength is + set to the number of bytes in the dictionary, and that many bytes are copied + to dictionary. dictionary must have enough space, where 32768 bytes is + always enough. If deflateGetDictionary() is called with dictionary equal to + Z_NULL, then only the dictionary length is returned, and nothing is copied. + Similary, if dictLength is Z_NULL, then it is not set. + + deflateGetDictionary() may return a length less than the window size, even + when more than the window size in input has been provided. It may return up + to 258 bytes less in that case, due to how zlib's implementation of deflate + manages the sliding window and lookahead for matches, where matches can be + up to 258 bytes long. If the application needs the last window-size bytes of + input, then that would need to be saved by the application outside of zlib. + + deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the + stream state is inconsistent. +*/ + +ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, + z_streamp source)); +/* + Sets the destination stream as a complete copy of the source stream. + + This function can be useful when several compression strategies will be + tried, for example when there are several ways of pre-processing the input + data with a filter. The streams that will be discarded should then be freed + by calling deflateEnd. Note that deflateCopy duplicates the internal + compression state which can be quite large, so this strategy is slow and can + consume lots of memory. + + deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if the source stream state was inconsistent + (such as zalloc being Z_NULL). msg is left unchanged in both source and + destination. +*/ + +ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); +/* + This function is equivalent to deflateEnd followed by deflateInit, but + does not free and reallocate the internal compression state. The stream + will leave the compression level and any other attributes that may have been + set unchanged. + + deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being Z_NULL). +*/ + +ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, + int level, + int strategy)); +/* + Dynamically update the compression level and compression strategy. The + interpretation of level and strategy is as in deflateInit2(). This can be + used to switch between compression and straight copy of the input data, or + to switch to a different kind of input data requiring a different strategy. + If the compression approach (which is a function of the level) or the + strategy is changed, and if any input has been consumed in a previous + deflate() call, then the input available so far is compressed with the old + level and strategy using deflate(strm, Z_BLOCK). There are three approaches + for the compression levels 0, 1..3, and 4..9 respectively. The new level + and strategy will take effect at the next call of deflate(). + + If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does + not have enough output space to complete, then the parameter change will not + take effect. In this case, deflateParams() can be called again with the + same parameters and more output space to try again. + + In order to assure a change in the parameters on the first try, the + deflate stream should be flushed using deflate() with Z_BLOCK or other flush + request until strm.avail_out is not zero, before calling deflateParams(). + Then no more input data should be provided before the deflateParams() call. + If this is done, the old level and strategy will be applied to the data + compressed before deflateParams(), and the new level and strategy will be + applied to the the data compressed after deflateParams(). + + deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream + state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if + there was not enough output space to complete the compression of the + available input data before a change in the strategy or approach. Note that + in the case of a Z_BUF_ERROR, the parameters are not changed. A return + value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be + retried with more output space. +*/ + +ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm, + int good_length, + int max_lazy, + int nice_length, + int max_chain)); +/* + Fine tune deflate's internal compression parameters. This should only be + used by someone who understands the algorithm used by zlib's deflate for + searching for the best matching string, and even then only by the most + fanatic optimizer trying to squeeze out the last compressed bit for their + specific input data. Read the deflate.c source code for the meaning of the + max_lazy, good_length, nice_length, and max_chain parameters. + + deflateTune() can be called after deflateInit() or deflateInit2(), and + returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. + */ + +ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, + uLong sourceLen)); +/* + deflateBound() returns an upper bound on the compressed size after + deflation of sourceLen bytes. It must be called after deflateInit() or + deflateInit2(), and after deflateSetHeader(), if used. This would be used + to allocate an output buffer for deflation in a single pass, and so would be + called before deflate(). If that first deflate() call is provided the + sourceLen input bytes, an output buffer allocated to the size returned by + deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed + to return Z_STREAM_END. Note that it is possible for the compressed size to + be larger than the value returned by deflateBound() if flush options other + than Z_FINISH or Z_NO_FLUSH are used. +*/ + +ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm, + unsigned *pending, + int *bits)); +/* + deflatePending() returns the number of bytes and bits of output that have + been generated, but not yet provided in the available output. The bytes not + provided would be due to the available output space having being consumed. + The number of bits of output not provided are between 0 and 7, where they + await more bits to join them in order to fill out a full byte. If pending + or bits are Z_NULL, then those values are not set. + + deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. + */ + +ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, + int bits, + int value)); +/* + deflatePrime() inserts bits in the deflate output stream. The intent + is that this function is used to start off the deflate output with the bits + leftover from a previous deflate stream when appending to it. As such, this + function can only be used for raw deflate, and must be used before the first + deflate() call after a deflateInit2() or deflateReset(). bits must be less + than or equal to 16, and that many of the least significant bits of value + will be inserted in the output. + + deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough + room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the + source stream state was inconsistent. +*/ + +ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, + gz_headerp head)); +/* + deflateSetHeader() provides gzip header information for when a gzip + stream is requested by deflateInit2(). deflateSetHeader() may be called + after deflateInit2() or deflateReset() and before the first call of + deflate(). The text, time, os, extra field, name, and comment information + in the provided gz_header structure are written to the gzip header (xflag is + ignored -- the extra flags are set according to the compression level). The + caller must assure that, if not Z_NULL, name and comment are terminated with + a zero byte, and that if extra is not Z_NULL, that extra_len bytes are + available there. If hcrc is true, a gzip header crc is included. Note that + the current versions of the command-line version of gzip (up through version + 1.3.x) do not support header crc's, and will report that it is a "multi-part + gzip file" and give up. + + If deflateSetHeader is not used, the default gzip header has text false, + the time set to zero, and os set to 255, with no extra, name, or comment + fields. The gzip header is returned to the default state by deflateReset(). + + deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +/* +ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, + int windowBits)); + + This is another version of inflateInit with an extra parameter. The + fields next_in, avail_in, zalloc, zfree and opaque must be initialized + before by the caller. + + The windowBits parameter is the base two logarithm of the maximum window + size (the size of the history buffer). It should be in the range 8..15 for + this version of the library. The default value is 15 if inflateInit is used + instead. windowBits must be greater than or equal to the windowBits value + provided to deflateInit2() while compressing, or it must be equal to 15 if + deflateInit2() was not used. If a compressed stream with a larger window + size is given as input, inflate() will return with the error code + Z_DATA_ERROR instead of trying to allocate a larger window. + + windowBits can also be zero to request that inflate use the window size in + the zlib header of the compressed stream. + + windowBits can also be -8..-15 for raw inflate. In this case, -windowBits + determines the window size. inflate() will then process raw deflate data, + not looking for a zlib or gzip header, not generating a check value, and not + looking for any check values for comparison at the end of the stream. This + is for use with other formats that use the deflate compressed data format + such as zip. Those formats provide their own check values. If a custom + format is developed using the raw deflate format for compressed data, it is + recommended that a check value such as an Adler-32 or a CRC-32 be applied to + the uncompressed data as is done in the zlib, gzip, and zip formats. For + most applications, the zlib format should be used as is. Note that comments + above on the use in deflateInit2() applies to the magnitude of windowBits. + + windowBits can also be greater than 15 for optional gzip decoding. Add + 32 to windowBits to enable zlib and gzip decoding with automatic header + detection, or add 16 to decode only the gzip format (the zlib format will + return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is a + CRC-32 instead of an Adler-32. Unlike the gunzip utility and gzread() (see + below), inflate() will not automatically decode concatenated gzip streams. + inflate() will return Z_STREAM_END at the end of the gzip stream. The state + would need to be reset to continue decoding a subsequent gzip stream. + + inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_VERSION_ERROR if the zlib library version is incompatible with the + version assumed by the caller, or Z_STREAM_ERROR if the parameters are + invalid, such as a null pointer to the structure. msg is set to null if + there is no error message. inflateInit2 does not perform any decompression + apart from possibly reading the zlib header if present: actual decompression + will be done by inflate(). (So next_in and avail_in may be modified, but + next_out and avail_out are unused and unchanged.) The current implementation + of inflateInit2() does not process any header information -- that is + deferred until inflate() is called. +*/ + +ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, + const Bytef *dictionary, + uInt dictLength)); +/* + Initializes the decompression dictionary from the given uncompressed byte + sequence. This function must be called immediately after a call of inflate, + if that call returned Z_NEED_DICT. The dictionary chosen by the compressor + can be determined from the Adler-32 value returned by that call of inflate. + The compressor and decompressor must use exactly the same dictionary (see + deflateSetDictionary). For raw inflate, this function can be called at any + time to set the dictionary. If the provided dictionary is smaller than the + window and there is already data in the window, then the provided dictionary + will amend what's there. The application must insure that the dictionary + that was used for compression is provided. + + inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a + parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is + inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the + expected one (incorrect Adler-32 value). inflateSetDictionary does not + perform any decompression: this will be done by subsequent calls of + inflate(). +*/ + +ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm, + Bytef *dictionary, + uInt *dictLength)); +/* + Returns the sliding dictionary being maintained by inflate. dictLength is + set to the number of bytes in the dictionary, and that many bytes are copied + to dictionary. dictionary must have enough space, where 32768 bytes is + always enough. If inflateGetDictionary() is called with dictionary equal to + Z_NULL, then only the dictionary length is returned, and nothing is copied. + Similary, if dictLength is Z_NULL, then it is not set. + + inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the + stream state is inconsistent. +*/ + +ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); +/* + Skips invalid compressed data until a possible full flush point (see above + for the description of deflate with Z_FULL_FLUSH) can be found, or until all + available input is skipped. No output is provided. + + inflateSync searches for a 00 00 FF FF pattern in the compressed data. + All full flush points have this pattern, but not all occurrences of this + pattern are full flush points. + + inflateSync returns Z_OK if a possible full flush point has been found, + Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point + has been found, or Z_STREAM_ERROR if the stream structure was inconsistent. + In the success case, the application may save the current current value of + total_in which indicates where valid compressed data was found. In the + error case, the application may repeatedly call inflateSync, providing more + input each time, until success or end of the input data. +*/ + +ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, + z_streamp source)); +/* + Sets the destination stream as a complete copy of the source stream. + + This function can be useful when randomly accessing a large stream. The + first pass through the stream can periodically record the inflate state, + allowing restarting inflate at those points when randomly accessing the + stream. + + inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if the source stream state was inconsistent + (such as zalloc being Z_NULL). msg is left unchanged in both source and + destination. +*/ + +ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); +/* + This function is equivalent to inflateEnd followed by inflateInit, + but does not free and reallocate the internal decompression state. The + stream will keep attributes that may have been set by inflateInit2. + + inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being Z_NULL). +*/ + +ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm, + int windowBits)); +/* + This function is the same as inflateReset, but it also permits changing + the wrap and window size requests. The windowBits parameter is interpreted + the same as it is for inflateInit2. If the window size is changed, then the + memory allocated for the window is freed, and the window will be reallocated + by inflate() if needed. + + inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being Z_NULL), or if + the windowBits parameter is invalid. +*/ + +ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, + int bits, + int value)); +/* + This function inserts bits in the inflate input stream. The intent is + that this function is used to start inflating at a bit position in the + middle of a byte. The provided bits will be used before any bytes are used + from next_in. This function should only be used with raw inflate, and + should be used before the first inflate() call after inflateInit2() or + inflateReset(). bits must be less than or equal to 16, and that many of the + least significant bits of value will be inserted in the input. + + If bits is negative, then the input stream bit buffer is emptied. Then + inflatePrime() can be called again to put bits in the buffer. This is used + to clear out bits leftover after feeding inflate a block description prior + to feeding inflate codes. + + inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm)); +/* + This function returns two values, one in the lower 16 bits of the return + value, and the other in the remaining upper bits, obtained by shifting the + return value down 16 bits. If the upper value is -1 and the lower value is + zero, then inflate() is currently decoding information outside of a block. + If the upper value is -1 and the lower value is non-zero, then inflate is in + the middle of a stored block, with the lower value equaling the number of + bytes from the input remaining to copy. If the upper value is not -1, then + it is the number of bits back from the current bit position in the input of + the code (literal or length/distance pair) currently being processed. In + that case the lower value is the number of bytes already emitted for that + code. + + A code is being processed if inflate is waiting for more input to complete + decoding of the code, or if it has completed decoding but is waiting for + more output space to write the literal or match data. + + inflateMark() is used to mark locations in the input data for random + access, which may be at bit positions, and to note those cases where the + output of a code may span boundaries of random access blocks. The current + location in the input stream can be determined from avail_in and data_type + as noted in the description for the Z_BLOCK flush parameter for inflate. + + inflateMark returns the value noted above, or -65536 if the provided + source stream state was inconsistent. +*/ + +ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm, + gz_headerp head)); +/* + inflateGetHeader() requests that gzip header information be stored in the + provided gz_header structure. inflateGetHeader() may be called after + inflateInit2() or inflateReset(), and before the first call of inflate(). + As inflate() processes the gzip stream, head->done is zero until the header + is completed, at which time head->done is set to one. If a zlib stream is + being decoded, then head->done is set to -1 to indicate that there will be + no gzip header information forthcoming. Note that Z_BLOCK or Z_TREES can be + used to force inflate() to return immediately after header processing is + complete and before any actual data is decompressed. + + The text, time, xflags, and os fields are filled in with the gzip header + contents. hcrc is set to true if there is a header CRC. (The header CRC + was valid if done is set to one.) If extra is not Z_NULL, then extra_max + contains the maximum number of bytes to write to extra. Once done is true, + extra_len contains the actual extra field length, and extra contains the + extra field, or that field truncated if extra_max is less than extra_len. + If name is not Z_NULL, then up to name_max characters are written there, + terminated with a zero unless the length is greater than name_max. If + comment is not Z_NULL, then up to comm_max characters are written there, + terminated with a zero unless the length is greater than comm_max. When any + of extra, name, or comment are not Z_NULL and the respective field is not + present in the header, then that field is set to Z_NULL to signal its + absence. This allows the use of deflateSetHeader() with the returned + structure to duplicate the header. However if those fields are set to + allocated memory, then the application will need to save those pointers + elsewhere so that they can be eventually freed. + + If inflateGetHeader is not used, then the header information is simply + discarded. The header is always checked for validity, including the header + CRC if present. inflateReset() will reset the process to discard the header + information. The application would need to call inflateGetHeader() again to + retrieve the header from the next gzip stream. + + inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +/* +ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, + unsigned char FAR *window)); + + Initialize the internal stream state for decompression using inflateBack() + calls. The fields zalloc, zfree and opaque in strm must be initialized + before the call. If zalloc and zfree are Z_NULL, then the default library- + derived memory allocation routines are used. windowBits is the base two + logarithm of the window size, in the range 8..15. window is a caller + supplied buffer of that size. Except for special applications where it is + assured that deflate was used with small window sizes, windowBits must be 15 + and a 32K byte window must be supplied to be able to decompress general + deflate streams. + + See inflateBack() for the usage of these routines. + + inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of + the parameters are invalid, Z_MEM_ERROR if the internal state could not be + allocated, or Z_VERSION_ERROR if the version of the library does not match + the version of the header file. +*/ + +typedef unsigned (*in_func) OF((void FAR *, + z_const unsigned char FAR * FAR *)); +typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); + +ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, + in_func in, void FAR *in_desc, + out_func out, void FAR *out_desc)); +/* + inflateBack() does a raw inflate with a single call using a call-back + interface for input and output. This is potentially more efficient than + inflate() for file i/o applications, in that it avoids copying between the + output and the sliding window by simply making the window itself the output + buffer. inflate() can be faster on modern CPUs when used with large + buffers. inflateBack() trusts the application to not change the output + buffer passed by the output function, at least until inflateBack() returns. + + inflateBackInit() must be called first to allocate the internal state + and to initialize the state with the user-provided window buffer. + inflateBack() may then be used multiple times to inflate a complete, raw + deflate stream with each call. inflateBackEnd() is then called to free the + allocated state. + + A raw deflate stream is one with no zlib or gzip header or trailer. + This routine would normally be used in a utility that reads zip or gzip + files and writes out uncompressed files. The utility would decode the + header and process the trailer on its own, hence this routine expects only + the raw deflate stream to decompress. This is different from the default + behavior of inflate(), which expects a zlib header and trailer around the + deflate stream. + + inflateBack() uses two subroutines supplied by the caller that are then + called by inflateBack() for input and output. inflateBack() calls those + routines until it reads a complete deflate stream and writes out all of the + uncompressed data, or until it encounters an error. The function's + parameters and return types are defined above in the in_func and out_func + typedefs. inflateBack() will call in(in_desc, &buf) which should return the + number of bytes of provided input, and a pointer to that input in buf. If + there is no input available, in() must return zero -- buf is ignored in that + case -- and inflateBack() will return a buffer error. inflateBack() will + call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. + out() should return zero on success, or non-zero on failure. If out() + returns non-zero, inflateBack() will return with an error. Neither in() nor + out() are permitted to change the contents of the window provided to + inflateBackInit(), which is also the buffer that out() uses to write from. + The length written by out() will be at most the window size. Any non-zero + amount of input may be provided by in(). + + For convenience, inflateBack() can be provided input on the first call by + setting strm->next_in and strm->avail_in. If that input is exhausted, then + in() will be called. Therefore strm->next_in must be initialized before + calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called + immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in + must also be initialized, and then if strm->avail_in is not zero, input will + initially be taken from strm->next_in[0 .. strm->avail_in - 1]. + + The in_desc and out_desc parameters of inflateBack() is passed as the + first parameter of in() and out() respectively when they are called. These + descriptors can be optionally used to pass any information that the caller- + supplied in() and out() functions need to do their job. + + On return, inflateBack() will set strm->next_in and strm->avail_in to + pass back any unused input that was provided by the last in() call. The + return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR + if in() or out() returned an error, Z_DATA_ERROR if there was a format error + in the deflate stream (in which case strm->msg is set to indicate the nature + of the error), or Z_STREAM_ERROR if the stream was not properly initialized. + In the case of Z_BUF_ERROR, an input or output error can be distinguished + using strm->next_in which will be Z_NULL only if in() returned an error. If + strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning + non-zero. (in() will always be called before out(), so strm->next_in is + assured to be defined if out() returns non-zero.) Note that inflateBack() + cannot return Z_OK. +*/ + +ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); +/* + All memory allocated by inflateBackInit() is freed. + + inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream + state was inconsistent. +*/ + +ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); +/* Return flags indicating compile-time options. + + Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: + 1.0: size of uInt + 3.2: size of uLong + 5.4: size of voidpf (pointer) + 7.6: size of z_off_t + + Compiler, assembler, and debug options: + 8: ZLIB_DEBUG + 9: ASMV or ASMINF -- use ASM code + 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention + 11: 0 (reserved) + + One-time table building (smaller code, but not thread-safe if true): + 12: BUILDFIXED -- build static block decoding tables when needed + 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed + 14,15: 0 (reserved) + + Library content (indicates missing functionality): + 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking + deflate code when not needed) + 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect + and decode gzip streams (to avoid linking crc code) + 18-19: 0 (reserved) + + Operation variations (changes in library functionality): + 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate + 21: FASTEST -- deflate algorithm with only one, lowest compression level + 22,23: 0 (reserved) + + The sprintf variant used by gzprintf (zero is best): + 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format + 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure! + 26: 0 = returns value, 1 = void -- 1 means inferred string length returned + + Remainder: + 27-31: 0 (reserved) + */ + +#ifndef Z_SOLO + + /* utility functions */ + +/* + The following utility functions are implemented on top of the basic + stream-oriented functions. To simplify the interface, some default options + are assumed (compression level and memory usage, standard memory allocation + functions). The source code of these utility functions can be modified if + you need special options. +*/ + +ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); +/* + Compresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total size + of the destination buffer, which must be at least the value returned by + compressBound(sourceLen). Upon exit, destLen is the actual size of the + compressed data. compress() is equivalent to compress2() with a level + parameter of Z_DEFAULT_COMPRESSION. + + compress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer. +*/ + +ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen, + int level)); +/* + Compresses the source buffer into the destination buffer. The level + parameter has the same meaning as in deflateInit. sourceLen is the byte + length of the source buffer. Upon entry, destLen is the total size of the + destination buffer, which must be at least the value returned by + compressBound(sourceLen). Upon exit, destLen is the actual size of the + compressed data. + + compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_BUF_ERROR if there was not enough room in the output buffer, + Z_STREAM_ERROR if the level parameter is invalid. +*/ + +ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); +/* + compressBound() returns an upper bound on the compressed size after + compress() or compress2() on sourceLen bytes. It would be used before a + compress() or compress2() call to allocate the destination buffer. +*/ + +ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); +/* + Decompresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total size + of the destination buffer, which must be large enough to hold the entire + uncompressed data. (The size of the uncompressed data must have been saved + previously by the compressor and transmitted to the decompressor by some + mechanism outside the scope of this compression library.) Upon exit, destLen + is the actual size of the uncompressed data. + + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. In + the case where there is not enough room, uncompress() will fill the output + buffer with the uncompressed data up to that point. +*/ + +ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong *sourceLen)); +/* + Same as uncompress, except that sourceLen is a pointer, where the + length of the source is *sourceLen. On return, *sourceLen is the number of + source bytes consumed. +*/ + + /* gzip file access functions */ + +/* + This library supports reading and writing files in gzip (.gz) format with + an interface similar to that of stdio, using the functions that start with + "gz". The gzip format is different from the zlib format. gzip is a gzip + wrapper, documented in RFC 1952, wrapped around a deflate stream. +*/ + +typedef struct gzFile_s *gzFile; /* semi-opaque gzip file descriptor */ + +/* +ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); + + Opens a gzip (.gz) file for reading or writing. The mode parameter is as + in fopen ("rb" or "wb") but can also include a compression level ("wb9") or + a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only + compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F' + for fixed code compression as in "wb9F". (See the description of + deflateInit2 for more information about the strategy parameter.) 'T' will + request transparent writing or appending with no compression and not using + the gzip format. + + "a" can be used instead of "w" to request that the gzip stream that will + be written be appended to the file. "+" will result in an error, since + reading and writing to the same gzip file is not supported. The addition of + "x" when writing will create the file exclusively, which fails if the file + already exists. On systems that support it, the addition of "e" when + reading or writing will set the flag to close the file on an execve() call. + + These functions, as well as gzip, will read and decode a sequence of gzip + streams in a file. The append function of gzopen() can be used to create + such a file. (Also see gzflush() for another way to do this.) When + appending, gzopen does not test whether the file begins with a gzip stream, + nor does it look for the end of the gzip streams to begin appending. gzopen + will simply append a gzip stream to the existing file. + + gzopen can be used to read a file which is not in gzip format; in this + case gzread will directly read from the file without decompression. When + reading, this will be detected automatically by looking for the magic two- + byte gzip header. + + gzopen returns NULL if the file could not be opened, if there was + insufficient memory to allocate the gzFile state, or if an invalid mode was + specified (an 'r', 'w', or 'a' was not provided, or '+' was provided). + errno can be checked to determine if the reason gzopen failed was that the + file could not be opened. +*/ + +ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); +/* + gzdopen associates a gzFile with the file descriptor fd. File descriptors + are obtained from calls like open, dup, creat, pipe or fileno (if the file + has been previously opened with fopen). The mode parameter is as in gzopen. + + The next call of gzclose on the returned gzFile will also close the file + descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor + fd. If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd, + mode);. The duplicated descriptor should be saved to avoid a leak, since + gzdopen does not close fd if it fails. If you are using fileno() to get the + file descriptor from a FILE *, then you will have to use dup() to avoid + double-close()ing the file descriptor. Both gzclose() and fclose() will + close the associated file descriptor, so they need to have different file + descriptors. + + gzdopen returns NULL if there was insufficient memory to allocate the + gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not + provided, or '+' was provided), or if fd is -1. The file descriptor is not + used until the next gz* read, write, seek, or close operation, so gzdopen + will not detect if fd is invalid (unless fd is -1). +*/ + +ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size)); +/* + Set the internal buffer size used by this library's functions. The + default buffer size is 8192 bytes. This function must be called after + gzopen() or gzdopen(), and before any other calls that read or write the + file. The buffer memory allocation is always deferred to the first read or + write. Three times that size in buffer space is allocated. A larger buffer + size of, for example, 64K or 128K bytes will noticeably increase the speed + of decompression (reading). + + The new buffer size also affects the maximum length for gzprintf(). + + gzbuffer() returns 0 on success, or -1 on failure, such as being called + too late. +*/ + +ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); +/* + Dynamically update the compression level or strategy. See the description + of deflateInit2 for the meaning of these parameters. Previously provided + data is flushed before the parameter change. + + gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not + opened for writing, Z_ERRNO if there is an error writing the flushed data, + or Z_MEM_ERROR if there is a memory allocation error. +*/ + +ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); +/* + Reads the given number of uncompressed bytes from the compressed file. If + the input file is not in gzip format, gzread copies the given number of + bytes into the buffer directly from the file. + + After reaching the end of a gzip stream in the input, gzread will continue + to read, looking for another gzip stream. Any number of gzip streams may be + concatenated in the input file, and will all be decompressed by gzread(). + If something other than a gzip stream is encountered after a gzip stream, + that remaining trailing garbage is ignored (and no error is returned). + + gzread can be used to read a gzip file that is being concurrently written. + Upon reaching the end of the input, gzread will return with the available + data. If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then + gzclearerr can be used to clear the end of file indicator in order to permit + gzread to be tried again. Z_OK indicates that a gzip stream was completed + on the last gzread. Z_BUF_ERROR indicates that the input file ended in the + middle of a gzip stream. Note that gzread does not return -1 in the event + of an incomplete gzip stream. This error is deferred until gzclose(), which + will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip + stream. Alternatively, gzerror can be used before gzclose to detect this + case. + + gzread returns the number of uncompressed bytes actually read, less than + len for end of file, or -1 for error. If len is too large to fit in an int, + then nothing is read, -1 is returned, and the error state is set to + Z_STREAM_ERROR. +*/ + +ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems, + gzFile file)); +/* + Read up to nitems items of size size from file to buf, otherwise operating + as gzread() does. This duplicates the interface of stdio's fread(), with + size_t request and return types. If the library defines size_t, then + z_size_t is identical to size_t. If not, then z_size_t is an unsigned + integer type that can contain a pointer. + + gzfread() returns the number of full items read of size size, or zero if + the end of the file was reached and a full item could not be read, or if + there was an error. gzerror() must be consulted if zero is returned in + order to determine if there was an error. If the multiplication of size and + nitems overflows, i.e. the product does not fit in a z_size_t, then nothing + is read, zero is returned, and the error state is set to Z_STREAM_ERROR. + + In the event that the end of file is reached and only a partial item is + available at the end, i.e. the remaining uncompressed data length is not a + multiple of size, then the final partial item is nevetheless read into buf + and the end-of-file flag is set. The length of the partial item read is not + provided, but could be inferred from the result of gztell(). This behavior + is the same as the behavior of fread() implementations in common libraries, + but it prevents the direct use of gzfread() to read a concurrently written + file, reseting and retrying on end-of-file, when size is not 1. +*/ + +ZEXTERN int ZEXPORT gzwrite OF((gzFile file, + voidpc buf, unsigned len)); +/* + Writes the given number of uncompressed bytes into the compressed file. + gzwrite returns the number of uncompressed bytes written or 0 in case of + error. +*/ + +ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size, + z_size_t nitems, gzFile file)); +/* + gzfwrite() writes nitems items of size size from buf to file, duplicating + the interface of stdio's fwrite(), with size_t request and return types. If + the library defines size_t, then z_size_t is identical to size_t. If not, + then z_size_t is an unsigned integer type that can contain a pointer. + + gzfwrite() returns the number of full items written of size size, or zero + if there was an error. If the multiplication of size and nitems overflows, + i.e. the product does not fit in a z_size_t, then nothing is written, zero + is returned, and the error state is set to Z_STREAM_ERROR. +*/ + +ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...)); +/* + Converts, formats, and writes the arguments to the compressed file under + control of the format string, as in fprintf. gzprintf returns the number of + uncompressed bytes actually written, or a negative zlib error code in case + of error. The number of uncompressed bytes written is limited to 8191, or + one less than the buffer size given to gzbuffer(). The caller should assure + that this limit is not exceeded. If it is exceeded, then gzprintf() will + return an error (0) with nothing written. In this case, there may also be a + buffer overflow with unpredictable consequences, which is possible only if + zlib was compiled with the insecure functions sprintf() or vsprintf() + because the secure snprintf() or vsnprintf() functions were not available. + This can be determined using zlibCompileFlags(). +*/ + +ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); +/* + Writes the given null-terminated string to the compressed file, excluding + the terminating null character. + + gzputs returns the number of characters written, or -1 in case of error. +*/ + +ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); +/* + Reads bytes from the compressed file until len-1 characters are read, or a + newline character is read and transferred to buf, or an end-of-file + condition is encountered. If any characters are read or if len == 1, the + string is terminated with a null character. If no characters are read due + to an end-of-file or len < 1, then the buffer is left untouched. + + gzgets returns buf which is a null-terminated string, or it returns NULL + for end-of-file or in case of error. If there was an error, the contents at + buf are indeterminate. +*/ + +ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); +/* + Writes c, converted to an unsigned char, into the compressed file. gzputc + returns the value that was written, or -1 in case of error. +*/ + +ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); +/* + Reads one byte from the compressed file. gzgetc returns this byte or -1 + in case of end of file or error. This is implemented as a macro for speed. + As such, it does not do all of the checking the other functions do. I.e. + it does not check to see if file is NULL, nor whether the structure file + points to has been clobbered or not. +*/ + +ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); +/* + Push one character back onto the stream to be read as the first character + on the next read. At least one character of push-back is allowed. + gzungetc() returns the character pushed, or -1 on failure. gzungetc() will + fail if c is -1, and may fail if a character has been pushed but not read + yet. If gzungetc is used immediately after gzopen or gzdopen, at least the + output buffer size of pushed characters is allowed. (See gzbuffer above.) + The pushed character will be discarded if the stream is repositioned with + gzseek() or gzrewind(). +*/ + +ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); +/* + Flushes all pending output into the compressed file. The parameter flush + is as in the deflate() function. The return value is the zlib error number + (see function gzerror below). gzflush is only permitted when writing. + + If the flush parameter is Z_FINISH, the remaining data is written and the + gzip stream is completed in the output. If gzwrite() is called again, a new + gzip stream will be started in the output. gzread() is able to read such + concatenated gzip streams. + + gzflush should be called only when strictly necessary because it will + degrade compression if called too often. +*/ + +/* +ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, + z_off_t offset, int whence)); + + Sets the starting position for the next gzread or gzwrite on the given + compressed file. The offset represents a number of bytes in the + uncompressed data stream. The whence parameter is defined as in lseek(2); + the value SEEK_END is not supported. + + If the file is opened for reading, this function is emulated but can be + extremely slow. If the file is opened for writing, only forward seeks are + supported; gzseek then compresses a sequence of zeroes up to the new + starting position. + + gzseek returns the resulting offset location as measured in bytes from + the beginning of the uncompressed stream, or -1 in case of error, in + particular if the file is opened for writing and the new starting position + would be before the current position. +*/ + +ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); +/* + Rewinds the given file. This function is supported only for reading. + + gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) +*/ + +/* +ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); + + Returns the starting position for the next gzread or gzwrite on the given + compressed file. This position represents a number of bytes in the + uncompressed data stream, and is zero when starting, even if appending or + reading a gzip stream from the middle of a file using gzdopen(). + + gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) +*/ + +/* +ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file)); + + Returns the current offset in the file being read or written. This offset + includes the count of bytes that precede the gzip stream, for example when + appending or when using gzdopen() for reading. When reading, the offset + does not include as yet unused buffered input. This information can be used + for a progress indicator. On error, gzoffset() returns -1. +*/ + +ZEXTERN int ZEXPORT gzeof OF((gzFile file)); +/* + Returns true (1) if the end-of-file indicator has been set while reading, + false (0) otherwise. Note that the end-of-file indicator is set only if the + read tried to go past the end of the input, but came up short. Therefore, + just like feof(), gzeof() may return false even if there is no more data to + read, in the event that the last read request was for the exact number of + bytes remaining in the input file. This will happen if the input file size + is an exact multiple of the buffer size. + + If gzeof() returns true, then the read functions will return no more data, + unless the end-of-file indicator is reset by gzclearerr() and the input file + has grown since the previous end of file was detected. +*/ + +ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); +/* + Returns true (1) if file is being copied directly while reading, or false + (0) if file is a gzip stream being decompressed. + + If the input file is empty, gzdirect() will return true, since the input + does not contain a gzip stream. + + If gzdirect() is used immediately after gzopen() or gzdopen() it will + cause buffers to be allocated to allow reading the file to determine if it + is a gzip file. Therefore if gzbuffer() is used, it should be called before + gzdirect(). + + When writing, gzdirect() returns true (1) if transparent writing was + requested ("wT" for the gzopen() mode), or false (0) otherwise. (Note: + gzdirect() is not needed when writing. Transparent writing must be + explicitly requested, so the application already knows the answer. When + linking statically, using gzdirect() will include all of the zlib code for + gzip file reading and decompression, which may not be desired.) +*/ + +ZEXTERN int ZEXPORT gzclose OF((gzFile file)); +/* + Flushes all pending output if necessary, closes the compressed file and + deallocates the (de)compression state. Note that once file is closed, you + cannot call gzerror with file, since its structures have been deallocated. + gzclose must not be called more than once on the same file, just as free + must not be called more than once on the same allocation. + + gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a + file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the + last read ended in the middle of a gzip stream, or Z_OK on success. +*/ + +ZEXTERN int ZEXPORT gzclose_r OF((gzFile file)); +ZEXTERN int ZEXPORT gzclose_w OF((gzFile file)); +/* + Same as gzclose(), but gzclose_r() is only for use when reading, and + gzclose_w() is only for use when writing or appending. The advantage to + using these instead of gzclose() is that they avoid linking in zlib + compression or decompression code that is not used when only reading or only + writing respectively. If gzclose() is used, then both compression and + decompression code will be included the application when linking to a static + zlib library. +*/ + +ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); +/* + Returns the error message for the last error which occurred on the given + compressed file. errnum is set to zlib error number. If an error occurred + in the file system and not in the compression library, errnum is set to + Z_ERRNO and the application may consult errno to get the exact error code. + + The application must not modify the returned string. Future calls to + this function may invalidate the previously returned string. If file is + closed, then the string previously returned by gzerror will no longer be + available. + + gzerror() should be used to distinguish errors from end-of-file for those + functions above that do not distinguish those cases in their return values. +*/ + +ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); +/* + Clears the error and end-of-file flags for file. This is analogous to the + clearerr() function in stdio. This is useful for continuing to read a gzip + file that is being written concurrently. +*/ + +#endif /* !Z_SOLO */ + + /* checksum functions */ + +/* + These functions are not related to compression but are exported + anyway because they might be useful in applications using the compression + library. +*/ + +ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); +/* + Update a running Adler-32 checksum with the bytes buf[0..len-1] and + return the updated checksum. If buf is Z_NULL, this function returns the + required initial value for the checksum. + + An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed + much faster. + + Usage example: + + uLong adler = adler32(0L, Z_NULL, 0); + + while (read_buffer(buffer, length) != EOF) { + adler = adler32(adler, buffer, length); + } + if (adler != original_adler) error(); +*/ + +ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf, + z_size_t len)); +/* + Same as adler32(), but with a size_t length. +*/ + +/* +ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, + z_off_t len2)); + + Combine two Adler-32 checksums into one. For two sequences of bytes, seq1 + and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for + each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of + seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. Note + that the z_off_t type (like off_t) is a signed integer. If len2 is + negative, the result has no meaning or utility. +*/ + +ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); +/* + Update a running CRC-32 with the bytes buf[0..len-1] and return the + updated CRC-32. If buf is Z_NULL, this function returns the required + initial value for the crc. Pre- and post-conditioning (one's complement) is + performed within this function so it shouldn't be done by the application. + + Usage example: + + uLong crc = crc32(0L, Z_NULL, 0); + + while (read_buffer(buffer, length) != EOF) { + crc = crc32(crc, buffer, length); + } + if (crc != original_crc) error(); +*/ + +ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf, + z_size_t len)); +/* + Same as crc32(), but with a size_t length. +*/ + +/* +ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); + + Combine two CRC-32 check values into one. For two sequences of bytes, + seq1 and seq2 with lengths len1 and len2, CRC-32 check values were + calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32 + check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and + len2. +*/ + + + /* various hacks, don't look :) */ + +/* deflateInit and inflateInit are macros to allow checking the zlib version + * and the compiler's view of z_stream: + */ +ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, + const char *version, int stream_size)); +ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, + const char *version, int stream_size)); +ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, + int windowBits, int memLevel, + int strategy, const char *version, + int stream_size)); +ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, + const char *version, int stream_size)); +ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, + unsigned char FAR *window, + const char *version, + int stream_size)); +#ifdef Z_PREFIX_SET +# define z_deflateInit(strm, level) \ + deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream)) +# define z_inflateInit(strm) \ + inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream)) +# define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ + deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ + (strategy), ZLIB_VERSION, (int)sizeof(z_stream)) +# define z_inflateInit2(strm, windowBits) \ + inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ + (int)sizeof(z_stream)) +# define z_inflateBackInit(strm, windowBits, window) \ + inflateBackInit_((strm), (windowBits), (window), \ + ZLIB_VERSION, (int)sizeof(z_stream)) +#else +# define deflateInit(strm, level) \ + deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream)) +# define inflateInit(strm) \ + inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream)) +# define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ + deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ + (strategy), ZLIB_VERSION, (int)sizeof(z_stream)) +# define inflateInit2(strm, windowBits) \ + inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ + (int)sizeof(z_stream)) +# define inflateBackInit(strm, windowBits, window) \ + inflateBackInit_((strm), (windowBits), (window), \ + ZLIB_VERSION, (int)sizeof(z_stream)) +#endif + +#ifndef Z_SOLO + +/* gzgetc() macro and its supporting function and exposed data structure. Note + * that the real internal state is much larger than the exposed structure. + * This abbreviated structure exposes just enough for the gzgetc() macro. The + * user should not mess with these exposed elements, since their names or + * behavior could change in the future, perhaps even capriciously. They can + * only be used by the gzgetc() macro. You have been warned. + */ +struct gzFile_s { + unsigned have; + unsigned char *next; + z_off64_t pos; +}; +ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ +#ifdef Z_PREFIX_SET +# undef z_gzgetc +# define z_gzgetc(g) \ + ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g)) +#else +# define gzgetc(g) \ + ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g)) +#endif + +/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or + * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if + * both are true, the application gets the *64 functions, and the regular + * functions are changed to 64 bits) -- in case these are set on systems + * without large file support, _LFS64_LARGEFILE must also be true + */ +#ifdef Z_LARGE64 + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); + ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); + ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); + ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t)); + ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t)); +#endif + +#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64) +# ifdef Z_PREFIX_SET +# define z_gzopen z_gzopen64 +# define z_gzseek z_gzseek64 +# define z_gztell z_gztell64 +# define z_gzoffset z_gzoffset64 +# define z_adler32_combine z_adler32_combine64 +# define z_crc32_combine z_crc32_combine64 +# else +# define gzopen gzopen64 +# define gzseek gzseek64 +# define gztell gztell64 +# define gzoffset gzoffset64 +# define adler32_combine adler32_combine64 +# define crc32_combine crc32_combine64 +# endif +# ifndef Z_LARGE64 + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); + ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); + ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile)); + ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); + ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); +# endif +#else + ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *)); + ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int)); + ZEXTERN z_off_t ZEXPORT gztell OF((gzFile)); + ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile)); + ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); + ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); +#endif + +#else /* Z_SOLO */ + + ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); + ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); + +#endif /* !Z_SOLO */ + +/* undocumented functions */ +ZEXTERN const char * ZEXPORT zError OF((int)); +ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp)); +ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table OF((void)); +ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int)); +ZEXTERN int ZEXPORT inflateValidate OF((z_streamp, int)); +ZEXTERN unsigned long ZEXPORT inflateCodesUsed OF ((z_streamp)); +ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp)); +ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp)); +#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO) +ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path, + const char *mode)); +#endif +#if defined(STDC) || defined(Z_HAVE_STDARG_H) +# ifndef Z_SOLO +ZEXTERN int ZEXPORTVA gzvprintf Z_ARG((gzFile file, + const char *format, + va_list va)); +# endif +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* ZLIB_H */ diff -r 85895476fecf sys/include/html.h --- a/sys/include/html.h Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/include/html.h Fri Mar 05 20:37:37 2021 -0800 @@ -103,7 +103,6 @@ typedef struct Align Align; typedef struct Dimen Dimen; typedef struct Anchor Anchor; -typedef struct DestAnchor DestAnchor; typedef struct Map Map; typedef struct Area Area; typedef struct Background Background; @@ -174,7 +173,7 @@ int width; /* width in pixels (0 for floating items) */ int height; /* height in pixels */ int ascent; /* ascent (from top to baseline) in pixels */ - int anchorid; /* if nonzero, which anchor we're in */ + Anchor* anchor; /* if non-nil, which anchor we're in */ int state; /* flags and values (see below) */ Genattr*genattr; /* generic attributes and events */ int tag; /* variant discriminator: Itexttag, etc. */ @@ -405,7 +404,7 @@ int cellspacing; /* cellspacing attr */ int cellpadding; /* cellpadding attr */ Background background; /* table background */ - Item* caption; /* linked list of Items, giving caption */ + Rune* caption; /* caption text */ uchar caption_place; /* ALtop or ALbottom */ Lay* caption_lay; /* layout of caption */ int totw; /* total width */ @@ -466,27 +465,15 @@ Point pos; /* nw corner of cell contents, in cell */ }; -/* Anchor is for info about hyperlinks that go somewhere */ struct Anchor { Anchor* next; /* next in list of document's anchors */ - int index; /* serial no. of anchor within its doc */ Rune* name; /* name attr */ Rune* href; /* href attr */ int target; /* target attr as targetid */ }; -/* DestAnchor is for info about hyperlinks that are destinations */ -struct DestAnchor -{ - DestAnchor*next; /* next in list of document's destanchors */ - int index; /* serial no. of anchor within its doc */ - Rune* name; /* name attr */ - Item* item; /* the destination */ -}; - - /* Maps (client side) */ struct Map { @@ -500,10 +487,9 @@ { Area* next; /* next in list of a map's areas */ int shape; /* SHrect, etc. */ - Rune* href; /* associated hypertext link */ - int target; /* associated target frame */ Dimen* coords; /* array of coords for shape */ int ncoords; /* size of coords array */ + Anchor* anchor; /* associated hypertext link */ }; /* Area shapes */ @@ -600,7 +586,6 @@ /* info needed to respond to user actions */ Anchor* anchors; /* list of href anchors */ - DestAnchor*dests; /* list of destination anchors */ Form* forms; /* list of forms */ Table* tables; /* list of tables */ Map* maps; /* list of maps */ diff -r 85895476fecf sys/lib/dist/mail/lib/qmail --- a/sys/lib/dist/mail/lib/qmail Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/lib/dist/mail/lib/qmail Fri Mar 05 20:37:37 2021 -0800 @@ -1,6 +1,6 @@ #!/bin/rc # qmail sender machine user... rfork s -upas/vf | upas/qer /mail/queue mail $* || exit 'qer failed' +upas/qer /mail/queue mail $* || exit 'qer failed' upas/runq -n 10 /mail/queue /mail/lib/remotemail /dev/null >[2=1] & exit '' diff -r 85895476fecf sys/lib/dist/mail/lib/remotemail --- a/sys/lib/dist/mail/lib/remotemail Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/lib/dist/mail/lib/remotemail Fri Mar 05 20:37:37 2021 -0800 @@ -1,14 +1,27 @@ #!/bin/rc -shift -sender=$1 -shift -addr=$1 -shift -fd=`{/bin/upas/aliasmail -f $sender} -switch($fd){ -case *.* - ; -case * - fd=yourdomain.dom + +# allow per-user customization +if(test -x $home/mail/lib/remotemail) + exec $home/mail/lib/remotemail + +ds=() +sender=$2 +svcpat='[ ]service=smtp[ ]' +addrpat='[ ]sender='$2'[ ]' +config=`{= 0) microdelay(1000); } + +int +finalize(Blk *b) +{ + PBIT16(b->data+HOtype, b->type); + switch(b->type){ + case Pivot: + PBIT16(b->data+HOnent, b->nent); + PBIT16(b->data+HOvalsz, b->valsz); + PBIT16(b->data+HOnmsg, b->nmsg); + PBIT16(b->data+HObufsz, b->bufsz); + break; + case Leaf: + PBIT16(b->data+HOnent, b->nent); + PBIT16(b->data+HOvalsz, b->nent); + break; + case Alloc: + PBIT16(b->data+HOnent, b->nent); + break; + } +} \ No newline at end of file diff -r 85895476fecf sys/src/9/pc/audiohda.c --- a/sys/src/9/pc/audiohda.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/9/pc/audiohda.c Fri Mar 05 20:37:37 2021 -0800 @@ -1780,7 +1780,6 @@ case (0x8086 << 16) | 0x9d71: /* Intel Sunrise Point-LP */ case (0x8086 << 16) | 0x3a6e: /* Intel ICH10 */ case (0x8086 << 16) | 0x3198: /* Intel Gemini-Lake */ - case (0x8086 << 16) | 0x8d20: /* Intel C610/X99 */ case (0x10de << 16) | 0x026c: /* NVidia MCP51 (untested) */ case (0x10de << 16) | 0x0371: /* NVidia MCP55 (untested) */ diff -r 85895476fecf sys/src/9/pc/devvmx.c --- a/sys/src/9/pc/devvmx.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/9/pc/devvmx.c Fri Mar 05 20:37:37 2021 -0800 @@ -383,7 +383,8 @@ char *p; v = strtoull(s, &p, 0); - if(p == s || *p != 0) error("invalid value"); + if(p == s || *p != 0) + error("invalid value"); return v; } @@ -621,13 +622,15 @@ int i; tab = vmx->pml4; - if(tab == nil) error(Egreg); + if(tab == nil) + error(Egreg); for(i = 3; i >= 1; i--){ tab += addr >> 12 + 9 * i & 0x1ff; v = *tab; if((v & 3) == 0){ nt = mallocalign(BY2PG, BY2PG, 0, 0); - if(nt == nil) error(Enomem); + if(nt == nil) + error(Enomem); memset(nt, 0, BY2PG); v = PADDR(nt) | 0x407; *tab = v; @@ -643,11 +646,13 @@ int i; uvlong v, *t; - if(tab == nil) error(Egreg); + if(tab == nil) + error(Egreg); if(level < 3){ for(i = 0; i < 512; i++){ v = tab[i]; - if((v & 3) == 0) continue; + if((v & 3) == 0) + continue; t = KADDR(v & ~0xfff); eptfree(t, level + 1); tab[i] = 0; @@ -696,7 +701,8 @@ p0 = va_arg(va, char *); e = va_arg(va, char *); p = p0; - if(p < e) *p = 0; + if(p < e) + *p = 0; for(mp = cmd->vmx->mem.next; mp != &cmd->vmx->mem; mp = mp->next){ if(mp->seg == nil) continue; @@ -823,35 +829,60 @@ poperror(); continue; } - if(rc != 4 && rc != 6) error("number of fields wrong"); + if(rc != 4 && rc != 6) + error("number of fields wrong"); for(q = f[0]; *q != 0; q++) switch(*q){ - case 'r': if((mp->attr & 1) != 0) goto tinval; mp->attr |= 1; break; - case 'w': if((mp->attr & 2) != 0) goto tinval; mp->attr |= 2; break; - case 'x': if((mp->attr & 4) != 0) goto tinval; mp->attr |= 0x404; break; - case '-': break; - default: tinval: error("invalid access field"); + case 'r': + if((mp->attr & 1) != 0) + goto tinval; + mp->attr |= 1; + break; + case 'w': + if((mp->attr & 2) != 0) + goto tinval; + mp->attr |= 2; + break; + case 'x': + if((mp->attr & 4) != 0) + goto tinval; + mp->attr |= 0x404; + break; + case '-': + break; + default: + tinval: + error("invalid access field"); } for(j = 0; j < 8; j++) if(strncmp(mtype[j], f[1], 2) == 0){ mp->attr |= j << 3; break; } - if(j == 8 || strlen(f[1]) > 3) error("invalid memory type"); - if(f[1][2] == '!') mp->attr |= 0x40; - else if(f[1][2] != 0) error("invalid memory type"); + if(j == 8 || strlen(f[1]) > 3) + error("invalid memory type"); + if(f[1][2] == '!') + mp->attr |= 0x40; + else if(f[1][2] != 0) + error("invalid memory type"); mp->addr = strtoull(f[2], &r, 0); - if(*r != 0 || !vmokpage(mp->addr)) error("invalid low guest physical address"); + if(*r != 0 || !vmokpage(mp->addr)) + error("invalid low guest physical address"); end = strtoull(f[3], &r, 0); - if(*r != 0 || !vmokpage(end) || end <= mp->addr) error("invalid high guest physical address"); + if(*r != 0 || !vmokpage(end) || end <= mp->addr) + error("invalid high guest physical address"); if((mp->attr & 7) != 0){ - if(rc != 6) error("number of fields wrong"); + if(rc != 6) + error("number of fields wrong"); mp->seg = _globalsegattach(f[4]); - if(mp->seg == nil) error("no such segment"); - if(mp->seg->base + mp->off + (end - mp->addr) > mp->seg->top) error("out of bounds"); + if(mp->seg == nil) + error("no such segment"); + if(mp->seg->base + mp->off + (end - mp->addr) > mp->seg->top) + error("out of bounds"); kstrdup(&mp->name, f[4]); mp->off = strtoull(f[5], &r, 0); - if(*r != 0 || !vmokpage(mp->off)) error("invalid offset"); + if(*r != 0 || !vmokpage(mp->off)) + error("invalid offset"); } poperror(); epttranslate(cmd->vmx, mp, end); @@ -870,9 +901,11 @@ int i; cpuid(1, 0, regs); - if((regs[2] & 1<<5) == 0) return; + if((regs[2] & 1<<5) == 0) + return; /* check if disabled by BIOS */ - if(rdmsr(0x3a, &msr) < 0) return; + if(rdmsr(0x3a, &msr) < 0) + return; if((msr & 5) != 5){ if((msr & 1) == 0){ /* msr still unlocked */ wrmsr(0x3a, msr | 5); @@ -882,10 +915,14 @@ if((msr & 5) != 5) return; } - if(rdmsr(VMX_PROCB_CTLS_MSR, &msr) < 0) return; - if((vlong)msr >= 0) return; - if(rdmsr(VMX_PROCB_CTLS2_MSR, &msr) < 0) return; - if((msr >> 32 & PROCB_EPT) == 0 || (msr >> 32 & PROCB_VPID) == 0) return; + if(rdmsr(VMX_PROCB_CTLS_MSR, &msr) < 0) + return; + if((vlong)msr >= 0) + return; + if(rdmsr(VMX_PROCB_CTLS2_MSR, &msr) < 0) + return; + if((msr >> 32 & PROCB_EPT) == 0 || (msr >> 32 & PROCB_VPID) == 0) + return; for(i = 0; i < conf.nmach; i++){ MACHP(i)->vmx = mallocalign(sizeof(VmxMach), 4096, 0, 0); if(vmxmachp(i) == nil) @@ -940,22 +977,29 @@ vmx->launched = 0; vmx->onentry = 0; - if(rdmsr(VMX_BASIC_MSR, &msr) < 0) error("rdmsr(VMX_BASIC_MSR) failed"); + if(rdmsr(VMX_BASIC_MSR, &msr) < 0) + error("rdmsr(VMX_BASIC_MSR) failed"); if((msr & 1ULL<<55) != 0){ - if(rdmsr(VMX_TRUE_PROCB_CTLS_MSR, &procb_ctls) < 0) error("rdmsr(VMX_TRUE_PROCB_CTLS_MSR) failed"); - if(rdmsr(VMX_TRUE_PINB_CTLS_MSR, &pinb_ctls) < 0) error("rdmsr(VMX_TRUE_PINB_CTLS_MSR) failed"); + if(rdmsr(VMX_TRUE_PROCB_CTLS_MSR, &procb_ctls) < 0) + error("rdmsr(VMX_TRUE_PROCB_CTLS_MSR) failed"); + if(rdmsr(VMX_TRUE_PINB_CTLS_MSR, &pinb_ctls) < 0) + error("rdmsr(VMX_TRUE_PINB_CTLS_MSR) failed"); }else{ - if(rdmsr(VMX_PROCB_CTLS_MSR, &procb_ctls) < 0) error("rdmsr(VMX_PROCB_CTLS_MSR) failed"); - if(rdmsr(VMX_PINB_CTLS_MSR, &pinb_ctls) < 0) error("rdmsr(VMX_PINB_CTLS_MSR) failed"); + if(rdmsr(VMX_PROCB_CTLS_MSR, &procb_ctls) < 0) + error("rdmsr(VMX_PROCB_CTLS_MSR) failed"); + if(rdmsr(VMX_PINB_CTLS_MSR, &pinb_ctls) < 0) + error("rdmsr(VMX_PINB_CTLS_MSR) failed"); } - if(rdmsr(VMX_PINB_CTLS_MSR, &msr) < 0) error("rdmsr(VMX_PINB_CTLS_MSR failed"); + if(rdmsr(VMX_PINB_CTLS_MSR, &msr) < 0) + error("rdmsr(VMX_PINB_CTLS_MSR failed"); x = (u32int)pinb_ctls | 1<<1 | 1<<2 | 1<<4; /* currently reserved default1 bits */ x |= PINB_EXITIRQ | PINB_EXITNMI; x &= pinb_ctls >> 32; vmcswrite(PINB_CTLS, x); - if(rdmsr(VMX_PROCB_CTLS_MSR, &msr) < 0) error("rdmsr(VMX_PROCB_CTLS_MSR failed"); + if(rdmsr(VMX_PROCB_CTLS_MSR, &msr) < 0) + error("rdmsr(VMX_PROCB_CTLS_MSR failed"); x = (u32int)procb_ctls | 1<<1 | 7<<4 | 1<<8 | 1<<13 | 1<<14 | 1<<26; /* currently reserved default1 bits */ x |= PROCB_TSCOFFSET | PROCB_EXITMWAIT | PROCB_EXITMONITOR | PROCB_EXITHLT; x |= PROCB_EXITMOVDR | PROCB_EXITIO | PROCB_MSRBITMAP; @@ -963,19 +1007,23 @@ x &= msr >> 32; vmcswrite(PROCB_CTLS, x); - if(rdmsr(VMX_PROCB_CTLS2_MSR, &msr) < 0) error("rdmsr(VMX_PROCB_CTLS2_MSR failed"); + if(rdmsr(VMX_PROCB_CTLS2_MSR, &msr) < 0) + error("rdmsr(VMX_PROCB_CTLS2_MSR failed"); x = PROCB_EPT | PROCB_VPID | PROCB_UNRESTR; x &= msr >> 32; vmcswrite(PROCB_CTLS2, x); - if(rdmsr(VMX_VMEXIT_CTLS_MSR, &msr) < 0) error("rdmsr(VMX_VMEXIT_CTLS_MSR failed"); + if(rdmsr(VMX_VMEXIT_CTLS_MSR, &msr) < 0) + error("rdmsr(VMX_VMEXIT_CTLS_MSR failed"); x = (u32int)msr; - if(sizeof(uintptr) == 8) x |= VMEXIT_HOST64; + if(sizeof(uintptr) == 8) + x |= VMEXIT_HOST64; x |= VMEXIT_LD_IA32_PAT | VMEXIT_LD_IA32_EFER | VMEXIT_ST_DEBUG | VMEXIT_ST_IA32_EFER; x &= msr >> 32; vmcswrite(VMEXIT_CTLS, x); - if(rdmsr(VMX_VMENTRY_CTLS_MSR, &msr) < 0) error("rdmsr(VMX_VMENTRY_CTLS_MSR failed"); + if(rdmsr(VMX_VMENTRY_CTLS_MSR, &msr) < 0) + error("rdmsr(VMX_VMENTRY_CTLS_MSR failed"); x = (u32int)msr; x |= VMENTRY_LD_IA32_PAT | VMENTRY_LD_IA32_EFER | VMENTRY_LD_DEBUG; x &= msr >> 32; @@ -1002,9 +1050,11 @@ vmcswrite(HOST_TRBASE, (uintptr) m->tss); vmcswrite(HOST_GDTR, (uintptr) m->gdt); vmcswrite(HOST_IDTR, IDTADDR); - if(rdmsr(0x277, &msr) < 0) error("rdmsr(IA32_PAT) failed"); + if(rdmsr(0x277, &msr) < 0) + error("rdmsr(IA32_PAT) failed"); vmcswrite(HOST_IA32_PAT, msr); - if(rdmsr(Efer, &msr) < 0) error("rdmsr(IA32_EFER) failed"); + if(rdmsr(Efer, &msr) < 0) + error("rdmsr(IA32_EFER) failed"); vmcswrite(HOST_IA32_EFER, msr); vmcswrite(EXC_BITMAP, 1<<18|1<<1); @@ -1092,13 +1142,19 @@ putcr4(getcr4() | CR4VMXE); putcr0(getcr0() | 0x20); /* set NE */ cr = getcr0(); - if(rdmsr(VMX_CR0_FIXED0, &msr) < 0) error("rdmsr(VMX_CR0_FIXED0) failed"); - if(rdmsr(VMX_CR0_FIXED1, &msr2) < 0) error("rdmsr(VMX_CR0_FIXED1) failed"); - if((cr & ~msr & ~msr2 | ~cr & msr & msr2) != 0) error("invalid CR0 value"); + if(rdmsr(VMX_CR0_FIXED0, &msr) < 0) + error("rdmsr(VMX_CR0_FIXED0) failed"); + if(rdmsr(VMX_CR0_FIXED1, &msr2) < 0) + error("rdmsr(VMX_CR0_FIXED1) failed"); + if((cr & ~msr & ~msr2 | ~cr & msr & msr2) != 0) + error("invalid CR0 value"); cr = getcr4(); - if(rdmsr(VMX_CR4_FIXED0, &msr) < 0) error("rdmsr(VMX_CR4_FIXED0) failed"); - if(rdmsr(VMX_CR4_FIXED1, &msr2) < 0) error("rdmsr(VMX_CR4_FIXED1) failed"); - if((cr & ~msr & ~msr2 | ~cr & msr & msr2) != 0) error("invalid CR4 value"); + if(rdmsr(VMX_CR4_FIXED0, &msr) < 0) + error("rdmsr(VMX_CR4_FIXED0) failed"); + if(rdmsr(VMX_CR4_FIXED1, &msr2) < 0) + error("rdmsr(VMX_CR4_FIXED1) failed"); + if((cr & ~msr & ~msr2 | ~cr & msr & msr2) != 0) + error("invalid CR4 value"); rdmsr(VMX_BASIC_MSR, &x); qlock(vmxmach); @@ -1142,7 +1198,8 @@ for(p = vmx->postponed; p != nil; p = pn){ pn = p->next; p->next = nil; - if(p == notme) continue; + if(p == notme) + continue; kstrcpy(p->errstr, Equit, ERRMAX); cmdrelease(p, CMDFFAIL); } @@ -1151,7 +1208,8 @@ for(p = vmx->firstcmd; p != nil; p = pn){ pn = p->next; p->next = nil; - if(p == notme) continue; + if(p == notme) + continue; kstrcpy(p->errstr, Equit, ERRMAX); cmdrelease(p, CMDFFAIL); } @@ -1261,7 +1319,8 @@ rc = getfields(p, f, nelem(f), 1, fs); p = q + 1; if(rc == 0) continue; - if(rc != 2) error("number of fields wrong"); + if(rc != 2) + error("number of fields wrong"); for(r = guestregs; r < guestregs + nelem(guestregs); r++) if(strcmp(r->name, f[0]) == 0) @@ -1274,8 +1333,10 @@ } val = strtoull(f[1], &rp, 0); sz = r->size; - if(sz == 0) sz = sizeof(uintptr); - if(rp == f[1] || *rp != 0) error("invalid value"); + if(sz == 0) + sz = sizeof(uintptr); + if(rp == f[1] || *rp != 0) + error("invalid value"); if(r->offset >= 0) vmcswrite(r->offset, val); else{ @@ -1362,21 +1423,47 @@ } static char *exitreasons[] = { - [0] "exc", [1] "extirq", [2] "triplef", [3] "initsig", [4] "sipi", [5] "smiio", [6] "smiother", [7] "irqwin", - [8] "nmiwin", [9] "taskswitch", [10] ".cpuid", [11] ".getsec", [12] ".hlt", [13] ".invd", [14] ".invlpg", [15] ".rdpmc", - [16] ".rdtsc", [17] ".rsm", [18] ".vmcall", [19] ".vmclear", [20] ".vmlaunch", [21] ".vmptrld", [22] ".vmptrst", [23] ".vmread", - [24] ".vmresume", [25] ".vmwrite", [26] ".vmxoff", [27] ".vmxon", [28] "movcr", [29] ".movdr", [30] "io", [31] ".rdmsr", - [32] ".wrmsr", [33] "entrystate", [34] "entrymsr", [36] ".mwait", [37] "monitortrap", [39] ".monitor", - [40] ".pause", [41] "mcheck", [43] "tpr", [44] "apicacc", [45] "eoi", [46] "gdtr_idtr", [47] "ldtr_tr", - [48] "eptfault", [49] "eptinval", [50] ".invept", [51] ".rdtscp", [52] "preempt", [53] ".invvpid", [54] ".wbinvd", [55] ".xsetbv", - [56] "apicwrite", [57] ".rdrand", [58] ".invpcid", [59] ".vmfunc", [60] ".encls", [61] ".rdseed", [62] "pmlfull", [63] ".xsaves", - [64] ".xrstors", + [0] "exc", [1] "extirq", + [2] "triplef", [3] "initsig", + [4] "sipi", [5] "smiio", + [6] "smiother", [7] "irqwin", + [8] "nmiwin", [9] "taskswitch", + [10] ".cpuid", [11] ".getsec", + [12] ".hlt", [13] ".invd", + [14] ".invlpg", [15] ".rdpmc", + [16] ".rdtsc", [17] ".rsm", + [18] ".vmcall", [19] ".vmclear", + [20] ".vmlaunch", [21] ".vmptrld", + [22] ".vmptrst", [23] ".vmread", + [24] ".vmresume", [25] ".vmwrite", + [26] ".vmxoff", [27] ".vmxon", + [28] "movcr", [29] ".movdr", + [30] "io", [31] ".rdmsr", + [32] ".wrmsr", [33] "entrystate", + [34] "entrymsr", [36] ".mwait", + [37] "monitortrap", [39] ".monitor", + [40] ".pause", [41] "mcheck", + [43] "tpr", [44] "apicacc", + [45] "eoi", [46] "gdtr_idtr", + [47] "ldtr_tr", [48] "eptfault", + [49] "eptinval", [50] ".invept", + [51] ".rdtscp", [52] "preempt", + [53] ".invvpid", [54] ".wbinvd", + [55] ".xsetbv", [56] "apicwrite", + [57] ".rdrand", [58] ".invpcid", + [59] ".vmfunc", [60] ".encls", + [61] ".rdseed", [62] "pmlfull", + [63] ".xsaves", [64] ".xrstors", }; +static char *exitcounts[64] = {0}; + static char *except[] = { - [0] "#de", [1] "#db", [3] "#bp", [4] "#of", [5] "#br", [6] "#ud", [7] "#nm", - [8] "#df", [10] "#ts", [11] "#np", [12] "#ss", [13] "#gp", [14] "#pf", - [16] "#mf", [17] "#ac", [18] "#mc", [19] "#xm", [20] "#ve", + [0] "#de", [1] "#db", [3] "#bp", [4] "#of", + [5] "#br", [6] "#ud", [7] "#nm", [8] "#df", + [10] "#ts", [11] "#np", [12] "#ss", [13] "#gp", + [14] "#pf", [16] "#mf", [17] "#ac", [18] "#mc", + [19] "#xm", [20] "#ve", }; static int @@ -1410,19 +1497,27 @@ if((reason & 1<<31) != 0) p = seprint(p, e, "!"); if(rno == 0 && (intr & 1<<31) != 0){ + exitcounts[0]++; if((intr & 0xff) >= nelem(except) || except[intr & 0xff] == nil) p = seprint(p, e, "#%d ", intr & 0xff); else p = seprint(p, e, "%s ", except[intr & 0xff]); }else if(rno >= nelem(exitreasons) || exitreasons[rno] == nil) p = seprint(p, e, "?%d ", rno); - else + else{ + exitcounts[rno]++; p = seprint(p, e, "%s ", exitreasons[rno]); - p = seprint(p, e, "%#ullx pc %#ullx sp %#ullx ilen %#ullx iinfo %#ullx", qual, vmcsread(GUEST_RIP), vmcsread(GUEST_RSP), vmcsread(VM_EXINSTRLEN), vmcsread(VM_EXINSTRINFO)); - if((intr & 1<<11) != 0) p = seprint(p, e, " excode %#ullx", vmcsread(VM_EXINTRCODE)); - if(rno == 48 && (qual & 0x80) != 0) p = seprint(p, e, " va %#ullx", vmcsread(VM_GUESTVA)); - if(rno == 48 || rno == 49) p = seprint(p, e, " pa %#ullx", vmcsread(VM_GUESTPA)); - if(rno == 30) p = seprint(p, e, " ax %#ullx", (uvlong)vmx->ureg.ax); + } + p = seprint(p, e, "%#ullx pc %#ullx sp %#ullx ilen %#ullx iinfo %#ullx", + qual, vmcsread(GUEST_RIP), vmcsread(GUEST_RSP), vmcsread(VM_EXINSTRLEN), vmcsread(VM_EXINSTRINFO)); + if((intr & 1<<11) != 0) + p = seprint(p, e, " excode %#ullx", vmcsread(VM_EXINTRCODE)); + if(rno == 48 && (qual & 0x80) != 0) + p = seprint(p, e, " va %#ullx", vmcsread(VM_GUESTVA)); + if(rno == 48 || rno == 49) + p = seprint(p, e, " pa %#ullx", vmcsread(VM_GUESTPA)); + if(rno == 30) + p = seprint(p, e, " ax %#ullx", (uvlong)vmx->ureg.ax); p = seprint(p, e, "\n"); return p - p0; } @@ -1453,7 +1548,8 @@ } if(i == nelem(except)){ i = strtoul(q, &q, 10); - if(*q != 0 || i > 255) error(Ebadctl); + if(*q != 0 || i > 255) + error(Ebadctl); } vi->info |= i; if((vi->info & 0x7ff) == 3 || (vi->info & 0x7ff) == 4) @@ -1465,7 +1561,8 @@ }else r++; if(*r == ',') vi->ilen = strtoul(r + 1, &r, 0); - if(*r != 0) error(Ebadctl); + if(*r != 0) + error(Ebadctl); out: poperror(); free(q); @@ -1477,7 +1574,8 @@ Vmx *vmx; vmx = cp->vmx; - if(cp->scratched) error(Eintr); + if(cp->scratched) + error(Eintr); if((vmx->onentry & POSTEX) != 0){ cp->flags |= CMDFPOSTP; return 0; @@ -1514,7 +1612,8 @@ p = va_arg(va, char *); v = strtoul(p, &q, 0); - if(q == p || *q != 0) error(Ebadarg); + if(q == p || *q != 0) + error(Ebadarg); vmcswrite(EXC_BITMAP, v); return 0; } @@ -1595,7 +1694,8 @@ markcmddone(p, &pp); continue; } - if(p->scratched) error(Eintr); + if(p->scratched) + error(Eintr); p->retval = p->cmd(p, p->va); poperror(); markcmddone(p, &pp); @@ -1893,7 +1993,8 @@ static Chan * vmxattach(char *spec) { - if(!gotvmx) error(Enodev); + if(!gotvmx) + error(Enodev); return devattach('X', spec); } @@ -1970,7 +2071,8 @@ Vmx *vmx; if(c->qid.path == Qclone){ - if(!iseve()) error(Eperm); + if(!iseve()) + error(Eperm); vmx = vmxnew(); c->qid.path = QIDPATH(vmx->index, Qctl); } @@ -1980,8 +2082,10 @@ nexterror(); } vmx = vmxlook(SLOT(c->qid)); - if(SLOT(c->qid) >= 0 && vmx == nil) error(Enonexist); - if(FILE(c->qid) != Qdir && !iseve()) error(Eperm); + if(SLOT(c->qid) >= 0 && vmx == nil) + error(Enonexist); + if(FILE(c->qid) != Qdir && !iseve()) + error(Eperm); ch = devopen(c, omode, nil, 0, vmxgen); qunlock(&vmxtablock); poperror(); @@ -2053,7 +2157,8 @@ } } vmx = vmxent(c->qid); - if(vmx == nil) error(Enonexist); + if(vmx == nil) + error(Enonexist); switch(FILE(c->qid)){ case Qdir: goto dirread; @@ -2132,7 +2237,8 @@ } } vmx = vmxent(c->qid); - if(vmx == nil) error(Enonexist); + if(vmx == nil) + error(Enonexist); switch(FILE(c->qid)){ case Qdir: error(Eperm); @@ -2150,8 +2256,10 @@ case CMgo: case CMstep: s = nil; - if(cb->nf == 2) kstrdup(&s, cb->f[1]); - else if(cb->nf != 1) error(Ebadarg); + if(cb->nf == 2) + kstrdup(&s, cb->f[1]); + else if(cb->nf != 1) + error(Ebadarg); if(waserror()){ free(s); nexterror(); @@ -2207,7 +2315,8 @@ case Qmap: case Qregs: s = malloc(n+1); - if(s == nil) error(Enomem); + if(s == nil) + error(Enomem); if(waserror()){ free(s); nexterror(); diff -r 85895476fecf sys/src/9/port/chan.c --- a/sys/src/9/port/chan.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/9/port/chan.c Fri Mar 05 20:37:37 2021 -0800 @@ -790,6 +790,10 @@ wunlock(&pg->ns); error(Eunmount); } + if(pg->noattach){ + wunlock(&pg->ns); + error(Enoattach); + } wlock(&m->lock); f = m->mount; diff -r 85895476fecf sys/src/9/port/devsrv.c --- a/sys/src/9/port/devsrv.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/9/port/devsrv.c Fri Mar 05 20:37:37 2021 -0800 @@ -9,9 +9,11 @@ typedef struct Srv Srv; struct Srv { + Ref; char *name; char *owner; ulong perm; + ulong time; Chan *chan; Srv *link; ulong path; @@ -179,6 +181,8 @@ sp->perm = perm&0777; sp->path = qidpath++; + sp->time = seconds(); + sp->atime = seconds(); c->qid.path = sp->path; c->qid.type = QTFILE; diff -r 85895476fecf sys/src/cmd/6c/txt.c --- a/sys/src/cmd/6c/txt.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/6c/txt.c Fri Mar 05 20:37:37 2021 -0800 @@ -1420,6 +1420,8 @@ case OHI: a = AJHI; break; } gins(a, Z, Z); + if(et == TDOUBLE || et == TFLOAT) + gins(AJPC, Z, Z); return; } if(a == AGOK) @@ -1458,7 +1460,6 @@ void patch(Prog *op, long pc) { - op->to.offset = pc; op->to.type = D_BRANCH; } diff -r 85895476fecf sys/src/cmd/6l/span.c --- a/sys/src/cmd/6l/span.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/6l/span.c Fri Mar 05 20:37:37 2021 -0800 @@ -1031,6 +1031,7 @@ vlong v; o = opindex[p->as]; + print("doing %P\n", p); if(o == nil) { diag("asmins: missing op %P", p); return; @@ -1090,6 +1091,9 @@ if(p->mode != 64) diag("asmins: illegal in %d-bit mode: %P", p->mode, p); break; + default: + print("nopfx\n"); + break; } v = vaddr(&p->from); op = o->op[z]; diff -r 85895476fecf sys/src/cmd/abaco/fns.h --- a/sys/src/cmd/abaco/fns.h Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/abaco/fns.h Fri Mar 05 20:37:37 2021 -0800 @@ -59,7 +59,6 @@ void colarray(Image **, Image *, Image *, Image *, int); void rect3d(Image *, Rectangle, int, Image **, Point); void ellipse3d(Image *, Point, int, int, Image **, Point); -void reverseimages(Iimage **); void setstatus(Window *, char *, ...); int istextfield(Item *); int forceitem(Item *); @@ -69,7 +68,6 @@ int pipeline(int fd, char *cmd, ...); void getimage(Cimage *, Rune *); Point getpt(Page *p, Point); -Rune *urlcombine(Rune *, Rune *); void fixtext(Page *); void addrefresh(Page *, char *, ...); void flushrefresh(void); diff -r 85895476fecf sys/src/cmd/abaco/html.c --- a/sys/src/cmd/abaco/html.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/abaco/html.c Fri Mar 05 20:37:37 2021 -0800 @@ -282,7 +282,7 @@ draw(im, r, ci->i, nil, ci->i->r.min); if(i->border){ - if(i->anchorid >= 0) + if(i->anchor != nil) c = getcolor(p->doc->link); else c = display->black; @@ -459,27 +459,16 @@ mouselink(Box *b, Page *p, int but) { Runestr rs; - Anchor *a; /* eat mouse */ while(mousectl->buttons) readmouse(mousectl); - if(b->i->anchorid < 0) + if(b->i->anchor == nil || b->i->anchor->href == nil) return; - /* binary search would be better */ - for(a=p->doc->anchors; a!=nil; a=a->next) - if(a->index == b->i->anchorid) - break; - - if(a==nil || a->href==nil) - return; - - p = whichtarget(p, a->target); - rs.r = urlcombine(getbase(p), a->href); - if(rs.r == nil) - return; + p = whichtarget(p, b->i->anchor->target); + rs.r = runestrdup(b->i->anchor->href); rs.nr = runestrlen(rs.r); if(but == 1) @@ -521,7 +510,7 @@ x = y; } p = whichtarget(p, form->target); - y = urlcombine(getbase(p), form->action); + y = form->action; memset(&src, 0, sizeof(Runestr)); memset(&post, 0, sizeof(Runestr)); @@ -532,9 +521,8 @@ sep = L"?"; src.r = runesmprint("%S%S%S",y, sep, x); free(x); - free(y); }else{ - src.r = y; + src.r = runestrdup(y); post.r = x; post.nr = runestrlen(x); if(post.nr == 0){ @@ -684,7 +672,7 @@ void boxinit(Box *b) { - if(b->i->anchorid) + if(b->i->anchor != nil) b->mouse = mouselink; /* override mouselink for forms */ if(b->i->tag == Iformfieldtag){ diff -r 85895476fecf sys/src/cmd/abaco/page.c --- a/sys/src/cmd/abaco/page.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/abaco/page.c Fri Mar 05 20:37:37 2021 -0800 @@ -54,10 +54,9 @@ c->kidinfo = t; /* this check shouldn't be necessary, but... */ if(t->src){ - rs.r = urlcombine(p->url->act.r, t->src); + rs.r = t->src; rs.nr = runestrlen(rs.r); pageload1(c, urlalloc(&rs, nil, HGet), FALSE); - closerunestr(&rs); } } } @@ -205,23 +204,19 @@ { Cimage *ci; Iimage *i; - Rune *src; addrefresh(p, "loading images..."); - reverseimages(&p->doc->images); for(i=p->doc->images; i!=nil; i=i->nextimage){ if(p->aborting) break; - src = urlcombine(getbase(p), i->imsrc); - ci = findimg(src); + ci = findimg(i->imsrc); if(ci == nil){ - ci = loadimg(src, i->imwidth, i->imheight); + ci = loadimg(i->imsrc, i->imwidth, i->imheight); qlock(&cimagelock); ci->next = cimages; cimages = ci; qunlock(&cimagelock); } - free(src); incref(ci); i->aux = ci; p->cimage = erealloc(p->cimage, ++p->ncimage*sizeof(Cimage *)); @@ -752,8 +747,7 @@ void pagesetrefresh(Page *p) { - Runestr rs; - Rune *s, *q, *t; + Rune *s, *q; char *v; int n; @@ -765,8 +759,6 @@ if(q == nil) return; q++; - if(!q) - return; n = runestrlen(q); if(*q == L'''){ q++; @@ -774,12 +766,9 @@ } if(n <= 0) return; - t = runesmprint("%.*S", n, q); - rs.r = urlcombine(getbase(p), t); - rs.nr = runestrlen(rs.r); - copyrunestr(&p->refresh.rs, &rs); - closerunestr(&rs); - free(t); + /* broken for relative urls; don't think this ever worked anyway... */ + p->refresh.rs.nr = n; + p->refresh.rs.r = runesmprint("%.*S", n, q); /* now the time */ q = runestrchr(s, L';'); diff -r 85895476fecf sys/src/cmd/abaco/tabs.c --- a/sys/src/cmd/abaco/tabs.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/abaco/tabs.c Fri Mar 05 20:37:37 2021 -0800 @@ -64,14 +64,9 @@ settables(Page *p) { Table *t; - Item *i; if(p->doc==nil) return; - for(i=p->items; i!=nil; i=i->next) - if(i->tag == Itabletag) - ((Itable *)i)->table->flags |= Ttoplevel; - for(t=p->doc->tables; t!=nil; t=t->next) settable(t); } diff -r 85895476fecf sys/src/cmd/abaco/urls.c --- a/sys/src/cmd/abaco/urls.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/abaco/urls.c Fri Mar 05 20:37:37 2021 -0800 @@ -121,130 +121,3 @@ close(cfd); return fd; } - -void -urlcanon(Rune *name) -{ - Rune *s, *e, *tail, tailr; - Rune **comp, **p, **q; - int n; - - name = runestrstr(name, L"://"); - if(name == nil) - return; - name = runestrchr(name+3, '/'); - if(name == nil) - return; - if(*name == L'/') - name++; - - n = 0; - for(e = name; *e != 0; e++) - if(*e == L'/') - n++; - comp = emalloc((n+2)*sizeof *comp); - - /* - * Break the name into a list of components - */ - p = comp; - *p++ = name; - tail = nil; - tailr = L'☺'; /* silence compiler */ - for(s = name; *s != 0; s++){ - if(*s == '?' || *s == '#'){ - tail = s+1; - tailr = *s; - *s = 0; - break; - } - else if(*s == L'/'){ - *p++ = s+1; - *s = 0; - } - } - - /* - * go through the component list, deleting components that are empty (except - * the last component) or ., and any .. and its predecessor. - */ - for(p = q = comp; *p != nil; p++){ - if(runestrcmp(*p, L"") == 0 && p[1] != nil - || runestrcmp(*p, L".") == 0) - continue; - else if(q>comp && runestrcmp(*p, L"..") == 0 && runestrcmp(q[-1], L"..") != 0) - q--; - else - *q++ = *p; - } - *q = nil; - - /* - * rebuild the path name - */ - s = name; - for(p = comp; pnextimage; - c->nextimage = r; - r = c; - } - *head = r; -} - char urlexpr[] = "^(https?|ftp|file|gopher|mailto|news|nntp|telnet|wais|" "prospero)://[^/]+"; Reprog *urlprog; @@ -907,7 +893,7 @@ ntext = emalloc(sizeof(Itext)); ntext->s = s2; ntext->ascent = text->ascent; - ntext->anchorid = text->anchorid; + ntext->anchor = text->anchor; ntext->state = text->state&~(IFbrk|IFbrksp|IFnobrk|IFcleft|IFcright); ntext->tag = text->tag; ntext->fnt = text->fnt; diff -r 85895476fecf sys/src/cmd/acme/look.c --- a/sys/src/cmd/acme/look.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/acme/look.c Fri Mar 05 20:37:37 2021 -0800 @@ -314,7 +314,7 @@ { if(isalnum(r)) return TRUE; - if(runestrchr(L".-+/:", r)) + if(runestrchr(L".-+/:@", r)) return TRUE; return FALSE; } diff -r 85895476fecf sys/src/cmd/hjfs/auth.c --- a/sys/src/cmd/hjfs/auth.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/hjfs/auth.c Fri Mar 05 20:37:37 2021 -0800 @@ -301,10 +301,13 @@ if((fs->flags & FSNOPERM) != 0) return 1; perm = d->mode & 0777; - if(d->uid == uid) - perm >>= 6; - else if(ingroup(fs, uid, d->gid, 0)) - perm >>= 3; + /* uid none gets only other permissions */ + if(d->uid != 0) { + if(d->uid == uid) + perm >>= 6; + else if(ingroup(fs, uid, d->gid, 0)) + perm >>= 3; + } switch(mode & 3){ case OREAD: return (perm & 4) != 0; diff -r 85895476fecf sys/src/cmd/htmlfmt/html.c --- a/sys/src/cmd/htmlfmt/html.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/htmlfmt/html.c Fri Mar 05 20:37:37 2021 -0800 @@ -7,11 +7,6 @@ #include #include "dat.h" -char urlexpr[] = - "^(https?|ftp|file|gopher|mailto|news|nntp|telnet|wais|prospero)" - "://([a-zA-Z0-9_@\\-]+([.:][a-zA-Z0-9_@\\-]+)*)"; -Reprog *urlprog; - int inword = 0; int col = 0; int wordi = 0; @@ -40,19 +35,6 @@ return nil; } -char* -runetobyte(Rune *r, int n) -{ - char *s; - - if(n == 0) - return emalloc(1); - s = smprint("%.*S", n, r); - if(s == nil) - error("malloc failed"); - return s; -} - int closingpunct(char c) { @@ -129,73 +111,16 @@ free(r); } -char* -baseurl(char *url) -{ - char *base, *slash; - Resub rs[10]; - - if(url == nil) - return nil; - if(urlprog == nil){ - urlprog = regcomp(urlexpr); - if(urlprog == nil) - error("can't compile URL regexp"); - } - memset(rs, 0, sizeof rs); - if(regexec(urlprog, url, rs, nelem(rs)) == 0) - return nil; - base = estrdup(url); - slash = strrchr(base, '/'); - if(slash!=nil && slash>=&base[rs[0].ep-rs[0].sp]) - *slash = '\0'; - else - base[rs[0].ep-rs[0].sp] = '\0'; - return base; -} - -char* -fullurl(URLwin *u, Rune *rhref) -{ - char *base, *href, *hrefbase; - char *result; - - if(rhref == nil) - return estrdup("NULL URL"); - href = runetobyte(rhref, runestrlen(rhref)); - hrefbase = baseurl(href); - result = nil; - if(hrefbase==nil && (base = baseurl(u->url))!=nil){ - result = estrdup(base); - if(base[strlen(base)-1]!='/' && (href==nil || href[0]!='/')) - result = eappend(result, "/", ""); - free(base); - } - if(href){ - if(result) - result = eappend(result, "", href); - else - result = estrdup(href); - } - free(hrefbase); - if(result == nil) - return estrdup("***unknown***"); - return result; -} - void -render(URLwin *u, Bytes *t, Item *items, int curanchor) +render(URLwin *u, Bytes *t, Item *items, Anchor *curanchor) { Item *il; Itext *it; Ifloat *ifl; Ispacer *is; Itable *ita; - Iimage *im; - Anchor *a; Table *tab; Tablecell *cell; - char *href; inword = 0; col = 0; @@ -221,14 +146,8 @@ renderbytes(t, "=======\n"); break; case Iimagetag: - if(!aflag) - break; - im = (Iimage*)il; - if(im->imsrc){ - href = fullurl(u, im->imsrc); - renderbytes(t, "[image %s]", href); - free(href); - } + if(aflag) + renderbytes(t, "[image %S]", ((Iimage*)il)->imsrc); break; case Iformfieldtag: if(aflag) @@ -255,15 +174,10 @@ default: error("unknown item tag %d\n", il->tag); } - if(il->anchorid != 0 && il->anchorid!=curanchor){ - for(a=u->docinfo->anchors; a!=nil; a=a->next) - if(aflag && a->index == il->anchorid){ - href = fullurl(u, a->href); - renderbytes(t, "[%s]", href); - free(href); - break; - } - curanchor = il->anchorid; + if(aflag && il->anchor!=curanchor){ + if(curanchor != nil) + renderbytes(t, "[%S]", curanchor->href); + curanchor = il->anchor; } } if(t->n>0 && t->b[t->n-1]!='\n') diff -r 85895476fecf sys/src/cmd/ip/httpd/httpd.c --- a/sys/src/cmd/ip/httpd/httpd.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/ip/httpd/httpd.c Fri Mar 05 20:37:37 2021 -0800 @@ -51,6 +51,7 @@ address = nil; hmydomain = nil; netdir = "/net"; + tmfmtinstall(); fmtinstall('D', hdatefmt); fmtinstall('H', httpfmt); fmtinstall('U', hurlfmt); diff -r 85895476fecf sys/src/cmd/mkone --- a/sys/src/cmd/mkone Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/mkone Fri Mar 05 20:37:37 2021 -0800 @@ -40,7 +40,7 @@ rm -f *.[$OS] [$OS].out y.tab.? lex.yy.c y.debug y.output *.acid $TARG $CLEANFILES clean:V: - rm -f *.[$OS] [$OS].out y.tab.? lex.yy.c y.debug y.output $TARG $CLEANFILES + rm -f *.[$OS] *.a[$OS] [$OS].out y.tab.? lex.yy.c y.debug y.output $TARG $CLEANFILES safeinstall:V: $O.out test -e $BIN/$TARG && mv $BIN/$TARG $BIN/_$TARG diff -r 85895476fecf sys/src/cmd/ndb/dnresolve.c --- a/sys/src/cmd/ndb/dnresolve.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/ndb/dnresolve.c Fri Mar 05 20:37:37 2021 -0800 @@ -1510,6 +1510,7 @@ memset(&req, 0, sizeof req); req.isslave = 1; req.aborttime = timems() + Maxreqtm; + req.tries = Maxreqtries; req.from = "internal"; queryinit(&q, dnlookup(root, Cin, 1), Tns, &req); nsrp = randomize(dblookup(root, Cin, Tns, 0, 0)); diff -r 85895476fecf sys/src/cmd/python/Extra/mkfile --- a/sys/src/cmd/python/Extra/mkfile Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/python/Extra/mkfile Fri Mar 05 20:37:37 2021 -0800 @@ -7,7 +7,7 @@ >8) @@ -534,28 +558,6 @@ } } -typedef struct Tab Tab; -struct Tab -{ - char *name; - ulong mode; -}; - -Tab tab[] = -{ - "/", DMDIR|0555, - "cs", 0666, - "tcp", DMDIR|0555, - "clone", 0666, - nil, DMDIR|0555, - "ctl", 0666, - "data", 0666, - "local", 0444, - "remote", 0444, - "status", 0444, - "listen", 0666, -}; - static void fillstat(Dir *d, uvlong path) { diff -r 85895476fecf sys/src/cmd/tprof.c --- a/sys/src/cmd/tprof.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/tprof.c Fri Mar 05 20:37:37 2021 -0800 @@ -36,10 +36,54 @@ return 0; return 1; } + +int +runcmd(char **argv, int *pfd) +{ + int pid, fd; + char path[128]; + + + pid = fork(); + switch(pid){ + case -1: + sysfatal("fork: %r"); + case 0: + snprint(path, sizeof(path), "/proc/%d/ctl", getpid()); + print("hang %s\n", path); + if((fd = open(path, OWRITE|OCEXEC)) == -1) + sysfatal("open self: %r"); + if(fprint(fd, "hang") == -1) + sysfatal("hang: %r"); + close(fd); + + exec(argv[0], argv); + snprint(path, sizeof(path), "/bin/%s", argv[0]); + exec(path, argv); + sysfatal("exec: %r"); + break; + default: + snprint(path, sizeof(path), "/proc/%d/ctl", pid); + if((fd = open(path, OWRITE)) == -1) + sysfatal("open %d: %r\n", pid); + if(fprint(fd, "profile\n") == -1) + sysfatal("start profile: %r"); + fprint(fd, "startstop\n"); + *pfd = fd; + } + return pid; +} + +void +usage(void) +{ + error(0, "usage: tprof [pid [binary] | -c cmd... ]"); +} + void main(int argc, char *argv[]) { - int fd; + int fd, pid, procfd, cmd; long i, j, k, n; Dir *d; char *name; @@ -52,16 +96,31 @@ struct COUNTER *cp; char filebuf[128], *file; - if(argc != 2 && argc != 3) - error(0, "usage: tprof pid [binary]"); + cmd = 0; + pid = -1; + ARGBEGIN{ + case 'c': + cmd++; + break; + default: + usage(); + break; + }ARGEND; + + if(cmd != 0) + pid = runcmd(argv, &procfd); + else if(argc == 1 || argc == 2) + pid = atoi(argv[0]); + else + usage(); /* * Read symbol table */ - if(argc == 2){ + if(cmd || argc == 1){ file = filebuf; - snprint(filebuf, sizeof filebuf, "/proc/%s/text", argv[1]); + snprint(filebuf, sizeof filebuf, "/proc/%d/text", pid); }else - file = argv[2]; + file = argv[1]; fd = open(file, OREAD); if(fd < 0) @@ -78,10 +137,11 @@ /* * Read timing data */ - file = smprint("/proc/%s/profile", argv[1]); + file = smprint("/proc/%d/profile", pid); fd = open(file, OREAD); if(fd < 0) error(1, file); + fprint(procfd, "startstop\n"); free(file); d = dirfstat(fd); if(d == nil) @@ -92,7 +152,7 @@ data = malloc(d->length); if(data == 0) error(1, "malloc"); - if(read(fd, data, d->length) < 0) + if(readn(fd, data, d->length) < 0) error(1, "text read"); close(fd); diff -r 85895476fecf sys/src/cmd/upas/Mail/mail.h --- a/sys/src/cmd/upas/Mail/mail.h Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/upas/Mail/mail.h Fri Mar 05 20:37:37 2021 -0800 @@ -15,6 +15,7 @@ Sdummy = 1<<0, /* message placeholder */ Stoplev = 1<<1, /* not a response to anything */ Sopen = 1<<2, /* opened for viewing */ + Szap = 1<<3, /* flushed, to be removed from list */ }; enum { diff -r 85895476fecf sys/src/cmd/upas/Mail/mbox.c --- a/sys/src/cmd/upas/Mail/mbox.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/upas/Mail/mbox.c Fri Mar 05 20:37:37 2021 -0800 @@ -679,38 +679,43 @@ char *path; Mesg *m, *p; - i = 0; path = estrjoin(maildir, "/ctl", nil); fd = open(path, OWRITE); free(path); if(fd == -1) sysfatal("open mbox: %r"); - while(i < mbox.nmesg){ + for(i = 0; i < mbox.nmesg; i++){ m = mbox.mesg[i]; - if((m->state & Sopen) || !(m->flags & (Fdel|Ftodel))){ - i++; + p = m->parent; + if(m->state & (Sopen|Szap) || (m->flags & (Fdel|Ftodel)) == 0) continue; - } + ln = mesglineno(m, nil); fprint(mbox.addr, "%d,%d", ln, ln+m->nsub); write(mbox.data, "", 0); if(m->flags & Ftodel) fprint(fd, "delete %s %d", mailbox, atoi(m->name)); - p = m->parent; removeid(m); + m->state |= Szap; if(p == nil && m->nsub != 0){ p = placeholder(m->messageid, m->time, 1); p->nsub = m->nsub + 1; - mbox.mesg[i] = p; } if(p != nil) relinkmsg(p, m); for(j = 0; j < m->nchild; j++) mbredraw(m->child[j], 1, 1); - memmove(&mbox.mesg[i], &mbox.mesg[i+1], (mbox.nmesg - i)*sizeof(Mesg*)); - mbox.nmesg--; } + + for(i = 0, j = 0; i < mbox.nmesg; i++){ + m = mbox.mesg[i]; + if((m->state & Szap) != 0) + mesgfree(m); + else + mbox.mesg[j++] = m; + } + close(fd); fprint(mbox.ctl, "clean\n"); } diff -r 85895476fecf sys/src/cmd/winwatch.c --- a/sys/src/cmd/winwatch.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/cmd/winwatch.c Fri Mar 05 20:37:37 2021 -0800 @@ -185,21 +185,19 @@ int geometry(void) { - int i, nrows, ncols, z; + int i, ncols, z; Rectangle r; z = 0; - nrows = (Dy(screen->r)-2*MARGIN+PAD)/(font->height+PAD); - if(nrows <= 0) - nrows = 1; - if(nrows != rows){ - rows = nrows; - z = 1; - } - ncols = nwin <= 0 ? 1 : (nwin+rows-1)/rows; - if(ncols != cols){ - cols = ncols; - z = 1; + rows = (Dy(screen->r)-2*MARGIN+PAD)/(font->height+PAD); + if(rows <= 0) + rows = 1; + if(rows*cols < nwin || rows*cols >= nwin*2){ + ncols = nwin <= 0 ? 1 : (nwin+rows-1)/rows; + if(ncols != cols){ + cols = ncols; + z = 1; + } } r = Rect(0,0,(Dx(screen->r)-2*MARGIN+PAD)/cols-PAD, font->height); diff -r 85895476fecf sys/src/libbio/binit.c --- a/sys/src/libbio/binit.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/libbio/binit.c Fri Mar 05 20:37:37 2021 -0800 @@ -59,6 +59,8 @@ static int biowrite(Biobufhdr *bp, void *v, long n) { + if(n == 0) + return; return write(bp->fid, v, n); } diff -r 85895476fecf sys/src/libc/port/malloc.c --- a/sys/src/libc/port/malloc.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/libc/port/malloc.c Fri Mar 05 20:37:37 2021 -0800 @@ -246,8 +246,10 @@ void free(void *v) { - if(v != nil) + if(v != nil){ + setmalloctag(v, getcallerpc(&v)); poolfree(mainmem, (ulong*)v-Npadlong); + } } void* diff -r 85895476fecf sys/src/libc/port/pool.c --- a/sys/src/libc/port/pool.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/libc/port/pool.c Fri Mar 05 20:37:37 2021 -0800 @@ -560,6 +560,7 @@ LOG(p, "pool too big: %llud+%lud > %llud\n", (uvlong)p->cursize, asize, (uvlong)p->maxsize); werrstr("memory pool too large"); + abort(); } return; } diff -r 85895476fecf sys/src/libhtml/build.c --- a/sys/src/libhtml/build.c Tue Mar 02 22:56:58 2021 -0500 +++ b/sys/src/libhtml/build.c Fri Mar 05 20:37:37 2021 -0800 @@ -27,7 +27,6 @@ int curvoff; // current baseline offset uchar curul; // current underline/strike state uchar curjust; // current justify state - int curanchor; // current (href) anchor id (if in one), or 0 int curstate; // current value of item state int literal; // current literal state int inpar; // true when in a paragraph-like construct @@ -52,11 +51,8 @@ Pstate* psstk; int nforms; int ntables; - int nanchors; int nframes; - Formfield* curfield; Form* curform; - Map* curmap; Table* tabstk; Kidinfo* kidstk; }; @@ -255,7 +251,6 @@ static Pstate* finishcell(Table* curtab, Pstate* psstk); static void finish_table(Table* t); static void freeanchor(Anchor* a); -static void freedestanchor(DestAnchor* da); static void freeform(Form* f); static void freeformfield(Formfield* ff); static void freeitem(Item* it); @@ -271,9 +266,6 @@ static Align makealign(int halign, int valign); static Background makebackground(Rune* imgurl, int color); static Dimen makedimen(int kind, int spec); -static Anchor* newanchor(int index, Rune* name, Rune* href, int target, Anchor* link); -static Area* newarea(int shape, Rune* href, int target, Area* link); -static DestAnchor* newdestanchor(int index, Rune* name, Item* item, DestAnchor* link); static Docinfo* newdocinfo(void); static Genattr* newgenattr(Rune* id, Rune* class, Rune* style, Rune* title, SEvent* events); static Form* newform(int formid, Rune* name, Rune* action, @@ -357,18 +349,15 @@ is->psstk = ps; is->nforms = 0; is->ntables = 0; - is->nanchors = 0; is->nframes = 0; - is->curfield = nil; is->curform = nil; - is->curmap = nil; is->tabstk = nil; is->kidstk = nil; return is; } static void -linkitems(Docinfo *di, Item *it) +linkitems(Docinfo *di, Item *it, Iimage** imgtail) { Formfield *ff; Tablecell *c; @@ -378,8 +367,8 @@ switch(it->tag) { case Iimagetag: /* link image to docinfo */ - ((Iimage*)it)->nextimage = di->images; - di->images = (Iimage*)it; + *imgtail = (Iimage*)it; + imgtail = &(*imgtail)->nextimage; break; case Iformfieldtag: /* link formfield to form */ @@ -399,7 +388,7 @@ ff = ((Iformfield*)it)->formfield; ff->form->fields = ff; } - linkitems(di, ff->image); + linkitems(di, ff->image, imgtail); } break; case Itabletag: @@ -410,12 +399,11 @@ tt->tabletok = nil; tt->next = di->tables; di->tables = tt; - linkitems(di, tt->caption); for(c = tt->cells; c != nil; c = c->next) - linkitems(di, c->content); + linkitems(di, c->content, imgtail); break; case Ifloattag: - linkitems(di, ((Ifloat*)it)->item); + linkitems(di, ((Ifloat*)it)->item, imgtail); break; } Next: @@ -474,8 +462,6 @@ int sty; int nosh; int color; - int oldcuranchor; - int dfltbd; int v; int hang; int isempty; @@ -489,7 +475,6 @@ uchar ty; uchar ty2; Pstate* ps; - Pstate* nextps; Pstate* outerps; Table* curtab; Token* tok; @@ -521,12 +506,13 @@ Tablerow* tr; Formfield* field; Formfield* ff; - Rune* href; Rune* src; Rune* scriptsrc; Rune* bgurl; Rune* action; Background bg; + Anchor** atail; + Area *area; if(!buildinited) buildinit(); @@ -534,6 +520,8 @@ ps = is->psstk; curtab = is->tabstk; di = is->doc; + atail = &di->anchors; + map = nil; toks = _gettoks(data, datalen, di->chset, di->mediatype, &tokslen); toki = 0; for(; toki < tokslen; toki++) { @@ -628,36 +616,36 @@ // Anchors are not supposed to be nested, but you sometimes see // href anchors inside destination anchors. case Ta: - if(ps->curanchor != 0) { + if(*atail != nil) { if(warn) fprint(2, "warning: nested or missing \n"); - ps->curanchor = 0; - } - name = aval(tok, Aname); - href = aurlval(tok, Ahref, nil, di->base); - // ignore rel, rev, and title attrs - if(href != nil) { - target = atargval(tok, di->target); - di->anchors = newanchor(++is->nanchors, name, href, target, di->anchors); - if(name != nil) - name = _Strdup(name); // for DestAnchor construction, below - ps->curanchor = is->nanchors; - ps->curfg = push(&ps->fgstk, di->link); - ps->curul = push(&ps->ulstk, ULunder); - } - if(name != nil) { - // add a null item to be destination - additem(ps, newispacer(ISPnull), tok); - di->dests = newdestanchor(++is->nanchors, name, ps->lastit, di->dests); - } - break; - - case Ta+RBRA : - if(ps->curanchor != 0) { ps->curfg = popretnewtop(&ps->fgstk, di->text); ps->curul = popretnewtop(&ps->ulstk, ULnone); - ps->curanchor = 0; - } + additem(ps, newispacer(ISPnull), tok); + ps->lastit->anchor = nil; + atail = &(*atail)->next; + } + *atail = (Anchor*)emalloc(sizeof(Anchor)); + (*atail)->name = aval(tok, Aname); + (*atail)->href = aurlval(tok, Ahref, nil, di->base); + (*atail)->target = atargval(tok, di->target); + additem(ps, newispacer(ISPnull), tok); + ps->lastit->anchor = *atail; + ps->curfg = push(&ps->fgstk, di->link); + ps->curul = push(&ps->ulstk, ULunder); + break; + + case Ta+RBRA : + if(*atail == nil) { + if(warn) + fprint(2, "warning: unexpected \n"); + continue; + } + ps->curfg = popretnewtop(&ps->fgstk, di->text); + ps->curul = popretnewtop(&ps->ulstk, ULnone); + additem(ps, newispacer(ISPnull), tok); + ps->lastit->anchor = nil; + atail = &(*atail)->next; break; // @@ -671,17 +659,31 @@ // case Tarea: - map = di->maps; if(map == nil) { if(warn) fprint(2, "warning: not inside \n"); continue; } - map->areas = newarea(atabval(tok, Ashape, shape_tab, NSHAPETAB, SHrect), - aurlval(tok, Ahref, nil, di->base), - atargval(tok, di->target), - map->areas); - setdimarray(tok, Acoords, &map->areas->coords, &map->areas->ncoords); + area = (Area*)emalloc(sizeof(Area)); + area->next = map->areas; + map->areas = area; + area->shape = atabval(tok, Ashape, shape_tab, NSHAPETAB, SHrect); + setdimarray(tok, Acoords, &area->coords, &area->ncoords); + if(*atail != nil) { + if(warn) + fprint(2, "warning: inside \n"); + ps->curfg = popretnewtop(&ps->fgstk, di->text); + ps->curul = popretnewtop(&ps->ulstk, ULnone); + additem(ps, newispacer(ISPnull), tok); + ps->lastit->anchor = nil; + atail = &(*atail)->next; + } + area->anchor = (Anchor*)emalloc(sizeof(Anchor)); + area->anchor->name = aval(tok, Aalt); + area->anchor->href = aurlval(tok, Ahref, nil, di->base); + area->anchor->target = atargval(tok, di->target); + *atail = area->anchor; + atail = &(*atail)->next; break; // @@ -789,25 +791,12 @@ fprint(2, "warning: more than one in \n"); continue; } - ps = newpstate(ps); + curtab->caption = getpcdata(toks, tokslen, &toki); + if(warn && toki < tokslen - 1 && toks[toki + 1].tag != Tcaption + RBRA) + fprint(2, "warning: \n"); - continue; - } - if(curtab->caption != nil) - freeitems(curtab->caption); - curtab->caption = ps->items->next; - ps->items->next = nil; - freepstate(ps); - ps = nextps; - break; - case Tcenter: case Tdiv: if(tag == Tcenter) @@ -1092,7 +1081,6 @@ // case Timg: map = nil; - oldcuranchor = ps->curanchor; if(_tokaval(tok, Ausemap, &usemap, 0)) { if(!_prefix(L"#", usemap)) { if(warn) @@ -1100,21 +1088,13 @@ } else { map = getmap(di, usemap+1); - if(ps->curanchor == 0) { - di->anchors = newanchor(++is->nanchors, nil, nil, di->target, di->anchors); - ps->curanchor = is->nanchors; - } } } align = atabval(tok, Aalign, align_tab, NALIGNTAB, ALbottom); - dfltbd = 0; - if(ps->curanchor != 0) - dfltbd = 2; src = aurlval(tok, Asrc, nil, di->base); if(src == nil) { if(warn) fprint(2, "warning: has no src attribute\n"); - ps->curanchor = oldcuranchor; continue; } img = newiimage(src, @@ -1124,7 +1104,7 @@ auintval(tok, Aheight, 0), auintval(tok, Ahspace, IMGHSPACE), auintval(tok, Avspace, IMGVSPACE), - auintval(tok, Aborder, dfltbd), + auintval(tok, Aborder, ps->lastit->anchor == nil && usemap == nil ? 0 : 2), aflagval(tok, Aismap), map); if(align == ALleft || align == ALright) { @@ -1137,7 +1117,6 @@ ps->skipwhite = 0; additem(ps, img, tok); } - ps->curanchor = oldcuranchor; break; // @@ -1148,7 +1127,7 @@ fprint(2, " not inside \n"); continue; } - field = newformfield( + field = is->curform->fields = newformfield( atabval(tok, Atype, input_tab, NINPUTTAB, Ftext), ++is->curform->nfields, is->curform, @@ -1156,7 +1135,7 @@ aval(tok, Avalue), auintval(tok, Asize, 0), auintval(tok, Amaxlength, 1000), - nil); + is->curform->fields); if(aflagval(tok, Achecked)) field->flags = FFchecked; @@ -1239,14 +1218,14 @@ HGet, di->forms); di->forms = frm; - ff = newformfield(Ftext, + frm->fields = ff = newformfield(Ftext, ++frm->nfields, frm, _Strdup(L"_ISINDEX_"), nil, 50, 1000, - nil); + frm->fields); additem(ps, newiformfield(ff), tok); addbrk(ps, 1, 0); break; @@ -1279,17 +1258,16 @@ // case Tmap: if(_tokaval(tok, Aname, &name, 0)) - is->curmap = getmap(di, name); + map = getmap(di, name); break; case Tmap+RBRA: - map = is->curmap; if(map == nil) { if(warn) fprint(2, "warning: unexpected \n"); continue; } - map->areas = (Area*)_revlist((List*)map->areas); + map = nil; break; case Tmeta: @@ -1443,14 +1421,14 @@ fprint(2, "\n"); continue; } - field = is->curfield; + field = is->curform->fields; if(field->ftype != Fselect) continue; // put options back in input order field->options = (Option*)_revlist((List*)field->options); - is->curfield = nil; break; // @@ -1676,14 +1653,14 @@ fprint(2, "
data ended by %T\n", &toks[toki + 1]); curtab->caption_place = atabval(tok, Aalign, align_tab, NALIGNTAB, ALtop); break; - case Tcaption+RBRA: - nextps = ps->next; - if(curtab == nil || nextps == nil) { - if(warn) - fprint(2, "warning: unexpected