updated to the new Pikotools API

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1071 e52654a7-88a9-db11-a3e9-0013d4bc506e
2018-01-06 18:12:53 +00:00
parent 3eff400d88
commit ccf78dcb02
48 changed files with 766 additions and 390 deletions
--- a/winixd/core/Makefile.dep
+++ b/winixd/core/Makefile.dep
@@ -7,6 +7,8 @@ acceptbaseparser.o: ../../../pikotools/date/date.h requesttypes.h
 acceptbaseparser.o: ../../../pikotools/textstream/textstream.h
 acceptbaseparser.o: ../../../pikotools/convert/convert.h
 acceptbaseparser.o: ../../../pikotools/convert/inttostr.h
+acceptbaseparser.o: ../../../pikotools/convert/strtoint.h
+acceptbaseparser.o: ../../../pikotools/convert/text.h
 acceptbaseparser.o: ../../../pikotools/membuffer/membuffer.h
 acceptbaseparser.o: ../../../pikotools/textstream/types.h
 acceptbaseparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
@@ -22,6 +24,8 @@ app.o: ../../../winix/winixd/core/textstream.h misc.h requesttypes.h
 app.o: ../../../pikotools/textstream/textstream.h
 app.o: ../../../pikotools/convert/convert.h
 app.o: ../../../pikotools/convert/inttostr.h
+app.o: ../../../pikotools/convert/strtoint.h
+app.o: ../../../pikotools/convert/text.h
 app.o: ../../../pikotools/membuffer/membuffer.h
 app.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 app.o: winix_const.h ../../../winix/winixd/core/error.h
@@ -120,14 +124,16 @@ compress.o: ../../../pikotools/textstream/types.h
 compress.o: ../../../pikotools/date/date.h
 compress.o: ../../../pikotools/convert/convert.h
 compress.o: ../../../pikotools/convert/inttostr.h
+compress.o: ../../../pikotools/convert/strtoint.h
+compress.o: ../../../pikotools/convert/text.h misc.h item.h
+compress.o: ../../../pikotools/utf8/utf8.h winix_const.h
 compress.o: ../../../pikotools/membuffer/membuffer.h
 compress.o: ../../../pikotools/textstream/types.h log.h textstream.h
-compress.o: logmanipulators.h slog.h cur.h request.h item.h error.h config.h
+compress.o: logmanipulators.h slog.h cur.h request.h error.h config.h
 compress.o: ../../../pikotools/space/spaceparser.h
 compress.o: ../../../pikotools/space/space.h htmlfilter.h
 compress.o: ../../../winix/winixd/templates/htmltextstream.h
-compress.o: ../../../winix/winixd/core/textstream.h misc.h
-compress.o: ../../../pikotools/utf8/utf8.h winix_const.h
+compress.o: ../../../winix/winixd/core/textstream.h
 compress.o: ../../../pikotools/space/spacetojson.h
 compress.o: ../../../ezc/src/outstreams.h session.h user.h plugindata.h
 compress.o: rebus.h ipban.h mount.h ../../../winix/winixd/templates/locale.h
@@ -139,12 +145,13 @@ config.o: ../../../pikotools/textstream/textstream.h
 config.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
 config.o: ../../../pikotools/convert/convert.h
 config.o: ../../../pikotools/convert/inttostr.h
+config.o: ../../../pikotools/convert/strtoint.h
+config.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
+config.o: ../../../pikotools/utf8/utf8.h winix_const.h
 config.o: ../../../pikotools/membuffer/membuffer.h
 config.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
-config.o: requesttypes.h item.h error.h
-config.o: ../../../winix/winixd/templates/htmltextstream.h
-config.o: ../../../winix/winixd/core/textstream.h misc.h
-config.o: ../../../pikotools/utf8/utf8.h winix_const.h
+config.o: error.h ../../../winix/winixd/templates/htmltextstream.h
+config.o: ../../../winix/winixd/core/textstream.h
 config.o: ../../../pikotools/space/spacetojson.h
 config.o: ../../../ezc/src/outstreams.h session.h user.h plugindata.h rebus.h
 config.o: ipban.h mount.h ../../../winix/winixd/templates/locale.h plugin.h
@@ -243,11 +250,12 @@ crypt.o: ../../../pikotools/textstream/textstream.h
 crypt.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
 crypt.o: ../../../pikotools/convert/convert.h
 crypt.o: ../../../pikotools/convert/inttostr.h
-crypt.o: ../../../pikotools/membuffer/membuffer.h
-crypt.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
-crypt.o: requesttypes.h item.h error.h
+crypt.o: ../../../pikotools/convert/strtoint.h
+crypt.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
+crypt.o: winix_const.h ../../../pikotools/membuffer/membuffer.h
+crypt.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h error.h
 crypt.o: ../../../winix/winixd/templates/htmltextstream.h
-crypt.o: ../../../winix/winixd/core/textstream.h misc.h winix_const.h
+crypt.o: ../../../winix/winixd/core/textstream.h
 crypt.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
 crypt.o: session.h plugindata.h rebus.h ipban.h mount.h
 crypt.o: ../../../winix/winixd/templates/locale.h
@@ -257,14 +265,15 @@ dircontainer.o: ../../../pikotools/date/date.h log.h textstream.h
 dircontainer.o: logmanipulators.h ../../../pikotools/textstream/textstream.h
 dircontainer.o: ../../../pikotools/convert/convert.h
 dircontainer.o: ../../../pikotools/convert/inttostr.h
+dircontainer.o: ../../../pikotools/convert/strtoint.h
+dircontainer.o: ../../../pikotools/convert/text.h misc.h requesttypes.h
+dircontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h
 dircontainer.o: ../../../pikotools/membuffer/membuffer.h
 dircontainer.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
-dircontainer.o: requesttypes.h error.h config.h
-dircontainer.o: ../../../pikotools/space/spaceparser.h
+dircontainer.o: error.h config.h ../../../pikotools/space/spaceparser.h
 dircontainer.o: ../../../pikotools/space/space.h htmlfilter.h
 dircontainer.o: ../../../winix/winixd/templates/htmltextstream.h
-dircontainer.o: ../../../winix/winixd/core/textstream.h misc.h
-dircontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h
+dircontainer.o: ../../../winix/winixd/core/textstream.h
 dircontainer.o: ../../../pikotools/space/spacetojson.h
 dircontainer.o: ../../../ezc/src/outstreams.h session.h user.h plugindata.h
 dircontainer.o: rebus.h ipban.h mount.h
@@ -278,6 +287,8 @@ dirs.o: ../../../winix/winixd/core/textstream.h misc.h requesttypes.h
 dirs.o: ../../../pikotools/textstream/textstream.h
 dirs.o: ../../../pikotools/convert/convert.h
 dirs.o: ../../../pikotools/convert/inttostr.h
+dirs.o: ../../../pikotools/convert/strtoint.h
+dirs.o: ../../../pikotools/convert/text.h
 dirs.o: ../../../pikotools/membuffer/membuffer.h
 dirs.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 dirs.o: winix_const.h ../../../winix/winixd/core/error.h
@@ -318,6 +329,8 @@ groups.o: ../../../pikotools/date/date.h requesttypes.h
 groups.o: ../../../pikotools/textstream/textstream.h
 groups.o: ../../../pikotools/convert/convert.h
 groups.o: ../../../pikotools/convert/inttostr.h
+groups.o: ../../../pikotools/convert/strtoint.h
+groups.o: ../../../pikotools/convert/text.h
 groups.o: ../../../pikotools/membuffer/membuffer.h
 groups.o: ../../../pikotools/textstream/types.h
 groups.o: ../../../pikotools/utf8/utf8.h winix_const.h
@@ -344,6 +357,8 @@ httpsimpleparser.o: ../../../pikotools/date/date.h requesttypes.h
 httpsimpleparser.o: ../../../pikotools/textstream/textstream.h
 httpsimpleparser.o: ../../../pikotools/convert/convert.h
 httpsimpleparser.o: ../../../pikotools/convert/inttostr.h
+httpsimpleparser.o: ../../../pikotools/convert/strtoint.h
+httpsimpleparser.o: ../../../pikotools/convert/text.h
 httpsimpleparser.o: ../../../pikotools/membuffer/membuffer.h
 httpsimpleparser.o: ../../../pikotools/textstream/types.h
 httpsimpleparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
@@ -357,6 +372,8 @@ image.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
 image.o: requesttypes.h ../../../pikotools/textstream/textstream.h
 image.o: ../../../pikotools/convert/convert.h
 image.o: ../../../pikotools/convert/inttostr.h
+image.o: ../../../pikotools/convert/strtoint.h
+image.o: ../../../pikotools/convert/text.h
 image.o: ../../../pikotools/membuffer/membuffer.h
 image.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 image.o: winix_const.h ../../../winix/winixd/core/error.h
@@ -456,14 +473,16 @@ ipbancontainer.o: ../../../pikotools/textstream/types.h
 ipbancontainer.o: ../../../pikotools/date/date.h
 ipbancontainer.o: ../../../pikotools/convert/convert.h
 ipbancontainer.o: ../../../pikotools/convert/inttostr.h
+ipbancontainer.o: ../../../pikotools/convert/strtoint.h
+ipbancontainer.o: ../../../pikotools/convert/text.h misc.h item.h
+ipbancontainer.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
 ipbancontainer.o: ../../../pikotools/membuffer/membuffer.h
 ipbancontainer.o: ../../../pikotools/textstream/types.h slog.h cur.h
-ipbancontainer.o: request.h requesttypes.h item.h error.h config.h
+ipbancontainer.o: request.h error.h config.h
 ipbancontainer.o: ../../../pikotools/space/spaceparser.h
 ipbancontainer.o: ../../../pikotools/space/space.h htmlfilter.h
 ipbancontainer.o: ../../../winix/winixd/templates/htmltextstream.h
-ipbancontainer.o: ../../../winix/winixd/core/textstream.h misc.h
-ipbancontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h
+ipbancontainer.o: ../../../winix/winixd/core/textstream.h
 ipbancontainer.o: ../../../pikotools/space/spacetojson.h
 ipbancontainer.o: ../../../ezc/src/outstreams.h session.h user.h plugindata.h
 ipbancontainer.o: rebus.h mount.h ../../../winix/winixd/templates/locale.h
@@ -472,6 +491,8 @@ item.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
 item.o: misc.h requesttypes.h ../../../pikotools/textstream/textstream.h
 item.o: ../../../pikotools/convert/convert.h
 item.o: ../../../pikotools/convert/inttostr.h
+item.o: ../../../pikotools/convert/strtoint.h
+item.o: ../../../pikotools/convert/text.h
 item.o: ../../../pikotools/membuffer/membuffer.h
 item.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 item.o: winix_const.h crypt.h run.h config.h
@@ -483,14 +504,15 @@ job.o: textstream.h logmanipulators.h
 job.o: ../../../pikotools/textstream/textstream.h
 job.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 job.o: ../../../pikotools/convert/inttostr.h
+job.o: ../../../pikotools/convert/strtoint.h
+job.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
+job.o: ../../../pikotools/utf8/utf8.h winix_const.h
 job.o: ../../../pikotools/membuffer/membuffer.h
-job.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
-job.o: requesttypes.h item.h error.h config.h
-job.o: ../../../pikotools/space/spaceparser.h
+job.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h error.h
+job.o: config.h ../../../pikotools/space/spaceparser.h
 job.o: ../../../pikotools/space/space.h htmlfilter.h
 job.o: ../../../winix/winixd/templates/htmltextstream.h
-job.o: ../../../winix/winixd/core/textstream.h misc.h
-job.o: ../../../pikotools/utf8/utf8.h winix_const.h
+job.o: ../../../winix/winixd/core/textstream.h
 job.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
 job.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
 job.o: ../../../winix/winixd/templates/locale.h system.h dirs.h
@@ -584,14 +606,15 @@ lastcontainer.o: ../../../pikotools/space/space.h
 lastcontainer.o: ../../../pikotools/textstream/types.h
 lastcontainer.o: ../../../pikotools/convert/convert.h
 lastcontainer.o: ../../../pikotools/convert/inttostr.h
+lastcontainer.o: ../../../pikotools/convert/strtoint.h
+lastcontainer.o: ../../../pikotools/convert/text.h misc.h item.h
+lastcontainer.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
 lastcontainer.o: ../../../pikotools/membuffer/membuffer.h
 lastcontainer.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
-lastcontainer.o: requesttypes.h item.h error.h config.h
-lastcontainer.o: ../../../pikotools/space/spaceparser.h
+lastcontainer.o: error.h config.h ../../../pikotools/space/spaceparser.h
 lastcontainer.o: ../../../pikotools/space/space.h htmlfilter.h
 lastcontainer.o: ../../../winix/winixd/templates/htmltextstream.h
-lastcontainer.o: ../../../winix/winixd/core/textstream.h misc.h
-lastcontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h
+lastcontainer.o: ../../../winix/winixd/core/textstream.h
 lastcontainer.o: ../../../pikotools/space/spacetojson.h
 lastcontainer.o: ../../../ezc/src/outstreams.h session.h user.h plugindata.h
 lastcontainer.o: rebus.h ipban.h mount.h
@@ -603,14 +626,15 @@ loadavg.o: ../../../pikotools/textstream/types.h
 loadavg.o: ../../../pikotools/date/date.h
 loadavg.o: ../../../pikotools/convert/convert.h
 loadavg.o: ../../../pikotools/convert/inttostr.h
+loadavg.o: ../../../pikotools/convert/strtoint.h
+loadavg.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
+loadavg.o: ../../../pikotools/utf8/utf8.h winix_const.h
 loadavg.o: ../../../pikotools/membuffer/membuffer.h
 loadavg.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
-loadavg.o: requesttypes.h item.h error.h config.h
-loadavg.o: ../../../pikotools/space/spaceparser.h
+loadavg.o: error.h config.h ../../../pikotools/space/spaceparser.h
 loadavg.o: ../../../pikotools/space/space.h htmlfilter.h
 loadavg.o: ../../../winix/winixd/templates/htmltextstream.h
-loadavg.o: ../../../winix/winixd/core/textstream.h misc.h
-loadavg.o: ../../../pikotools/utf8/utf8.h winix_const.h
+loadavg.o: ../../../winix/winixd/core/textstream.h
 loadavg.o: ../../../pikotools/space/spacetojson.h
 loadavg.o: ../../../ezc/src/outstreams.h session.h user.h plugindata.h
 loadavg.o: rebus.h ipban.h mount.h ../../../winix/winixd/templates/locale.h
@@ -620,14 +644,15 @@ log.o: ../../../pikotools/textstream/textstream.h
 log.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h
 log.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 log.o: ../../../pikotools/convert/inttostr.h
+log.o: ../../../pikotools/convert/strtoint.h
+log.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
+log.o: ../../../pikotools/utf8/utf8.h winix_const.h
 log.o: ../../../pikotools/membuffer/membuffer.h
-log.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
-log.o: requesttypes.h item.h error.h config.h
-log.o: ../../../pikotools/space/spaceparser.h
+log.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h error.h
+log.o: config.h ../../../pikotools/space/spaceparser.h
 log.o: ../../../pikotools/space/space.h htmlfilter.h
 log.o: ../../../winix/winixd/templates/htmltextstream.h
-log.o: ../../../winix/winixd/core/textstream.h misc.h
-log.o: ../../../pikotools/utf8/utf8.h winix_const.h
+log.o: ../../../winix/winixd/core/textstream.h
 log.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
 log.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
 log.o: ../../../winix/winixd/templates/locale.h timezones.h timezone.h
@@ -636,6 +661,8 @@ misc.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
 misc.o: requesttypes.h ../../../pikotools/textstream/textstream.h
 misc.o: ../../../pikotools/convert/convert.h
 misc.o: ../../../pikotools/convert/inttostr.h
+misc.o: ../../../pikotools/convert/strtoint.h
+misc.o: ../../../pikotools/convert/text.h
 misc.o: ../../../pikotools/membuffer/membuffer.h
 misc.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 misc.o: winix_const.h log.h textstream.h logmanipulators.h slog.h cur.h
@@ -676,6 +703,8 @@ mount.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
 mount.o: requesttypes.h ../../../pikotools/textstream/textstream.h
 mount.o: ../../../pikotools/convert/convert.h
 mount.o: ../../../pikotools/convert/inttostr.h
+mount.o: ../../../pikotools/convert/strtoint.h
+mount.o: ../../../pikotools/convert/text.h
 mount.o: ../../../pikotools/membuffer/membuffer.h
 mount.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 mount.o: winix_const.h
@@ -690,6 +719,8 @@ mountparser.o: ../../../winix/winixd/core/textstream.h misc.h requesttypes.h
 mountparser.o: ../../../pikotools/textstream/textstream.h
 mountparser.o: ../../../pikotools/convert/convert.h
 mountparser.o: ../../../pikotools/convert/inttostr.h
+mountparser.o: ../../../pikotools/convert/strtoint.h
+mountparser.o: ../../../pikotools/convert/text.h
 mountparser.o: ../../../pikotools/membuffer/membuffer.h
 mountparser.o: ../../../pikotools/textstream/types.h
 mountparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
@@ -735,6 +766,8 @@ mounts.o: ../../../winix/winixd/core/textstream.h misc.h requesttypes.h
 mounts.o: ../../../pikotools/textstream/textstream.h
 mounts.o: ../../../pikotools/convert/convert.h
 mounts.o: ../../../pikotools/convert/inttostr.h
+mounts.o: ../../../pikotools/convert/strtoint.h
+mounts.o: ../../../pikotools/convert/text.h
 mounts.o: ../../../pikotools/membuffer/membuffer.h
 mounts.o: ../../../pikotools/textstream/types.h
 mounts.o: ../../../pikotools/utf8/utf8.h winix_const.h
@@ -835,14 +868,15 @@ plugin.o: ../../../pikotools/space/space.h
 plugin.o: ../../../pikotools/textstream/types.h
 plugin.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 plugin.o: ../../../pikotools/convert/inttostr.h
+plugin.o: ../../../pikotools/convert/strtoint.h
+plugin.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
+plugin.o: ../../../pikotools/utf8/utf8.h winix_const.h
 plugin.o: ../../../pikotools/membuffer/membuffer.h
 plugin.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
-plugin.o: requesttypes.h item.h error.h config.h
-plugin.o: ../../../pikotools/space/spaceparser.h
+plugin.o: error.h config.h ../../../pikotools/space/spaceparser.h
 plugin.o: ../../../pikotools/space/space.h htmlfilter.h
 plugin.o: ../../../winix/winixd/templates/htmltextstream.h
-plugin.o: ../../../winix/winixd/core/textstream.h misc.h
-plugin.o: ../../../pikotools/utf8/utf8.h winix_const.h
+plugin.o: ../../../winix/winixd/core/textstream.h
 plugin.o: ../../../pikotools/space/spacetojson.h
 plugin.o: ../../../ezc/src/outstreams.h session.h user.h plugindata.h rebus.h
 plugin.o: ipban.h mount.h ../../../winix/winixd/templates/locale.h system.h
@@ -940,14 +974,15 @@ plugindata.o: ../../../pikotools/textstream/types.h
 plugindata.o: ../../../pikotools/date/date.h
 plugindata.o: ../../../pikotools/convert/convert.h
 plugindata.o: ../../../pikotools/convert/inttostr.h
+plugindata.o: ../../../pikotools/convert/strtoint.h
+plugindata.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
+plugindata.o: ../../../pikotools/utf8/utf8.h winix_const.h
 plugindata.o: ../../../pikotools/membuffer/membuffer.h
 plugindata.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
-plugindata.o: requesttypes.h item.h error.h config.h
-plugindata.o: ../../../pikotools/space/spaceparser.h
+plugindata.o: error.h config.h ../../../pikotools/space/spaceparser.h
 plugindata.o: ../../../pikotools/space/space.h htmlfilter.h
 plugindata.o: ../../../winix/winixd/templates/htmltextstream.h
-plugindata.o: ../../../winix/winixd/core/textstream.h misc.h
-plugindata.o: ../../../pikotools/utf8/utf8.h winix_const.h
+plugindata.o: ../../../winix/winixd/core/textstream.h
 plugindata.o: ../../../pikotools/space/spacetojson.h
 plugindata.o: ../../../ezc/src/outstreams.h session.h user.h rebus.h ipban.h
 plugindata.o: mount.h ../../../winix/winixd/templates/locale.h system.h job.h
@@ -1046,11 +1081,13 @@ postmultiparser.o: ../../../pikotools/textstream/types.h
 postmultiparser.o: ../../../pikotools/date/date.h
 postmultiparser.o: ../../../pikotools/convert/convert.h
 postmultiparser.o: ../../../pikotools/convert/inttostr.h
+postmultiparser.o: ../../../pikotools/convert/strtoint.h
+postmultiparser.o: ../../../pikotools/convert/text.h misc.h item.h
+postmultiparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
 postmultiparser.o: ../../../pikotools/membuffer/membuffer.h
 postmultiparser.o: ../../../pikotools/textstream/types.h config.h
 postmultiparser.o: ../../../pikotools/space/spaceparser.h
-postmultiparser.o: ../../../pikotools/space/space.h htmlfilter.h misc.h
-postmultiparser.o: item.h ../../../pikotools/utf8/utf8.h winix_const.h log.h
+postmultiparser.o: ../../../pikotools/space/space.h htmlfilter.h log.h
 postmultiparser.o: textstream.h logmanipulators.h slog.h cur.h request.h
 postmultiparser.o: ../../../winix/winixd/templates/htmltextstream.h
 postmultiparser.o: ../../../winix/winixd/core/textstream.h
@@ -1064,14 +1101,15 @@ rebus.o: ../../../pikotools/space/space.h
 rebus.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
 rebus.o: ../../../pikotools/convert/convert.h
 rebus.o: ../../../pikotools/convert/inttostr.h
+rebus.o: ../../../pikotools/convert/strtoint.h
+rebus.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
+rebus.o: ../../../pikotools/utf8/utf8.h winix_const.h
 rebus.o: ../../../pikotools/membuffer/membuffer.h
-rebus.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
-rebus.o: requesttypes.h item.h error.h config.h
-rebus.o: ../../../pikotools/space/spaceparser.h
+rebus.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h error.h
+rebus.o: config.h ../../../pikotools/space/spaceparser.h
 rebus.o: ../../../pikotools/space/space.h htmlfilter.h
 rebus.o: ../../../winix/winixd/templates/htmltextstream.h
-rebus.o: ../../../winix/winixd/core/textstream.h misc.h
-rebus.o: ../../../pikotools/utf8/utf8.h winix_const.h
+rebus.o: ../../../winix/winixd/core/textstream.h
 rebus.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
 rebus.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
 rebus.o: ../../../winix/winixd/templates/locale.h
@@ -1082,13 +1120,15 @@ request.o: ../../../pikotools/textstream/types.h
 request.o: ../../../pikotools/date/date.h
 request.o: ../../../pikotools/convert/convert.h
 request.o: ../../../pikotools/convert/inttostr.h
+request.o: ../../../pikotools/convert/strtoint.h
+request.o: ../../../pikotools/convert/text.h misc.h item.h
+request.o: ../../../pikotools/utf8/utf8.h winix_const.h
 request.o: ../../../pikotools/membuffer/membuffer.h
-request.o: ../../../pikotools/textstream/types.h item.h error.h config.h
+request.o: ../../../pikotools/textstream/types.h error.h config.h
 request.o: ../../../pikotools/space/spaceparser.h
 request.o: ../../../pikotools/space/space.h htmlfilter.h textstream.h
 request.o: ../../../winix/winixd/templates/htmltextstream.h
-request.o: ../../../winix/winixd/core/textstream.h misc.h
-request.o: ../../../pikotools/utf8/utf8.h winix_const.h
+request.o: ../../../winix/winixd/core/textstream.h
 request.o: ../../../pikotools/space/spacetojson.h
 request.o: ../../../ezc/src/outstreams.h log.h logmanipulators.h slog.h cur.h
 request.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
@@ -1186,14 +1226,15 @@ run.o: ../../../pikotools/textstream/textstream.h
 run.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h
 run.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 run.o: ../../../pikotools/convert/inttostr.h
+run.o: ../../../pikotools/convert/strtoint.h
+run.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
+run.o: ../../../pikotools/utf8/utf8.h winix_const.h
 run.o: ../../../pikotools/membuffer/membuffer.h
-run.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
-run.o: requesttypes.h item.h error.h config.h
-run.o: ../../../pikotools/space/spaceparser.h
+run.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h error.h
+run.o: config.h ../../../pikotools/space/spaceparser.h
 run.o: ../../../pikotools/space/space.h htmlfilter.h
 run.o: ../../../winix/winixd/templates/htmltextstream.h
-run.o: ../../../winix/winixd/core/textstream.h misc.h
-run.o: ../../../pikotools/utf8/utf8.h winix_const.h
+run.o: ../../../winix/winixd/core/textstream.h
 run.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
 run.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
 run.o: ../../../winix/winixd/templates/locale.h
@@ -1204,6 +1245,8 @@ session.o: textstream.h ipban.h misc.h requesttypes.h
 session.o: ../../../pikotools/textstream/textstream.h
 session.o: ../../../pikotools/convert/convert.h
 session.o: ../../../pikotools/convert/inttostr.h
+session.o: ../../../pikotools/convert/strtoint.h
+session.o: ../../../pikotools/convert/text.h
 session.o: ../../../pikotools/membuffer/membuffer.h
 session.o: ../../../pikotools/textstream/types.h
 session.o: ../../../pikotools/utf8/utf8.h winix_const.h
@@ -1215,13 +1258,15 @@ sessioncontainer.o: plugindata.h rebus.h textstream.h ipban.h cur.h request.h
 sessioncontainer.o: requesttypes.h ../../../pikotools/textstream/textstream.h
 sessioncontainer.o: ../../../pikotools/convert/convert.h
 sessioncontainer.o: ../../../pikotools/convert/inttostr.h
+sessioncontainer.o: ../../../pikotools/convert/strtoint.h
+sessioncontainer.o: ../../../pikotools/convert/text.h misc.h
+sessioncontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h
 sessioncontainer.o: ../../../pikotools/membuffer/membuffer.h
 sessioncontainer.o: ../../../pikotools/textstream/types.h config.h
 sessioncontainer.o: ../../../pikotools/space/spaceparser.h
 sessioncontainer.o: ../../../pikotools/space/space.h htmlfilter.h
 sessioncontainer.o: ../../../winix/winixd/templates/htmltextstream.h
-sessioncontainer.o: ../../../winix/winixd/core/textstream.h misc.h
-sessioncontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h
+sessioncontainer.o: ../../../winix/winixd/core/textstream.h
 sessioncontainer.o: ../../../pikotools/space/spacetojson.h
 sessioncontainer.o: ../../../ezc/src/outstreams.h mount.h log.h
 sessioncontainer.o: logmanipulators.h slog.h
@@ -1238,13 +1283,15 @@ sessionidmanager.o: logmanipulators.h
 sessionidmanager.o: ../../../pikotools/textstream/textstream.h
 sessionidmanager.o: ../../../pikotools/convert/convert.h
 sessionidmanager.o: ../../../pikotools/convert/inttostr.h
+sessionidmanager.o: ../../../pikotools/convert/strtoint.h
+sessionidmanager.o: ../../../pikotools/convert/text.h misc.h item.h
+sessionidmanager.o: requesttypes.h winix_const.h
 sessionidmanager.o: ../../../pikotools/membuffer/membuffer.h
 sessionidmanager.o: ../../../pikotools/textstream/types.h slog.h cur.h
-sessionidmanager.o: request.h requesttypes.h item.h error.h config.h
-sessionidmanager.o: htmlfilter.h
+sessionidmanager.o: request.h error.h config.h htmlfilter.h
 sessionidmanager.o: ../../../winix/winixd/templates/htmltextstream.h
-sessionidmanager.o: ../../../winix/winixd/core/textstream.h misc.h
-sessionidmanager.o: winix_const.h ../../../pikotools/space/spacetojson.h
+sessionidmanager.o: ../../../winix/winixd/core/textstream.h
+sessionidmanager.o: ../../../pikotools/space/spacetojson.h
 sessionidmanager.o: ../../../ezc/src/outstreams.h session.h user.h
 sessionidmanager.o: plugindata.h rebus.h ipban.h mount.h
 sessionidmanager.o: ../../../winix/winixd/templates/locale.h
@@ -1256,13 +1303,15 @@ sessionmanager.o: rebus.h textstream.h ipban.h cur.h request.h requesttypes.h
 sessionmanager.o: ../../../pikotools/textstream/textstream.h
 sessionmanager.o: ../../../pikotools/convert/convert.h
 sessionmanager.o: ../../../pikotools/convert/inttostr.h
+sessionmanager.o: ../../../pikotools/convert/strtoint.h
+sessionmanager.o: ../../../pikotools/convert/text.h misc.h
+sessionmanager.o: ../../../pikotools/utf8/utf8.h winix_const.h
 sessionmanager.o: ../../../pikotools/membuffer/membuffer.h
 sessionmanager.o: ../../../pikotools/textstream/types.h config.h
 sessionmanager.o: ../../../pikotools/space/spaceparser.h
 sessionmanager.o: ../../../pikotools/space/space.h htmlfilter.h
 sessionmanager.o: ../../../winix/winixd/templates/htmltextstream.h
-sessionmanager.o: ../../../winix/winixd/core/textstream.h misc.h
-sessionmanager.o: ../../../pikotools/utf8/utf8.h winix_const.h
+sessionmanager.o: ../../../winix/winixd/core/textstream.h
 sessionmanager.o: ../../../pikotools/space/spacetojson.h
 sessionmanager.o: ../../../ezc/src/outstreams.h mount.h ipbancontainer.h
 sessionmanager.o: lastcontainer.h system.h job.h basethread.h synchro.h
@@ -1364,13 +1413,15 @@ sessionparser.o: request.h requesttypes.h
 sessionparser.o: ../../../pikotools/textstream/textstream.h
 sessionparser.o: ../../../pikotools/convert/convert.h
 sessionparser.o: ../../../pikotools/convert/inttostr.h
+sessionparser.o: ../../../pikotools/convert/strtoint.h
+sessionparser.o: ../../../pikotools/convert/text.h misc.h
+sessionparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
 sessionparser.o: ../../../pikotools/membuffer/membuffer.h
 sessionparser.o: ../../../pikotools/textstream/types.h config.h
 sessionparser.o: ../../../pikotools/space/spaceparser.h
 sessionparser.o: ../../../pikotools/space/space.h htmlfilter.h
 sessionparser.o: ../../../winix/winixd/templates/htmltextstream.h
-sessionparser.o: ../../../winix/winixd/core/textstream.h misc.h
-sessionparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
+sessionparser.o: ../../../winix/winixd/core/textstream.h
 sessionparser.o: ../../../pikotools/space/spacetojson.h
 sessionparser.o: ../../../ezc/src/outstreams.h mount.h users.h log.h
 sessionparser.o: logmanipulators.h slog.h
@@ -1381,13 +1432,15 @@ slog.o: ../../../pikotools/space/space.h
 slog.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
 slog.o: ../../../pikotools/convert/convert.h
 slog.o: ../../../pikotools/convert/inttostr.h
+slog.o: ../../../pikotools/convert/strtoint.h
+slog.o: ../../../pikotools/convert/text.h misc.h item.h
+slog.o: ../../../pikotools/utf8/utf8.h winix_const.h
 slog.o: ../../../pikotools/membuffer/membuffer.h
-slog.o: ../../../pikotools/textstream/types.h item.h error.h config.h
+slog.o: ../../../pikotools/textstream/types.h error.h config.h
 slog.o: ../../../pikotools/space/spaceparser.h
 slog.o: ../../../pikotools/space/space.h htmlfilter.h textstream.h
 slog.o: ../../../winix/winixd/templates/htmltextstream.h
-slog.o: ../../../winix/winixd/core/textstream.h misc.h
-slog.o: ../../../pikotools/utf8/utf8.h winix_const.h
+slog.o: ../../../winix/winixd/core/textstream.h
 slog.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
 slog.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
 slog.o: logmanipulators.h ../../../winix/winixd/templates/locale.h
@@ -1403,6 +1456,8 @@ system.o: ../../../winix/winixd/core/textstream.h misc.h requesttypes.h
 system.o: ../../../pikotools/textstream/textstream.h
 system.o: ../../../pikotools/convert/convert.h
 system.o: ../../../pikotools/convert/inttostr.h
+system.o: ../../../pikotools/convert/strtoint.h
+system.o: ../../../pikotools/convert/text.h
 system.o: ../../../pikotools/membuffer/membuffer.h
 system.o: ../../../pikotools/textstream/types.h
 system.o: ../../../pikotools/utf8/utf8.h winix_const.h
@@ -1504,14 +1559,15 @@ threadmanager.o: ../../../pikotools/textstream/types.h
 threadmanager.o: ../../../pikotools/date/date.h
 threadmanager.o: ../../../pikotools/convert/convert.h
 threadmanager.o: ../../../pikotools/convert/inttostr.h
+threadmanager.o: ../../../pikotools/convert/strtoint.h
+threadmanager.o: ../../../pikotools/convert/text.h misc.h item.h
+threadmanager.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
 threadmanager.o: ../../../pikotools/membuffer/membuffer.h
 threadmanager.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
-threadmanager.o: requesttypes.h item.h error.h config.h
-threadmanager.o: ../../../pikotools/space/spaceparser.h
+threadmanager.o: error.h config.h ../../../pikotools/space/spaceparser.h
 threadmanager.o: ../../../pikotools/space/space.h htmlfilter.h
 threadmanager.o: ../../../winix/winixd/templates/htmltextstream.h
-threadmanager.o: ../../../winix/winixd/core/textstream.h misc.h
-threadmanager.o: ../../../pikotools/utf8/utf8.h winix_const.h
+threadmanager.o: ../../../winix/winixd/core/textstream.h
 threadmanager.o: ../../../pikotools/space/spacetojson.h
 threadmanager.o: ../../../ezc/src/outstreams.h session.h user.h plugindata.h
 threadmanager.o: rebus.h ipban.h mount.h
@@ -1522,6 +1578,8 @@ timezone.o: ../../../pikotools/textstream/types.h misc.h item.h
 timezone.o: requesttypes.h ../../../pikotools/textstream/textstream.h
 timezone.o: ../../../pikotools/convert/convert.h
 timezone.o: ../../../pikotools/convert/inttostr.h
+timezone.o: ../../../pikotools/convert/strtoint.h
+timezone.o: ../../../pikotools/convert/text.h
 timezone.o: ../../../pikotools/membuffer/membuffer.h
 timezone.o: ../../../pikotools/textstream/types.h
 timezone.o: ../../../pikotools/utf8/utf8.h winix_const.h
@@ -1533,6 +1591,8 @@ timezones.o: ../../../pikotools/space/space.h misc.h item.h requesttypes.h
 timezones.o: ../../../pikotools/textstream/textstream.h
 timezones.o: ../../../pikotools/convert/convert.h
 timezones.o: ../../../pikotools/convert/inttostr.h
+timezones.o: ../../../pikotools/convert/strtoint.h
+timezones.o: ../../../pikotools/convert/text.h
 timezones.o: ../../../pikotools/membuffer/membuffer.h
 timezones.o: ../../../pikotools/textstream/types.h
 timezones.o: ../../../pikotools/utf8/utf8.h winix_const.h log.h textstream.h
@@ -1550,13 +1610,15 @@ users.o: error.h user.h plugindata.h rebus.h textstream.h ipban.h cur.h
 users.o: request.h requesttypes.h ../../../pikotools/textstream/textstream.h
 users.o: ../../../pikotools/convert/convert.h
 users.o: ../../../pikotools/convert/inttostr.h
+users.o: ../../../pikotools/convert/strtoint.h
+users.o: ../../../pikotools/convert/text.h misc.h
+users.o: ../../../pikotools/utf8/utf8.h winix_const.h
 users.o: ../../../pikotools/membuffer/membuffer.h
 users.o: ../../../pikotools/textstream/types.h config.h
 users.o: ../../../pikotools/space/spaceparser.h
 users.o: ../../../pikotools/space/space.h htmlfilter.h
 users.o: ../../../winix/winixd/templates/htmltextstream.h
-users.o: ../../../winix/winixd/core/textstream.h misc.h
-users.o: ../../../pikotools/utf8/utf8.h winix_const.h
+users.o: ../../../winix/winixd/core/textstream.h
 users.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
 users.o: mount.h ipbancontainer.h lastcontainer.h system.h job.h basethread.h
 users.o: synchro.h dirs.h dircontainer.h ../../../winix/winixd/db/db.h
--- a/winixd/core/Makefile.o.dep
+++ b/winixd/core/Makefile.o.dep
@@ -1 +1 @@
-o = acceptbaseparser.o app.o basethread.o bbcodeparser.o compress.o config.o crypt.o dircontainer.o dirs.o groups.o htmlfilter.o httpsimpleparser.o image.o ipbancontainer.o item.o job.o lastcontainer.o loadavg.o lock.o log.o misc.o mount.o mountparser.o mounts.o plugin.o plugindata.o postmultiparser.o rebus.o request.o run.o session.o sessioncontainer.o sessionidmanager.o sessionmanager.o sessionparser.o slog.o synchro.o system.o threadmanager.o timezone.o timezones.o user.o users.o 
+o = acceptbaseparser.o app.o basethread.o bbcodeparser.o compress.o config.o crypt.o dircontainer.o dirs.o groups.o htmlfilter.o httpsimpleparser.o image.o ipbancontainer.o item.o job.o lastcontainer.o loadavg.o lock.o log.o misc.o mount.o mountparser.o mounts.o plugin.o plugindata.o postmultiparser.o rebus.o request.o run.o session.o sessioncontainer.o sessionidmanager.o sessionmanager.o sessionparser.o slog.o synchro.o system.o threadmanager.o timezone.o timezones.o user.o users.o 
--- a/winixd/core/app.cpp
+++ b/winixd/core/app.cpp
@@ -5,7 +5,7 @@
 */

 /* 
- * Copyright (c) 2010-2015, Tomasz Sowa
+ * Copyright (c) 2010-2018, Tomasz Sowa
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
@@ -1141,23 +1141,26 @@ void App::PrepareHeadersNormal(Header header, size_t output_size)
 // and if compression is enabled the client's browser will not be able to decompress the stream
 void App::SendHeaders()
 {
-	PT::Space::TableSingle::iterator i;
+	PT::Space::Table::iterator i;
 	PT::Space & headers = cur.request->out_headers;

 	plugin.Call(WINIX_PREPARE_TO_SEND_HTTP_HEADERS, &headers);

-	for(i=headers.table_single.begin() ; i != headers.table_single.end() ; ++i)
+	for(i=headers.table.begin() ; i != headers.table.end() ; ++i)
 	{
-		PT::WideToUTF8(i->first,  aheader_name);
-		PT::WideToUTF8(i->second, aheader_value);
+		if( i->second.size() == 1 )
+		{
+			PT::WideToUTF8(i->first,     aheader_name);
+			PT::WideToUTF8(i->second[0], aheader_value);

-		FCGX_PutS(aheader_name.c_str(), 	fcgi_request.out);
-		FCGX_PutS(": ", 					fcgi_request.out);
-		FCGX_PutS(aheader_value.c_str(), 	fcgi_request.out);
-		FCGX_PutS("\r\n", 					fcgi_request.out);
+			FCGX_PutS(aheader_name.c_str(), 	fcgi_request.out);
+			FCGX_PutS(": ", 					fcgi_request.out);
+			FCGX_PutS(aheader_value.c_str(), 	fcgi_request.out);
+			FCGX_PutS("\r\n", 					fcgi_request.out);

-		if( config.log_http_answer_headers )
-			log << log1 << "HTTP Header: " << aheader_name << ": " << aheader_value << logend;
+			if( config.log_http_answer_headers )
+				log << log1 << "HTTP Header: " << aheader_name << ": " << aheader_value << logend;
+		}
 	}
 }

@@ -1165,24 +1168,27 @@ void App::SendHeaders()

 void App::SendCookies()
 {
-	PT::Space::TableSingle::iterator i;
+	PT::Space::Table::iterator i;
 	PT::Space & cookies = cur.request->out_cookies;

 	plugin.Call(WINIX_PREPARE_TO_SEND_HTTP_COOKIES, &cookies);

-	for(i=cookies.table_single.begin() ; i != cookies.table_single.end() ; ++i)
+	for(i=cookies.table.begin() ; i != cookies.table.end() ; ++i)
 	{
-		PT::WideToUTF8(i->first,  aheader_name);
-		PT::WideToUTF8(i->second, aheader_value);
+		if( i->second.size() == 1 )
+		{
+			PT::WideToUTF8(i->first,     aheader_name);
+			PT::WideToUTF8(i->second[0], aheader_value);

-		FCGX_PutS("Set-Cookie: ", 			fcgi_request.out);
-		FCGX_PutS(aheader_name.c_str(), 	fcgi_request.out);
-		FCGX_PutS("=", 						fcgi_request.out);
-		FCGX_PutS(aheader_value.c_str(), 	fcgi_request.out);
-		FCGX_PutS("\r\n", 					fcgi_request.out);
+			FCGX_PutS("Set-Cookie: ", 			fcgi_request.out);
+			FCGX_PutS(aheader_name.c_str(), 	fcgi_request.out);
+			FCGX_PutS("=", 						fcgi_request.out);
+			FCGX_PutS(aheader_value.c_str(), 	fcgi_request.out);
+			FCGX_PutS("\r\n", 					fcgi_request.out);

-		if( config.log_http_answer_headers )
-			log << log1 << "HTTP Header: Set-Cookie: " << aheader_name << "=" << aheader_value << logend;
+			if( config.log_http_answer_headers )
+				log << log1 << "HTTP Header: Set-Cookie: " << aheader_name << "=" << aheader_value << logend;
+		}
 	}
 }

--- a/winixd/core/config.cpp
+++ b/winixd/core/config.cpp
@@ -5,7 +5,7 @@
 */

 /* 
- * Copyright (c) 2008-2017, Tomasz Sowa
+ * Copyright (c) 2008-2018, Tomasz Sowa
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
@@ -101,9 +101,7 @@ bool Config::ReadConfig(bool errors_to_stdout_, bool stdout_is_closed)

 	log << log2 << "Config: reading a config file" << logend;

-	parser.SplitSingle(true);
 	parser.SetSpace(space);
-
 	PT::SpaceParser::Status status = parser.Parse(config_file);

 	if( status == PT::SpaceParser::ok )
@@ -373,24 +371,42 @@ void Config::CheckPasswd()



-std::wstring & Config::Text(const wchar_t * name)
+std::wstring Config::Text(const wchar_t * name)
 {
 	return space.Text(name);
 }


-std::wstring & Config::Text(const wchar_t * name, const wchar_t * def)
+std::wstring Config::Text(const wchar_t * name, const wchar_t * def)
 {
 	return space.Text(name, def);
 }


-std::wstring & Config::Text(const std::wstring & name, const wchar_t * def)
+std::wstring Config::Text(const std::wstring & name, const wchar_t * def)
 {
 	return space.Text(name, def);
 }


+std::wstring & Config::TextRef(const wchar_t * name)
+{
+	return space.TextRef(name);
+}
+
+
+std::wstring & Config::TextRef(const wchar_t * name, const wchar_t * def)
+{
+	return space.TextRef(name, def);
+}
+
+
+std::wstring & Config::TextRef(const std::wstring & name, const wchar_t * def)
+{
+	return space.TextRef(name, def);
+}
+
+
 int Config::Int(const wchar_t * name)
 {
 	return space.Int(name);
--- a/winixd/core/config.h
+++ b/winixd/core/config.h
@@ -5,7 +5,7 @@
 */

 /* 
- * Copyright (c) 2008-2017, Tomasz Sowa
+ * Copyright (c) 2008-2018, Tomasz Sowa
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
@@ -751,9 +751,20 @@ public:
 	Config();
 	bool ReadConfig(bool errors_to_stdout_, bool stdout_is_closed = true);

-	std::wstring & Text(const wchar_t * name);
-	std::wstring & Text(const wchar_t * name,		const wchar_t * def);
-	std::wstring & Text(const std::wstring & name,	const wchar_t * def);
+	/*
+	 *
+	 * CHECK ME
+	 * there was a change in Pikotools
+	 * before Text() returns a reference to the std::wstring
+	 *
+	 */
+	std::wstring Text(const wchar_t * name);
+	std::wstring Text(const wchar_t * name,	     const wchar_t * def);
+	std::wstring Text(const std::wstring & name, const wchar_t * def);
+
+	std::wstring & TextRef(const wchar_t * name);
+	std::wstring & TextRef(const wchar_t * name, const wchar_t * def);
+	std::wstring & TextRef(const std::wstring & name, const wchar_t * def);

 	int  Int(const wchar_t *);
 	int  Int(const wchar_t * name, int def);
--- a/winixd/core/timezone.cpp
+++ b/winixd/core/timezone.cpp
@@ -5,7 +5,7 @@
 */

 /* 
- * Copyright (c) 2012-2014, Tomasz Sowa
+ * Copyright (c) 2012-2018, Tomasz Sowa
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
@@ -242,7 +242,7 @@ return offset;

 time_t TimeZone::GetOffset(PT::Space & space)
 {
-	std::wstring * offset_str = space.GetValue(L"offset_str");
+	std::wstring * offset_str = space.GetFirstValue(L"offset_str");

 	if( offset_str )
 		return ParseStrOffset(offset_str->c_str());