diff --git a/winixd/Makefile b/winixd/Makefile index 49e4120..b9f824b 100644 --- a/winixd/Makefile +++ b/winixd/Makefile @@ -5,7 +5,7 @@ include Makefile.dep # https://www.gnu.org/software/make/manual/html_node/Flavors.html#Flavors GLOBAL_WORKING_DIR := $(shell pwd)/../.. -EZC_ADDITIONAL_INCLUDE := -I$(shell pwd) -I$(GLOBAL_WORKING_DIR)/ezc/src + current_path := $(shell pwd) global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR)) @@ -27,7 +27,7 @@ endif # CXX = g++-4.8 ifndef CXXFLAGS -CXXFLAGS = -Wall -O0 -g -fPIC -pthread -std=c++17 -I/usr/local/include -I/usr/include/postgresql -DEZC_USE_WINIX_LOGGER -DEZC_HAS_SPECIAL_STREAM +CXXFLAGS = -Wall -O0 -g -fPIC -pthread -std=c++17 -I/usr/local/include -I/usr/include/postgresql -DEZC_HAS_SPECIAL_STREAM endif ifndef AR @@ -40,8 +40,6 @@ ifndef LDFLAGS LDFLAGS = -L/usr/local/lib endif -# this macro is used in ezc's Makefile -EZC_USE_WINIX_LOGGER = yes # for make install @@ -51,8 +49,6 @@ winix_install_dir = /usr/local/winix export CXX export CXXFLAGS export LDFLAGS -export EZC_USE_WINIX_LOGGER -export EZC_ADDITIONAL_INCLUDE export GLOBAL_WORKING_DIR @@ -73,7 +69,7 @@ winix.so: $(winix.src.files) @cd $(GLOBAL_WORKING_DIR)/tito/src ; $(MAKE) -e @cd $(GLOBAL_WORKING_DIR)/pikotools ; $(MAKE) -e @cd $(GLOBAL_WORKING_DIR)/morm/src ; $(MAKE) -e - $(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) $(winix_include_paths) core/*.o db/*.o functions/*.o templates/*.o notify/*.o $(GLOBAL_WORKING_DIR)/ezc/src/ezc.a $(GLOBAL_WORKING_DIR)/tito/src/tito.a $(GLOBAL_WORKING_DIR)/pikotools/convert/convert.a $(GLOBAL_WORKING_DIR)/pikotools/utf8/utf8.a $(GLOBAL_WORKING_DIR)/pikotools/space/space.a $(GLOBAL_WORKING_DIR)/pikotools/mainparser/mainparser.a $(GLOBAL_WORKING_DIR)/pikotools/date/date.a $(GLOBAL_WORKING_DIR)/pikotools/logger/logger.a $(GLOBAL_WORKING_DIR)/morm/src/morm.a $(LDFLAGS) -lfcgi -lpq -lz -lpthread -lcurl -Wl,-no-whole-archive + $(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) $(winix_include_paths) core/*.o db/*.o functions/*.o templates/*.o notify/*.o $(GLOBAL_WORKING_DIR)/ezc/src/ezc.a $(GLOBAL_WORKING_DIR)/tito/src/tito.a $(GLOBAL_WORKING_DIR)/pikotools/convert/convert.a $(GLOBAL_WORKING_DIR)/pikotools/utf8/utf8.a $(GLOBAL_WORKING_DIR)/pikotools/space/space.a $(GLOBAL_WORKING_DIR)/pikotools/mainparser/mainparser.a $(GLOBAL_WORKING_DIR)/pikotools/date/date.a $(GLOBAL_WORKING_DIR)/pikotools/log/log.a $(GLOBAL_WORKING_DIR)/morm/src/morm.a $(LDFLAGS) -lfcgi -lpq -lz -lpthread -lcurl -Wl,-no-whole-archive winix: winix.so $(winix.src.files) diff --git a/winixd/Makefile.dep b/winixd/Makefile.dep index b8912dd..28bfa44 100644 --- a/winixd/Makefile.dep +++ b/winixd/Makefile.dep @@ -1 +1 @@ -winix.src.files = ./core/synchro.h ./core/sessioncontainer.h ./core/cookieparser.h ./core/misc.cpp ./core/item.cpp ./core/error.h ./core/timezone.h ./core/compress.h ./core/crypt.cpp ./core/dirs.cpp ./core/slog.cpp ./core/config.cpp ./core/lastcontainer.cpp ./core/users.h ./core/httpsimpleparser.cpp ./core/threadmanager.h ./core/postparser.h ./core/pluginmsg.h ./core/acceptbaseparser.h ./core/loadavg.cpp ./core/job.h ./core/mountparser.cpp ./core/timezones.h ./core/sessionmanager.h ./core/groups.h ./core/system.cpp ./core/rebus.h ./core/synchro.cpp ./core/lock.cpp ./core/acceptencodingparser.h ./core/version.h ./core/compress.cpp ./core/ipbancontainer.cpp ./core/request.h ./core/plugindata.h ./core/plugin.cpp ./core/sessionparser.cpp ./core/bbcodeparser.h ./core/users.cpp ./core/mount.cpp ./core/item.h ./core/slog.h ./core/threadmanager.cpp ./core/acceptbaseparser.cpp ./core/lastcontainer.h ./core/httpsimpleparser.h ./core/timezones.cpp ./core/groups.cpp ./core/requesttypes.h ./core/system.h ./core/bbcodeparser.cpp ./core/lock.h ./core/ipbancontainer.h ./core/group.h ./core/plugin.h ./core/run.cpp ./core/textstream.h ./core/sessionparser.h ./core/basethread.h ./core/mount.h ./core/htmlfilter.cpp ./core/user.cpp ./core/app.cpp ./core/image.cpp ./core/ugcontainer.h ./core/postmultiparser.h ./core/logmanipulators.h ./core/sessioncontainer.cpp ./core/dircontainer.h ./core/log.h ./core/session.h ./core/timezone.cpp ./core/mounts.h ./core/ipban.h ./core/cur.h ./core/misc.h ./core/dirs.h ./core/crypt.h ./core/run.h ./core/config.h ./core/job.cpp ./core/postmultiparser.cpp ./core/sessionmanager.cpp ./core/htmlfilter.h ./core/rebus.cpp ./core/dircontainer.cpp ./core/log.cpp ./core/user.h ./core/loadavg.h ./core/session.cpp ./core/mountparser.h ./core/mounts.cpp ./core/image.h ./core/plugindata.cpp ./core/request.cpp ./core/app.h ./core/basethread.cpp ./core/sessionidmanager.h ./core/winix_const.h ./core/sessionidmanager.cpp ./core/filelog.cpp ./core/filelog.h ./core/winixbase.cpp ./core/winixbase.h ./core/winixmodel.cpp ./core/winixmodel.h ./core/winixrequest.cpp ./core/winixrequest.h ./core/winixsystem.cpp ./core/winixsystem.h ./db/dbconn.cpp ./db/db.cpp ./db/dbbase.h ./db/dbitemcolumns.cpp ./db/dbtextstream.cpp ./db/dbconn.h ./db/db.h ./db/dbitemcolumns.h ./db/dbitemquery.cpp ./db/dbtextstream.h ./db/dbitemquery.h ./db/dbbase.cpp ./functions/upload.cpp ./functions/priv.h ./functions/env.cpp ./functions/default.h ./functions/node.h ./functions/specialdefault.h ./functions/timezone.cpp ./functions/pw.h ./functions/adduser.h ./functions/chmod.h ./functions/imgcrop.cpp ./functions/vim.h ./functions/account.h ./functions/mount.cpp ./functions/uptime.cpp ./functions/ckeditor.cpp ./functions/mkdir.cpp ./functions/reload.cpp ./functions/functionparser.h ./functions/logout.cpp ./functions/rmuser.cpp ./functions/rm.cpp ./functions/chown.h ./functions/nicedit.h ./functions/mv.h ./functions/node.cpp ./functions/specialdefault.cpp ./functions/adduser.cpp ./functions/upload.h ./functions/vim.cpp ./functions/env.h ./functions/timezone.h ./functions/who.h ./functions/cp.cpp ./functions/run.cpp ./functions/locale.h ./functions/imgcrop.h ./functions/passwd.h ./functions/mount.h ./functions/privchanger.cpp ./functions/functions.cpp ./functions/last.h ./functions/ckeditor.h ./functions/mkdir.h ./functions/reload.h ./functions/cat.h ./functions/download.h ./functions/ln.h ./functions/nicedit.cpp ./functions/functionbase.cpp ./functions/man.h ./functions/rm.h ./functions/meta.cpp ./functions/emacs.cpp ./functions/sort.h ./functions/who.cpp ./functions/ipban.h ./functions/locale.cpp ./functions/passwd.cpp ./functions/last.cpp ./functions/subject.h ./functions/download.cpp ./functions/cp.h ./functions/cat.cpp ./functions/login.cpp ./functions/tinymce.cpp ./functions/ln.cpp ./functions/run.h ./functions/uname.h ./functions/man.cpp ./functions/functions.h ./functions/privchanger.h ./functions/ls.cpp ./functions/template.h ./functions/stat.h ./functions/priv.cpp ./functions/default.cpp ./functions/functionbase.h ./functions/pw.cpp ./functions/sort.cpp ./functions/ipban.cpp ./functions/chmod.cpp ./functions/meta.h ./functions/account.cpp ./functions/emacs.h ./functions/subject.cpp ./functions/functionparser.cpp ./functions/uname.cpp ./functions/uptime.h ./functions/template.cpp ./functions/stat.cpp ./functions/tinymce.h ./functions/login.h ./functions/chown.cpp ./functions/logout.h ./functions/mv.cpp ./functions/rmuser.h ./functions/ls.h ./main/main.cpp ./notify/notifypool.h ./notify/templatesnotify.cpp ./notify/notify.cpp ./notify/templatesnotify.h ./notify/notify.h ./notify/notifythread.cpp ./notify/notifypool.cpp ./notify/notifythread.h ./plugins/group/init.cpp ./plugins/group/groups.h ./plugins/group/groupinfo.cpp ./plugins/group/groupinfo.h ./plugins/group/templates.cpp ./plugins/group/groups.cpp ./plugins/stats/statssession.h ./plugins/stats/bot.h ./plugins/stats/stats.cpp ./plugins/stats/templates.cpp ./plugins/stats/init.cpp ./plugins/stats/stats.h ./plugins/stats/templates.h ./plugins/stats/bot.cpp ./plugins/gallery/galleryinfo.cpp ./plugins/gallery/templates.cpp ./plugins/gallery/gallery.cpp ./plugins/gallery/galleryinfo.h ./plugins/gallery/init.cpp ./plugins/gallery/gallery.h ./plugins/export/init.cpp ./plugins/export/export.h ./plugins/export/exportthread.cpp ./plugins/export/message.h ./plugins/export/edb.cpp ./plugins/export/funexport.cpp ./plugins/export/exportinfo.cpp ./plugins/export/exportthread.h ./plugins/export/edb.h ./plugins/export/funexport.h ./plugins/export/exportinfo.h ./plugins/ticket/funticket.h ./plugins/ticket/init.cpp ./plugins/ticket/ticketinfo.h ./plugins/ticket/showtickets.cpp ./plugins/ticket/createticket.cpp ./plugins/ticket/tdb.cpp ./plugins/ticket/pluginmsg.h ./plugins/ticket/createticket.h ./plugins/ticket/showtickets.h ./plugins/ticket/sessiondata.cpp ./plugins/ticket/tdb.h ./plugins/ticket/sessiondata.h ./plugins/ticket/ticket.h ./plugins/ticket/editticket.cpp ./plugins/ticket/funticket.cpp ./plugins/ticket/templates.cpp ./plugins/ticket/editticket.h ./plugins/ticket/ticketinfo.cpp ./plugins/menu/cache.cpp ./plugins/menu/init.cpp ./plugins/menu/cache.h ./plugins/menu/templates.cpp ./plugins/thread/funthread.cpp ./plugins/thread/threadinfo.cpp ./plugins/thread/funthread.h ./plugins/thread/threadinfo.h ./plugins/thread/createthread.cpp ./plugins/thread/reply.cpp ./plugins/thread/showthreads.cpp ./plugins/thread/templates.cpp ./plugins/thread/createthread.h ./plugins/thread/reply.h ./plugins/thread/showthreads.h ./plugins/thread/init.cpp ./plugins/thread/templates.h ./plugins/thread/tdb.cpp ./plugins/thread/pluginmsg.h ./plugins/thread/thread.h ./plugins/thread/tdb.h ./plugins/mailregister/funregistermail.h ./plugins/mailregister/mdb.h ./plugins/mailregister/funregistermail.cpp ./plugins/mailregister/mdb.cpp ./plugins/mailregister/init.cpp ./plugins/mailregister/templates.cpp ./plugins/mailregister/registermail_info.h ./plugins/mailregister/funregistermail_showusers.h ./plugins/mailregister/funregistermail_showusers.cpp ./plugins/mailregister/registermail_info.cpp ./templates/who.cpp ./templates/item.cpp ./templates/mount.cpp ./templates/templates.h ./templates/locale.h ./templates/slog.cpp ./templates/doc.cpp ./templates/localefilter.cpp ./templates/config.cpp ./templates/patterns.h ./templates/miscspace.cpp ./templates/filters.cpp ./templates/login.cpp ./templates/man.cpp ./templates/changepatterns.h ./templates/stat.cpp ./templates/template.cpp ./templates/dir.cpp ./templates/user.cpp ./templates/rebus.cpp ./templates/patterncacher.cpp ./templates/upload.cpp ./templates/textextstream.h ./templates/adduser.cpp ./templates/ipban.cpp ./templates/htmltextstream.h ./templates/indexpatterns.h ./templates/templates.cpp ./templates/winix.cpp ./templates/locale.cpp ./templates/misc.h ./templates/patterns.cpp ./templates/passwd.cpp ./templates/last.cpp ./templates/uptime.cpp ./templates/insert.cpp ./templates/changepatterns.cpp ./templates/localefilter.h ./templates/miscspace.h ./templates/ls.cpp ./templates/sys.cpp ./templates/priv.cpp ./templates/textextstream.cpp ./templates/htmltextstream.cpp ./templates/env.cpp ./templates/indexpatterns.cpp ./templates/patterncacher.h ./templates/misc.cpp ./templates/generic.cpp ./templates/currentdate.cpp ./templates/server.cpp ./templates/antispam.cpp ../../ezc/src/funinfo.h ../../ezc/src/patternparser.cpp ../../ezc/src/generator.h ../../ezc/src/functions.h ../../ezc/src/pattern.cpp ../../ezc/src/item.cpp ../../ezc/src/patternparser.h ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/ezc.h ../../ezc/src/cache.cpp ../../ezc/src/cache.h ../../ezc/src/blocks.h ../../ezc/src/blocks.cpp ../../ezc/src/expressionparser.h ../../ezc/src/objects.h ../../ezc/src/outstreams.h ../../tito/src/crypto.cpp ../../tito/src/misc.h ../../tito/src/base64.cpp ../../tito/src/crypto.h ../../tito/src/aes.cpp ../../tito/src/base64.h ../../tito/src/misc.cpp ../../tito/src/aes.h ../../pikotools/mainparser/sample/sample.cpp ../../pikotools/mainparser/mainparser.cpp ../../pikotools/mainparser/mainparser.h ../../pikotools/space/space.h ../../pikotools/space/spaceparser.cpp ../../pikotools/space/space.cpp ../../pikotools/space/spaceparser.h ../../pikotools/space/jsontospaceparser.cpp ../../pikotools/space/spacetojson.cpp ../../pikotools/space/jsontospaceparser.h ../../pikotools/space/spacetojson.h ../../pikotools/date/date.h ../../pikotools/date/date.cpp ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.cpp ../../pikotools/utf8/utf8.h ../../pikotools/textstream/textstream.h ../../pikotools/textstream/types.h ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h ../../pikotools/convert/misc.cpp ../../pikotools/convert/misc.h ../../pikotools/convert/strtoint.h ../../pikotools/convert/text.cpp ../../pikotools/convert/text.h ../../pikotools/mainspaceparser/mainspaceparser.cpp ../../pikotools/mainspaceparser/mainspaceparser.h ../../pikotools/logger/logger.cpp ../../pikotools/logger/logger.h ../../morm/src/dbconnector.cpp ../../morm/src/finder.h ../../morm/src/model.cpp ../../morm/src/model.h ../../morm/src/modelconnector.cpp ../../morm/src/modelconnector.h ../../morm/src/morm.h ../../morm/src/morm_types.h ../../morm/src/outstream.h ../../morm/src/baseexpression.cpp ../../morm/src/baseexpression.h ../../morm/src/dochtmlexpression.h ../../morm/src/dbconnector.h ../../morm/src/dbexpression.cpp ../../morm/src/dbexpression.h ../../morm/src/flatconnector.cpp ../../morm/src/flatconnector.h ../../morm/src/flatexpression.cpp ../../morm/src/flatexpression.h ../../morm/src/jsonconnector.cpp ../../morm/src/jsonconnector.h ../../morm/src/jsonexpression.cpp ../../morm/src/jsonexpression.h ../../morm/src/postgresqlconnector.cpp ../../morm/src/postgresqlconnector.h ../../morm/src/postgresqlexpression.cpp ../../morm/src/postgresqlexpression.h ../../morm/src/dochtmlconnector.h ../../morm/src/dochtmlconnector.cpp ../../morm/src/dochtmlexpression.cpp ../../morm/src/clearer.cpp ../../morm/src/clearer.h \ No newline at end of file +winix.src.files = ./core/synchro.h ./core/sessioncontainer.h ./core/cookieparser.h ./core/misc.cpp ./core/item.cpp ./core/error.h ./core/timezone.h ./core/compress.h ./core/crypt.cpp ./core/dirs.cpp ./core/slog.cpp ./core/config.cpp ./core/lastcontainer.cpp ./core/users.h ./core/httpsimpleparser.cpp ./core/threadmanager.h ./core/postparser.h ./core/pluginmsg.h ./core/acceptbaseparser.h ./core/loadavg.cpp ./core/job.h ./core/mountparser.cpp ./core/timezones.h ./core/sessionmanager.h ./core/groups.h ./core/system.cpp ./core/rebus.h ./core/synchro.cpp ./core/lock.cpp ./core/acceptencodingparser.h ./core/version.h ./core/compress.cpp ./core/ipbancontainer.cpp ./core/request.h ./core/plugindata.h ./core/plugin.cpp ./core/sessionparser.cpp ./core/bbcodeparser.h ./core/users.cpp ./core/mount.cpp ./core/item.h ./core/slog.h ./core/threadmanager.cpp ./core/acceptbaseparser.cpp ./core/lastcontainer.h ./core/httpsimpleparser.h ./core/timezones.cpp ./core/groups.cpp ./core/requesttypes.h ./core/system.h ./core/bbcodeparser.cpp ./core/lock.h ./core/ipbancontainer.h ./core/group.h ./core/plugin.h ./core/run.cpp ./core/textstream.h ./core/sessionparser.h ./core/basethread.h ./core/mount.h ./core/htmlfilter.cpp ./core/user.cpp ./core/app.cpp ./core/image.cpp ./core/ugcontainer.h ./core/postmultiparser.h ./core/logmanipulators.h ./core/sessioncontainer.cpp ./core/dircontainer.h ./core/log.h ./core/session.h ./core/timezone.cpp ./core/mounts.h ./core/ipban.h ./core/cur.h ./core/misc.h ./core/dirs.h ./core/crypt.h ./core/run.h ./core/config.h ./core/job.cpp ./core/postmultiparser.cpp ./core/sessionmanager.cpp ./core/htmlfilter.h ./core/rebus.cpp ./core/dircontainer.cpp ./core/log.cpp ./core/user.h ./core/loadavg.h ./core/session.cpp ./core/mountparser.h ./core/mounts.cpp ./core/image.h ./core/plugindata.cpp ./core/request.cpp ./core/app.h ./core/basethread.cpp ./core/sessionidmanager.h ./core/winix_const.h ./core/sessionidmanager.cpp ./core/winixbase.h ./core/winixmodel.h ./core/filelog.h ./core/filelog.cpp ./core/winixbase.cpp ./core/winixmodel.cpp ./core/winixsystem.h ./core/winixsystem.cpp ./core/winixrequest.h ./core/winixrequest.cpp ./db/dbconn.cpp ./db/db.cpp ./db/dbbase.h ./db/dbitemcolumns.cpp ./db/dbtextstream.cpp ./db/dbconn.h ./db/db.h ./db/dbitemcolumns.h ./db/dbitemquery.cpp ./db/dbtextstream.h ./db/dbitemquery.h ./db/dbbase.cpp ./functions/upload.cpp ./functions/priv.h ./functions/env.cpp ./functions/default.h ./functions/node.h ./functions/specialdefault.h ./functions/timezone.cpp ./functions/pw.h ./functions/adduser.h ./functions/chmod.h ./functions/imgcrop.cpp ./functions/vim.h ./functions/account.h ./functions/mount.cpp ./functions/uptime.cpp ./functions/ckeditor.cpp ./functions/mkdir.cpp ./functions/reload.cpp ./functions/functionparser.h ./functions/logout.cpp ./functions/rmuser.cpp ./functions/rm.cpp ./functions/chown.h ./functions/nicedit.h ./functions/mv.h ./functions/node.cpp ./functions/specialdefault.cpp ./functions/adduser.cpp ./functions/upload.h ./functions/vim.cpp ./functions/env.h ./functions/timezone.h ./functions/who.h ./functions/cp.cpp ./functions/run.cpp ./functions/locale.h ./functions/imgcrop.h ./functions/passwd.h ./functions/mount.h ./functions/privchanger.cpp ./functions/functions.cpp ./functions/last.h ./functions/ckeditor.h ./functions/mkdir.h ./functions/reload.h ./functions/cat.h ./functions/download.h ./functions/ln.h ./functions/nicedit.cpp ./functions/functionbase.cpp ./functions/man.h ./functions/rm.h ./functions/meta.cpp ./functions/emacs.cpp ./functions/sort.h ./functions/who.cpp ./functions/ipban.h ./functions/locale.cpp ./functions/passwd.cpp ./functions/last.cpp ./functions/subject.h ./functions/download.cpp ./functions/cp.h ./functions/cat.cpp ./functions/login.cpp ./functions/tinymce.cpp ./functions/ln.cpp ./functions/run.h ./functions/uname.h ./functions/man.cpp ./functions/functions.h ./functions/privchanger.h ./functions/ls.cpp ./functions/template.h ./functions/stat.h ./functions/priv.cpp ./functions/default.cpp ./functions/functionbase.h ./functions/pw.cpp ./functions/sort.cpp ./functions/ipban.cpp ./functions/chmod.cpp ./functions/meta.h ./functions/account.cpp ./functions/emacs.h ./functions/subject.cpp ./functions/functionparser.cpp ./functions/uname.cpp ./functions/uptime.h ./functions/template.cpp ./functions/stat.cpp ./functions/tinymce.h ./functions/login.h ./functions/chown.cpp ./functions/logout.h ./functions/mv.cpp ./functions/rmuser.h ./functions/ls.h ./main/main.cpp ./notify/notifypool.h ./notify/templatesnotify.cpp ./notify/notify.cpp ./notify/templatesnotify.h ./notify/notify.h ./notify/notifythread.cpp ./notify/notifypool.cpp ./notify/notifythread.h ./plugins/group/init.cpp ./plugins/group/groups.h ./plugins/group/groupinfo.cpp ./plugins/group/groupinfo.h ./plugins/group/templates.cpp ./plugins/group/groups.cpp ./plugins/stats/statssession.h ./plugins/stats/bot.h ./plugins/stats/stats.cpp ./plugins/stats/templates.cpp ./plugins/stats/init.cpp ./plugins/stats/stats.h ./plugins/stats/templates.h ./plugins/stats/bot.cpp ./plugins/gallery/galleryinfo.cpp ./plugins/gallery/templates.cpp ./plugins/gallery/gallery.cpp ./plugins/gallery/galleryinfo.h ./plugins/gallery/init.cpp ./plugins/gallery/gallery.h ./plugins/export/init.cpp ./plugins/export/export.h ./plugins/export/exportthread.cpp ./plugins/export/message.h ./plugins/export/edb.cpp ./plugins/export/funexport.cpp ./plugins/export/exportinfo.cpp ./plugins/export/exportthread.h ./plugins/export/edb.h ./plugins/export/funexport.h ./plugins/export/exportinfo.h ./plugins/ticket/funticket.h ./plugins/ticket/init.cpp ./plugins/ticket/ticketinfo.h ./plugins/ticket/showtickets.cpp ./plugins/ticket/createticket.cpp ./plugins/ticket/tdb.cpp ./plugins/ticket/pluginmsg.h ./plugins/ticket/createticket.h ./plugins/ticket/showtickets.h ./plugins/ticket/sessiondata.cpp ./plugins/ticket/tdb.h ./plugins/ticket/sessiondata.h ./plugins/ticket/ticket.h ./plugins/ticket/editticket.cpp ./plugins/ticket/funticket.cpp ./plugins/ticket/templates.cpp ./plugins/ticket/editticket.h ./plugins/ticket/ticketinfo.cpp ./plugins/menu/cache.cpp ./plugins/menu/init.cpp ./plugins/menu/cache.h ./plugins/menu/templates.cpp ./plugins/thread/funthread.cpp ./plugins/thread/threadinfo.cpp ./plugins/thread/funthread.h ./plugins/thread/threadinfo.h ./plugins/thread/createthread.cpp ./plugins/thread/reply.cpp ./plugins/thread/showthreads.cpp ./plugins/thread/templates.cpp ./plugins/thread/createthread.h ./plugins/thread/reply.h ./plugins/thread/showthreads.h ./plugins/thread/init.cpp ./plugins/thread/templates.h ./plugins/thread/tdb.cpp ./plugins/thread/pluginmsg.h ./plugins/thread/thread.h ./plugins/thread/tdb.h ./plugins/mailregister/funregistermail.h ./plugins/mailregister/mdb.h ./plugins/mailregister/funregistermail.cpp ./plugins/mailregister/mdb.cpp ./plugins/mailregister/init.cpp ./plugins/mailregister/templates.cpp ./plugins/mailregister/registermail_info.h ./plugins/mailregister/funregistermail_showusers.h ./plugins/mailregister/funregistermail_showusers.cpp ./plugins/mailregister/registermail_info.cpp ./templates/who.cpp ./templates/item.cpp ./templates/mount.cpp ./templates/templates.h ./templates/locale.h ./templates/slog.cpp ./templates/doc.cpp ./templates/localefilter.cpp ./templates/config.cpp ./templates/patterns.h ./templates/miscspace.cpp ./templates/filters.cpp ./templates/login.cpp ./templates/man.cpp ./templates/changepatterns.h ./templates/stat.cpp ./templates/template.cpp ./templates/dir.cpp ./templates/user.cpp ./templates/rebus.cpp ./templates/patterncacher.cpp ./templates/upload.cpp ./templates/textextstream.h ./templates/adduser.cpp ./templates/ipban.cpp ./templates/htmltextstream.h ./templates/indexpatterns.h ./templates/templates.cpp ./templates/winix.cpp ./templates/locale.cpp ./templates/misc.h ./templates/patterns.cpp ./templates/passwd.cpp ./templates/last.cpp ./templates/uptime.cpp ./templates/insert.cpp ./templates/changepatterns.cpp ./templates/localefilter.h ./templates/miscspace.h ./templates/ls.cpp ./templates/sys.cpp ./templates/priv.cpp ./templates/textextstream.cpp ./templates/htmltextstream.cpp ./templates/env.cpp ./templates/indexpatterns.cpp ./templates/patterncacher.h ./templates/misc.cpp ./templates/generic.cpp ./templates/currentdate.cpp ./templates/server.cpp ./templates/antispam.cpp ../../ezc/src/blocks.cpp ../../ezc/src/blocks.h ../../ezc/src/cache.cpp ../../ezc/src/cache.h ../../ezc/src/ezc.h ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../../ezc/src/generator.h ../../ezc/src/item.cpp ../../ezc/src/item.h ../../ezc/src/objects.h ../../ezc/src/outstreams.h ../../ezc/src/pattern.cpp ../../ezc/src/pattern.h ../../ezc/src/patternparser.cpp ../../ezc/src/patternparser.h ../../ezc/src/expressionparser.h ../../tito/src/crypto.cpp ../../tito/src/misc.h ../../tito/src/base64.cpp ../../tito/src/crypto.h ../../tito/src/aes.cpp ../../tito/src/base64.h ../../tito/src/misc.cpp ../../tito/src/aes.h ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h ../../pikotools/convert/text.h ../../pikotools/convert/text.cpp ../../pikotools/convert/strtoint.h ../../pikotools/convert/misc.h ../../pikotools/convert/misc.cpp ../../pikotools/date/date.cpp ../../pikotools/date/date.h ../../pikotools/mainparser/sample/sample.cpp ../../pikotools/mainparser/mainparser.cpp ../../pikotools/mainparser/mainparser.h ../../pikotools/mainspaceparser/mainspaceparser.cpp ../../pikotools/mainspaceparser/mainspaceparser.h ../../pikotools/membuffer/membuffer.h ../../pikotools/space/jsontospaceparser.cpp ../../pikotools/space/jsontospaceparser.h ../../pikotools/space/space.cpp ../../pikotools/space/space.h ../../pikotools/space/spaceparser.cpp ../../pikotools/space/spaceparser.h ../../pikotools/space/spacetojson.cpp ../../pikotools/space/spacetojson.h ../../pikotools/textstream/textstream.h ../../pikotools/textstream/types.h ../../pikotools/utf8/utf8.cpp ../../pikotools/utf8/utf8.h ../../pikotools/log/filelog.cpp ../../pikotools/log/log.cpp ../../pikotools/log/log.h ../../pikotools/log/filelog.h ../../morm/src/finder.h ../../morm/src/model.cpp ../../morm/src/model.h ../../morm/src/modelconnector.cpp ../../morm/src/modelconnector.h ../../morm/src/morm.h ../../morm/src/morm_types.h ../../morm/src/outstream.h ../../morm/src/flatconnector.h ../../morm/src/cursor.h ../../morm/src/flatconnector.cpp ../../morm/src/dbconnector.cpp ../../morm/src/jsonconnector.h ../../morm/src/jsonconnector.cpp ../../morm/src/dbconnector.h ../../morm/src/postgresqlconnector.h ../../morm/src/postgresqlconnector.cpp ../../morm/src/baseexpression.cpp ../../morm/src/baseexpression.h ../../morm/src/flatexpression.cpp ../../morm/src/postgresqlexpression.h ../../morm/src/dbexpression.h ../../morm/src/dbexpression.cpp ../../morm/src/flatexpression.h ../../morm/src/postgresqlexpression.cpp ../../morm/src/clearer.cpp ../../morm/src/jsonexpression.h ../../morm/src/jsonexpression.cpp ../../morm/src/queryresult.h ../../morm/src/clearer.h ../../morm/src/dochtmlconnector.cpp ../../morm/src/dochtmlconnector.h ../../morm/src/dochtmlexpression.cpp ../../morm/src/dochtmlexpression.h ../../morm/src/postgresqlqueryresult.cpp ../../morm/src/postgresqlqueryresult.h ../../morm/src/queryresult.cpp \ No newline at end of file diff --git a/winixd/core/Makefile.dep b/winixd/core/Makefile.dep index 3d9b2bb..9a9c851 100644 --- a/winixd/core/Makefile.dep +++ b/winixd/core/Makefile.dep @@ -4,18 +4,18 @@ acceptbaseparser.o: acceptbaseparser.h winixbase.h acceptbaseparser.o: ../../../winix/winixd/core/config.h acceptbaseparser.o: ../../../pikotools/space/spaceparser.h acceptbaseparser.o: ../../../pikotools/space/space.h -acceptbaseparser.o: ../../../pikotools/textstream/types.h log.h textstream.h -acceptbaseparser.o: misc.h item.h ../../../pikotools/space/space.h +acceptbaseparser.o: ../../../pikotools/textstream/types.h log.h +acceptbaseparser.o: logmanipulators.h ../../../pikotools/log/log.h +acceptbaseparser.o: ../../../pikotools/textstream/textstream.h +acceptbaseparser.o: ../../../pikotools/space/space.h acceptbaseparser.o: ../../../pikotools/date/date.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 requesttypes.h -acceptbaseparser.o: ../../../pikotools/textstream/textstream.h -acceptbaseparser.o: ../../../pikotools/membuffer/membuffer.h -acceptbaseparser.o: ../../../pikotools/textstream/types.h -acceptbaseparser.o: ../../../pikotools/utf8/utf8.h winix_const.h -acceptbaseparser.o: logmanipulators.h filelog.h +acceptbaseparser.o: ../../../pikotools/convert/text.h misc.h item.h +acceptbaseparser.o: requesttypes.h ../../../pikotools/utf8/utf8.h +acceptbaseparser.o: winix_const.h ../../../pikotools/membuffer/membuffer.h +acceptbaseparser.o: ../../../pikotools/textstream/types.h filelog.h acceptbaseparser.o: ../../../winix/winixd/core/synchro.h acceptbaseparser.o: ../../../winix/winixd/core/log.h acceptbaseparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h @@ -32,10 +32,11 @@ app.o: winix_const.h error.h user.h plugindata.h rebus.h winixbase.h app.o: ../../../winix/winixd/core/config.h app.o: ../../../pikotools/space/spaceparser.h app.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -app.o: log.h textstream.h logmanipulators.h filelog.h +app.o: log.h logmanipulators.h ../../../pikotools/log/log.h filelog.h app.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h -app.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h ipban.h cur.h -app.o: request.h config.h ../../../winix/winixd/templates/htmltextstream.h +app.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h textstream.h +app.o: ipban.h cur.h request.h config.h +app.o: ../../../winix/winixd/templates/htmltextstream.h app.o: ../../../winix/winixd/core/textstream.h app.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h app.o: mount.h winixmodel.h ../../../winix/winixd/core/winixbase.h plugin.h @@ -129,24 +130,24 @@ app.o: ../../../winix/winixd/templates/htmltextstream.h compress.h app.o: postparser.h httpsimpleparser.h ../../../pikotools/convert/text.h app.o: cookieparser.h postmultiparser.h acceptencodingparser.h app.o: acceptbaseparser.h ../../../pikotools/space/jsontospaceparser.h -app.o: winixrequest.h ../../../pikotools/logger/logger.h +app.o: winixrequest.h basethread.o: basethread.h synchro.h winixmodel.h basethread.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h basethread.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h basethread.o: ../../../pikotools/space/spaceparser.h basethread.o: ../../../pikotools/space/space.h -basethread.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h -basethread.o: item.h ../../../pikotools/space/space.h -basethread.o: ../../../pikotools/date/date.h +basethread.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +basethread.o: ../../../pikotools/log/log.h +basethread.o: ../../../pikotools/textstream/textstream.h +basethread.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h basethread.o: ../../../pikotools/convert/convert.h basethread.o: ../../../pikotools/convert/inttostr.h basethread.o: ../../../pikotools/convert/strtoint.h -basethread.o: ../../../pikotools/convert/text.h requesttypes.h -basethread.o: ../../../pikotools/textstream/textstream.h +basethread.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h +basethread.o: ../../../pikotools/utf8/utf8.h winix_const.h basethread.o: ../../../pikotools/membuffer/membuffer.h -basethread.o: ../../../pikotools/textstream/types.h -basethread.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h -basethread.o: filelog.h ../../../winix/winixd/core/synchro.h +basethread.o: ../../../pikotools/textstream/types.h filelog.h +basethread.o: ../../../winix/winixd/core/synchro.h basethread.o: ../../../winix/winixd/core/log.h basethread.o: ../../../winix/winixd/core/filelog.h lock.h bbcodeparser.o: bbcodeparser.h htmlfilter.h @@ -164,22 +165,23 @@ compress.o: ../../../pikotools/textstream/types.h winixbase.h compress.o: ../../../winix/winixd/core/config.h compress.o: ../../../pikotools/space/spaceparser.h compress.o: ../../../pikotools/space/space.h -compress.o: ../../../pikotools/textstream/types.h log.h textstream.h -compress.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h +compress.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +compress.o: ../../../pikotools/log/log.h filelog.h +compress.o: ../../../winix/winixd/core/synchro.h compress.o: ../../../winix/winixd/core/log.h compress.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h -config.o: config.h log.h textstream.h misc.h item.h +config.o: config.h log.h logmanipulators.h ../../../pikotools/log/log.h +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 requesttypes.h -config.o: ../../../pikotools/textstream/textstream.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 -config.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h -config.o: filelog.h ../../../winix/winixd/core/synchro.h crypt.h run.h -config.o: winixbase.h ../../../winix/winixd/core/config.h +config.o: ../../../pikotools/textstream/types.h filelog.h +config.o: ../../../winix/winixd/core/synchro.h crypt.h run.h winixbase.h +config.o: ../../../winix/winixd/core/config.h config.o: ../../../pikotools/space/spaceparser.h config.o: ../../../pikotools/space/space.h config.o: ../../../pikotools/textstream/types.h @@ -188,16 +190,17 @@ config.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h user.h crypt.o: crypt.h run.h winixbase.h ../../../winix/winixd/core/config.h crypt.o: ../../../pikotools/space/spaceparser.h crypt.o: ../../../pikotools/space/space.h -crypt.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h -crypt.o: item.h ../../../pikotools/space/space.h -crypt.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h +crypt.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +crypt.o: ../../../pikotools/log/log.h +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/convert/strtoint.h -crypt.o: ../../../pikotools/convert/text.h requesttypes.h -crypt.o: ../../../pikotools/textstream/textstream.h +crypt.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h +crypt.o: ../../../pikotools/utf8/utf8.h winix_const.h crypt.o: ../../../pikotools/membuffer/membuffer.h -crypt.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h -crypt.o: winix_const.h logmanipulators.h filelog.h +crypt.o: ../../../pikotools/textstream/types.h filelog.h crypt.o: ../../../winix/winixd/core/synchro.h crypt.o: ../../../winix/winixd/core/log.h crypt.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h config.h @@ -215,8 +218,8 @@ dircontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h winixbase.h dircontainer.o: ../../../winix/winixd/core/config.h dircontainer.o: ../../../pikotools/space/spaceparser.h dircontainer.o: ../../../pikotools/space/space.h -dircontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h -dircontainer.o: logmanipulators.h filelog.h +dircontainer.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +dircontainer.o: ../../../pikotools/log/log.h filelog.h dircontainer.o: ../../../winix/winixd/core/synchro.h dircontainer.o: ../../../winix/winixd/core/log.h dircontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h @@ -232,11 +235,12 @@ dirs.o: winix_const.h dircontainer.h winixbase.h dirs.o: ../../../winix/winixd/core/config.h dirs.o: ../../../pikotools/space/spaceparser.h dirs.o: ../../../pikotools/space/space.h -dirs.o: ../../../pikotools/textstream/types.h log.h textstream.h -dirs.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h -dirs.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h -dirs.o: lock.h synchro.h ../../../winix/winixd/db/db.h -dirs.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h +dirs.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +dirs.o: ../../../pikotools/log/log.h filelog.h +dirs.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +dirs.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h +dirs.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h +dirs.o: ../../../winix/winixd/db/dbconn.h dirs.o: ../../../winix/winixd/db/dbtextstream.h dirs.o: ../../../winix/winixd/core/textstream.h dirs.o: ../../../winix/winixd/core/winixbase.h @@ -247,7 +251,7 @@ dirs.o: ../../../winix/winixd/db/dbitemcolumns.h dirs.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h dirs.o: ../../../winix/winixd/core/dircontainer.h dirs.o: ../../../winix/winixd/core/ugcontainer.h request.h error.h config.h -dirs.o: ../../../winix/winixd/templates/htmltextstream.h +dirs.o: textstream.h ../../../winix/winixd/templates/htmltextstream.h dirs.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h dirs.o: winixmodel.h plugin.h pluginmsg.h plugindata.h dirs.o: ../../../winix/winixd/notify/notify.h @@ -266,17 +270,17 @@ dirs.o: ../../../winix/winixd/core/basethread.h dirs.o: ../../../winix/winixd/notify/templatesnotify.h dirs.o: ../../../winix/winixd/core/users.h dirs.o: ../../../winix/winixd/core/winixmodel.h -filelog.o: filelog.h textstream.h misc.h item.h +filelog.o: filelog.h ../../../winix/winixd/core/synchro.h +filelog.o: ../../../pikotools/log/log.h +filelog.o: ../../../pikotools/textstream/textstream.h filelog.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h filelog.o: ../../../pikotools/convert/convert.h filelog.o: ../../../pikotools/convert/inttostr.h filelog.o: ../../../pikotools/convert/strtoint.h -filelog.o: ../../../pikotools/convert/text.h requesttypes.h -filelog.o: ../../../pikotools/textstream/textstream.h -filelog.o: ../../../pikotools/membuffer/membuffer.h -filelog.o: ../../../pikotools/textstream/types.h +filelog.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h filelog.o: ../../../pikotools/utf8/utf8.h winix_const.h -filelog.o: ../../../winix/winixd/core/synchro.h timezones.h timezone.h +filelog.o: ../../../pikotools/membuffer/membuffer.h +filelog.o: ../../../pikotools/textstream/types.h timezones.h timezone.h filelog.o: ../../../pikotools/space/spaceparser.h filelog.o: ../../../pikotools/space/space.h filelog.o: ../../../pikotools/textstream/types.h winixbase.h @@ -308,8 +312,9 @@ groups.o: ../../../winix/winixd/core/user.h groups.o: ../../../winix/winixd/core/group.h groups.o: ../../../winix/winixd/core/dircontainer.h groups.o: ../../../winix/winixd/core/ugcontainer.h winixbase.h -groups.o: ../../../winix/winixd/core/config.h log.h textstream.h -groups.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h +groups.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h +groups.o: ../../../pikotools/log/log.h filelog.h +groups.o: ../../../winix/winixd/core/synchro.h groups.o: ../../../winix/winixd/core/log.h groups.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h winixmodel.h groups.o: plugin.h pluginmsg.h plugindata.h @@ -320,18 +325,18 @@ httpsimpleparser.o: pluginmsg.h plugindata.h winixbase.h httpsimpleparser.o: ../../../winix/winixd/core/config.h httpsimpleparser.o: ../../../pikotools/space/spaceparser.h httpsimpleparser.o: ../../../pikotools/space/space.h -httpsimpleparser.o: ../../../pikotools/textstream/types.h log.h textstream.h -httpsimpleparser.o: misc.h item.h ../../../pikotools/space/space.h +httpsimpleparser.o: ../../../pikotools/textstream/types.h log.h +httpsimpleparser.o: logmanipulators.h ../../../pikotools/log/log.h +httpsimpleparser.o: ../../../pikotools/textstream/textstream.h +httpsimpleparser.o: ../../../pikotools/space/space.h httpsimpleparser.o: ../../../pikotools/date/date.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 requesttypes.h -httpsimpleparser.o: ../../../pikotools/textstream/textstream.h -httpsimpleparser.o: ../../../pikotools/membuffer/membuffer.h -httpsimpleparser.o: ../../../pikotools/textstream/types.h -httpsimpleparser.o: ../../../pikotools/utf8/utf8.h winix_const.h -httpsimpleparser.o: logmanipulators.h filelog.h +httpsimpleparser.o: ../../../pikotools/convert/text.h misc.h item.h +httpsimpleparser.o: requesttypes.h ../../../pikotools/utf8/utf8.h +httpsimpleparser.o: winix_const.h ../../../pikotools/membuffer/membuffer.h +httpsimpleparser.o: ../../../pikotools/textstream/types.h filelog.h httpsimpleparser.o: ../../../winix/winixd/core/synchro.h httpsimpleparser.o: ../../../winix/winixd/core/log.h httpsimpleparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h @@ -340,19 +345,20 @@ image.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h image.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h image.o: ../../../pikotools/space/spaceparser.h image.o: ../../../pikotools/space/space.h -image.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h -image.o: item.h ../../../pikotools/space/space.h -image.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h +image.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +image.o: ../../../pikotools/log/log.h +image.o: ../../../pikotools/textstream/textstream.h +image.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.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 requesttypes.h -image.o: ../../../pikotools/textstream/textstream.h +image.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h +image.o: ../../../pikotools/utf8/utf8.h winix_const.h image.o: ../../../pikotools/membuffer/membuffer.h -image.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h -image.o: winix_const.h logmanipulators.h filelog.h +image.o: ../../../pikotools/textstream/types.h filelog.h image.o: ../../../winix/winixd/core/synchro.h image.o: ../../../winix/winixd/core/log.h -image.o: ../../../winix/winixd/core/filelog.h lock.h +image.o: ../../../winix/winixd/core/filelog.h lock.h textstream.h image.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h image.o: ../../../winix/winixd/db/dbconn.h image.o: ../../../winix/winixd/db/dbtextstream.h @@ -392,18 +398,18 @@ ipbancontainer.o: plugindata.h winixbase.h ipbancontainer.o: ../../../winix/winixd/core/config.h ipbancontainer.o: ../../../pikotools/space/spaceparser.h ipbancontainer.o: ../../../pikotools/space/space.h -ipbancontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h -ipbancontainer.o: misc.h item.h ../../../pikotools/space/space.h +ipbancontainer.o: ../../../pikotools/textstream/types.h log.h +ipbancontainer.o: logmanipulators.h ../../../pikotools/log/log.h +ipbancontainer.o: ../../../pikotools/textstream/textstream.h +ipbancontainer.o: ../../../pikotools/space/space.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 requesttypes.h -ipbancontainer.o: ../../../pikotools/textstream/textstream.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 -ipbancontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h -ipbancontainer.o: logmanipulators.h filelog.h +ipbancontainer.o: ../../../pikotools/textstream/types.h filelog.h ipbancontainer.o: ../../../winix/winixd/core/synchro.h ipbancontainer.o: ../../../winix/winixd/core/log.h ipbancontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h @@ -419,24 +425,25 @@ item.o: winix_const.h crypt.h run.h winixbase.h item.o: ../../../winix/winixd/core/config.h item.o: ../../../pikotools/space/spaceparser.h item.o: ../../../pikotools/space/space.h -item.o: ../../../pikotools/textstream/types.h log.h textstream.h -item.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h -item.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h -item.o: lock.h synchro.h config.h user.h +item.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +item.o: ../../../pikotools/log/log.h filelog.h +item.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +item.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h config.h user.h job.o: job.h basethread.h synchro.h winixmodel.h job.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h job.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h job.o: ../../../pikotools/space/spaceparser.h job.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -job.o: log.h textstream.h misc.h item.h ../../../pikotools/space/space.h -job.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h +job.o: log.h logmanipulators.h ../../../pikotools/log/log.h +job.o: ../../../pikotools/textstream/textstream.h +job.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +job.o: ../../../pikotools/convert/convert.h job.o: ../../../pikotools/convert/inttostr.h job.o: ../../../pikotools/convert/strtoint.h -job.o: ../../../pikotools/convert/text.h requesttypes.h -job.o: ../../../pikotools/textstream/textstream.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 ../../../pikotools/utf8/utf8.h -job.o: winix_const.h logmanipulators.h filelog.h +job.o: ../../../pikotools/textstream/types.h filelog.h job.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h job.o: ../../../winix/winixd/core/filelog.h lock.h lastcontainer.o: lastcontainer.h ../../../pikotools/date/date.h @@ -452,38 +459,39 @@ lastcontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h winixbase.h lastcontainer.o: ../../../winix/winixd/core/config.h lastcontainer.o: ../../../pikotools/space/spaceparser.h lastcontainer.o: ../../../pikotools/space/space.h -lastcontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h -lastcontainer.o: logmanipulators.h filelog.h +lastcontainer.o: ../../../pikotools/textstream/types.h log.h +lastcontainer.o: logmanipulators.h ../../../pikotools/log/log.h filelog.h lastcontainer.o: ../../../winix/winixd/core/synchro.h lastcontainer.o: ../../../winix/winixd/core/log.h lastcontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h loadavg.o: loadavg.h winixbase.h ../../../winix/winixd/core/config.h loadavg.o: ../../../pikotools/space/spaceparser.h loadavg.o: ../../../pikotools/space/space.h -loadavg.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h -loadavg.o: item.h ../../../pikotools/space/space.h -loadavg.o: ../../../pikotools/date/date.h +loadavg.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +loadavg.o: ../../../pikotools/log/log.h +loadavg.o: ../../../pikotools/textstream/textstream.h +loadavg.o: ../../../pikotools/space/space.h ../../../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 requesttypes.h -loadavg.o: ../../../pikotools/textstream/textstream.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 -loadavg.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h -loadavg.o: filelog.h ../../../winix/winixd/core/synchro.h +loadavg.o: ../../../pikotools/textstream/types.h filelog.h +loadavg.o: ../../../winix/winixd/core/synchro.h loadavg.o: ../../../winix/winixd/core/log.h loadavg.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h lock.o: lock.h synchro.h -log.o: log.h textstream.h misc.h item.h ../../../pikotools/space/space.h -log.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h +log.o: log.h logmanipulators.h ../../../pikotools/log/log.h +log.o: ../../../pikotools/textstream/textstream.h +log.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +log.o: ../../../pikotools/convert/convert.h log.o: ../../../pikotools/convert/inttostr.h log.o: ../../../pikotools/convert/strtoint.h -log.o: ../../../pikotools/convert/text.h requesttypes.h -log.o: ../../../pikotools/textstream/textstream.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 ../../../pikotools/utf8/utf8.h -log.o: winix_const.h logmanipulators.h filelog.h +log.o: ../../../pikotools/textstream/types.h filelog.h log.o: ../../../winix/winixd/core/synchro.h misc.o: misc.h item.h ../../../pikotools/space/space.h misc.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h @@ -499,7 +507,8 @@ misc.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h misc.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h misc.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h misc.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -misc.o: ../../../ezc/src/patternparser.h +misc.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +misc.o: filelog.h ../../../winix/winixd/core/synchro.h misc.o: ../../../winix/winixd/templates/patterncacher.h misc.o: ../../../winix/winixd/core/item.h misc.o: ../../../winix/winixd/core/winixbase.h @@ -512,8 +521,7 @@ misc.o: ../../../winix/winixd/templates/localefilter.h misc.o: ../../../winix/winixd/core/config.h misc.o: ../../../pikotools/space/spaceparser.h misc.o: ../../../pikotools/space/space.h -misc.o: ../../../pikotools/textstream/types.h log.h textstream.h -misc.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h +misc.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h misc.o: ../../../winix/winixd/core/cur.h ../../../winix/winixd/core/system.h misc.o: ../../../winix/winixd/core/sessionmanager.h misc.o: ../../../winix/winixd/core/htmlfilter.h ../../../winix/winixd/db/db.h @@ -531,7 +539,7 @@ misc.o: lock.h synchro.h ../../../winix/winixd/core/winixrequest.h misc.o: ../../../winix/winixd/core/winixsystem.h misc.o: ../../../winix/winixd/core/winixmodel.h misc.o: ../../../winix/winixd/core/slog.h cur.h request.h error.h config.h -misc.o: ../../../winix/winixd/templates/htmltextstream.h +misc.o: textstream.h ../../../winix/winixd/templates/htmltextstream.h misc.o: ../../../pikotools/space/spacetojson.h session.h user.h plugindata.h misc.o: rebus.h ipban.h mount.h ../../../winix/winixd/templates/locale.h mount.o: mount.h misc.h item.h ../../../pikotools/space/space.h @@ -556,8 +564,8 @@ mountparser.o: ../../../pikotools/utf8/utf8.h winix_const.h dirs.h mountparser.o: dircontainer.h winixbase.h ../../../winix/winixd/core/config.h mountparser.o: ../../../pikotools/space/spaceparser.h mountparser.o: ../../../pikotools/space/space.h -mountparser.o: ../../../pikotools/textstream/types.h log.h textstream.h -mountparser.o: logmanipulators.h filelog.h +mountparser.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +mountparser.o: ../../../pikotools/log/log.h filelog.h mountparser.o: ../../../winix/winixd/core/synchro.h mountparser.o: ../../../winix/winixd/core/log.h mountparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h @@ -575,7 +583,8 @@ mountparser.o: ../../../winix/winixd/core/user.h mountparser.o: ../../../winix/winixd/core/group.h mountparser.o: ../../../winix/winixd/core/dircontainer.h mountparser.o: ../../../winix/winixd/core/ugcontainer.h request.h error.h -mountparser.o: config.h ../../../winix/winixd/templates/htmltextstream.h +mountparser.o: config.h textstream.h +mountparser.o: ../../../winix/winixd/templates/htmltextstream.h mountparser.o: ../../../pikotools/space/spacetojson.h mountparser.o: ../../../ezc/src/outstreams.h winixmodel.h plugin.h mountparser.o: pluginmsg.h plugindata.h @@ -592,8 +601,9 @@ mounts.o: ../../../pikotools/utf8/utf8.h winix_const.h dircontainer.h mounts.o: winixbase.h ../../../winix/winixd/core/config.h mounts.o: ../../../pikotools/space/spaceparser.h mounts.o: ../../../pikotools/space/space.h -mounts.o: ../../../pikotools/textstream/types.h log.h textstream.h -mounts.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h +mounts.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +mounts.o: ../../../pikotools/log/log.h filelog.h +mounts.o: ../../../winix/winixd/core/synchro.h mounts.o: ../../../winix/winixd/core/log.h mounts.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h mounts.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h @@ -609,7 +619,7 @@ mounts.o: ../../../winix/winixd/core/user.h mounts.o: ../../../winix/winixd/core/group.h mounts.o: ../../../winix/winixd/core/dircontainer.h mounts.o: ../../../winix/winixd/core/ugcontainer.h request.h config.h -mounts.o: ../../../winix/winixd/templates/htmltextstream.h +mounts.o: textstream.h ../../../winix/winixd/templates/htmltextstream.h mounts.o: ../../../pikotools/space/spacetojson.h mounts.o: ../../../ezc/src/outstreams.h winixmodel.h plugin.h pluginmsg.h mounts.o: plugindata.h mountparser.h cur.h session.h user.h rebus.h ipban.h @@ -617,17 +627,18 @@ plugin.o: plugin.h pluginmsg.h plugindata.h winixbase.h plugin.o: ../../../winix/winixd/core/config.h plugin.o: ../../../pikotools/space/spaceparser.h plugin.o: ../../../pikotools/space/space.h -plugin.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h -plugin.o: item.h ../../../pikotools/space/space.h -plugin.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h +plugin.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +plugin.o: ../../../pikotools/log/log.h +plugin.o: ../../../pikotools/textstream/textstream.h +plugin.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +plugin.o: ../../../pikotools/convert/convert.h plugin.o: ../../../pikotools/convert/inttostr.h plugin.o: ../../../pikotools/convert/strtoint.h -plugin.o: ../../../pikotools/convert/text.h requesttypes.h -plugin.o: ../../../pikotools/textstream/textstream.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 -plugin.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h -plugin.o: filelog.h ../../../winix/winixd/core/synchro.h +plugin.o: ../../../pikotools/textstream/types.h filelog.h +plugin.o: ../../../winix/winixd/core/synchro.h plugin.o: ../../../winix/winixd/core/log.h plugin.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h system.h plugin.o: job.h basethread.h winixmodel.h @@ -644,7 +655,7 @@ plugin.o: ../../../winix/winixd/core/user.h plugin.o: ../../../winix/winixd/core/group.h plugin.o: ../../../winix/winixd/core/dircontainer.h plugin.o: ../../../winix/winixd/core/ugcontainer.h request.h error.h config.h -plugin.o: ../../../winix/winixd/templates/htmltextstream.h +plugin.o: textstream.h ../../../winix/winixd/templates/htmltextstream.h plugin.o: ../../../pikotools/space/spacetojson.h plugin.o: ../../../ezc/src/outstreams.h mounts.h mount.h mountparser.h plugin.o: crypt.h run.h user.h users.h ugcontainer.h lastcontainer.h cur.h @@ -730,18 +741,18 @@ plugindata.o: plugindata.h plugin.h pluginmsg.h winixbase.h plugindata.o: ../../../winix/winixd/core/config.h plugindata.o: ../../../pikotools/space/spaceparser.h plugindata.o: ../../../pikotools/space/space.h -plugindata.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h -plugindata.o: item.h ../../../pikotools/space/space.h -plugindata.o: ../../../pikotools/date/date.h +plugindata.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +plugindata.o: ../../../pikotools/log/log.h +plugindata.o: ../../../pikotools/textstream/textstream.h +plugindata.o: ../../../pikotools/space/space.h ../../../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 requesttypes.h -plugindata.o: ../../../pikotools/textstream/textstream.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 -plugindata.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h -plugindata.o: filelog.h ../../../winix/winixd/core/synchro.h +plugindata.o: ../../../pikotools/textstream/types.h filelog.h +plugindata.o: ../../../winix/winixd/core/synchro.h plugindata.o: ../../../winix/winixd/core/log.h plugindata.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h postmultiparser.o: postmultiparser.h error.h requesttypes.h @@ -758,21 +769,22 @@ postmultiparser.o: ../../../pikotools/textstream/types.h config.h winixbase.h postmultiparser.o: ../../../winix/winixd/core/config.h postmultiparser.o: ../../../pikotools/space/spaceparser.h postmultiparser.o: ../../../pikotools/space/space.h -postmultiparser.o: ../../../pikotools/textstream/types.h log.h textstream.h -postmultiparser.o: logmanipulators.h filelog.h +postmultiparser.o: ../../../pikotools/textstream/types.h log.h +postmultiparser.o: logmanipulators.h ../../../pikotools/log/log.h filelog.h postmultiparser.o: ../../../winix/winixd/core/synchro.h postmultiparser.o: ../../../winix/winixd/core/log.h postmultiparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h postmultiparser.o: ../../../pikotools/convert/text.h -rebus.o: log.h textstream.h misc.h item.h ../../../pikotools/space/space.h -rebus.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h +rebus.o: log.h logmanipulators.h ../../../pikotools/log/log.h +rebus.o: ../../../pikotools/textstream/textstream.h +rebus.o: ../../../pikotools/space/space.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 requesttypes.h -rebus.o: ../../../pikotools/textstream/textstream.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 ../../../pikotools/utf8/utf8.h -rebus.o: winix_const.h logmanipulators.h filelog.h +rebus.o: ../../../pikotools/textstream/types.h filelog.h rebus.o: ../../../winix/winixd/core/synchro.h rebus.h winixbase.h rebus.o: ../../../winix/winixd/core/config.h rebus.o: ../../../pikotools/space/spaceparser.h @@ -780,7 +792,7 @@ rebus.o: ../../../pikotools/space/space.h rebus.o: ../../../pikotools/textstream/types.h rebus.o: ../../../winix/winixd/core/log.h rebus.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h cur.h -rebus.o: request.h error.h config.h +rebus.o: request.h error.h config.h textstream.h rebus.o: ../../../winix/winixd/templates/htmltextstream.h rebus.o: ../../../winix/winixd/core/textstream.h rebus.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h @@ -800,7 +812,8 @@ request.o: ../../../winix/winixd/core/textstream.h request.o: ../../../pikotools/space/spacetojson.h request.o: ../../../pikotools/space/space.h request.o: ../../../pikotools/textstream/types.h -request.o: ../../../ezc/src/outstreams.h log.h logmanipulators.h filelog.h +request.o: ../../../ezc/src/outstreams.h log.h logmanipulators.h +request.o: ../../../pikotools/log/log.h filelog.h request.o: ../../../winix/winixd/core/synchro.h plugin.h pluginmsg.h request.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h request.o: ../../../pikotools/space/spaceparser.h @@ -809,15 +822,16 @@ request.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h run.o: run.h winixbase.h ../../../winix/winixd/core/config.h run.o: ../../../pikotools/space/spaceparser.h run.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -run.o: log.h textstream.h misc.h item.h ../../../pikotools/space/space.h -run.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h +run.o: log.h logmanipulators.h ../../../pikotools/log/log.h +run.o: ../../../pikotools/textstream/textstream.h +run.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +run.o: ../../../pikotools/convert/convert.h run.o: ../../../pikotools/convert/inttostr.h run.o: ../../../pikotools/convert/strtoint.h -run.o: ../../../pikotools/convert/text.h requesttypes.h -run.o: ../../../pikotools/textstream/textstream.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 ../../../pikotools/utf8/utf8.h -run.o: winix_const.h logmanipulators.h filelog.h +run.o: ../../../pikotools/textstream/types.h filelog.h run.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h run.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h session.o: session.h item.h ../../../pikotools/space/space.h @@ -834,10 +848,12 @@ session.o: plugindata.h rebus.h winixbase.h session.o: ../../../winix/winixd/core/config.h session.o: ../../../pikotools/space/spaceparser.h session.o: ../../../pikotools/space/space.h -session.o: ../../../pikotools/textstream/types.h log.h textstream.h -session.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h +session.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +session.o: ../../../pikotools/log/log.h filelog.h +session.o: ../../../winix/winixd/core/synchro.h session.o: ../../../winix/winixd/core/log.h -session.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h ipban.h +session.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h textstream.h +session.o: ipban.h sessioncontainer.o: sessioncontainer.h session.h item.h sessioncontainer.o: ../../../pikotools/space/space.h sessioncontainer.o: ../../../pikotools/date/date.h @@ -853,12 +869,12 @@ sessioncontainer.o: user.h plugindata.h rebus.h winixbase.h sessioncontainer.o: ../../../winix/winixd/core/config.h sessioncontainer.o: ../../../pikotools/space/spaceparser.h sessioncontainer.o: ../../../pikotools/space/space.h -sessioncontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h -sessioncontainer.o: logmanipulators.h filelog.h +sessioncontainer.o: ../../../pikotools/textstream/types.h log.h +sessioncontainer.o: logmanipulators.h ../../../pikotools/log/log.h filelog.h sessioncontainer.o: ../../../winix/winixd/core/synchro.h sessioncontainer.o: ../../../winix/winixd/core/log.h sessioncontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h -sessioncontainer.o: ipban.h cur.h request.h config.h +sessioncontainer.o: textstream.h ipban.h cur.h request.h config.h sessioncontainer.o: ../../../winix/winixd/templates/htmltextstream.h sessioncontainer.o: ../../../winix/winixd/core/textstream.h sessioncontainer.o: ../../../pikotools/space/spacetojson.h @@ -870,17 +886,17 @@ sessionidmanager.o: ../../../pikotools/space/space.h ../../../tito/src/aes.h sessionidmanager.o: winixbase.h ../../../winix/winixd/core/config.h sessionidmanager.o: ../../../pikotools/space/spaceparser.h sessionidmanager.o: ../../../pikotools/space/space.h -sessionidmanager.o: ../../../pikotools/textstream/types.h log.h textstream.h -sessionidmanager.o: misc.h item.h ../../../pikotools/date/date.h +sessionidmanager.o: ../../../pikotools/textstream/types.h log.h +sessionidmanager.o: logmanipulators.h ../../../pikotools/log/log.h +sessionidmanager.o: ../../../pikotools/textstream/textstream.h +sessionidmanager.o: ../../../pikotools/date/date.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 requesttypes.h -sessionidmanager.o: ../../../pikotools/textstream/textstream.h -sessionidmanager.o: ../../../pikotools/membuffer/membuffer.h -sessionidmanager.o: ../../../pikotools/textstream/types.h -sessionidmanager.o: ../../../pikotools/utf8/utf8.h winix_const.h -sessionidmanager.o: logmanipulators.h filelog.h +sessionidmanager.o: ../../../pikotools/convert/text.h misc.h item.h +sessionidmanager.o: requesttypes.h ../../../pikotools/utf8/utf8.h +sessionidmanager.o: winix_const.h ../../../pikotools/membuffer/membuffer.h +sessionidmanager.o: ../../../pikotools/textstream/types.h filelog.h sessionidmanager.o: ../../../winix/winixd/core/synchro.h sessionidmanager.o: ../../../winix/winixd/core/log.h sessionidmanager.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h @@ -899,12 +915,12 @@ sessionmanager.o: plugindata.h rebus.h winixbase.h sessionmanager.o: ../../../winix/winixd/core/config.h sessionmanager.o: ../../../pikotools/space/spaceparser.h sessionmanager.o: ../../../pikotools/space/space.h -sessionmanager.o: ../../../pikotools/textstream/types.h log.h textstream.h -sessionmanager.o: logmanipulators.h filelog.h +sessionmanager.o: ../../../pikotools/textstream/types.h log.h +sessionmanager.o: logmanipulators.h ../../../pikotools/log/log.h filelog.h sessionmanager.o: ../../../winix/winixd/core/synchro.h sessionmanager.o: ../../../winix/winixd/core/log.h sessionmanager.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h -sessionmanager.o: ipban.h cur.h request.h config.h +sessionmanager.o: textstream.h ipban.h cur.h request.h config.h sessionmanager.o: ../../../winix/winixd/templates/htmltextstream.h sessionmanager.o: ../../../winix/winixd/core/textstream.h sessionmanager.o: ../../../pikotools/space/spacetojson.h @@ -968,13 +984,13 @@ sessionparser.o: plugindata.h rebus.h winixbase.h sessionparser.o: ../../../winix/winixd/core/config.h sessionparser.o: ../../../pikotools/space/spaceparser.h sessionparser.o: ../../../pikotools/space/space.h -sessionparser.o: ../../../pikotools/textstream/types.h log.h textstream.h -sessionparser.o: logmanipulators.h filelog.h +sessionparser.o: ../../../pikotools/textstream/types.h log.h +sessionparser.o: logmanipulators.h ../../../pikotools/log/log.h filelog.h sessionparser.o: ../../../winix/winixd/core/synchro.h sessionparser.o: ../../../winix/winixd/core/log.h sessionparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h -sessionparser.o: ipban.h sessioncontainer.h cur.h request.h config.h -sessionparser.o: ../../../winix/winixd/templates/htmltextstream.h +sessionparser.o: textstream.h ipban.h sessioncontainer.h cur.h request.h +sessionparser.o: config.h ../../../winix/winixd/templates/htmltextstream.h sessionparser.o: ../../../winix/winixd/core/textstream.h sessionparser.o: ../../../pikotools/space/spacetojson.h sessionparser.o: ../../../ezc/src/outstreams.h mount.h winixmodel.h @@ -1010,9 +1026,9 @@ slog.o: ../../../pikotools/textstream/types.h ../../../ezc/src/outstreams.h slog.o: session.h user.h plugindata.h rebus.h winixbase.h slog.o: ../../../winix/winixd/core/config.h slog.o: ../../../pikotools/space/spaceparser.h log.h logmanipulators.h -slog.o: filelog.h ../../../winix/winixd/core/synchro.h -slog.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h -slog.o: lock.h synchro.h ipban.h mount.h +slog.o: ../../../pikotools/log/log.h filelog.h +slog.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +slog.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h ipban.h mount.h slog.o: ../../../winix/winixd/templates/locale.h slog.o: ../../../winix/winixd/core/winixbase.h synchro.o: synchro.h @@ -1021,17 +1037,18 @@ system.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h system.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h system.o: ../../../pikotools/space/spaceparser.h system.o: ../../../pikotools/space/space.h -system.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h -system.o: item.h ../../../pikotools/space/space.h -system.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h +system.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +system.o: ../../../pikotools/log/log.h +system.o: ../../../pikotools/textstream/textstream.h +system.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.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 requesttypes.h -system.o: ../../../pikotools/textstream/textstream.h +system.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h +system.o: ../../../pikotools/utf8/utf8.h winix_const.h system.o: ../../../pikotools/membuffer/membuffer.h -system.o: ../../../pikotools/textstream/types.h -system.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h -system.o: filelog.h ../../../winix/winixd/core/synchro.h +system.o: ../../../pikotools/textstream/types.h filelog.h +system.o: ../../../winix/winixd/core/synchro.h system.o: ../../../winix/winixd/core/log.h system.o: ../../../winix/winixd/core/filelog.h lock.h dirs.h dircontainer.h system.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h @@ -1046,7 +1063,7 @@ system.o: ../../../winix/winixd/core/user.h system.o: ../../../winix/winixd/core/group.h system.o: ../../../winix/winixd/core/dircontainer.h system.o: ../../../winix/winixd/core/ugcontainer.h request.h error.h config.h -system.o: ../../../winix/winixd/templates/htmltextstream.h +system.o: textstream.h ../../../winix/winixd/templates/htmltextstream.h system.o: ../../../pikotools/space/spacetojson.h system.o: ../../../ezc/src/outstreams.h mounts.h mount.h mountparser.h system.o: crypt.h run.h user.h users.h ugcontainer.h lastcontainer.h cur.h @@ -1131,18 +1148,18 @@ threadmanager.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h threadmanager.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h threadmanager.o: ../../../pikotools/space/spaceparser.h threadmanager.o: ../../../pikotools/space/space.h -threadmanager.o: ../../../pikotools/textstream/types.h log.h textstream.h -threadmanager.o: misc.h item.h ../../../pikotools/space/space.h +threadmanager.o: ../../../pikotools/textstream/types.h log.h +threadmanager.o: logmanipulators.h ../../../pikotools/log/log.h +threadmanager.o: ../../../pikotools/textstream/textstream.h +threadmanager.o: ../../../pikotools/space/space.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 requesttypes.h -threadmanager.o: ../../../pikotools/textstream/textstream.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 -threadmanager.o: ../../../pikotools/utf8/utf8.h winix_const.h -threadmanager.o: logmanipulators.h filelog.h +threadmanager.o: ../../../pikotools/textstream/types.h filelog.h threadmanager.o: ../../../winix/winixd/core/synchro.h threadmanager.o: ../../../winix/winixd/core/log.h threadmanager.o: ../../../winix/winixd/core/filelog.h lock.h @@ -1169,8 +1186,9 @@ timezones.o: ../../../pikotools/utf8/utf8.h winix_const.h timezones.o: ../../../pikotools/space/spaceparser.h timezones.o: ../../../pikotools/space/space.h timezones.o: ../../../pikotools/textstream/types.h winixbase.h -timezones.o: ../../../winix/winixd/core/config.h log.h textstream.h -timezones.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h +timezones.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h +timezones.o: ../../../pikotools/log/log.h filelog.h +timezones.o: ../../../winix/winixd/core/synchro.h timezones.o: ../../../winix/winixd/core/log.h timezones.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h user.o: user.h ../../../pikotools/space/space.h @@ -1194,11 +1212,12 @@ users.o: winix_const.h ugcontainer.h lastcontainer.h winixbase.h users.o: ../../../winix/winixd/core/config.h users.o: ../../../pikotools/space/spaceparser.h users.o: ../../../pikotools/space/space.h -users.o: ../../../pikotools/textstream/types.h log.h textstream.h -users.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h +users.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +users.o: ../../../pikotools/log/log.h filelog.h +users.o: ../../../winix/winixd/core/synchro.h users.o: ../../../winix/winixd/core/log.h users.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h cur.h -users.o: request.h error.h config.h +users.o: request.h error.h config.h textstream.h users.o: ../../../winix/winixd/templates/htmltextstream.h users.o: ../../../winix/winixd/core/textstream.h users.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h @@ -1238,18 +1257,18 @@ users.o: ../../../tito/src/aes.h winixbase.o: winixbase.h ../../../winix/winixd/core/config.h winixbase.o: ../../../pikotools/space/spaceparser.h winixbase.o: ../../../pikotools/space/space.h -winixbase.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h -winixbase.o: item.h ../../../pikotools/space/space.h -winixbase.o: ../../../pikotools/date/date.h +winixbase.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +winixbase.o: ../../../pikotools/log/log.h +winixbase.o: ../../../pikotools/textstream/textstream.h +winixbase.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h winixbase.o: ../../../pikotools/convert/convert.h winixbase.o: ../../../pikotools/convert/inttostr.h winixbase.o: ../../../pikotools/convert/strtoint.h -winixbase.o: ../../../pikotools/convert/text.h requesttypes.h -winixbase.o: ../../../pikotools/textstream/textstream.h +winixbase.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h +winixbase.o: ../../../pikotools/utf8/utf8.h winix_const.h winixbase.o: ../../../pikotools/membuffer/membuffer.h -winixbase.o: ../../../pikotools/textstream/types.h -winixbase.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h -winixbase.o: filelog.h ../../../winix/winixd/core/synchro.h +winixbase.o: ../../../pikotools/textstream/types.h filelog.h +winixbase.o: ../../../winix/winixd/core/synchro.h winixbase.o: ../../../winix/winixd/core/log.h winixbase.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h winixmodel.o: winixmodel.h ../../../winix/winixd/core/winixbase.h plugin.h @@ -1257,18 +1276,18 @@ winixmodel.o: pluginmsg.h plugindata.h winixbase.h winixmodel.o: ../../../winix/winixd/core/config.h winixmodel.o: ../../../pikotools/space/spaceparser.h winixmodel.o: ../../../pikotools/space/space.h -winixmodel.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h -winixmodel.o: item.h ../../../pikotools/space/space.h -winixmodel.o: ../../../pikotools/date/date.h +winixmodel.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h +winixmodel.o: ../../../pikotools/log/log.h +winixmodel.o: ../../../pikotools/textstream/textstream.h +winixmodel.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h winixmodel.o: ../../../pikotools/convert/convert.h winixmodel.o: ../../../pikotools/convert/inttostr.h winixmodel.o: ../../../pikotools/convert/strtoint.h -winixmodel.o: ../../../pikotools/convert/text.h requesttypes.h -winixmodel.o: ../../../pikotools/textstream/textstream.h +winixmodel.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h +winixmodel.o: ../../../pikotools/utf8/utf8.h winix_const.h winixmodel.o: ../../../pikotools/membuffer/membuffer.h -winixmodel.o: ../../../pikotools/textstream/types.h -winixmodel.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h -winixmodel.o: filelog.h ../../../winix/winixd/core/synchro.h +winixmodel.o: ../../../pikotools/textstream/types.h filelog.h +winixmodel.o: ../../../winix/winixd/core/synchro.h winixmodel.o: ../../../winix/winixd/core/log.h winixmodel.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h winixrequest.o: winixrequest.h diff --git a/winixd/core/app.cpp b/winixd/core/app.cpp index a5bc14d..67c365c 100644 --- a/winixd/core/app.cpp +++ b/winixd/core/app.cpp @@ -165,7 +165,7 @@ App::App() void App::InitLoggers() { file_log.init(config.log_file, config.log_stdout, config.log_level, config.log_save_each_line, config.log_time_zone_id); - log.Init(config.log_request); + log.SetMaxRequests(config.log_request); } @@ -277,11 +277,9 @@ return true; bool App::Init() { - // temporarily - logger.init(config.log_level, config.log_save_each_line, L"/var/log/www/db.log", config.log_stdout); - - postgresql_connector.set_logger(logger); postgresql_connector.set_conn_param(config.db_database, config.db_user, config.db_pass); + postgresql_connector.set_logger(log); + postgresql_connector.set_log_queries(config.log_db_query); postgresql_connector.wait_for_connection(); model_connector.set_flat_connector(json_connector); diff --git a/winixd/core/app.h b/winixd/core/app.h index 55428a4..1374d98 100644 --- a/winixd/core/app.h +++ b/winixd/core/app.h @@ -57,7 +57,7 @@ #include "space/jsontospaceparser.h" #include "winixrequest.h" -#include "logger/logger.h" +#include "log/log.h" #include "filelog.h" @@ -166,7 +166,6 @@ private: std::wstring http_header; std::string http_header_8bit; - PT::Logger logger; // temporarily morm::ModelConnector model_connector; // main thread model connector, each thread has its own connector morm::JSONConnector json_connector; morm::PostgreSQLConnector postgresql_connector; @@ -183,7 +182,7 @@ private: ////////////////////////// // log_buffer for the main thread - TextStream log_buffer; + PT::WTextStream log_buffer; // logger only for App object Log log; diff --git a/winixd/core/config.cpp b/winixd/core/config.cpp index 0a4ff8f..06e4f81 100644 --- a/winixd/core/config.cpp +++ b/winixd/core/config.cpp @@ -52,13 +52,10 @@ Config::Config() void Config::SetFileLog(FileLog * file_log) { log.SetFileLog(file_log); - - // the config is not read yet so we put some constants here - log.Init(1); } -void Config::SetLogBuffer(TextStream * log_buffer) +void Config::SetLogBuffer(PT::WTextStream * log_buffer) { log.SetLogBuffer(log_buffer); } diff --git a/winixd/core/config.h b/winixd/core/config.h index 71f26e1..8322c26 100644 --- a/winixd/core/config.h +++ b/winixd/core/config.h @@ -821,7 +821,7 @@ public: void SetFileLog(FileLog * file_log); - void SetLogBuffer(TextStream * log_buffer); + void SetLogBuffer(PT::WTextStream * log_buffer); private: diff --git a/winixd/core/crypt.cpp b/winixd/core/crypt.cpp index 8045a5e..d9b2352 100644 --- a/winixd/core/crypt.cpp +++ b/winixd/core/crypt.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2014, Tomasz Sowa + * Copyright (c) 2011-2018, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,6 +36,7 @@ #include "crypt.h" #include "utf8/utf8.h" #include "log.h" +#include "misc.h" diff --git a/winixd/core/filelog.cpp b/winixd/core/filelog.cpp index b39ed70..f5844b5 100644 --- a/winixd/core/filelog.cpp +++ b/winixd/core/filelog.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2018, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -47,8 +47,6 @@ namespace Winix FileLog::FileLog() { - log_stdout = false; - log_file_open = false; time_zones = nullptr; synchro = nullptr; log_time_zone_id = 0; @@ -68,13 +66,8 @@ void FileLog::set_synchro(Synchro * synchro) void FileLog::init(const std::wstring & log_file, bool log_stdout, int log_level, bool save_each_line, size_t log_time_zone_id) { - this->log_stdout = log_stdout; + PT::FileLog::init(log_file, log_stdout, log_level, save_each_line); this->log_time_zone_id = log_time_zone_id; - this->log_level = log_level; - this->save_each_line = save_each_line; - PT::WideToUTF8(log_file, this->log_file); - // don't open the file here - // because it would be created with the root as an owner } @@ -122,57 +115,15 @@ PT::Date FileLog::get_local_date(const PT::Date & date) -void FileLog::open_file() +bool FileLog::synchro_lock() { - if( !log_file.empty() ) - { - file.open( log_file.c_str(), std::ios_base::out | std::ios_base::app ); - log_file_open = true; - } + return synchro->Lock(); } - -void FileLog::save_log(TextStream * buffer) +void FileLog::synchro_unlock() { - if( buffer->Str().empty() ) - return; - - if( synchro ) - { - synchro->Lock(); - } - - try - { - if( log_stdout ) - PT::WideToUTF8(buffer->Str(), std::cout); - - if( log_file.empty() ) - return; - - if( !log_file_open || !file ) - { - file.close(); - file.clear(); - - open_file(); - - if( !file ) - return; - } - - PT::WideToUTF8(buffer->Str(), file); - file.flush(); - } - catch(...) - { - } - - if( synchro ) - { - synchro->Unlock(); - } + synchro->Unlock(); } diff --git a/winixd/core/filelog.h b/winixd/core/filelog.h index d10955c..6460caf 100644 --- a/winixd/core/filelog.h +++ b/winixd/core/filelog.h @@ -39,8 +39,8 @@ #include #include #include -#include "textstream.h" #include "core/synchro.h" +#include "log/log.h" @@ -49,17 +49,16 @@ namespace Winix class TimeZones; -class FileLog +class FileLog : public PT::FileLog { public: FileLog(); - ~FileLog(); + virtual ~FileLog(); void set_synchro(Synchro * synchro); void init(const std::wstring & log_file, bool log_stdout, int log_level, bool save_each_line, size_t log_time_zone_id); - void save_log(TextStream * buffer); void set_time_zones(TimeZones * time_zones); PT::Date get_local_date(const PT::Date & date); @@ -67,17 +66,9 @@ public: int get_log_level(); bool should_save_each_line(); -private: - // file log - std::string log_file; - std::ofstream file; - // logging to stdout - bool log_stdout; - - // is the config file already open - bool log_file_open; +protected: size_t log_time_zone_id; @@ -85,14 +76,11 @@ private: Synchro * synchro; - // log lovel from the config file - int log_level; - // whether to save each line (for debug) - bool save_each_line; + virtual bool synchro_lock(); + virtual void synchro_unlock(); - void open_file(); }; diff --git a/winixd/core/loadavg.cpp b/winixd/core/loadavg.cpp index c13ac1c..013f1b1 100644 --- a/winixd/core/loadavg.cpp +++ b/winixd/core/loadavg.cpp @@ -31,9 +31,9 @@ * POSSIBILITY OF SUCH DAMAGE. * */ - #include "loadavg.h" +#include "misc.h" diff --git a/winixd/core/log.cpp b/winixd/core/log.cpp index 49a35c5..0abd1d5 100644 --- a/winixd/core/log.cpp +++ b/winixd/core/log.cpp @@ -46,39 +46,16 @@ namespace Winix Log::Log() { - current_level = 100; // nothing to log (call Init() first) request = 0; max_requests = 1; - lines = 0; - max_lines = 5000; - file_log = nullptr; - buffer = nullptr; } Log::~Log() { - SaveLogAndClear(); } -void Log::SetLogBuffer(TextStream * buffer) -{ - this->buffer = buffer; -} - - -void Log::SetFileLog(FileLog * pfile_log) -{ - this->file_log = pfile_log; -} - - -FileLog * Log::GetFileLog() -{ - return file_log; -} - void Log::SetDependency(Log * log) { @@ -88,34 +65,28 @@ void Log::SetDependency(Log * log) -void Log::Init(int max_requests) +void Log::SetMaxRequests(int max_requests) { - this->max_requests = max_requests; + this->max_requests = max_requests; } void Log::PrintDate(const PT::Date & date) { - if( file_log ) - { - (*this) << file_log->get_local_date(date); - } + FileLog * winix_file_log = dynamic_cast(file_log); + + if( winix_file_log ) + (*this) << winix_file_log->get_local_date(date); else - { (*this) << date; - } } Log & Log::operator<<(const void * s) { - if( current_level <= file_log->get_log_level() && buffer ) - { - (*buffer) << s; - } - + PT::Log::operator<<(s); return *this; } @@ -123,23 +94,15 @@ Log & Log::operator<<(const void * s) Log & Log::operator<<(const char * s) { - if( current_level <= file_log->get_log_level() && buffer && s ) - { - (*buffer) << s; - } - -return *this; + PT::Log::operator<<(s); + return *this; } Log & Log::operator<<(const std::string & s) { - if( current_level <= file_log->get_log_level() && buffer ) - { - (*buffer) << s; - } - + PT::Log::operator<<(s); return *this; } @@ -147,11 +110,7 @@ Log & Log::operator<<(const std::string & s) Log & Log::operator<<(const std::string * s) { - if( current_level <= file_log->get_log_level() && buffer ) - { - (*buffer) << *s; - } - + PT::Log::operator<<(s); return *this; } @@ -162,23 +121,15 @@ Log & Log::operator<<(const std::string * s) Log & Log::operator<<(const wchar_t * s) { - if( current_level <= file_log->get_log_level() && buffer && s ) - { - (*buffer) << s; - } - -return *this; + PT::Log::operator<<(s); + return *this; } Log & Log::operator<<(const std::wstring & s) { - if( current_level <= file_log->get_log_level() && buffer ) - { - (*buffer) << s; - } - + PT::Log::operator<<(s); return *this; } @@ -186,25 +137,15 @@ Log & Log::operator<<(const std::wstring & s) Log & Log::operator<<(const std::wstring * s) { - if( current_level <= file_log->get_log_level() && buffer ) - { - (*buffer) << *s; - } - + PT::Log::operator<<(s); return *this; } - - Log & Log::operator<<(int s) { - if( current_level <= file_log->get_log_level() && buffer ) - { - (*buffer) << s; - } - + PT::Log::operator<<(s); return *this; } @@ -212,11 +153,7 @@ Log & Log::operator<<(int s) Log & Log::operator<<(long s) { - if( current_level <= file_log->get_log_level() && buffer ) - { - (*buffer) << s; - } - + PT::Log::operator<<(s); return *this; } @@ -225,33 +162,21 @@ Log & Log::operator<<(long s) Log & Log::operator<<(char s) { - if( current_level <= file_log->get_log_level() && buffer ) - { - (*buffer) << s; - } - + PT::Log::operator<<(s); return *this; } Log & Log::operator<<(wchar_t s) { - if( current_level <= file_log->get_log_level() && buffer ) - { - (*buffer) << s; - } - + PT::Log::operator<<(s); return *this; } Log & Log::operator<<(size_t s) { - if( current_level <= file_log->get_log_level() && buffer ) - { - (*buffer) << s; - } - + PT::Log::operator<<(s); return *this; } @@ -259,11 +184,7 @@ Log & Log::operator<<(size_t s) Log & Log::operator<<(double s) { - if( current_level <= file_log->get_log_level() && buffer ) - { - (*buffer) << s; - } - + PT::Log::operator<<(s); return *this; } @@ -271,24 +192,16 @@ Log & Log::operator<<(double s) Log & Log::operator<<(const PT::Space & s) { - if( current_level <= file_log->get_log_level() && buffer ) - { - (*buffer) << s; - } - -return *this; + PT::Log::operator<<(s); + return *this; } Log & Log::operator<<(const PT::Date & date) { - if( current_level <= file_log->get_log_level() && buffer ) - { - (*buffer) << date; - } - -return *this; + PT::Log::operator<<(date); + return *this; } @@ -297,42 +210,38 @@ Log & Log::operator<<(LogManipulators m) { switch(m) { - case logend: - if( current_level <= file_log->get_log_level() && buffer ) + case LogManipulators::log1: + PT::Log::operator<<(PT::Log::log1); + break; + + case LogManipulators::log2: + PT::Log::operator<<(PT::Log::log2); + break; + + case LogManipulators::log3: + PT::Log::operator<<(PT::Log::log3); + break; + + case LogManipulators::log4: + PT::Log::operator<<(PT::Log::log4); + break; + + case LogManipulators::logend: + PT::Log::operator<<(PT::Log::logend); + break; + + case LogManipulators::logsave: + PT::Log::operator<<(PT::Log::logsave); + break; + + case LogManipulators::logendrequest: + if( ++request >= max_requests ) { - (*buffer) << '\n'; - lines += 1; - - if( file_log->should_save_each_line() ) - SaveLogAndClear(); + save_log_and_clear(); + request = 0; } break; - case logsave: - SaveLogAndClear(); - break; - - case logendrequest: - if( ++request >= max_requests || lines > max_lines ) - SaveLogAndClear(); - break; - - case log1: - current_level = 1; - break; - - case log2: - current_level = 2; - break; - - case log3: - current_level = 3; - break; - - case log4: - current_level = 4; - break; - default: break; } @@ -341,84 +250,7 @@ return *this; } - - -char Log::GetHEXdigit(unsigned char c) -{ - if( c < 10 ) - return c + '0'; - -return c - 10 + 'A'; -} - - - -void Log::ToHEX(char * buf, unsigned char c) -{ - buf[0] = GetHEXdigit(c >> 4); - buf[1] = GetHEXdigit(c & 0xf); - buf[2] = 0; -} - - -void Log::LogBinary(const char * blob, size_t blob_len) -{ -size_t i=0; -char buf[3]; - - if( !buffer ) - return; - - - while( i < blob_len ) - { - size_t oldi = i; - - for(size_t a=0 ; a<16 ; ++a) - { - if( i < blob_len ) - { - ToHEX(buf, blob[i]); - (*buffer) << buf << ' '; - ++i; - } - else - { - (*buffer) << " "; - } - - if( a == 7 ) - { - if( i < blob_len ) - (*buffer) << "- "; - else - (*buffer) << " "; - } - } - - i = oldi; - (*buffer) << ' '; - - for(size_t a=0 ; a<16 && i 31 && blob[i] < 127 ) - (*buffer) << blob[i]; - else - (*buffer) << '.'; - } - - (*this) << logend; - } -} - - -void Log::LogBinary(const std::string & blob) -{ - LogBinary(blob.c_str(), blob.size()); -} - - -void Log::SystemErr(int err) +Log & Log::SystemErr(int err) { (*this) << "errno: " << err; @@ -426,29 +258,37 @@ void Log::SystemErr(int err) if( err_msg ) (*this) << " (" << err_msg << ")"; + + return *this; } -void Log::SaveLogAndClear() + + +Log & Log::LogString(const std::string & value, size_t max_size) { - SaveLog(); - - if( buffer ) - { - buffer->Clear(); - } - - request = 0; - lines = 0; + PT::Log::LogString(value, max_size); + return *this; } -void Log::SaveLog() +Log & Log::LogString(const std::wstring & value, size_t max_size) { - if( buffer ) - { - file_log->save_log(buffer); - } + PT::Log::LogString(value, max_size); + return *this; +} + + +Log & Log::LogBinary(const char * blob, size_t blob_len) +{ + PT::Log::LogBinary(blob, blob_len); + return *this; +} + +Log & Log::LogBinary(const std::string & blob) +{ + PT::Log::LogBinary(blob); + return *this; } diff --git a/winixd/core/log.h b/winixd/core/log.h index 2c787f3..ed4c20f 100644 --- a/winixd/core/log.h +++ b/winixd/core/log.h @@ -40,10 +40,10 @@ #include #include #include -#include "textstream.h" + #include "logmanipulators.h" -#include "textstream/textstream.h" #include "filelog.h" +#include "log/log.h" namespace Winix @@ -51,67 +51,51 @@ namespace Winix -class Log +class Log : public PT::Log { public: Log(); - ~Log(); + virtual ~Log(); - void SetLogBuffer(TextStream * buffer); + virtual void SetDependency(Log * log); - void SetFileLog(FileLog * file_log); - FileLog * GetFileLog(); + virtual void SetMaxRequests(int max_requests); - void SetDependency(Log * log); + virtual Log & operator<<(const void * s); + virtual Log & operator<<(const char * s); + virtual Log & operator<<(const std::string * s); + virtual Log & operator<<(const std::string & s); + virtual Log & operator<<(const wchar_t * s); + virtual Log & operator<<(const std::wstring * s); + virtual Log & operator<<(const std::wstring & s); + virtual Log & operator<<(int s); + virtual Log & operator<<(long s); + virtual Log & operator<<(char s); + virtual Log & operator<<(wchar_t s); + virtual Log & operator<<(size_t s); + virtual Log & operator<<(double s); + virtual Log & operator<<(const PT::Space & space); + virtual Log & operator<<(LogManipulators m); + virtual Log & operator<<(const PT::Date & date); - void Init(int max_requests); - - Log & operator<<(const void * s); - Log & operator<<(const char * s); - Log & operator<<(const std::string * s); - Log & operator<<(const std::string & s); - Log & operator<<(const wchar_t * s); - Log & operator<<(const std::wstring * s); - Log & operator<<(const std::wstring & s); - Log & operator<<(int s); - Log & operator<<(long s); - Log & operator<<(char s); - Log & operator<<(wchar_t s); - Log & operator<<(size_t s); - Log & operator<<(double s); - Log & operator<<(const PT::Space & space); - Log & operator<<(LogManipulators m); - Log & operator<<(const PT::Date & date); - - void PrintDate(const PT::Date & date); + virtual void PrintDate(const PT::Date & date); template Log & operator<<(const PT::TextStreamBase & buf); - template - void LogString(const StringType & value, size_t max_size); - - void LogBinary(const char * blob, size_t blob_len); - void LogBinary(const std::string & blob); - - - void SystemErr(int err); - void SaveLog(); - void SaveLogAndClear(); + virtual Log & LogString(const std::string & value, size_t max_size); + virtual Log & LogString(const std::wstring & value, size_t max_size); + virtual Log & LogBinary(const char * blob, size_t blob_len); + virtual Log & LogBinary(const std::string & blob); + virtual Log & SystemErr(int err); private: - // buffer for the log - TextStream * buffer; // IMPROVE ME this buffer should be a common buffer for all objects for a one thread - - // current level set by a modifier (e.g. log << log3) - int current_level; - // current request for logging // starts from zero and incremented after logendrequest modifier int request; @@ -119,51 +103,18 @@ private: // how many request to save at once int max_requests; - - // IMPROVE ME now we don't know how many lines there are in the buffer as the buffer can be used by other Logs - // how many lines there are in the buffer - int lines; - - // how many lines can be in the config buffer - // default: 5000 - int max_lines; - - - FileLog * file_log; - - char GetHEXdigit(unsigned char c); - void ToHEX(char * buf, unsigned char c); - }; -template -void Log::LogString(const StringType & value, size_t max_size) -{ -size_t min_size = value.size() < max_size ? value.size() : max_size; - - if( current_level <= file_log->get_log_level() && buffer ) - { - for(size_t i=0 ; i Log & Log::operator<<(const PT::TextStreamBase & buf) { - if( current_level <= file_log->get_log_level() && buffer ) - (*buffer) << buf; - -return *this; + PT::Log::operator<<(buf); + return *this; } diff --git a/winixd/core/logmanipulators.h b/winixd/core/logmanipulators.h index cef8cc6..b53f05f 100644 --- a/winixd/core/logmanipulators.h +++ b/winixd/core/logmanipulators.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2014, Tomasz Sowa + * Copyright (c) 2011-2018, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,13 +35,13 @@ #ifndef headerfile_winix_core_logmanipulators #define headerfile_winix_core_logmanipulators +#include "log/log.h" + namespace Winix { - - /* log1 - the first level log2 @@ -65,10 +65,12 @@ enum LogManipulators log2, log3, log4, + logend, - logendrequest, logsave, + logendrequest, + loginfo, logerror, logwarning diff --git a/winixd/core/plugin.cpp b/winixd/core/plugin.cpp index 279c946..95608f1 100644 --- a/winixd/core/plugin.cpp +++ b/winixd/core/plugin.cpp @@ -197,7 +197,6 @@ bool Plugin::SetDependency(PluginInfo & info) info.plugin = this; info.log.SetDependency(&log); - log.Init(config->log_request); return res; } diff --git a/winixd/core/threadmanager.cpp b/winixd/core/threadmanager.cpp index 5d7ab39..c6a0b8e 100644 --- a/winixd/core/threadmanager.cpp +++ b/winixd/core/threadmanager.cpp @@ -87,6 +87,8 @@ ThreadItem item; //data.postgresql_connector.set_logger(logger); data.postgresql_connector.set_conn_param(config->db_database, config->db_user, config->db_pass); + data.postgresql_connector.set_logger(thread_tab.back().object->get_logger()); + data.postgresql_connector.set_log_queries(config->log_db_query); data.postgresql_connector.wait_for_connection(); data.model_connector.set_db_connector(data.postgresql_connector); data.model_connector.set_flat_connector(data.json_connector); diff --git a/winixd/core/threadmanager.h b/winixd/core/threadmanager.h index 69bc679..aa47e01 100644 --- a/winixd/core/threadmanager.h +++ b/winixd/core/threadmanager.h @@ -39,6 +39,7 @@ #include #include "basethread.h" #include "synchro.h" +#include "textstream/textstream.h" namespace Winix @@ -53,9 +54,6 @@ public: ThreadManager(); - // synchro object - //void SetSynchro(Synchro * psynchro); - // initializing void Init(); @@ -82,7 +80,7 @@ private: morm::JSONConnector json_connector; morm::PostgreSQLConnector postgresql_connector; - TextStream log_buffer; + PT::WTextStream log_buffer; }; struct ThreadItem @@ -94,7 +92,6 @@ private: }; - //Synchro * synchro; typedef std::list ThreadTab; ThreadTab thread_tab; bool were_started; diff --git a/winixd/core/winixbase.cpp b/winixd/core/winixbase.cpp index 4e092cb..0cf9132 100644 --- a/winixd/core/winixbase.cpp +++ b/winixd/core/winixbase.cpp @@ -63,7 +63,7 @@ void WinixBase::set_synchro(Synchro * synchro) } -void WinixBase::set_log_buffer(TextStream * log_buffer) +void WinixBase::set_log_buffer(PT::WTextStream * log_buffer) { log.SetLogBuffer(log_buffer); } @@ -75,6 +75,12 @@ void WinixBase::set_file_log(FileLog * file_log) } +Log * WinixBase::get_logger() +{ + return &log; +} + + void WinixBase::set_dependency(WinixBase * winix_base) { config = winix_base->config; diff --git a/winixd/core/winixbase.h b/winixd/core/winixbase.h index 31a248a..4bd66a3 100644 --- a/winixd/core/winixbase.h +++ b/winixd/core/winixbase.h @@ -41,7 +41,7 @@ #include "core/synchro.h" #include "core/filelog.h" #include "lock.h" -#include "textstream.h" +#include "textstream/textstream.h" @@ -58,9 +58,11 @@ public: void set_config(Config * config); void set_synchro(Synchro * synchro); - void set_log_buffer(TextStream * log_buffer); + void set_log_buffer(PT::WTextStream * log_buffer); void set_file_log(FileLog * file_log); + Log * get_logger(); + void set_dependency(WinixBase * winix_base); diff --git a/winixd/db/Makefile.dep b/winixd/db/Makefile.dep index 492a560..f889680 100644 --- a/winixd/db/Makefile.dep +++ b/winixd/db/Makefile.dep @@ -16,10 +16,9 @@ db.o: ../../../winix/winixd/core/winixbase.h db.o: ../../../winix/winixd/core/config.h db.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h db.o: ../../../winix/winixd/core/log.h -db.o: ../../../winix/winixd/core/textstream.h db.o: ../../../winix/winixd/core/logmanipulators.h -db.o: ../../../winix/winixd/core/filelog.h -db.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +db.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +db.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h db.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h db.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/error.h db.o: dbitemquery.h ../../../winix/winixd/core/item.h dbitemcolumns.h @@ -47,11 +46,10 @@ dbbase.o: ../../../winix/winixd/core/winixbase.h dbbase.o: ../../../winix/winixd/core/config.h dbbase.o: ../../../pikotools/space/spaceparser.h dbbase.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -dbbase.o: ../../../winix/winixd/core/textstream.h dbbase.o: ../../../winix/winixd/core/logmanipulators.h -dbbase.o: ../../../winix/winixd/core/filelog.h -dbbase.o: ../../../winix/winixd/core/synchro.h +dbbase.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h dbbase.o: ../../../winix/winixd/core/log.h +dbbase.o: ../../../winix/winixd/core/synchro.h dbbase.o: ../../../winix/winixd/core/filelog.h dbbase.o: ../../../winix/winixd/core/lock.h dbbase.o: ../../../winix/winixd/core/synchro.h @@ -75,11 +73,10 @@ dbconn.o: ../../../winix/winixd/core/winixbase.h dbconn.o: ../../../winix/winixd/core/config.h dbconn.o: ../../../pikotools/space/spaceparser.h dbconn.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -dbconn.o: ../../../winix/winixd/core/textstream.h dbconn.o: ../../../winix/winixd/core/logmanipulators.h -dbconn.o: ../../../winix/winixd/core/filelog.h -dbconn.o: ../../../winix/winixd/core/synchro.h +dbconn.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h dbconn.o: ../../../winix/winixd/core/log.h +dbconn.o: ../../../winix/winixd/core/synchro.h dbconn.o: ../../../winix/winixd/core/filelog.h dbconn.o: ../../../winix/winixd/core/lock.h dbconn.o: ../../../winix/winixd/core/synchro.h @@ -107,11 +104,11 @@ dbitemcolumns.o: ../../../winix/winixd/core/config.h dbitemcolumns.o: ../../../pikotools/space/spaceparser.h dbitemcolumns.o: ../../../pikotools/space/space.h dbitemcolumns.o: ../../../winix/winixd/core/log.h -dbitemcolumns.o: ../../../winix/winixd/core/textstream.h dbitemcolumns.o: ../../../winix/winixd/core/logmanipulators.h -dbitemcolumns.o: ../../../winix/winixd/core/filelog.h -dbitemcolumns.o: ../../../winix/winixd/core/synchro.h +dbitemcolumns.o: ../../../pikotools/log/log.h +dbitemcolumns.o: ../../../pikotools/log/filelog.h dbitemcolumns.o: ../../../winix/winixd/core/log.h +dbitemcolumns.o: ../../../winix/winixd/core/synchro.h dbitemcolumns.o: ../../../winix/winixd/core/filelog.h dbitemcolumns.o: ../../../winix/winixd/core/lock.h dbitemcolumns.o: ../../../winix/winixd/core/synchro.h diff --git a/winixd/functions/Makefile.dep b/winixd/functions/Makefile.dep index 84d1326..84d6022 100644 --- a/winixd/functions/Makefile.dep +++ b/winixd/functions/Makefile.dep @@ -21,11 +21,10 @@ account.o: ../../../winix/winixd/core/winixbase.h account.o: ../../../winix/winixd/core/config.h account.o: ../../../pikotools/space/spaceparser.h account.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -account.o: ../../../winix/winixd/core/textstream.h account.o: ../../../winix/winixd/core/logmanipulators.h -account.o: ../../../winix/winixd/core/filelog.h -account.o: ../../../winix/winixd/core/synchro.h +account.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h account.o: ../../../winix/winixd/core/log.h +account.o: ../../../winix/winixd/core/synchro.h account.o: ../../../winix/winixd/core/filelog.h account.o: ../../../winix/winixd/core/lock.h account.o: ../../../winix/winixd/core/synchro.h @@ -42,6 +41,7 @@ account.o: ../../../winix/winixd/core/request.h account.o: ../../../winix/winixd/core/requesttypes.h account.o: ../../../winix/winixd/core/error.h account.o: ../../../winix/winixd/core/config.h +account.o: ../../../winix/winixd/core/textstream.h account.o: ../../../winix/winixd/templates/htmltextstream.h account.o: ../../../pikotools/space/spacetojson.h account.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -124,11 +124,10 @@ adduser.o: ../../../winix/winixd/core/winixbase.h adduser.o: ../../../winix/winixd/core/config.h adduser.o: ../../../pikotools/space/spaceparser.h adduser.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -adduser.o: ../../../winix/winixd/core/textstream.h adduser.o: ../../../winix/winixd/core/logmanipulators.h -adduser.o: ../../../winix/winixd/core/filelog.h -adduser.o: ../../../winix/winixd/core/synchro.h +adduser.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h adduser.o: ../../../winix/winixd/core/log.h +adduser.o: ../../../winix/winixd/core/synchro.h adduser.o: ../../../winix/winixd/core/filelog.h adduser.o: ../../../winix/winixd/core/lock.h adduser.o: ../../../winix/winixd/core/synchro.h @@ -145,6 +144,7 @@ adduser.o: ../../../winix/winixd/core/request.h adduser.o: ../../../winix/winixd/core/requesttypes.h adduser.o: ../../../winix/winixd/core/error.h adduser.o: ../../../winix/winixd/core/config.h +adduser.o: ../../../winix/winixd/core/textstream.h adduser.o: ../../../winix/winixd/templates/htmltextstream.h adduser.o: ../../../pikotools/space/spacetojson.h adduser.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -223,10 +223,9 @@ cat.o: ../../../winix/winixd/core/winixbase.h cat.o: ../../../winix/winixd/core/config.h cat.o: ../../../pikotools/space/spaceparser.h cat.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -cat.o: ../../../winix/winixd/core/textstream.h cat.o: ../../../winix/winixd/core/logmanipulators.h -cat.o: ../../../winix/winixd/core/filelog.h -cat.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +cat.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +cat.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h cat.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h cat.o: ../../../winix/winixd/core/synchro.h cat.o: ../../../winix/winixd/core/error.h @@ -240,6 +239,7 @@ cat.o: ../../../winix/winixd/core/ugcontainer.h cat.o: ../../../winix/winixd/core/request.h cat.o: ../../../winix/winixd/core/requesttypes.h cat.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +cat.o: ../../../winix/winixd/core/textstream.h cat.o: ../../../winix/winixd/templates/htmltextstream.h cat.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h cat.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -312,11 +312,10 @@ chmod.o: ../../../winix/winixd/core/winixbase.h chmod.o: ../../../winix/winixd/core/config.h chmod.o: ../../../pikotools/space/spaceparser.h chmod.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -chmod.o: ../../../winix/winixd/core/textstream.h chmod.o: ../../../winix/winixd/core/logmanipulators.h -chmod.o: ../../../winix/winixd/core/filelog.h -chmod.o: ../../../winix/winixd/core/synchro.h +chmod.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h chmod.o: ../../../winix/winixd/core/log.h +chmod.o: ../../../winix/winixd/core/synchro.h chmod.o: ../../../winix/winixd/core/filelog.h chmod.o: ../../../winix/winixd/core/lock.h chmod.o: ../../../winix/winixd/core/synchro.h @@ -332,6 +331,7 @@ chmod.o: ../../../winix/winixd/core/request.h chmod.o: ../../../winix/winixd/core/requesttypes.h chmod.o: ../../../winix/winixd/core/error.h chmod.o: ../../../winix/winixd/core/config.h +chmod.o: ../../../winix/winixd/core/textstream.h chmod.o: ../../../winix/winixd/templates/htmltextstream.h chmod.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h chmod.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -406,11 +406,10 @@ chown.o: ../../../winix/winixd/core/winixbase.h chown.o: ../../../winix/winixd/core/config.h chown.o: ../../../pikotools/space/spaceparser.h chown.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -chown.o: ../../../winix/winixd/core/textstream.h chown.o: ../../../winix/winixd/core/logmanipulators.h -chown.o: ../../../winix/winixd/core/filelog.h -chown.o: ../../../winix/winixd/core/synchro.h +chown.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h chown.o: ../../../winix/winixd/core/log.h +chown.o: ../../../winix/winixd/core/synchro.h chown.o: ../../../winix/winixd/core/filelog.h chown.o: ../../../winix/winixd/core/lock.h chown.o: ../../../winix/winixd/core/synchro.h @@ -426,6 +425,7 @@ chown.o: ../../../winix/winixd/core/request.h chown.o: ../../../winix/winixd/core/requesttypes.h chown.o: ../../../winix/winixd/core/error.h chown.o: ../../../winix/winixd/core/config.h +chown.o: ../../../winix/winixd/core/textstream.h chown.o: ../../../winix/winixd/templates/htmltextstream.h chown.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h chown.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -503,11 +503,10 @@ ckeditor.o: ../../../winix/winixd/core/winixbase.h ckeditor.o: ../../../winix/winixd/core/config.h ckeditor.o: ../../../pikotools/space/spaceparser.h ckeditor.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -ckeditor.o: ../../../winix/winixd/core/textstream.h ckeditor.o: ../../../winix/winixd/core/logmanipulators.h -ckeditor.o: ../../../winix/winixd/core/filelog.h -ckeditor.o: ../../../winix/winixd/core/synchro.h +ckeditor.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h ckeditor.o: ../../../winix/winixd/core/log.h +ckeditor.o: ../../../winix/winixd/core/synchro.h ckeditor.o: ../../../winix/winixd/core/filelog.h ckeditor.o: ../../../winix/winixd/core/lock.h ckeditor.o: ../../../winix/winixd/core/synchro.h @@ -524,6 +523,7 @@ ckeditor.o: ../../../winix/winixd/core/request.h ckeditor.o: ../../../winix/winixd/core/requesttypes.h ckeditor.o: ../../../winix/winixd/core/error.h ckeditor.o: ../../../winix/winixd/core/config.h +ckeditor.o: ../../../winix/winixd/core/textstream.h ckeditor.o: ../../../winix/winixd/templates/htmltextstream.h ckeditor.o: ../../../pikotools/space/spacetojson.h ckeditor.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -598,10 +598,9 @@ cp.o: ../../../winix/winixd/core/winixbase.h cp.o: ../../../winix/winixd/core/config.h cp.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h cp.o: ../../../winix/winixd/core/log.h -cp.o: ../../../winix/winixd/core/textstream.h cp.o: ../../../winix/winixd/core/logmanipulators.h -cp.o: ../../../winix/winixd/core/filelog.h -cp.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +cp.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +cp.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h cp.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h cp.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/error.h cp.o: ../../../winix/winixd/db/dbitemquery.h @@ -614,6 +613,7 @@ cp.o: ../../../winix/winixd/core/ugcontainer.h cp.o: ../../../winix/winixd/core/request.h cp.o: ../../../winix/winixd/core/requesttypes.h cp.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +cp.o: ../../../winix/winixd/core/textstream.h cp.o: ../../../winix/winixd/templates/htmltextstream.h cp.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h cp.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -690,11 +690,10 @@ default.o: ../../../winix/winixd/core/winixbase.h default.o: ../../../winix/winixd/core/config.h default.o: ../../../pikotools/space/spaceparser.h default.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -default.o: ../../../winix/winixd/core/textstream.h default.o: ../../../winix/winixd/core/logmanipulators.h -default.o: ../../../winix/winixd/core/filelog.h -default.o: ../../../winix/winixd/core/synchro.h +default.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h default.o: ../../../winix/winixd/core/log.h +default.o: ../../../winix/winixd/core/synchro.h default.o: ../../../winix/winixd/core/filelog.h default.o: ../../../winix/winixd/core/lock.h default.o: ../../../winix/winixd/core/synchro.h @@ -711,6 +710,7 @@ default.o: ../../../winix/winixd/core/request.h default.o: ../../../winix/winixd/core/requesttypes.h default.o: ../../../winix/winixd/core/error.h default.o: ../../../winix/winixd/core/config.h +default.o: ../../../winix/winixd/core/textstream.h default.o: ../../../winix/winixd/templates/htmltextstream.h default.o: ../../../pikotools/space/spacetojson.h default.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -790,11 +790,10 @@ download.o: ../../../winix/winixd/core/winixbase.h download.o: ../../../winix/winixd/core/config.h download.o: ../../../pikotools/space/spaceparser.h download.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -download.o: ../../../winix/winixd/core/textstream.h download.o: ../../../winix/winixd/core/logmanipulators.h -download.o: ../../../winix/winixd/core/filelog.h -download.o: ../../../winix/winixd/core/synchro.h +download.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h download.o: ../../../winix/winixd/core/log.h +download.o: ../../../winix/winixd/core/synchro.h download.o: ../../../winix/winixd/core/filelog.h download.o: ../../../winix/winixd/core/lock.h download.o: ../../../winix/winixd/core/synchro.h @@ -811,6 +810,7 @@ download.o: ../../../winix/winixd/core/request.h download.o: ../../../winix/winixd/core/requesttypes.h download.o: ../../../winix/winixd/core/error.h download.o: ../../../winix/winixd/core/config.h +download.o: ../../../winix/winixd/core/textstream.h download.o: ../../../winix/winixd/templates/htmltextstream.h download.o: ../../../pikotools/space/spacetojson.h download.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -887,11 +887,10 @@ emacs.o: ../../../winix/winixd/core/winixbase.h emacs.o: ../../../winix/winixd/core/config.h emacs.o: ../../../pikotools/space/spaceparser.h emacs.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -emacs.o: ../../../winix/winixd/core/textstream.h emacs.o: ../../../winix/winixd/core/logmanipulators.h -emacs.o: ../../../winix/winixd/core/filelog.h -emacs.o: ../../../winix/winixd/core/synchro.h +emacs.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h emacs.o: ../../../winix/winixd/core/log.h +emacs.o: ../../../winix/winixd/core/synchro.h emacs.o: ../../../winix/winixd/core/filelog.h emacs.o: ../../../winix/winixd/core/lock.h emacs.o: ../../../winix/winixd/core/synchro.h @@ -907,6 +906,7 @@ emacs.o: ../../../winix/winixd/core/request.h emacs.o: ../../../winix/winixd/core/requesttypes.h emacs.o: ../../../winix/winixd/core/error.h emacs.o: ../../../winix/winixd/core/config.h +emacs.o: ../../../winix/winixd/core/textstream.h emacs.o: ../../../winix/winixd/templates/htmltextstream.h emacs.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h emacs.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -986,10 +986,9 @@ env.o: ../../../winix/winixd/core/winixbase.h env.o: ../../../winix/winixd/core/config.h env.o: ../../../pikotools/space/spaceparser.h env.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -env.o: ../../../winix/winixd/core/textstream.h env.o: ../../../winix/winixd/core/logmanipulators.h -env.o: ../../../winix/winixd/core/filelog.h -env.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +env.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +env.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h env.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h env.o: ../../../winix/winixd/core/synchro.h env.o: ../../../winix/winixd/core/error.h @@ -1003,6 +1002,7 @@ env.o: ../../../winix/winixd/core/ugcontainer.h env.o: ../../../winix/winixd/core/request.h env.o: ../../../winix/winixd/core/requesttypes.h env.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +env.o: ../../../winix/winixd/core/textstream.h env.o: ../../../winix/winixd/templates/htmltextstream.h env.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h env.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -1080,11 +1080,10 @@ functionbase.o: ../../../winix/winixd/core/config.h functionbase.o: ../../../pikotools/space/spaceparser.h functionbase.o: ../../../pikotools/space/space.h functionbase.o: ../../../winix/winixd/core/log.h -functionbase.o: ../../../winix/winixd/core/textstream.h functionbase.o: ../../../winix/winixd/core/logmanipulators.h -functionbase.o: ../../../winix/winixd/core/filelog.h -functionbase.o: ../../../winix/winixd/core/synchro.h +functionbase.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h functionbase.o: ../../../winix/winixd/core/log.h +functionbase.o: ../../../winix/winixd/core/synchro.h functionbase.o: ../../../winix/winixd/core/filelog.h functionbase.o: ../../../winix/winixd/core/lock.h functionbase.o: ../../../winix/winixd/core/synchro.h @@ -1101,6 +1100,7 @@ functionbase.o: ../../../winix/winixd/core/request.h functionbase.o: ../../../winix/winixd/core/requesttypes.h functionbase.o: ../../../winix/winixd/core/error.h functionbase.o: ../../../winix/winixd/core/config.h +functionbase.o: ../../../winix/winixd/core/textstream.h functionbase.o: ../../../winix/winixd/templates/htmltextstream.h functionbase.o: ../../../pikotools/space/spacetojson.h functionbase.o: ../../../ezc/src/outstreams.h @@ -1184,11 +1184,11 @@ functionparser.o: ../../../winix/winixd/core/config.h functionparser.o: ../../../pikotools/space/spaceparser.h functionparser.o: ../../../pikotools/space/space.h functionparser.o: ../../../winix/winixd/core/log.h -functionparser.o: ../../../winix/winixd/core/textstream.h functionparser.o: ../../../winix/winixd/core/logmanipulators.h -functionparser.o: ../../../winix/winixd/core/filelog.h -functionparser.o: ../../../winix/winixd/core/synchro.h +functionparser.o: ../../../pikotools/log/log.h +functionparser.o: ../../../pikotools/log/filelog.h functionparser.o: ../../../winix/winixd/core/log.h +functionparser.o: ../../../winix/winixd/core/synchro.h functionparser.o: ../../../winix/winixd/core/filelog.h functionparser.o: ../../../winix/winixd/core/lock.h functionparser.o: ../../../winix/winixd/core/synchro.h @@ -1218,6 +1218,7 @@ functionparser.o: ../../../winix/winixd/core/request.h functionparser.o: ../../../winix/winixd/core/requesttypes.h functionparser.o: ../../../winix/winixd/core/error.h functionparser.o: ../../../winix/winixd/core/config.h +functionparser.o: ../../../winix/winixd/core/textstream.h functionparser.o: ../../../winix/winixd/templates/htmltextstream.h functionparser.o: ../../../pikotools/space/spacetojson.h functionparser.o: ../../../ezc/src/outstreams.h @@ -1289,11 +1290,10 @@ functions.o: ../../../winix/winixd/core/config.h functions.o: ../../../pikotools/space/spaceparser.h functions.o: ../../../pikotools/space/space.h functions.o: ../../../winix/winixd/core/log.h -functions.o: ../../../winix/winixd/core/textstream.h functions.o: ../../../winix/winixd/core/logmanipulators.h -functions.o: ../../../winix/winixd/core/filelog.h -functions.o: ../../../winix/winixd/core/synchro.h +functions.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h functions.o: ../../../winix/winixd/core/log.h +functions.o: ../../../winix/winixd/core/synchro.h functions.o: ../../../winix/winixd/core/filelog.h functions.o: ../../../winix/winixd/core/lock.h functions.o: ../../../winix/winixd/core/synchro.h @@ -1310,6 +1310,7 @@ functions.o: ../../../winix/winixd/core/request.h functions.o: ../../../winix/winixd/core/requesttypes.h functions.o: ../../../winix/winixd/core/error.h functions.o: ../../../winix/winixd/core/config.h +functions.o: ../../../winix/winixd/core/textstream.h functions.o: ../../../winix/winixd/templates/htmltextstream.h functions.o: ../../../pikotools/space/spacetojson.h functions.o: ../../../ezc/src/outstreams.h @@ -1400,11 +1401,10 @@ imgcrop.o: ../../../winix/winixd/core/winixbase.h imgcrop.o: ../../../winix/winixd/core/config.h imgcrop.o: ../../../pikotools/space/spaceparser.h imgcrop.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -imgcrop.o: ../../../winix/winixd/core/textstream.h imgcrop.o: ../../../winix/winixd/core/logmanipulators.h -imgcrop.o: ../../../winix/winixd/core/filelog.h -imgcrop.o: ../../../winix/winixd/core/synchro.h +imgcrop.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h imgcrop.o: ../../../winix/winixd/core/log.h +imgcrop.o: ../../../winix/winixd/core/synchro.h imgcrop.o: ../../../winix/winixd/core/filelog.h imgcrop.o: ../../../winix/winixd/core/lock.h imgcrop.o: ../../../winix/winixd/core/synchro.h @@ -1421,6 +1421,7 @@ imgcrop.o: ../../../winix/winixd/core/request.h imgcrop.o: ../../../winix/winixd/core/requesttypes.h imgcrop.o: ../../../winix/winixd/core/error.h imgcrop.o: ../../../winix/winixd/core/config.h +imgcrop.o: ../../../winix/winixd/core/textstream.h imgcrop.o: ../../../winix/winixd/templates/htmltextstream.h imgcrop.o: ../../../pikotools/space/spacetojson.h imgcrop.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -1497,11 +1498,10 @@ ipban.o: ../../../winix/winixd/core/winixbase.h ipban.o: ../../../winix/winixd/core/config.h ipban.o: ../../../pikotools/space/spaceparser.h ipban.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -ipban.o: ../../../winix/winixd/core/textstream.h ipban.o: ../../../winix/winixd/core/logmanipulators.h -ipban.o: ../../../winix/winixd/core/filelog.h -ipban.o: ../../../winix/winixd/core/synchro.h +ipban.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h ipban.o: ../../../winix/winixd/core/log.h +ipban.o: ../../../winix/winixd/core/synchro.h ipban.o: ../../../winix/winixd/core/filelog.h ipban.o: ../../../winix/winixd/core/lock.h ipban.o: ../../../winix/winixd/core/synchro.h @@ -1517,6 +1517,7 @@ ipban.o: ../../../winix/winixd/core/request.h ipban.o: ../../../winix/winixd/core/requesttypes.h ipban.o: ../../../winix/winixd/core/error.h ipban.o: ../../../winix/winixd/core/config.h +ipban.o: ../../../winix/winixd/core/textstream.h ipban.o: ../../../winix/winixd/templates/htmltextstream.h ipban.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h ipban.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -1591,10 +1592,9 @@ last.o: ../../../winix/winixd/core/winixbase.h last.o: ../../../winix/winixd/core/config.h last.o: ../../../pikotools/space/spaceparser.h last.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -last.o: ../../../winix/winixd/core/textstream.h last.o: ../../../winix/winixd/core/logmanipulators.h -last.o: ../../../winix/winixd/core/filelog.h -last.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +last.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +last.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h last.o: ../../../winix/winixd/core/filelog.h last.o: ../../../winix/winixd/core/lock.h last.o: ../../../winix/winixd/core/synchro.h @@ -1610,6 +1610,7 @@ last.o: ../../../winix/winixd/core/request.h last.o: ../../../winix/winixd/core/requesttypes.h last.o: ../../../winix/winixd/core/error.h last.o: ../../../winix/winixd/core/config.h +last.o: ../../../winix/winixd/core/textstream.h last.o: ../../../winix/winixd/templates/htmltextstream.h last.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h last.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -1681,10 +1682,9 @@ ln.o: ../../../winix/winixd/core/winixbase.h ln.o: ../../../winix/winixd/core/config.h ln.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h ln.o: ../../../winix/winixd/core/log.h -ln.o: ../../../winix/winixd/core/textstream.h ln.o: ../../../winix/winixd/core/logmanipulators.h -ln.o: ../../../winix/winixd/core/filelog.h -ln.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +ln.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +ln.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h ln.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h ln.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/error.h ln.o: ../../../winix/winixd/db/dbitemquery.h @@ -1697,6 +1697,7 @@ ln.o: ../../../winix/winixd/core/ugcontainer.h ln.o: ../../../winix/winixd/core/request.h ln.o: ../../../winix/winixd/core/requesttypes.h ln.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +ln.o: ../../../winix/winixd/core/textstream.h ln.o: ../../../winix/winixd/templates/htmltextstream.h ln.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h ln.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -1772,11 +1773,10 @@ locale.o: ../../../winix/winixd/core/winixbase.h locale.o: ../../../winix/winixd/core/config.h locale.o: ../../../pikotools/space/spaceparser.h locale.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -locale.o: ../../../winix/winixd/core/textstream.h locale.o: ../../../winix/winixd/core/logmanipulators.h -locale.o: ../../../winix/winixd/core/filelog.h -locale.o: ../../../winix/winixd/core/synchro.h +locale.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h locale.o: ../../../winix/winixd/core/log.h +locale.o: ../../../winix/winixd/core/synchro.h locale.o: ../../../winix/winixd/core/filelog.h locale.o: ../../../winix/winixd/core/lock.h locale.o: ../../../winix/winixd/core/synchro.h @@ -1793,6 +1793,7 @@ locale.o: ../../../winix/winixd/core/request.h locale.o: ../../../winix/winixd/core/requesttypes.h locale.o: ../../../winix/winixd/core/error.h locale.o: ../../../winix/winixd/core/config.h +locale.o: ../../../winix/winixd/core/textstream.h locale.o: ../../../winix/winixd/templates/htmltextstream.h locale.o: ../../../pikotools/space/spacetojson.h locale.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -1884,9 +1885,9 @@ login.o: ../../../winix/winixd/core/config.h login.o: ../../../pikotools/space/spaceparser.h login.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h login.o: ../../../winix/winixd/core/logmanipulators.h -login.o: ../../../winix/winixd/core/filelog.h -login.o: ../../../winix/winixd/core/synchro.h +login.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h login.o: ../../../winix/winixd/core/log.h +login.o: ../../../winix/winixd/core/synchro.h login.o: ../../../winix/winixd/core/filelog.h login.o: ../../../winix/winixd/core/lock.h login.o: ../../../winix/winixd/core/synchro.h @@ -1968,11 +1969,10 @@ logout.o: ../../../winix/winixd/core/winixbase.h logout.o: ../../../winix/winixd/core/config.h logout.o: ../../../pikotools/space/spaceparser.h logout.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -logout.o: ../../../winix/winixd/core/textstream.h logout.o: ../../../winix/winixd/core/logmanipulators.h -logout.o: ../../../winix/winixd/core/filelog.h -logout.o: ../../../winix/winixd/core/synchro.h +logout.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h logout.o: ../../../winix/winixd/core/log.h +logout.o: ../../../winix/winixd/core/synchro.h logout.o: ../../../winix/winixd/core/filelog.h logout.o: ../../../winix/winixd/core/lock.h logout.o: ../../../winix/winixd/core/synchro.h @@ -1989,6 +1989,7 @@ logout.o: ../../../winix/winixd/core/request.h logout.o: ../../../winix/winixd/core/requesttypes.h logout.o: ../../../winix/winixd/core/error.h logout.o: ../../../winix/winixd/core/config.h +logout.o: ../../../winix/winixd/core/textstream.h logout.o: ../../../winix/winixd/templates/htmltextstream.h logout.o: ../../../pikotools/space/spacetojson.h logout.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -2063,10 +2064,9 @@ ls.o: ../../../winix/winixd/core/winixbase.h ls.o: ../../../winix/winixd/core/config.h ls.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h ls.o: ../../../winix/winixd/core/log.h -ls.o: ../../../winix/winixd/core/textstream.h ls.o: ../../../winix/winixd/core/logmanipulators.h -ls.o: ../../../winix/winixd/core/filelog.h -ls.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +ls.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +ls.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h ls.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h ls.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/error.h ls.o: ../../../winix/winixd/db/dbitemquery.h @@ -2079,6 +2079,7 @@ ls.o: ../../../winix/winixd/core/ugcontainer.h ls.o: ../../../winix/winixd/core/request.h ls.o: ../../../winix/winixd/core/requesttypes.h ls.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +ls.o: ../../../winix/winixd/core/textstream.h ls.o: ../../../winix/winixd/templates/htmltextstream.h ls.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h ls.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -2149,10 +2150,9 @@ man.o: ../../../winix/winixd/core/winixbase.h man.o: ../../../winix/winixd/core/config.h man.o: ../../../pikotools/space/spaceparser.h man.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -man.o: ../../../winix/winixd/core/textstream.h man.o: ../../../winix/winixd/core/logmanipulators.h -man.o: ../../../winix/winixd/core/filelog.h -man.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +man.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +man.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h man.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h man.o: ../../../winix/winixd/core/synchro.h man.o: ../../../winix/winixd/core/error.h @@ -2166,6 +2166,7 @@ man.o: ../../../winix/winixd/core/ugcontainer.h man.o: ../../../winix/winixd/core/request.h man.o: ../../../winix/winixd/core/requesttypes.h man.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +man.o: ../../../winix/winixd/core/textstream.h man.o: ../../../winix/winixd/templates/htmltextstream.h man.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h man.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -2238,10 +2239,9 @@ meta.o: ../../../winix/winixd/core/winixbase.h meta.o: ../../../winix/winixd/core/config.h meta.o: ../../../pikotools/space/spaceparser.h meta.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -meta.o: ../../../winix/winixd/core/textstream.h meta.o: ../../../winix/winixd/core/logmanipulators.h -meta.o: ../../../winix/winixd/core/filelog.h -meta.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +meta.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +meta.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h meta.o: ../../../winix/winixd/core/filelog.h meta.o: ../../../winix/winixd/core/lock.h meta.o: ../../../winix/winixd/core/synchro.h @@ -2257,6 +2257,7 @@ meta.o: ../../../winix/winixd/core/request.h meta.o: ../../../winix/winixd/core/requesttypes.h meta.o: ../../../winix/winixd/core/error.h meta.o: ../../../winix/winixd/core/config.h +meta.o: ../../../winix/winixd/core/textstream.h meta.o: ../../../winix/winixd/templates/htmltextstream.h meta.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h meta.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -2330,11 +2331,10 @@ mkdir.o: ../../../winix/winixd/core/winixbase.h mkdir.o: ../../../winix/winixd/core/config.h mkdir.o: ../../../pikotools/space/spaceparser.h mkdir.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -mkdir.o: ../../../winix/winixd/core/textstream.h mkdir.o: ../../../winix/winixd/core/logmanipulators.h -mkdir.o: ../../../winix/winixd/core/filelog.h -mkdir.o: ../../../winix/winixd/core/synchro.h +mkdir.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h mkdir.o: ../../../winix/winixd/core/log.h +mkdir.o: ../../../winix/winixd/core/synchro.h mkdir.o: ../../../winix/winixd/core/filelog.h mkdir.o: ../../../winix/winixd/core/lock.h mkdir.o: ../../../winix/winixd/core/synchro.h @@ -2350,6 +2350,7 @@ mkdir.o: ../../../winix/winixd/core/request.h mkdir.o: ../../../winix/winixd/core/requesttypes.h mkdir.o: ../../../winix/winixd/core/error.h mkdir.o: ../../../winix/winixd/core/config.h +mkdir.o: ../../../winix/winixd/core/textstream.h mkdir.o: ../../../winix/winixd/templates/htmltextstream.h mkdir.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h mkdir.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -2424,11 +2425,10 @@ mount.o: ../../../winix/winixd/core/winixbase.h mount.o: ../../../winix/winixd/core/config.h mount.o: ../../../pikotools/space/spaceparser.h mount.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -mount.o: ../../../winix/winixd/core/textstream.h mount.o: ../../../winix/winixd/core/logmanipulators.h -mount.o: ../../../winix/winixd/core/filelog.h -mount.o: ../../../winix/winixd/core/synchro.h +mount.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h mount.o: ../../../winix/winixd/core/log.h +mount.o: ../../../winix/winixd/core/synchro.h mount.o: ../../../winix/winixd/core/filelog.h mount.o: ../../../winix/winixd/core/lock.h mount.o: ../../../winix/winixd/core/synchro.h @@ -2444,6 +2444,7 @@ mount.o: ../../../winix/winixd/core/request.h mount.o: ../../../winix/winixd/core/requesttypes.h mount.o: ../../../winix/winixd/core/error.h mount.o: ../../../winix/winixd/core/config.h +mount.o: ../../../winix/winixd/core/textstream.h mount.o: ../../../winix/winixd/templates/htmltextstream.h mount.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h mount.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -2516,10 +2517,9 @@ mv.o: ../../../winix/winixd/core/winixbase.h mv.o: ../../../winix/winixd/core/config.h mv.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h mv.o: ../../../winix/winixd/core/log.h -mv.o: ../../../winix/winixd/core/textstream.h mv.o: ../../../winix/winixd/core/logmanipulators.h -mv.o: ../../../winix/winixd/core/filelog.h -mv.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +mv.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +mv.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h mv.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h mv.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/error.h mv.o: ../../../winix/winixd/db/dbitemquery.h @@ -2532,6 +2532,7 @@ mv.o: ../../../winix/winixd/core/ugcontainer.h mv.o: ../../../winix/winixd/core/request.h mv.o: ../../../winix/winixd/core/requesttypes.h mv.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +mv.o: ../../../winix/winixd/core/textstream.h mv.o: ../../../winix/winixd/templates/htmltextstream.h mv.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h mv.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -2606,11 +2607,10 @@ nicedit.o: ../../../winix/winixd/core/winixbase.h nicedit.o: ../../../winix/winixd/core/config.h nicedit.o: ../../../pikotools/space/spaceparser.h nicedit.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -nicedit.o: ../../../winix/winixd/core/textstream.h nicedit.o: ../../../winix/winixd/core/logmanipulators.h -nicedit.o: ../../../winix/winixd/core/filelog.h -nicedit.o: ../../../winix/winixd/core/synchro.h +nicedit.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h nicedit.o: ../../../winix/winixd/core/log.h +nicedit.o: ../../../winix/winixd/core/synchro.h nicedit.o: ../../../winix/winixd/core/filelog.h nicedit.o: ../../../winix/winixd/core/lock.h nicedit.o: ../../../winix/winixd/core/synchro.h @@ -2627,6 +2627,7 @@ nicedit.o: ../../../winix/winixd/core/request.h nicedit.o: ../../../winix/winixd/core/requesttypes.h nicedit.o: ../../../winix/winixd/core/error.h nicedit.o: ../../../winix/winixd/core/config.h +nicedit.o: ../../../winix/winixd/core/textstream.h nicedit.o: ../../../winix/winixd/templates/htmltextstream.h nicedit.o: ../../../pikotools/space/spacetojson.h nicedit.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -2703,10 +2704,9 @@ node.o: ../../../winix/winixd/core/winixbase.h node.o: ../../../winix/winixd/core/config.h node.o: ../../../pikotools/space/spaceparser.h node.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -node.o: ../../../winix/winixd/core/textstream.h node.o: ../../../winix/winixd/core/logmanipulators.h -node.o: ../../../winix/winixd/core/filelog.h -node.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +node.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +node.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h node.o: ../../../winix/winixd/core/filelog.h node.o: ../../../winix/winixd/core/lock.h node.o: ../../../winix/winixd/core/synchro.h @@ -2722,6 +2722,7 @@ node.o: ../../../winix/winixd/core/request.h node.o: ../../../winix/winixd/core/requesttypes.h node.o: ../../../winix/winixd/core/error.h node.o: ../../../winix/winixd/core/config.h +node.o: ../../../winix/winixd/core/textstream.h node.o: ../../../winix/winixd/templates/htmltextstream.h node.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h node.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -2796,11 +2797,10 @@ passwd.o: ../../../winix/winixd/core/winixbase.h passwd.o: ../../../winix/winixd/core/config.h passwd.o: ../../../pikotools/space/spaceparser.h passwd.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -passwd.o: ../../../winix/winixd/core/textstream.h passwd.o: ../../../winix/winixd/core/logmanipulators.h -passwd.o: ../../../winix/winixd/core/filelog.h -passwd.o: ../../../winix/winixd/core/synchro.h +passwd.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h passwd.o: ../../../winix/winixd/core/log.h +passwd.o: ../../../winix/winixd/core/synchro.h passwd.o: ../../../winix/winixd/core/filelog.h passwd.o: ../../../winix/winixd/core/lock.h passwd.o: ../../../winix/winixd/core/synchro.h @@ -2817,6 +2817,7 @@ passwd.o: ../../../winix/winixd/core/request.h passwd.o: ../../../winix/winixd/core/requesttypes.h passwd.o: ../../../winix/winixd/core/error.h passwd.o: ../../../winix/winixd/core/config.h +passwd.o: ../../../winix/winixd/core/textstream.h passwd.o: ../../../winix/winixd/templates/htmltextstream.h passwd.o: ../../../pikotools/space/spacetojson.h passwd.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -2894,10 +2895,9 @@ priv.o: ../../../winix/winixd/core/winixbase.h priv.o: ../../../winix/winixd/core/config.h priv.o: ../../../pikotools/space/spaceparser.h priv.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -priv.o: ../../../winix/winixd/core/textstream.h priv.o: ../../../winix/winixd/core/logmanipulators.h -priv.o: ../../../winix/winixd/core/filelog.h -priv.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +priv.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +priv.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h priv.o: ../../../winix/winixd/core/filelog.h priv.o: ../../../winix/winixd/core/lock.h priv.o: ../../../winix/winixd/core/synchro.h @@ -2913,6 +2913,7 @@ priv.o: ../../../winix/winixd/core/request.h priv.o: ../../../winix/winixd/core/requesttypes.h priv.o: ../../../winix/winixd/core/error.h priv.o: ../../../winix/winixd/core/config.h +priv.o: ../../../winix/winixd/core/textstream.h priv.o: ../../../winix/winixd/templates/htmltextstream.h priv.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h priv.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -3000,9 +3001,9 @@ privchanger.o: ../../../winix/winixd/core/config.h privchanger.o: ../../../pikotools/space/spaceparser.h privchanger.o: ../../../winix/winixd/core/log.h privchanger.o: ../../../winix/winixd/core/logmanipulators.h -privchanger.o: ../../../winix/winixd/core/filelog.h -privchanger.o: ../../../winix/winixd/core/synchro.h +privchanger.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h privchanger.o: ../../../winix/winixd/core/log.h +privchanger.o: ../../../winix/winixd/core/synchro.h privchanger.o: ../../../winix/winixd/core/filelog.h privchanger.o: ../../../winix/winixd/core/lock.h privchanger.o: ../../../winix/winixd/core/plugin.h @@ -3087,10 +3088,9 @@ pw.o: ../../../winix/winixd/core/winixbase.h pw.o: ../../../winix/winixd/core/config.h pw.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h pw.o: ../../../winix/winixd/core/log.h -pw.o: ../../../winix/winixd/core/textstream.h pw.o: ../../../winix/winixd/core/logmanipulators.h -pw.o: ../../../winix/winixd/core/filelog.h -pw.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +pw.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +pw.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h pw.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h pw.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/error.h pw.o: ../../../winix/winixd/db/dbitemquery.h @@ -3103,6 +3103,7 @@ pw.o: ../../../winix/winixd/core/ugcontainer.h pw.o: ../../../winix/winixd/core/request.h pw.o: ../../../winix/winixd/core/requesttypes.h pw.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +pw.o: ../../../winix/winixd/core/textstream.h pw.o: ../../../winix/winixd/templates/htmltextstream.h pw.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h pw.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -3177,11 +3178,10 @@ reload.o: ../../../winix/winixd/core/winixbase.h reload.o: ../../../winix/winixd/core/config.h reload.o: ../../../pikotools/space/spaceparser.h reload.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -reload.o: ../../../winix/winixd/core/textstream.h reload.o: ../../../winix/winixd/core/logmanipulators.h -reload.o: ../../../winix/winixd/core/filelog.h -reload.o: ../../../winix/winixd/core/synchro.h +reload.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h reload.o: ../../../winix/winixd/core/log.h +reload.o: ../../../winix/winixd/core/synchro.h reload.o: ../../../winix/winixd/core/filelog.h reload.o: ../../../winix/winixd/core/lock.h reload.o: ../../../winix/winixd/core/synchro.h @@ -3198,6 +3198,7 @@ reload.o: ../../../winix/winixd/core/request.h reload.o: ../../../winix/winixd/core/requesttypes.h reload.o: ../../../winix/winixd/core/error.h reload.o: ../../../winix/winixd/core/config.h +reload.o: ../../../winix/winixd/core/textstream.h reload.o: ../../../winix/winixd/templates/htmltextstream.h reload.o: ../../../pikotools/space/spacetojson.h reload.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -3278,10 +3279,9 @@ rm.o: ../../../winix/winixd/core/winixbase.h rm.o: ../../../winix/winixd/core/config.h rm.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h rm.o: ../../../winix/winixd/core/log.h -rm.o: ../../../winix/winixd/core/textstream.h rm.o: ../../../winix/winixd/core/logmanipulators.h -rm.o: ../../../winix/winixd/core/filelog.h -rm.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +rm.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +rm.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h rm.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h rm.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/error.h rm.o: ../../../winix/winixd/db/dbitemquery.h @@ -3294,6 +3294,7 @@ rm.o: ../../../winix/winixd/core/ugcontainer.h rm.o: ../../../winix/winixd/core/request.h rm.o: ../../../winix/winixd/core/requesttypes.h rm.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +rm.o: ../../../winix/winixd/core/textstream.h rm.o: ../../../winix/winixd/templates/htmltextstream.h rm.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h rm.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -3374,11 +3375,10 @@ rmuser.o: ../../../winix/winixd/core/winixbase.h rmuser.o: ../../../winix/winixd/core/config.h rmuser.o: ../../../pikotools/space/spaceparser.h rmuser.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -rmuser.o: ../../../winix/winixd/core/textstream.h rmuser.o: ../../../winix/winixd/core/logmanipulators.h -rmuser.o: ../../../winix/winixd/core/filelog.h -rmuser.o: ../../../winix/winixd/core/synchro.h +rmuser.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h rmuser.o: ../../../winix/winixd/core/log.h +rmuser.o: ../../../winix/winixd/core/synchro.h rmuser.o: ../../../winix/winixd/core/filelog.h rmuser.o: ../../../winix/winixd/core/lock.h rmuser.o: ../../../winix/winixd/core/synchro.h @@ -3395,6 +3395,7 @@ rmuser.o: ../../../winix/winixd/core/request.h rmuser.o: ../../../winix/winixd/core/requesttypes.h rmuser.o: ../../../winix/winixd/core/error.h rmuser.o: ../../../winix/winixd/core/config.h +rmuser.o: ../../../winix/winixd/core/textstream.h rmuser.o: ../../../winix/winixd/templates/htmltextstream.h rmuser.o: ../../../pikotools/space/spacetojson.h rmuser.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -3474,10 +3475,9 @@ run.o: ../../../winix/winixd/core/winixbase.h run.o: ../../../winix/winixd/core/config.h run.o: ../../../pikotools/space/spaceparser.h run.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -run.o: ../../../winix/winixd/core/textstream.h run.o: ../../../winix/winixd/core/logmanipulators.h -run.o: ../../../winix/winixd/core/filelog.h -run.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +run.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +run.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h run.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h run.o: ../../../winix/winixd/core/synchro.h run.o: ../../../winix/winixd/core/error.h @@ -3491,6 +3491,7 @@ run.o: ../../../winix/winixd/core/ugcontainer.h run.o: ../../../winix/winixd/core/request.h run.o: ../../../winix/winixd/core/requesttypes.h run.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +run.o: ../../../winix/winixd/core/textstream.h run.o: ../../../winix/winixd/templates/htmltextstream.h run.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h run.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -3563,10 +3564,9 @@ sort.o: ../../../winix/winixd/core/winixbase.h sort.o: ../../../winix/winixd/core/config.h sort.o: ../../../pikotools/space/spaceparser.h sort.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -sort.o: ../../../winix/winixd/core/textstream.h sort.o: ../../../winix/winixd/core/logmanipulators.h -sort.o: ../../../winix/winixd/core/filelog.h -sort.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +sort.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +sort.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h sort.o: ../../../winix/winixd/core/filelog.h sort.o: ../../../winix/winixd/core/lock.h sort.o: ../../../winix/winixd/core/synchro.h @@ -3582,6 +3582,7 @@ sort.o: ../../../winix/winixd/core/request.h sort.o: ../../../winix/winixd/core/requesttypes.h sort.o: ../../../winix/winixd/core/error.h sort.o: ../../../winix/winixd/core/config.h +sort.o: ../../../winix/winixd/core/textstream.h sort.o: ../../../winix/winixd/templates/htmltextstream.h sort.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h sort.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -3662,11 +3663,11 @@ specialdefault.o: ../../../winix/winixd/core/config.h specialdefault.o: ../../../pikotools/space/spaceparser.h specialdefault.o: ../../../pikotools/space/space.h specialdefault.o: ../../../winix/winixd/core/log.h -specialdefault.o: ../../../winix/winixd/core/textstream.h specialdefault.o: ../../../winix/winixd/core/logmanipulators.h -specialdefault.o: ../../../winix/winixd/core/filelog.h -specialdefault.o: ../../../winix/winixd/core/synchro.h +specialdefault.o: ../../../pikotools/log/log.h +specialdefault.o: ../../../pikotools/log/filelog.h specialdefault.o: ../../../winix/winixd/core/log.h +specialdefault.o: ../../../winix/winixd/core/synchro.h specialdefault.o: ../../../winix/winixd/core/filelog.h specialdefault.o: ../../../winix/winixd/core/lock.h specialdefault.o: ../../../winix/winixd/core/synchro.h @@ -3683,6 +3684,7 @@ specialdefault.o: ../../../winix/winixd/core/request.h specialdefault.o: ../../../winix/winixd/core/requesttypes.h specialdefault.o: ../../../winix/winixd/core/error.h specialdefault.o: ../../../winix/winixd/core/config.h +specialdefault.o: ../../../winix/winixd/core/textstream.h specialdefault.o: ../../../winix/winixd/templates/htmltextstream.h specialdefault.o: ../../../pikotools/space/spacetojson.h specialdefault.o: ../../../ezc/src/outstreams.h @@ -3763,10 +3765,9 @@ stat.o: ../../../winix/winixd/core/winixbase.h stat.o: ../../../winix/winixd/core/config.h stat.o: ../../../pikotools/space/spaceparser.h stat.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -stat.o: ../../../winix/winixd/core/textstream.h stat.o: ../../../winix/winixd/core/logmanipulators.h -stat.o: ../../../winix/winixd/core/filelog.h -stat.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +stat.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +stat.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h stat.o: ../../../winix/winixd/core/filelog.h stat.o: ../../../winix/winixd/core/lock.h stat.o: ../../../winix/winixd/core/synchro.h @@ -3782,6 +3783,7 @@ stat.o: ../../../winix/winixd/core/request.h stat.o: ../../../winix/winixd/core/requesttypes.h stat.o: ../../../winix/winixd/core/error.h stat.o: ../../../winix/winixd/core/config.h +stat.o: ../../../winix/winixd/core/textstream.h stat.o: ../../../winix/winixd/templates/htmltextstream.h stat.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h stat.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -3858,11 +3860,10 @@ subject.o: ../../../winix/winixd/core/winixbase.h subject.o: ../../../winix/winixd/core/config.h subject.o: ../../../pikotools/space/spaceparser.h subject.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -subject.o: ../../../winix/winixd/core/textstream.h subject.o: ../../../winix/winixd/core/logmanipulators.h -subject.o: ../../../winix/winixd/core/filelog.h -subject.o: ../../../winix/winixd/core/synchro.h +subject.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h subject.o: ../../../winix/winixd/core/log.h +subject.o: ../../../winix/winixd/core/synchro.h subject.o: ../../../winix/winixd/core/filelog.h subject.o: ../../../winix/winixd/core/lock.h subject.o: ../../../winix/winixd/core/synchro.h @@ -3879,6 +3880,7 @@ subject.o: ../../../winix/winixd/core/request.h subject.o: ../../../winix/winixd/core/requesttypes.h subject.o: ../../../winix/winixd/core/error.h subject.o: ../../../winix/winixd/core/config.h +subject.o: ../../../winix/winixd/core/textstream.h subject.o: ../../../winix/winixd/templates/htmltextstream.h subject.o: ../../../pikotools/space/spacetojson.h subject.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -3958,11 +3960,10 @@ template.o: ../../../winix/winixd/core/winixbase.h template.o: ../../../winix/winixd/core/config.h template.o: ../../../pikotools/space/spaceparser.h template.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -template.o: ../../../winix/winixd/core/textstream.h template.o: ../../../winix/winixd/core/logmanipulators.h -template.o: ../../../winix/winixd/core/filelog.h -template.o: ../../../winix/winixd/core/synchro.h +template.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h template.o: ../../../winix/winixd/core/log.h +template.o: ../../../winix/winixd/core/synchro.h template.o: ../../../winix/winixd/core/filelog.h template.o: ../../../winix/winixd/core/lock.h template.o: ../../../winix/winixd/core/synchro.h @@ -3979,6 +3980,7 @@ template.o: ../../../winix/winixd/core/request.h template.o: ../../../winix/winixd/core/requesttypes.h template.o: ../../../winix/winixd/core/error.h template.o: ../../../winix/winixd/core/config.h +template.o: ../../../winix/winixd/core/textstream.h template.o: ../../../winix/winixd/templates/htmltextstream.h template.o: ../../../pikotools/space/spacetojson.h template.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -4060,11 +4062,10 @@ timezone.o: ../../../winix/winixd/core/winixbase.h timezone.o: ../../../winix/winixd/core/config.h timezone.o: ../../../pikotools/space/spaceparser.h timezone.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -timezone.o: ../../../winix/winixd/core/textstream.h timezone.o: ../../../winix/winixd/core/logmanipulators.h -timezone.o: ../../../winix/winixd/core/filelog.h -timezone.o: ../../../winix/winixd/core/synchro.h +timezone.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h timezone.o: ../../../winix/winixd/core/log.h +timezone.o: ../../../winix/winixd/core/synchro.h timezone.o: ../../../winix/winixd/core/filelog.h timezone.o: ../../../winix/winixd/core/lock.h timezone.o: ../../../winix/winixd/core/synchro.h @@ -4081,6 +4082,7 @@ timezone.o: ../../../winix/winixd/core/request.h timezone.o: ../../../winix/winixd/core/requesttypes.h timezone.o: ../../../winix/winixd/core/error.h timezone.o: ../../../winix/winixd/core/config.h +timezone.o: ../../../winix/winixd/core/textstream.h timezone.o: ../../../winix/winixd/templates/htmltextstream.h timezone.o: ../../../pikotools/space/spacetojson.h timezone.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -4160,11 +4162,10 @@ tinymce.o: ../../../winix/winixd/core/winixbase.h tinymce.o: ../../../winix/winixd/core/config.h tinymce.o: ../../../pikotools/space/spaceparser.h tinymce.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -tinymce.o: ../../../winix/winixd/core/textstream.h tinymce.o: ../../../winix/winixd/core/logmanipulators.h -tinymce.o: ../../../winix/winixd/core/filelog.h -tinymce.o: ../../../winix/winixd/core/synchro.h +tinymce.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h tinymce.o: ../../../winix/winixd/core/log.h +tinymce.o: ../../../winix/winixd/core/synchro.h tinymce.o: ../../../winix/winixd/core/filelog.h tinymce.o: ../../../winix/winixd/core/lock.h tinymce.o: ../../../winix/winixd/core/synchro.h @@ -4181,6 +4182,7 @@ tinymce.o: ../../../winix/winixd/core/request.h tinymce.o: ../../../winix/winixd/core/requesttypes.h tinymce.o: ../../../winix/winixd/core/error.h tinymce.o: ../../../winix/winixd/core/config.h +tinymce.o: ../../../winix/winixd/core/textstream.h tinymce.o: ../../../winix/winixd/templates/htmltextstream.h tinymce.o: ../../../pikotools/space/spacetojson.h tinymce.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -4257,11 +4259,10 @@ uname.o: ../../../winix/winixd/core/winixbase.h uname.o: ../../../winix/winixd/core/config.h uname.o: ../../../pikotools/space/spaceparser.h uname.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -uname.o: ../../../winix/winixd/core/textstream.h uname.o: ../../../winix/winixd/core/logmanipulators.h -uname.o: ../../../winix/winixd/core/filelog.h -uname.o: ../../../winix/winixd/core/synchro.h +uname.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h uname.o: ../../../winix/winixd/core/log.h +uname.o: ../../../winix/winixd/core/synchro.h uname.o: ../../../winix/winixd/core/filelog.h uname.o: ../../../winix/winixd/core/lock.h uname.o: ../../../winix/winixd/core/synchro.h @@ -4277,6 +4278,7 @@ uname.o: ../../../winix/winixd/core/request.h uname.o: ../../../winix/winixd/core/requesttypes.h uname.o: ../../../winix/winixd/core/error.h uname.o: ../../../winix/winixd/core/config.h +uname.o: ../../../winix/winixd/core/textstream.h uname.o: ../../../winix/winixd/templates/htmltextstream.h uname.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h uname.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -4352,11 +4354,10 @@ upload.o: ../../../winix/winixd/core/winixbase.h upload.o: ../../../winix/winixd/core/config.h upload.o: ../../../pikotools/space/spaceparser.h upload.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -upload.o: ../../../winix/winixd/core/textstream.h upload.o: ../../../winix/winixd/core/logmanipulators.h -upload.o: ../../../winix/winixd/core/filelog.h -upload.o: ../../../winix/winixd/core/synchro.h +upload.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h upload.o: ../../../winix/winixd/core/log.h +upload.o: ../../../winix/winixd/core/synchro.h upload.o: ../../../winix/winixd/core/filelog.h upload.o: ../../../winix/winixd/core/lock.h upload.o: ../../../winix/winixd/core/synchro.h @@ -4373,6 +4374,7 @@ upload.o: ../../../winix/winixd/core/request.h upload.o: ../../../winix/winixd/core/requesttypes.h upload.o: ../../../winix/winixd/core/error.h upload.o: ../../../winix/winixd/core/config.h +upload.o: ../../../winix/winixd/core/textstream.h upload.o: ../../../winix/winixd/templates/htmltextstream.h upload.o: ../../../pikotools/space/spacetojson.h upload.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -4459,11 +4461,10 @@ uptime.o: ../../../winix/winixd/core/winixbase.h uptime.o: ../../../winix/winixd/core/config.h uptime.o: ../../../pikotools/space/spaceparser.h uptime.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -uptime.o: ../../../winix/winixd/core/textstream.h uptime.o: ../../../winix/winixd/core/logmanipulators.h -uptime.o: ../../../winix/winixd/core/filelog.h -uptime.o: ../../../winix/winixd/core/synchro.h +uptime.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h uptime.o: ../../../winix/winixd/core/log.h +uptime.o: ../../../winix/winixd/core/synchro.h uptime.o: ../../../winix/winixd/core/filelog.h uptime.o: ../../../winix/winixd/core/lock.h uptime.o: ../../../winix/winixd/core/synchro.h @@ -4480,6 +4481,7 @@ uptime.o: ../../../winix/winixd/core/request.h uptime.o: ../../../winix/winixd/core/requesttypes.h uptime.o: ../../../winix/winixd/core/error.h uptime.o: ../../../winix/winixd/core/config.h +uptime.o: ../../../winix/winixd/core/textstream.h uptime.o: ../../../winix/winixd/templates/htmltextstream.h uptime.o: ../../../pikotools/space/spacetojson.h uptime.o: ../../../ezc/src/outstreams.h ../../../winix/winixd/core/system.h @@ -4555,10 +4557,9 @@ vim.o: ../../../winix/winixd/core/winixbase.h vim.o: ../../../winix/winixd/core/config.h vim.o: ../../../pikotools/space/spaceparser.h vim.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -vim.o: ../../../winix/winixd/core/textstream.h vim.o: ../../../winix/winixd/core/logmanipulators.h -vim.o: ../../../winix/winixd/core/filelog.h -vim.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +vim.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +vim.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h vim.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h vim.o: ../../../winix/winixd/core/synchro.h vim.o: ../../../winix/winixd/core/error.h @@ -4572,6 +4573,7 @@ vim.o: ../../../winix/winixd/core/ugcontainer.h vim.o: ../../../winix/winixd/core/request.h vim.o: ../../../winix/winixd/core/requesttypes.h vim.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +vim.o: ../../../winix/winixd/core/textstream.h vim.o: ../../../winix/winixd/templates/htmltextstream.h vim.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h vim.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h @@ -4643,10 +4645,9 @@ who.o: ../../../winix/winixd/core/winixbase.h who.o: ../../../winix/winixd/core/config.h who.o: ../../../pikotools/space/spaceparser.h who.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -who.o: ../../../winix/winixd/core/textstream.h who.o: ../../../winix/winixd/core/logmanipulators.h -who.o: ../../../winix/winixd/core/filelog.h -who.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +who.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h +who.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h who.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h who.o: ../../../winix/winixd/core/synchro.h who.o: ../../../winix/winixd/core/error.h @@ -4660,6 +4661,7 @@ who.o: ../../../winix/winixd/core/ugcontainer.h who.o: ../../../winix/winixd/core/request.h who.o: ../../../winix/winixd/core/requesttypes.h who.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +who.o: ../../../winix/winixd/core/textstream.h who.o: ../../../winix/winixd/templates/htmltextstream.h who.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h who.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h diff --git a/winixd/main/Makefile.dep b/winixd/main/Makefile.dep index 9edd6ce..fffd285 100644 --- a/winixd/main/Makefile.dep +++ b/winixd/main/Makefile.dep @@ -17,18 +17,19 @@ main.o: ../../../winix/winixd/core/winixbase.h main.o: ../../../winix/winixd/core/config.h main.o: ../../../pikotools/space/spaceparser.h main.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h -main.o: ../../../winix/winixd/core/textstream.h +main.o: ../../../winix/winixd/core/logmanipulators.h +main.o: ../../../pikotools/log/log.h main.o: ../../../pikotools/textstream/textstream.h main.o: ../../../pikotools/membuffer/membuffer.h -main.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h -main.o: ../../../winix/winixd/core/logmanipulators.h -main.o: ../../../winix/winixd/core/filelog.h -main.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h +main.o: ../../../pikotools/textstream/types.h +main.o: ../../../pikotools/log/filelog.h ../../../winix/winixd/core/log.h +main.o: ../../../winix/winixd/core/synchro.h main.o: ../../../winix/winixd/core/filelog.h main.o: ../../../winix/winixd/core/lock.h main.o: ../../../winix/winixd/core/synchro.h -main.o: ../../../winix/winixd/core/ipban.h ../../../winix/winixd/core/cur.h -main.o: ../../../winix/winixd/core/request.h +main.o: ../../../winix/winixd/core/textstream.h +main.o: ../../../pikotools/utf8/utf8.h ../../../winix/winixd/core/ipban.h +main.o: ../../../winix/winixd/core/cur.h ../../../winix/winixd/core/request.h main.o: ../../../winix/winixd/core/requesttypes.h main.o: ../../../winix/winixd/core/config.h main.o: ../../../winix/winixd/templates/htmltextstream.h @@ -153,5 +154,4 @@ main.o: ../../../winix/winixd/core/acceptencodingparser.h main.o: ../../../winix/winixd/core/acceptbaseparser.h main.o: ../../../pikotools/space/jsontospaceparser.h main.o: ../../../winix/winixd/core/winixrequest.h -main.o: ../../../pikotools/logger/logger.h main.o: ../../../winix/winixd/core/version.h diff --git a/winixd/notify/Makefile.dep b/winixd/notify/Makefile.dep index 3ef5a14..83a633c 100644 --- a/winixd/notify/Makefile.dep +++ b/winixd/notify/Makefile.dep @@ -15,12 +15,10 @@ notify.o: ../../../pikotools/textstream/types.h notify.o: ../../../winix/winixd/core/winixbase.h notify.o: ../../../winix/winixd/core/config.h notify.o: ../../../winix/winixd/core/log.h -notify.o: ../../../winix/winixd/core/textstream.h -notify.o: ../../../pikotools/utf8/utf8.h notify.o: ../../../winix/winixd/core/logmanipulators.h -notify.o: ../../../winix/winixd/core/filelog.h -notify.o: ../../../winix/winixd/core/synchro.h +notify.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h notify.o: ../../../winix/winixd/core/log.h +notify.o: ../../../winix/winixd/core/synchro.h notify.o: ../../../winix/winixd/core/filelog.h notify.o: ../../../winix/winixd/core/lock.h notify.o: ../../../winix/winixd/core/synchro.h @@ -30,9 +28,9 @@ notify.o: ../../../winix/winixd/templates/localefilter.h notify.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h notify.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h notify.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h -notify.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h -notify.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h -notify.o: ../../../ezc/src/expressionparser.h +notify.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h +notify.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +notify.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h notify.o: ../../../ezc/src/patternparser.h notifythread.h notify.o: ../../../winix/winixd/core/basethread.h notify.o: ../../../winix/winixd/core/winixmodel.h @@ -50,6 +48,7 @@ notify.o: ../../../winix/winixd/core/request.h notify.o: ../../../winix/winixd/core/requesttypes.h notify.o: ../../../winix/winixd/core/error.h notify.o: ../../../winix/winixd/core/config.h +notify.o: ../../../winix/winixd/core/textstream.h notify.o: ../../../winix/winixd/templates/htmltextstream.h notify.o: ../../../pikotools/space/spacetojson.h notify.o: ../../../winix/winixd/core/session.h @@ -120,12 +119,10 @@ notifypool.o: ../../../pikotools/textstream/types.h notifypool.o: ../../../winix/winixd/core/winixbase.h notifypool.o: ../../../winix/winixd/core/config.h notifypool.o: ../../../winix/winixd/core/log.h -notifypool.o: ../../../winix/winixd/core/textstream.h -notifypool.o: ../../../pikotools/utf8/utf8.h notifypool.o: ../../../winix/winixd/core/logmanipulators.h -notifypool.o: ../../../winix/winixd/core/filelog.h -notifypool.o: ../../../winix/winixd/core/synchro.h +notifypool.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h notifypool.o: ../../../winix/winixd/core/log.h +notifypool.o: ../../../winix/winixd/core/synchro.h notifypool.o: ../../../winix/winixd/core/filelog.h notifypool.o: ../../../winix/winixd/core/lock.h notifypool.o: ../../../winix/winixd/core/synchro.h @@ -138,22 +135,21 @@ notifythread.o: ../../../pikotools/space/spaceparser.h notifythread.o: ../../../pikotools/space/space.h notifythread.o: ../../../pikotools/textstream/types.h notifythread.o: ../../../winix/winixd/core/log.h -notifythread.o: ../../../winix/winixd/core/textstream.h -notifythread.o: ../../../pikotools/convert/misc.h -notifythread.o: ../../../pikotools/convert/text.h +notifythread.o: ../../../winix/winixd/core/logmanipulators.h +notifythread.o: ../../../pikotools/log/log.h +notifythread.o: ../../../pikotools/textstream/textstream.h notifythread.o: ../../../pikotools/space/space.h notifythread.o: ../../../pikotools/date/date.h notifythread.o: ../../../pikotools/convert/convert.h notifythread.o: ../../../pikotools/convert/inttostr.h notifythread.o: ../../../pikotools/convert/strtoint.h -notifythread.o: ../../../pikotools/textstream/textstream.h +notifythread.o: ../../../pikotools/convert/text.h +notifythread.o: ../../../pikotools/convert/misc.h notifythread.o: ../../../pikotools/membuffer/membuffer.h notifythread.o: ../../../pikotools/textstream/types.h -notifythread.o: ../../../pikotools/utf8/utf8.h -notifythread.o: ../../../winix/winixd/core/logmanipulators.h -notifythread.o: ../../../winix/winixd/core/filelog.h -notifythread.o: ../../../winix/winixd/core/synchro.h +notifythread.o: ../../../pikotools/log/filelog.h notifythread.o: ../../../winix/winixd/core/log.h +notifythread.o: ../../../winix/winixd/core/synchro.h notifythread.o: ../../../winix/winixd/core/filelog.h notifythread.o: ../../../winix/winixd/core/lock.h notifythread.o: ../../../winix/winixd/core/plugin.h @@ -163,8 +159,9 @@ notifythread.o: ../../../winix/winixd/core/winixbase.h templatesnotify.h notifythread.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h notifythread.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h notifythread.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h -notifythread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h -notifythread.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h +notifythread.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h +notifythread.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +notifythread.o: ../../../ezc/src/outstreams.h notifythread.o: ../../../ezc/src/expressionparser.h notifythread.o: ../../../ezc/src/patternparser.h notifythread.o: ../../../winix/winixd/core/textstream.h notifypool.h @@ -178,6 +175,7 @@ notifythread.o: ../../../winix/winixd/core/request.h notifythread.o: ../../../winix/winixd/core/requesttypes.h notifythread.o: ../../../winix/winixd/core/error.h notifythread.o: ../../../winix/winixd/core/config.h +notifythread.o: ../../../winix/winixd/core/textstream.h notifythread.o: ../../../winix/winixd/templates/htmltextstream.h notifythread.o: ../../../pikotools/space/spacetojson.h notifythread.o: ../../../winix/winixd/core/session.h @@ -208,11 +206,7 @@ templatesnotify.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h templatesnotify.o: ../../../ezc/src/outstreams.h templatesnotify.o: ../../../ezc/src/expressionparser.h templatesnotify.o: ../../../ezc/src/patternparser.h -templatesnotify.o: ../../../winix/winixd/core/textstream.h notifypool.h -templatesnotify.o: ../../../winix/winixd/templates/locale.h -templatesnotify.o: ../../../pikotools/space/spaceparser.h -templatesnotify.o: ../../../pikotools/space/space.h -templatesnotify.o: ../../../pikotools/textstream/types.h +templatesnotify.o: ../../../pikotools/log/log.h templatesnotify.o: ../../../pikotools/textstream/textstream.h templatesnotify.o: ../../../pikotools/space/space.h templatesnotify.o: ../../../pikotools/date/date.h @@ -223,14 +217,18 @@ templatesnotify.o: ../../../pikotools/convert/text.h templatesnotify.o: ../../../pikotools/convert/misc.h templatesnotify.o: ../../../pikotools/membuffer/membuffer.h templatesnotify.o: ../../../pikotools/textstream/types.h +templatesnotify.o: ../../../pikotools/log/filelog.h +templatesnotify.o: ../../../winix/winixd/core/textstream.h notifypool.h +templatesnotify.o: ../../../winix/winixd/templates/locale.h +templatesnotify.o: ../../../pikotools/space/spaceparser.h +templatesnotify.o: ../../../pikotools/space/space.h +templatesnotify.o: ../../../pikotools/textstream/types.h templatesnotify.o: ../../../winix/winixd/core/winixbase.h templatesnotify.o: ../../../winix/winixd/core/config.h templatesnotify.o: ../../../winix/winixd/core/log.h -templatesnotify.o: ../../../winix/winixd/core/textstream.h templatesnotify.o: ../../../winix/winixd/core/logmanipulators.h -templatesnotify.o: ../../../winix/winixd/core/filelog.h -templatesnotify.o: ../../../winix/winixd/core/synchro.h templatesnotify.o: ../../../winix/winixd/core/log.h +templatesnotify.o: ../../../winix/winixd/core/synchro.h templatesnotify.o: ../../../winix/winixd/core/filelog.h templatesnotify.o: ../../../winix/winixd/core/lock.h templatesnotify.o: ../../../winix/winixd/core/synchro.h diff --git a/winixd/plugins/export/Makefile.dep b/winixd/plugins/export/Makefile.dep index 8d0a8dd..901455d 100644 --- a/winixd/plugins/export/Makefile.dep +++ b/winixd/plugins/export/Makefile.dep @@ -24,11 +24,10 @@ edb.o: ../../../../winix/winixd/core/config.h edb.o: ../../../../pikotools/space/spaceparser.h edb.o: ../../../../pikotools/space/space.h edb.o: ../../../../winix/winixd/core/log.h -edb.o: ../../../../winix/winixd/core/textstream.h edb.o: ../../../../winix/winixd/core/logmanipulators.h -edb.o: ../../../../winix/winixd/core/filelog.h -edb.o: ../../../../winix/winixd/core/synchro.h +edb.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h edb.o: ../../../../winix/winixd/core/log.h +edb.o: ../../../../winix/winixd/core/synchro.h edb.o: ../../../../winix/winixd/core/filelog.h edb.o: ../../../../winix/winixd/core/lock.h edb.o: ../../../../winix/winixd/core/synchro.h @@ -47,6 +46,7 @@ edb.o: ../../../../winix/winixd/core/ugcontainer.h edb.o: ../../../../winix/winixd/core/request.h edb.o: ../../../../winix/winixd/core/error.h edb.o: ../../../../winix/winixd/core/config.h +edb.o: ../../../../winix/winixd/core/textstream.h edb.o: ../../../../winix/winixd/templates/htmltextstream.h edb.o: ../../../../pikotools/space/spacetojson.h edb.o: ../../../../ezc/src/outstreams.h @@ -65,8 +65,8 @@ exportinfo.o: ../../../../winix/winixd/core/config.h exportinfo.o: ../../../../pikotools/space/spaceparser.h exportinfo.o: ../../../../pikotools/space/space.h exportinfo.o: ../../../../winix/winixd/core/log.h -exportinfo.o: ../../../../winix/winixd/core/textstream.h exportinfo.o: ../../../../winix/winixd/core/logmanipulators.h +exportinfo.o: ../../../../pikotools/log/log.h exportinfo.o: ../../../../pikotools/textstream/textstream.h exportinfo.o: ../../../../pikotools/space/space.h exportinfo.o: ../../../../pikotools/textstream/types.h @@ -82,7 +82,7 @@ exportinfo.o: ../../../../pikotools/utf8/utf8.h exportinfo.o: ../../../../winix/winixd/core/winix_const.h exportinfo.o: ../../../../pikotools/membuffer/membuffer.h exportinfo.o: ../../../../pikotools/textstream/types.h -exportinfo.o: ../../../../winix/winixd/core/filelog.h +exportinfo.o: ../../../../pikotools/log/filelog.h exportinfo.o: ../../../../winix/winixd/core/synchro.h exportinfo.o: ../../../../winix/winixd/core/filelog.h exportinfo.o: ../../../../winix/winixd/core/lock.h @@ -104,6 +104,7 @@ exportinfo.o: ../../../../winix/winixd/core/ugcontainer.h exportinfo.o: ../../../../winix/winixd/core/request.h exportinfo.o: ../../../../winix/winixd/core/error.h exportinfo.o: ../../../../winix/winixd/core/config.h +exportinfo.o: ../../../../winix/winixd/core/textstream.h exportinfo.o: ../../../../winix/winixd/templates/htmltextstream.h exportinfo.o: ../../../../winix/winixd/core/textstream.h exportinfo.o: ../../../../pikotools/space/spacetojson.h @@ -209,8 +210,8 @@ funexport.o: ../../../../winix/winixd/core/config.h funexport.o: ../../../../pikotools/space/spaceparser.h funexport.o: ../../../../winix/winixd/core/log.h funexport.o: ../../../../winix/winixd/core/logmanipulators.h -funexport.o: ../../../../winix/winixd/core/filelog.h -funexport.o: ../../../../winix/winixd/core/synchro.h +funexport.o: ../../../../pikotools/log/log.h +funexport.o: ../../../../pikotools/log/filelog.h funexport.o: ../../../../winix/winixd/core/system.h funexport.o: ../../../../winix/winixd/core/job.h funexport.o: ../../../../winix/winixd/core/basethread.h @@ -218,6 +219,7 @@ funexport.o: ../../../../winix/winixd/core/synchro.h funexport.o: ../../../../winix/winixd/core/winixmodel.h funexport.o: ../../../../winix/winixd/core/winixbase.h funexport.o: ../../../../winix/winixd/core/log.h +funexport.o: ../../../../winix/winixd/core/synchro.h funexport.o: ../../../../winix/winixd/core/filelog.h funexport.o: ../../../../winix/winixd/core/lock.h funexport.o: ../../../../winix/winixd/core/plugin.h @@ -294,8 +296,8 @@ init.o: ../../../../winix/winixd/core/config.h init.o: ../../../../pikotools/space/spaceparser.h init.o: ../../../../pikotools/space/space.h init.o: ../../../../winix/winixd/core/log.h -init.o: ../../../../winix/winixd/core/textstream.h init.o: ../../../../winix/winixd/core/logmanipulators.h +init.o: ../../../../pikotools/log/log.h init.o: ../../../../pikotools/textstream/textstream.h init.o: ../../../../pikotools/space/space.h init.o: ../../../../pikotools/textstream/types.h @@ -311,7 +313,7 @@ init.o: ../../../../pikotools/utf8/utf8.h init.o: ../../../../winix/winixd/core/winix_const.h init.o: ../../../../pikotools/membuffer/membuffer.h init.o: ../../../../pikotools/textstream/types.h -init.o: ../../../../winix/winixd/core/filelog.h +init.o: ../../../../pikotools/log/filelog.h init.o: ../../../../winix/winixd/core/synchro.h init.o: ../../../../winix/winixd/core/filelog.h init.o: ../../../../winix/winixd/core/lock.h @@ -329,6 +331,7 @@ init.o: ../../../../winix/winixd/core/ugcontainer.h init.o: ../../../../winix/winixd/core/request.h init.o: ../../../../winix/winixd/core/error.h init.o: ../../../../winix/winixd/core/config.h +init.o: ../../../../winix/winixd/core/textstream.h init.o: ../../../../winix/winixd/templates/htmltextstream.h init.o: ../../../../winix/winixd/core/textstream.h init.o: ../../../../pikotools/space/spacetojson.h diff --git a/winixd/plugins/gallery/Makefile.dep b/winixd/plugins/gallery/Makefile.dep index e305665..b2cfdcc 100644 --- a/winixd/plugins/gallery/Makefile.dep +++ b/winixd/plugins/gallery/Makefile.dep @@ -24,11 +24,11 @@ gallery.o: ../../../../winix/winixd/core/config.h gallery.o: ../../../../pikotools/space/spaceparser.h gallery.o: ../../../../pikotools/space/space.h gallery.o: ../../../../winix/winixd/core/log.h -gallery.o: ../../../../winix/winixd/core/textstream.h gallery.o: ../../../../winix/winixd/core/logmanipulators.h -gallery.o: ../../../../winix/winixd/core/filelog.h -gallery.o: ../../../../winix/winixd/core/synchro.h +gallery.o: ../../../../pikotools/log/log.h +gallery.o: ../../../../pikotools/log/filelog.h gallery.o: ../../../../winix/winixd/core/log.h +gallery.o: ../../../../winix/winixd/core/synchro.h gallery.o: ../../../../winix/winixd/core/filelog.h gallery.o: ../../../../winix/winixd/core/lock.h gallery.o: ../../../../winix/winixd/core/synchro.h @@ -45,6 +45,7 @@ gallery.o: ../../../../winix/winixd/core/request.h gallery.o: ../../../../winix/winixd/core/requesttypes.h gallery.o: ../../../../winix/winixd/core/error.h gallery.o: ../../../../winix/winixd/core/config.h +gallery.o: ../../../../winix/winixd/core/textstream.h gallery.o: ../../../../winix/winixd/templates/htmltextstream.h gallery.o: ../../../../pikotools/space/spacetojson.h gallery.o: ../../../../ezc/src/outstreams.h @@ -137,11 +138,10 @@ init.o: ../../../../winix/winixd/core/config.h init.o: ../../../../pikotools/space/spaceparser.h init.o: ../../../../pikotools/space/space.h init.o: ../../../../winix/winixd/core/log.h -init.o: ../../../../winix/winixd/core/textstream.h init.o: ../../../../winix/winixd/core/logmanipulators.h -init.o: ../../../../winix/winixd/core/filelog.h -init.o: ../../../../winix/winixd/core/synchro.h +init.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h init.o: ../../../../winix/winixd/core/log.h +init.o: ../../../../winix/winixd/core/synchro.h init.o: ../../../../winix/winixd/core/filelog.h init.o: ../../../../winix/winixd/core/lock.h init.o: ../../../../winix/winixd/core/synchro.h @@ -158,6 +158,7 @@ init.o: ../../../../winix/winixd/core/request.h init.o: ../../../../winix/winixd/core/requesttypes.h init.o: ../../../../winix/winixd/core/error.h init.o: ../../../../winix/winixd/core/config.h +init.o: ../../../../winix/winixd/core/textstream.h init.o: ../../../../winix/winixd/templates/htmltextstream.h init.o: ../../../../pikotools/space/spacetojson.h init.o: ../../../../ezc/src/outstreams.h @@ -288,11 +289,11 @@ templates.o: ../../../../winix/winixd/core/config.h templates.o: ../../../../pikotools/space/spaceparser.h templates.o: ../../../../pikotools/space/space.h templates.o: ../../../../winix/winixd/core/log.h -templates.o: ../../../../winix/winixd/core/textstream.h templates.o: ../../../../winix/winixd/core/logmanipulators.h -templates.o: ../../../../winix/winixd/core/filelog.h -templates.o: ../../../../winix/winixd/core/synchro.h +templates.o: ../../../../pikotools/log/log.h +templates.o: ../../../../pikotools/log/filelog.h templates.o: ../../../../winix/winixd/core/log.h +templates.o: ../../../../winix/winixd/core/synchro.h templates.o: ../../../../winix/winixd/core/filelog.h templates.o: ../../../../winix/winixd/core/lock.h templates.o: ../../../../winix/winixd/core/synchro.h @@ -309,6 +310,7 @@ templates.o: ../../../../winix/winixd/core/request.h templates.o: ../../../../winix/winixd/core/requesttypes.h templates.o: ../../../../winix/winixd/core/error.h templates.o: ../../../../winix/winixd/core/config.h +templates.o: ../../../../winix/winixd/core/textstream.h templates.o: ../../../../winix/winixd/templates/htmltextstream.h templates.o: ../../../../pikotools/space/spacetojson.h templates.o: ../../../../ezc/src/outstreams.h diff --git a/winixd/plugins/group/Makefile.dep b/winixd/plugins/group/Makefile.dep index acac0bb..3553abf 100644 --- a/winixd/plugins/group/Makefile.dep +++ b/winixd/plugins/group/Makefile.dep @@ -9,25 +9,21 @@ groupinfo.o: ../../../../winix/winixd/core/winixmodel.h groupinfo.o: ../../../../winix/winixd/core/winixbase.h groupinfo.o: ../../../../winix/winixd/core/config.h groupinfo.o: ../../../../winix/winixd/core/log.h -groupinfo.o: ../../../../winix/winixd/core/textstream.h -groupinfo.o: ../../../../winix/winixd/core/misc.h -groupinfo.o: ../../../../winix/winixd/core/item.h +groupinfo.o: ../../../../winix/winixd/core/logmanipulators.h +groupinfo.o: ../../../../pikotools/log/log.h +groupinfo.o: ../../../../pikotools/textstream/textstream.h groupinfo.o: ../../../../pikotools/space/space.h groupinfo.o: ../../../../pikotools/date/date.h groupinfo.o: ../../../../pikotools/convert/convert.h groupinfo.o: ../../../../pikotools/convert/inttostr.h groupinfo.o: ../../../../pikotools/convert/strtoint.h groupinfo.o: ../../../../pikotools/convert/text.h -groupinfo.o: ../../../../winix/winixd/core/requesttypes.h -groupinfo.o: ../../../../pikotools/textstream/textstream.h +groupinfo.o: ../../../../pikotools/convert/misc.h groupinfo.o: ../../../../pikotools/membuffer/membuffer.h groupinfo.o: ../../../../pikotools/textstream/types.h -groupinfo.o: ../../../../pikotools/utf8/utf8.h -groupinfo.o: ../../../../winix/winixd/core/winix_const.h -groupinfo.o: ../../../../winix/winixd/core/logmanipulators.h -groupinfo.o: ../../../../winix/winixd/core/filelog.h -groupinfo.o: ../../../../winix/winixd/core/synchro.h +groupinfo.o: ../../../../pikotools/log/filelog.h groupinfo.o: ../../../../winix/winixd/core/log.h +groupinfo.o: ../../../../winix/winixd/core/synchro.h groupinfo.o: ../../../../winix/winixd/core/filelog.h groupinfo.o: ../../../../winix/winixd/core/lock.h groupinfo.o: ../../../../winix/winixd/core/synchro.h @@ -40,12 +36,14 @@ groupinfo.o: ../../../../winix/winixd/core/job.h groupinfo.o: ../../../../winix/winixd/core/basethread.h groupinfo.o: ../../../../winix/winixd/core/winixmodel.h groupinfo.o: ../../../../winix/winixd/core/dirs.h +groupinfo.o: ../../../../winix/winixd/core/item.h groupinfo.o: ../../../../winix/winixd/core/dircontainer.h groupinfo.o: ../../../../winix/winixd/db/db.h groupinfo.o: ../../../../winix/winixd/db/dbbase.h groupinfo.o: ../../../../winix/winixd/db/dbconn.h groupinfo.o: ../../../../winix/winixd/db/dbtextstream.h groupinfo.o: ../../../../winix/winixd/core/textstream.h +groupinfo.o: ../../../../pikotools/utf8/utf8.h groupinfo.o: ../../../../winix/winixd/core/error.h groupinfo.o: ../../../../winix/winixd/db/dbitemquery.h groupinfo.o: ../../../../winix/winixd/core/item.h @@ -55,8 +53,10 @@ groupinfo.o: ../../../../winix/winixd/core/group.h groupinfo.o: ../../../../winix/winixd/core/dircontainer.h groupinfo.o: ../../../../winix/winixd/core/ugcontainer.h groupinfo.o: ../../../../winix/winixd/core/request.h +groupinfo.o: ../../../../winix/winixd/core/requesttypes.h groupinfo.o: ../../../../winix/winixd/core/error.h groupinfo.o: ../../../../winix/winixd/core/config.h +groupinfo.o: ../../../../winix/winixd/core/textstream.h groupinfo.o: ../../../../winix/winixd/templates/htmltextstream.h groupinfo.o: ../../../../pikotools/space/spacetojson.h groupinfo.o: ../../../../ezc/src/outstreams.h @@ -111,25 +111,21 @@ groups.o: ../../../../winix/winixd/core/winixmodel.h groups.o: ../../../../winix/winixd/core/winixbase.h groups.o: ../../../../winix/winixd/core/config.h groups.o: ../../../../winix/winixd/core/log.h -groups.o: ../../../../winix/winixd/core/textstream.h -groups.o: ../../../../winix/winixd/core/misc.h -groups.o: ../../../../winix/winixd/core/item.h +groups.o: ../../../../winix/winixd/core/logmanipulators.h +groups.o: ../../../../pikotools/log/log.h +groups.o: ../../../../pikotools/textstream/textstream.h groups.o: ../../../../pikotools/space/space.h groups.o: ../../../../pikotools/date/date.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: ../../../../winix/winixd/core/requesttypes.h -groups.o: ../../../../pikotools/textstream/textstream.h +groups.o: ../../../../pikotools/convert/misc.h groups.o: ../../../../pikotools/membuffer/membuffer.h groups.o: ../../../../pikotools/textstream/types.h -groups.o: ../../../../pikotools/utf8/utf8.h -groups.o: ../../../../winix/winixd/core/winix_const.h -groups.o: ../../../../winix/winixd/core/logmanipulators.h -groups.o: ../../../../winix/winixd/core/filelog.h -groups.o: ../../../../winix/winixd/core/synchro.h +groups.o: ../../../../pikotools/log/filelog.h groups.o: ../../../../winix/winixd/core/log.h +groups.o: ../../../../winix/winixd/core/synchro.h groups.o: ../../../../winix/winixd/core/filelog.h groups.o: ../../../../winix/winixd/core/lock.h groups.o: ../../../../winix/winixd/core/synchro.h @@ -142,12 +138,14 @@ groups.o: ../../../../winix/winixd/core/job.h groups.o: ../../../../winix/winixd/core/basethread.h groups.o: ../../../../winix/winixd/core/winixmodel.h groups.o: ../../../../winix/winixd/core/dirs.h +groups.o: ../../../../winix/winixd/core/item.h groups.o: ../../../../winix/winixd/core/dircontainer.h groups.o: ../../../../winix/winixd/db/db.h groups.o: ../../../../winix/winixd/db/dbbase.h groups.o: ../../../../winix/winixd/db/dbconn.h groups.o: ../../../../winix/winixd/db/dbtextstream.h groups.o: ../../../../winix/winixd/core/textstream.h +groups.o: ../../../../pikotools/utf8/utf8.h groups.o: ../../../../winix/winixd/core/error.h groups.o: ../../../../winix/winixd/db/dbitemquery.h groups.o: ../../../../winix/winixd/core/item.h @@ -157,8 +155,10 @@ groups.o: ../../../../winix/winixd/core/group.h groups.o: ../../../../winix/winixd/core/dircontainer.h groups.o: ../../../../winix/winixd/core/ugcontainer.h groups.o: ../../../../winix/winixd/core/request.h +groups.o: ../../../../winix/winixd/core/requesttypes.h groups.o: ../../../../winix/winixd/core/error.h groups.o: ../../../../winix/winixd/core/config.h +groups.o: ../../../../winix/winixd/core/textstream.h groups.o: ../../../../winix/winixd/templates/htmltextstream.h groups.o: ../../../../pikotools/space/spacetojson.h groups.o: ../../../../ezc/src/outstreams.h @@ -218,22 +218,18 @@ init.o: ../../../../winix/winixd/core/winixmodel.h init.o: ../../../../winix/winixd/core/winixbase.h init.o: ../../../../winix/winixd/core/config.h init.o: ../../../../winix/winixd/core/log.h -init.o: ../../../../winix/winixd/core/textstream.h -init.o: ../../../../winix/winixd/core/misc.h -init.o: ../../../../winix/winixd/core/item.h +init.o: ../../../../winix/winixd/core/logmanipulators.h +init.o: ../../../../pikotools/log/log.h +init.o: ../../../../pikotools/textstream/textstream.h init.o: ../../../../pikotools/space/space.h ../../../../pikotools/date/date.h init.o: ../../../../pikotools/convert/convert.h init.o: ../../../../pikotools/convert/inttostr.h init.o: ../../../../pikotools/convert/strtoint.h init.o: ../../../../pikotools/convert/text.h -init.o: ../../../../winix/winixd/core/requesttypes.h -init.o: ../../../../pikotools/textstream/textstream.h +init.o: ../../../../pikotools/convert/misc.h init.o: ../../../../pikotools/membuffer/membuffer.h init.o: ../../../../pikotools/textstream/types.h -init.o: ../../../../pikotools/utf8/utf8.h -init.o: ../../../../winix/winixd/core/winix_const.h -init.o: ../../../../winix/winixd/core/logmanipulators.h -init.o: ../../../../winix/winixd/core/filelog.h +init.o: ../../../../pikotools/log/filelog.h init.o: ../../../../winix/winixd/core/synchro.h init.o: ../../../../winix/winixd/core/filelog.h init.o: ../../../../winix/winixd/core/lock.h @@ -244,11 +240,13 @@ init.o: ../../../../winix/winixd/core/job.h init.o: ../../../../winix/winixd/core/basethread.h init.o: ../../../../winix/winixd/core/winixmodel.h init.o: ../../../../winix/winixd/core/dirs.h +init.o: ../../../../winix/winixd/core/item.h init.o: ../../../../winix/winixd/core/dircontainer.h init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h init.o: ../../../../winix/winixd/db/dbconn.h init.o: ../../../../winix/winixd/db/dbtextstream.h init.o: ../../../../winix/winixd/core/textstream.h +init.o: ../../../../pikotools/utf8/utf8.h init.o: ../../../../winix/winixd/core/error.h init.o: ../../../../winix/winixd/db/dbitemquery.h init.o: ../../../../winix/winixd/core/item.h @@ -258,8 +256,10 @@ init.o: ../../../../winix/winixd/core/group.h init.o: ../../../../winix/winixd/core/dircontainer.h init.o: ../../../../winix/winixd/core/ugcontainer.h init.o: ../../../../winix/winixd/core/request.h +init.o: ../../../../winix/winixd/core/requesttypes.h init.o: ../../../../winix/winixd/core/error.h init.o: ../../../../winix/winixd/core/config.h +init.o: ../../../../winix/winixd/core/textstream.h init.o: ../../../../winix/winixd/templates/htmltextstream.h init.o: ../../../../pikotools/space/spacetojson.h init.o: ../../../../ezc/src/outstreams.h @@ -361,18 +361,18 @@ templates.o: ../../../../pikotools/convert/convert.h templates.o: ../../../../pikotools/convert/inttostr.h templates.o: ../../../../pikotools/convert/strtoint.h templates.o: ../../../../pikotools/convert/text.h -templates.o: ../../../../winix/winixd/core/misc.h -templates.o: ../../../../winix/winixd/core/requesttypes.h +templates.o: ../../../../pikotools/convert/misc.h ../../../../ezc/src/cache.h +templates.o: ../../../../ezc/src/functions.h +templates.o: ../../../../pikotools/utf8/utf8.h ../../../../ezc/src/funinfo.h +templates.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +templates.o: ../../../../ezc/src/outstreams.h +templates.o: ../../../../ezc/src/expressionparser.h +templates.o: ../../../../ezc/src/patternparser.h +templates.o: ../../../../pikotools/log/log.h templates.o: ../../../../pikotools/textstream/textstream.h templates.o: ../../../../pikotools/membuffer/membuffer.h templates.o: ../../../../pikotools/textstream/types.h -templates.o: ../../../../pikotools/utf8/utf8.h -templates.o: ../../../../winix/winixd/core/winix_const.h -templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h -templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h -templates.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h -templates.o: ../../../../ezc/src/expressionparser.h -templates.o: ../../../../ezc/src/patternparser.h +templates.o: ../../../../pikotools/log/filelog.h templates.o: ../../../../winix/winixd/templates/patterncacher.h templates.o: ../../../../winix/winixd/core/item.h templates.o: ../../../../winix/winixd/core/winixbase.h @@ -381,11 +381,9 @@ templates.o: ../../../../pikotools/space/spaceparser.h templates.o: ../../../../pikotools/space/space.h templates.o: ../../../../pikotools/textstream/types.h templates.o: ../../../../winix/winixd/core/log.h -templates.o: ../../../../winix/winixd/core/textstream.h templates.o: ../../../../winix/winixd/core/logmanipulators.h -templates.o: ../../../../winix/winixd/core/filelog.h -templates.o: ../../../../winix/winixd/core/synchro.h templates.o: ../../../../winix/winixd/core/log.h +templates.o: ../../../../winix/winixd/core/synchro.h templates.o: ../../../../winix/winixd/core/filelog.h templates.o: ../../../../winix/winixd/core/lock.h templates.o: ../../../../winix/winixd/core/synchro.h @@ -416,8 +414,10 @@ templates.o: ../../../../winix/winixd/core/group.h templates.o: ../../../../winix/winixd/core/dircontainer.h templates.o: ../../../../winix/winixd/core/ugcontainer.h templates.o: ../../../../winix/winixd/core/request.h +templates.o: ../../../../winix/winixd/core/requesttypes.h templates.o: ../../../../winix/winixd/core/error.h templates.o: ../../../../winix/winixd/core/config.h +templates.o: ../../../../winix/winixd/core/textstream.h templates.o: ../../../../winix/winixd/templates/htmltextstream.h templates.o: ../../../../pikotools/space/spacetojson.h templates.o: ../../../../winix/winixd/core/mounts.h @@ -462,3 +462,4 @@ templates.o: ../../../../winix/winixd/core/timezone.h templates.o: ../../../../winix/winixd/core/htmlfilter.h templates.o: ../../../../winix/winixd/core/plugin.h groupinfo.h templates.o: ../../../../winix/winixd/core/misc.h +templates.o: ../../../../winix/winixd/core/winix_const.h diff --git a/winixd/plugins/mailregister/Makefile.dep b/winixd/plugins/mailregister/Makefile.dep index e65c7df..fcb0845 100644 --- a/winixd/plugins/mailregister/Makefile.dep +++ b/winixd/plugins/mailregister/Makefile.dep @@ -25,11 +25,11 @@ funregistermail_showusers.o: ../../../../winix/winixd/core/config.h funregistermail_showusers.o: ../../../../pikotools/space/spaceparser.h funregistermail_showusers.o: ../../../../pikotools/space/space.h funregistermail_showusers.o: ../../../../winix/winixd/core/log.h -funregistermail_showusers.o: ../../../../winix/winixd/core/textstream.h funregistermail_showusers.o: ../../../../winix/winixd/core/logmanipulators.h -funregistermail_showusers.o: ../../../../winix/winixd/core/filelog.h -funregistermail_showusers.o: ../../../../winix/winixd/core/synchro.h +funregistermail_showusers.o: ../../../../pikotools/log/log.h +funregistermail_showusers.o: ../../../../pikotools/log/filelog.h funregistermail_showusers.o: ../../../../winix/winixd/core/log.h +funregistermail_showusers.o: ../../../../winix/winixd/core/synchro.h funregistermail_showusers.o: ../../../../winix/winixd/core/filelog.h funregistermail_showusers.o: ../../../../winix/winixd/core/lock.h funregistermail_showusers.o: ../../../../winix/winixd/core/synchro.h @@ -46,6 +46,7 @@ funregistermail_showusers.o: ../../../../winix/winixd/core/request.h funregistermail_showusers.o: ../../../../winix/winixd/core/requesttypes.h funregistermail_showusers.o: ../../../../winix/winixd/core/error.h funregistermail_showusers.o: ../../../../winix/winixd/core/config.h +funregistermail_showusers.o: ../../../../winix/winixd/core/textstream.h funregistermail_showusers.o: ../../../../winix/winixd/templates/htmltextstream.h funregistermail_showusers.o: ../../../../pikotools/space/spacetojson.h funregistermail_showusers.o: ../../../../ezc/src/outstreams.h @@ -139,11 +140,11 @@ funregistermail.o: ../../../../winix/winixd/core/config.h funregistermail.o: ../../../../pikotools/space/spaceparser.h funregistermail.o: ../../../../pikotools/space/space.h funregistermail.o: ../../../../winix/winixd/core/log.h -funregistermail.o: ../../../../winix/winixd/core/textstream.h funregistermail.o: ../../../../winix/winixd/core/logmanipulators.h -funregistermail.o: ../../../../winix/winixd/core/filelog.h -funregistermail.o: ../../../../winix/winixd/core/synchro.h +funregistermail.o: ../../../../pikotools/log/log.h +funregistermail.o: ../../../../pikotools/log/filelog.h funregistermail.o: ../../../../winix/winixd/core/log.h +funregistermail.o: ../../../../winix/winixd/core/synchro.h funregistermail.o: ../../../../winix/winixd/core/filelog.h funregistermail.o: ../../../../winix/winixd/core/lock.h funregistermail.o: ../../../../winix/winixd/core/synchro.h @@ -160,6 +161,7 @@ funregistermail.o: ../../../../winix/winixd/core/request.h funregistermail.o: ../../../../winix/winixd/core/requesttypes.h funregistermail.o: ../../../../winix/winixd/core/error.h funregistermail.o: ../../../../winix/winixd/core/config.h +funregistermail.o: ../../../../winix/winixd/core/textstream.h funregistermail.o: ../../../../winix/winixd/templates/htmltextstream.h funregistermail.o: ../../../../pikotools/space/spacetojson.h funregistermail.o: ../../../../ezc/src/outstreams.h @@ -254,9 +256,8 @@ init.o: ../../../../winix/winixd/core/config.h init.o: ../../../../pikotools/space/spaceparser.h init.o: ../../../../pikotools/space/space.h init.o: ../../../../winix/winixd/core/log.h -init.o: ../../../../winix/winixd/core/textstream.h init.o: ../../../../winix/winixd/core/logmanipulators.h -init.o: ../../../../winix/winixd/core/filelog.h +init.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h init.o: ../../../../winix/winixd/core/synchro.h init.o: ../../../../winix/winixd/core/filelog.h init.o: ../../../../winix/winixd/core/lock.h @@ -273,6 +274,7 @@ init.o: ../../../../winix/winixd/core/request.h init.o: ../../../../winix/winixd/core/requesttypes.h init.o: ../../../../winix/winixd/core/error.h init.o: ../../../../winix/winixd/core/config.h +init.o: ../../../../winix/winixd/core/textstream.h init.o: ../../../../winix/winixd/templates/htmltextstream.h init.o: ../../../../pikotools/space/spacetojson.h init.o: ../../../../ezc/src/outstreams.h @@ -391,29 +393,29 @@ templates.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h templates.o: ../../../../ezc/src/outstreams.h templates.o: ../../../../ezc/src/expressionparser.h templates.o: ../../../../ezc/src/patternparser.h -templates.o: ../../../../pikotools/convert/misc.h -templates.o: ../../../../pikotools/convert/text.h -templates.o: ../../../../winix/winixd/templates/patterncacher.h -templates.o: ../../../../winix/winixd/core/item.h +templates.o: ../../../../pikotools/log/log.h +templates.o: ../../../../pikotools/textstream/textstream.h templates.o: ../../../../pikotools/space/space.h templates.o: ../../../../pikotools/textstream/types.h templates.o: ../../../../pikotools/date/date.h templates.o: ../../../../pikotools/convert/convert.h templates.o: ../../../../pikotools/convert/inttostr.h templates.o: ../../../../pikotools/convert/strtoint.h +templates.o: ../../../../pikotools/convert/text.h +templates.o: ../../../../pikotools/convert/misc.h +templates.o: ../../../../pikotools/membuffer/membuffer.h +templates.o: ../../../../pikotools/textstream/types.h +templates.o: ../../../../pikotools/log/filelog.h +templates.o: ../../../../winix/winixd/templates/patterncacher.h +templates.o: ../../../../winix/winixd/core/item.h templates.o: ../../../../winix/winixd/core/winixbase.h templates.o: ../../../../winix/winixd/core/config.h templates.o: ../../../../pikotools/space/spaceparser.h templates.o: ../../../../pikotools/space/space.h templates.o: ../../../../winix/winixd/core/log.h -templates.o: ../../../../winix/winixd/core/textstream.h templates.o: ../../../../winix/winixd/core/logmanipulators.h -templates.o: ../../../../pikotools/textstream/textstream.h -templates.o: ../../../../pikotools/membuffer/membuffer.h -templates.o: ../../../../pikotools/textstream/types.h -templates.o: ../../../../winix/winixd/core/filelog.h -templates.o: ../../../../winix/winixd/core/synchro.h templates.o: ../../../../winix/winixd/core/log.h +templates.o: ../../../../winix/winixd/core/synchro.h templates.o: ../../../../winix/winixd/core/filelog.h templates.o: ../../../../winix/winixd/core/lock.h templates.o: ../../../../winix/winixd/core/synchro.h @@ -461,6 +463,7 @@ templates.o: ../../../../winix/winixd/core/lastcontainer.h templates.o: ../../../../winix/winixd/core/cur.h templates.o: ../../../../winix/winixd/core/session.h templates.o: ../../../../winix/winixd/core/rebus.h +templates.o: ../../../../winix/winixd/core/textstream.h templates.o: ../../../../winix/winixd/core/ipban.h templates.o: ../../../../winix/winixd/core/groups.h templates.o: ../../../../winix/winixd/core/group.h diff --git a/winixd/plugins/menu/Makefile.dep b/winixd/plugins/menu/Makefile.dep index 9a17b1b..b0dfbe4 100644 --- a/winixd/plugins/menu/Makefile.dep +++ b/winixd/plugins/menu/Makefile.dep @@ -17,15 +17,14 @@ cache.o: ../../../../winix/winixd/core/config.h cache.o: ../../../../pikotools/space/spaceparser.h cache.o: ../../../../pikotools/space/space.h cache.o: ../../../../winix/winixd/core/log.h -cache.o: ../../../../winix/winixd/core/textstream.h +cache.o: ../../../../winix/winixd/core/logmanipulators.h +cache.o: ../../../../pikotools/log/log.h cache.o: ../../../../pikotools/textstream/textstream.h cache.o: ../../../../pikotools/membuffer/membuffer.h cache.o: ../../../../pikotools/textstream/types.h -cache.o: ../../../../pikotools/utf8/utf8.h -cache.o: ../../../../winix/winixd/core/logmanipulators.h -cache.o: ../../../../winix/winixd/core/filelog.h -cache.o: ../../../../winix/winixd/core/synchro.h +cache.o: ../../../../pikotools/log/filelog.h cache.o: ../../../../winix/winixd/core/log.h +cache.o: ../../../../winix/winixd/core/synchro.h cache.o: ../../../../winix/winixd/core/filelog.h cache.o: ../../../../winix/winixd/core/lock.h cache.o: ../../../../winix/winixd/core/synchro.h @@ -34,6 +33,7 @@ cache.o: ../../../../winix/winixd/db/dbbase.h cache.o: ../../../../winix/winixd/db/dbconn.h cache.o: ../../../../winix/winixd/db/dbtextstream.h cache.o: ../../../../winix/winixd/core/textstream.h +cache.o: ../../../../pikotools/utf8/utf8.h cache.o: ../../../../winix/winixd/core/winixbase.h cache.o: ../../../../winix/winixd/core/error.h cache.o: ../../../../winix/winixd/db/dbitemquery.h @@ -46,6 +46,7 @@ cache.o: ../../../../winix/winixd/core/request.h cache.o: ../../../../winix/winixd/core/requesttypes.h cache.o: ../../../../winix/winixd/core/error.h cache.o: ../../../../winix/winixd/core/config.h +cache.o: ../../../../winix/winixd/core/textstream.h cache.o: ../../../../winix/winixd/templates/htmltextstream.h cache.o: ../../../../pikotools/space/spacetojson.h cache.o: ../../../../ezc/src/outstreams.h @@ -64,21 +65,20 @@ init.o: ../../../../winix/winixd/core/config.h init.o: ../../../../pikotools/space/spaceparser.h init.o: ../../../../pikotools/space/space.h init.o: ../../../../winix/winixd/core/log.h -init.o: ../../../../winix/winixd/core/textstream.h -init.o: ../../../../pikotools/convert/misc.h -init.o: ../../../../pikotools/convert/text.h +init.o: ../../../../winix/winixd/core/logmanipulators.h +init.o: ../../../../pikotools/log/log.h +init.o: ../../../../pikotools/textstream/textstream.h init.o: ../../../../pikotools/space/space.h init.o: ../../../../pikotools/textstream/types.h init.o: ../../../../pikotools/date/date.h init.o: ../../../../pikotools/convert/convert.h init.o: ../../../../pikotools/convert/inttostr.h init.o: ../../../../pikotools/convert/strtoint.h -init.o: ../../../../pikotools/textstream/textstream.h +init.o: ../../../../pikotools/convert/text.h +init.o: ../../../../pikotools/convert/misc.h init.o: ../../../../pikotools/membuffer/membuffer.h init.o: ../../../../pikotools/textstream/types.h -init.o: ../../../../pikotools/utf8/utf8.h -init.o: ../../../../winix/winixd/core/logmanipulators.h -init.o: ../../../../winix/winixd/core/filelog.h +init.o: ../../../../pikotools/log/filelog.h init.o: ../../../../winix/winixd/core/synchro.h init.o: ../../../../winix/winixd/core/filelog.h init.o: ../../../../winix/winixd/core/lock.h @@ -91,6 +91,7 @@ init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h init.o: ../../../../winix/winixd/db/dbconn.h init.o: ../../../../winix/winixd/db/dbtextstream.h init.o: ../../../../winix/winixd/core/textstream.h +init.o: ../../../../pikotools/utf8/utf8.h init.o: ../../../../winix/winixd/core/winixbase.h init.o: ../../../../winix/winixd/core/error.h init.o: ../../../../winix/winixd/db/dbitemquery.h @@ -103,6 +104,7 @@ init.o: ../../../../winix/winixd/core/request.h init.o: ../../../../winix/winixd/core/requesttypes.h init.o: ../../../../winix/winixd/core/error.h init.o: ../../../../winix/winixd/core/config.h +init.o: ../../../../winix/winixd/core/textstream.h init.o: ../../../../winix/winixd/templates/htmltextstream.h init.o: ../../../../pikotools/space/spacetojson.h init.o: ../../../../ezc/src/outstreams.h @@ -230,15 +232,14 @@ templates.o: ../../../../winix/winixd/core/config.h templates.o: ../../../../pikotools/space/spaceparser.h templates.o: ../../../../pikotools/space/space.h templates.o: ../../../../winix/winixd/core/log.h -templates.o: ../../../../winix/winixd/core/textstream.h +templates.o: ../../../../winix/winixd/core/logmanipulators.h +templates.o: ../../../../pikotools/log/log.h templates.o: ../../../../pikotools/textstream/textstream.h templates.o: ../../../../pikotools/membuffer/membuffer.h templates.o: ../../../../pikotools/textstream/types.h -templates.o: ../../../../pikotools/utf8/utf8.h -templates.o: ../../../../winix/winixd/core/logmanipulators.h -templates.o: ../../../../winix/winixd/core/filelog.h -templates.o: ../../../../winix/winixd/core/synchro.h +templates.o: ../../../../pikotools/log/filelog.h templates.o: ../../../../winix/winixd/core/log.h +templates.o: ../../../../winix/winixd/core/synchro.h templates.o: ../../../../winix/winixd/core/filelog.h templates.o: ../../../../winix/winixd/core/lock.h templates.o: ../../../../winix/winixd/core/synchro.h @@ -247,6 +248,7 @@ templates.o: ../../../../winix/winixd/db/dbbase.h templates.o: ../../../../winix/winixd/db/dbconn.h templates.o: ../../../../winix/winixd/db/dbtextstream.h templates.o: ../../../../winix/winixd/core/textstream.h +templates.o: ../../../../pikotools/utf8/utf8.h templates.o: ../../../../winix/winixd/core/winixbase.h templates.o: ../../../../winix/winixd/core/error.h templates.o: ../../../../winix/winixd/db/dbitemquery.h @@ -259,6 +261,7 @@ templates.o: ../../../../winix/winixd/core/request.h templates.o: ../../../../winix/winixd/core/requesttypes.h templates.o: ../../../../winix/winixd/core/error.h templates.o: ../../../../winix/winixd/core/config.h +templates.o: ../../../../winix/winixd/core/textstream.h templates.o: ../../../../winix/winixd/templates/htmltextstream.h templates.o: ../../../../pikotools/space/spacetojson.h templates.o: ../../../../ezc/src/outstreams.h diff --git a/winixd/plugins/stats/Makefile.dep b/winixd/plugins/stats/Makefile.dep index 8cab5e6..e838975 100644 --- a/winixd/plugins/stats/Makefile.dep +++ b/winixd/plugins/stats/Makefile.dep @@ -2,9 +2,9 @@ bot.o: bot.h init.o: ../../../../winix/winixd/core/log.h -init.o: ../../../../winix/winixd/core/textstream.h -init.o: ../../../../winix/winixd/core/misc.h -init.o: ../../../../winix/winixd/core/item.h +init.o: ../../../../winix/winixd/core/logmanipulators.h +init.o: ../../../../pikotools/log/log.h +init.o: ../../../../pikotools/textstream/textstream.h init.o: ../../../../pikotools/space/space.h init.o: ../../../../pikotools/textstream/types.h init.o: ../../../../pikotools/date/date.h @@ -12,21 +12,20 @@ init.o: ../../../../pikotools/convert/convert.h init.o: ../../../../pikotools/convert/inttostr.h init.o: ../../../../pikotools/convert/strtoint.h init.o: ../../../../pikotools/convert/text.h -init.o: ../../../../winix/winixd/core/requesttypes.h -init.o: ../../../../pikotools/textstream/textstream.h +init.o: ../../../../pikotools/convert/misc.h init.o: ../../../../pikotools/membuffer/membuffer.h init.o: ../../../../pikotools/textstream/types.h -init.o: ../../../../pikotools/utf8/utf8.h -init.o: ../../../../winix/winixd/core/winix_const.h -init.o: ../../../../winix/winixd/core/logmanipulators.h -init.o: ../../../../winix/winixd/core/filelog.h -init.o: ../../../../winix/winixd/core/synchro.h +init.o: ../../../../pikotools/log/filelog.h init.o: ../../../../winix/winixd/core/request.h +init.o: ../../../../winix/winixd/core/requesttypes.h +init.o: ../../../../winix/winixd/core/item.h init.o: ../../../../winix/winixd/core/error.h init.o: ../../../../winix/winixd/core/config.h init.o: ../../../../pikotools/space/spaceparser.h init.o: ../../../../pikotools/space/space.h init.o: ../../../../winix/winixd/core/log.h +init.o: ../../../../winix/winixd/core/textstream.h +init.o: ../../../../pikotools/utf8/utf8.h init.o: ../../../../winix/winixd/templates/htmltextstream.h init.o: ../../../../winix/winixd/core/textstream.h init.o: ../../../../pikotools/space/spacetojson.h @@ -36,6 +35,7 @@ init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h init.o: ../../../../winix/winixd/db/dbconn.h init.o: ../../../../winix/winixd/db/dbtextstream.h init.o: ../../../../winix/winixd/core/winixbase.h +init.o: ../../../../winix/winixd/core/synchro.h init.o: ../../../../winix/winixd/core/filelog.h init.o: ../../../../winix/winixd/core/lock.h init.o: ../../../../winix/winixd/core/synchro.h @@ -65,9 +65,9 @@ stats.o: stats.h ../../../../winix/winixd/core/config.h stats.o: ../../../../winix/winixd/core/winixmodel.h stats.o: ../../../../winix/winixd/core/winixbase.h stats.o: ../../../../winix/winixd/core/log.h -stats.o: ../../../../winix/winixd/core/textstream.h -stats.o: ../../../../winix/winixd/core/misc.h -stats.o: ../../../../winix/winixd/core/item.h +stats.o: ../../../../winix/winixd/core/logmanipulators.h +stats.o: ../../../../pikotools/log/log.h +stats.o: ../../../../pikotools/textstream/textstream.h stats.o: ../../../../pikotools/space/space.h stats.o: ../../../../pikotools/textstream/types.h stats.o: ../../../../pikotools/date/date.h @@ -75,14 +75,10 @@ stats.o: ../../../../pikotools/convert/convert.h stats.o: ../../../../pikotools/convert/inttostr.h stats.o: ../../../../pikotools/convert/strtoint.h stats.o: ../../../../pikotools/convert/text.h -stats.o: ../../../../winix/winixd/core/requesttypes.h -stats.o: ../../../../pikotools/textstream/textstream.h +stats.o: ../../../../pikotools/convert/misc.h stats.o: ../../../../pikotools/membuffer/membuffer.h stats.o: ../../../../pikotools/textstream/types.h -stats.o: ../../../../pikotools/utf8/utf8.h -stats.o: ../../../../winix/winixd/core/winix_const.h -stats.o: ../../../../winix/winixd/core/logmanipulators.h -stats.o: ../../../../winix/winixd/core/filelog.h +stats.o: ../../../../pikotools/log/filelog.h stats.o: ../../../../winix/winixd/core/synchro.h stats.o: ../../../../winix/winixd/core/filelog.h stats.o: ../../../../winix/winixd/core/lock.h @@ -91,6 +87,7 @@ stats.o: ../../../../winix/winixd/core/plugin.h stats.o: ../../../../winix/winixd/core/pluginmsg.h stats.o: ../../../../winix/winixd/core/plugindata.h stats.o: ../../../../winix/winixd/core/winixbase.h +stats.o: ../../../../pikotools/utf8/utf8.h templates.o: templates.h ../../../../winix/winixd/core/plugin.h templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h templates.o: ../../../../ezc/src/blocks.h @@ -102,26 +99,26 @@ templates.o: ../../../../pikotools/convert/convert.h templates.o: ../../../../pikotools/convert/inttostr.h templates.o: ../../../../pikotools/convert/strtoint.h templates.o: ../../../../pikotools/convert/text.h -templates.o: ../../../../winix/winixd/core/misc.h -templates.o: ../../../../winix/winixd/core/requesttypes.h +templates.o: ../../../../pikotools/convert/misc.h ../../../../ezc/src/cache.h +templates.o: ../../../../ezc/src/functions.h +templates.o: ../../../../pikotools/utf8/utf8.h ../../../../ezc/src/funinfo.h +templates.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +templates.o: ../../../../ezc/src/outstreams.h +templates.o: ../../../../ezc/src/expressionparser.h +templates.o: ../../../../ezc/src/patternparser.h +templates.o: ../../../../pikotools/log/log.h templates.o: ../../../../pikotools/textstream/textstream.h templates.o: ../../../../pikotools/membuffer/membuffer.h templates.o: ../../../../pikotools/textstream/types.h -templates.o: ../../../../pikotools/utf8/utf8.h -templates.o: ../../../../winix/winixd/core/winix_const.h -templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h -templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h -templates.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h -templates.o: ../../../../ezc/src/expressionparser.h -templates.o: ../../../../ezc/src/patternparser.h -templates.o: ../../../../winix/winixd/core/misc.h stats.h +templates.o: ../../../../pikotools/log/filelog.h +templates.o: ../../../../winix/winixd/core/misc.h +templates.o: ../../../../winix/winixd/core/requesttypes.h +templates.o: ../../../../winix/winixd/core/winix_const.h stats.h templates.o: ../../../../winix/winixd/core/config.h templates.o: ../../../../winix/winixd/core/winixmodel.h templates.o: ../../../../winix/winixd/core/winixbase.h templates.o: ../../../../winix/winixd/core/log.h -templates.o: ../../../../winix/winixd/core/textstream.h templates.o: ../../../../winix/winixd/core/logmanipulators.h -templates.o: ../../../../winix/winixd/core/filelog.h templates.o: ../../../../winix/winixd/core/synchro.h templates.o: ../../../../winix/winixd/core/filelog.h templates.o: ../../../../winix/winixd/core/lock.h diff --git a/winixd/plugins/thread/Makefile.dep b/winixd/plugins/thread/Makefile.dep index 9df2fed..ed78fa2 100644 --- a/winixd/plugins/thread/Makefile.dep +++ b/winixd/plugins/thread/Makefile.dep @@ -25,11 +25,11 @@ createthread.o: ../../../../winix/winixd/core/config.h createthread.o: ../../../../pikotools/space/spaceparser.h createthread.o: ../../../../pikotools/space/space.h createthread.o: ../../../../winix/winixd/core/log.h -createthread.o: ../../../../winix/winixd/core/textstream.h createthread.o: ../../../../winix/winixd/core/logmanipulators.h -createthread.o: ../../../../winix/winixd/core/filelog.h -createthread.o: ../../../../winix/winixd/core/synchro.h +createthread.o: ../../../../pikotools/log/log.h +createthread.o: ../../../../pikotools/log/filelog.h createthread.o: ../../../../winix/winixd/core/log.h +createthread.o: ../../../../winix/winixd/core/synchro.h createthread.o: ../../../../winix/winixd/core/filelog.h createthread.o: ../../../../winix/winixd/core/lock.h createthread.o: ../../../../winix/winixd/core/synchro.h @@ -46,6 +46,7 @@ createthread.o: ../../../../winix/winixd/core/request.h createthread.o: ../../../../winix/winixd/core/requesttypes.h createthread.o: ../../../../winix/winixd/core/error.h createthread.o: ../../../../winix/winixd/core/config.h +createthread.o: ../../../../winix/winixd/core/textstream.h createthread.o: ../../../../winix/winixd/templates/htmltextstream.h createthread.o: ../../../../pikotools/space/spacetojson.h createthread.o: ../../../../ezc/src/outstreams.h @@ -179,11 +180,11 @@ funthread.o: ../../../../winix/winixd/core/config.h funthread.o: ../../../../pikotools/space/spaceparser.h funthread.o: ../../../../pikotools/space/space.h funthread.o: ../../../../winix/winixd/core/log.h -funthread.o: ../../../../winix/winixd/core/textstream.h funthread.o: ../../../../winix/winixd/core/logmanipulators.h -funthread.o: ../../../../winix/winixd/core/filelog.h -funthread.o: ../../../../winix/winixd/core/synchro.h +funthread.o: ../../../../pikotools/log/log.h +funthread.o: ../../../../pikotools/log/filelog.h funthread.o: ../../../../winix/winixd/core/log.h +funthread.o: ../../../../winix/winixd/core/synchro.h funthread.o: ../../../../winix/winixd/core/filelog.h funthread.o: ../../../../winix/winixd/core/lock.h funthread.o: ../../../../winix/winixd/core/synchro.h @@ -198,6 +199,7 @@ funthread.o: ../../../../winix/winixd/core/ugcontainer.h funthread.o: ../../../../winix/winixd/core/request.h funthread.o: ../../../../winix/winixd/core/error.h funthread.o: ../../../../winix/winixd/core/config.h +funthread.o: ../../../../winix/winixd/core/textstream.h funthread.o: ../../../../winix/winixd/templates/htmltextstream.h funthread.o: ../../../../pikotools/space/spacetojson.h funthread.o: ../../../../ezc/src/outstreams.h @@ -283,11 +285,10 @@ init.o: ../../../../winix/winixd/core/config.h init.o: ../../../../pikotools/space/spaceparser.h init.o: ../../../../pikotools/space/space.h init.o: ../../../../winix/winixd/core/log.h -init.o: ../../../../winix/winixd/core/textstream.h init.o: ../../../../winix/winixd/core/logmanipulators.h -init.o: ../../../../winix/winixd/core/filelog.h -init.o: ../../../../winix/winixd/core/synchro.h +init.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h init.o: ../../../../winix/winixd/core/log.h +init.o: ../../../../winix/winixd/core/synchro.h init.o: ../../../../winix/winixd/core/filelog.h init.o: ../../../../winix/winixd/core/lock.h init.o: ../../../../winix/winixd/core/synchro.h @@ -303,6 +304,7 @@ init.o: ../../../../winix/winixd/core/request.h init.o: ../../../../winix/winixd/core/requesttypes.h init.o: ../../../../winix/winixd/core/error.h init.o: ../../../../winix/winixd/core/config.h +init.o: ../../../../winix/winixd/core/textstream.h init.o: ../../../../winix/winixd/templates/htmltextstream.h init.o: ../../../../pikotools/space/spacetojson.h init.o: ../../../../ezc/src/outstreams.h @@ -433,11 +435,10 @@ reply.o: ../../../../winix/winixd/core/config.h reply.o: ../../../../pikotools/space/spaceparser.h reply.o: ../../../../pikotools/space/space.h reply.o: ../../../../winix/winixd/core/log.h -reply.o: ../../../../winix/winixd/core/textstream.h reply.o: ../../../../winix/winixd/core/logmanipulators.h -reply.o: ../../../../winix/winixd/core/filelog.h -reply.o: ../../../../winix/winixd/core/synchro.h +reply.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h reply.o: ../../../../winix/winixd/core/log.h +reply.o: ../../../../winix/winixd/core/synchro.h reply.o: ../../../../winix/winixd/core/filelog.h reply.o: ../../../../winix/winixd/core/lock.h reply.o: ../../../../winix/winixd/core/synchro.h @@ -454,6 +455,7 @@ reply.o: ../../../../winix/winixd/core/request.h reply.o: ../../../../winix/winixd/core/requesttypes.h reply.o: ../../../../winix/winixd/core/error.h reply.o: ../../../../winix/winixd/core/config.h +reply.o: ../../../../winix/winixd/core/textstream.h reply.o: ../../../../winix/winixd/templates/htmltextstream.h reply.o: ../../../../pikotools/space/spacetojson.h reply.o: ../../../../ezc/src/outstreams.h @@ -586,11 +588,11 @@ showthreads.o: ../../../../winix/winixd/core/config.h showthreads.o: ../../../../pikotools/space/spaceparser.h showthreads.o: ../../../../pikotools/space/space.h showthreads.o: ../../../../winix/winixd/core/log.h -showthreads.o: ../../../../winix/winixd/core/textstream.h showthreads.o: ../../../../winix/winixd/core/logmanipulators.h -showthreads.o: ../../../../winix/winixd/core/filelog.h -showthreads.o: ../../../../winix/winixd/core/synchro.h +showthreads.o: ../../../../pikotools/log/log.h +showthreads.o: ../../../../pikotools/log/filelog.h showthreads.o: ../../../../winix/winixd/core/log.h +showthreads.o: ../../../../winix/winixd/core/synchro.h showthreads.o: ../../../../winix/winixd/core/filelog.h showthreads.o: ../../../../winix/winixd/core/lock.h showthreads.o: ../../../../winix/winixd/core/synchro.h @@ -607,6 +609,7 @@ showthreads.o: ../../../../winix/winixd/core/request.h showthreads.o: ../../../../winix/winixd/core/requesttypes.h showthreads.o: ../../../../winix/winixd/core/error.h showthreads.o: ../../../../winix/winixd/core/config.h +showthreads.o: ../../../../winix/winixd/core/textstream.h showthreads.o: ../../../../winix/winixd/templates/htmltextstream.h showthreads.o: ../../../../pikotools/space/spacetojson.h showthreads.o: ../../../../ezc/src/outstreams.h @@ -695,14 +698,14 @@ templates.o: ../../../../winix/winixd/core/config.h templates.o: ../../../../pikotools/space/spaceparser.h templates.o: ../../../../pikotools/space/space.h templates.o: ../../../../winix/winixd/core/log.h -templates.o: ../../../../winix/winixd/core/textstream.h templates.o: ../../../../winix/winixd/core/logmanipulators.h +templates.o: ../../../../pikotools/log/log.h templates.o: ../../../../pikotools/textstream/textstream.h templates.o: ../../../../pikotools/membuffer/membuffer.h templates.o: ../../../../pikotools/textstream/types.h -templates.o: ../../../../winix/winixd/core/filelog.h -templates.o: ../../../../winix/winixd/core/synchro.h +templates.o: ../../../../pikotools/log/filelog.h templates.o: ../../../../winix/winixd/core/log.h +templates.o: ../../../../winix/winixd/core/synchro.h templates.o: ../../../../winix/winixd/core/filelog.h templates.o: ../../../../winix/winixd/core/lock.h templates.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h @@ -739,6 +742,7 @@ templates.o: ../../../../winix/winixd/core/lastcontainer.h templates.o: ../../../../winix/winixd/core/cur.h templates.o: ../../../../winix/winixd/core/session.h templates.o: ../../../../winix/winixd/core/rebus.h +templates.o: ../../../../winix/winixd/core/textstream.h templates.o: ../../../../winix/winixd/core/ipban.h templates.o: ../../../../winix/winixd/core/groups.h templates.o: ../../../../winix/winixd/core/group.h @@ -854,14 +858,14 @@ threadinfo.o: ../../../../winix/winixd/core/config.h threadinfo.o: ../../../../pikotools/space/spaceparser.h threadinfo.o: ../../../../pikotools/space/space.h threadinfo.o: ../../../../winix/winixd/core/log.h -threadinfo.o: ../../../../winix/winixd/core/textstream.h threadinfo.o: ../../../../winix/winixd/core/logmanipulators.h +threadinfo.o: ../../../../pikotools/log/log.h threadinfo.o: ../../../../pikotools/textstream/textstream.h threadinfo.o: ../../../../pikotools/membuffer/membuffer.h threadinfo.o: ../../../../pikotools/textstream/types.h -threadinfo.o: ../../../../winix/winixd/core/filelog.h -threadinfo.o: ../../../../winix/winixd/core/synchro.h +threadinfo.o: ../../../../pikotools/log/filelog.h threadinfo.o: ../../../../winix/winixd/core/log.h +threadinfo.o: ../../../../winix/winixd/core/synchro.h threadinfo.o: ../../../../winix/winixd/core/filelog.h threadinfo.o: ../../../../winix/winixd/core/lock.h threadinfo.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h @@ -898,6 +902,7 @@ threadinfo.o: ../../../../winix/winixd/core/lastcontainer.h threadinfo.o: ../../../../winix/winixd/core/cur.h threadinfo.o: ../../../../winix/winixd/core/session.h threadinfo.o: ../../../../winix/winixd/core/rebus.h +threadinfo.o: ../../../../winix/winixd/core/textstream.h threadinfo.o: ../../../../winix/winixd/core/ipban.h threadinfo.o: ../../../../winix/winixd/core/groups.h threadinfo.o: ../../../../winix/winixd/core/group.h diff --git a/winixd/plugins/ticket/Makefile.dep b/winixd/plugins/ticket/Makefile.dep index d500632..905db64 100644 --- a/winixd/plugins/ticket/Makefile.dep +++ b/winixd/plugins/ticket/Makefile.dep @@ -25,11 +25,11 @@ createticket.o: ../../../../winix/winixd/core/config.h createticket.o: ../../../../pikotools/space/spaceparser.h createticket.o: ../../../../pikotools/space/space.h createticket.o: ../../../../winix/winixd/core/log.h -createticket.o: ../../../../winix/winixd/core/textstream.h createticket.o: ../../../../winix/winixd/core/logmanipulators.h -createticket.o: ../../../../winix/winixd/core/filelog.h -createticket.o: ../../../../winix/winixd/core/synchro.h +createticket.o: ../../../../pikotools/log/log.h +createticket.o: ../../../../pikotools/log/filelog.h createticket.o: ../../../../winix/winixd/core/log.h +createticket.o: ../../../../winix/winixd/core/synchro.h createticket.o: ../../../../winix/winixd/core/filelog.h createticket.o: ../../../../winix/winixd/core/lock.h createticket.o: ../../../../winix/winixd/core/synchro.h @@ -48,6 +48,7 @@ createticket.o: ../../../../winix/winixd/core/ugcontainer.h createticket.o: ../../../../winix/winixd/core/request.h createticket.o: ../../../../winix/winixd/core/error.h createticket.o: ../../../../winix/winixd/core/config.h +createticket.o: ../../../../winix/winixd/core/textstream.h createticket.o: ../../../../winix/winixd/templates/htmltextstream.h createticket.o: ../../../../pikotools/space/spacetojson.h createticket.o: ../../../../ezc/src/outstreams.h @@ -179,11 +180,11 @@ editticket.o: ../../../../winix/winixd/core/config.h editticket.o: ../../../../pikotools/space/spaceparser.h editticket.o: ../../../../pikotools/space/space.h editticket.o: ../../../../winix/winixd/core/log.h -editticket.o: ../../../../winix/winixd/core/textstream.h editticket.o: ../../../../winix/winixd/core/logmanipulators.h -editticket.o: ../../../../winix/winixd/core/filelog.h -editticket.o: ../../../../winix/winixd/core/synchro.h +editticket.o: ../../../../pikotools/log/log.h +editticket.o: ../../../../pikotools/log/filelog.h editticket.o: ../../../../winix/winixd/core/log.h +editticket.o: ../../../../winix/winixd/core/synchro.h editticket.o: ../../../../winix/winixd/core/filelog.h editticket.o: ../../../../winix/winixd/core/lock.h editticket.o: ../../../../winix/winixd/core/synchro.h @@ -221,6 +222,7 @@ editticket.o: ../../../../winix/winixd/core/lastcontainer.h editticket.o: ../../../../winix/winixd/core/cur.h editticket.o: ../../../../winix/winixd/core/session.h editticket.o: ../../../../winix/winixd/core/rebus.h +editticket.o: ../../../../winix/winixd/core/textstream.h editticket.o: ../../../../winix/winixd/core/ipban.h editticket.o: ../../../../winix/winixd/core/groups.h editticket.o: ../../../../winix/winixd/core/group.h @@ -332,11 +334,11 @@ funticket.o: ../../../../winix/winixd/core/config.h funticket.o: ../../../../pikotools/space/spaceparser.h funticket.o: ../../../../pikotools/space/space.h funticket.o: ../../../../winix/winixd/core/log.h -funticket.o: ../../../../winix/winixd/core/textstream.h funticket.o: ../../../../winix/winixd/core/logmanipulators.h -funticket.o: ../../../../winix/winixd/core/filelog.h -funticket.o: ../../../../winix/winixd/core/synchro.h +funticket.o: ../../../../pikotools/log/log.h +funticket.o: ../../../../pikotools/log/filelog.h funticket.o: ../../../../winix/winixd/core/log.h +funticket.o: ../../../../winix/winixd/core/synchro.h funticket.o: ../../../../winix/winixd/core/filelog.h funticket.o: ../../../../winix/winixd/core/lock.h funticket.o: ../../../../winix/winixd/core/synchro.h @@ -374,6 +376,7 @@ funticket.o: ../../../../winix/winixd/core/lastcontainer.h funticket.o: ../../../../winix/winixd/core/cur.h funticket.o: ../../../../winix/winixd/core/session.h funticket.o: ../../../../winix/winixd/core/rebus.h +funticket.o: ../../../../winix/winixd/core/textstream.h funticket.o: ../../../../winix/winixd/core/ipban.h funticket.o: ../../../../winix/winixd/core/groups.h funticket.o: ../../../../winix/winixd/core/group.h @@ -484,11 +487,10 @@ init.o: ../../../../winix/winixd/core/config.h init.o: ../../../../pikotools/space/spaceparser.h init.o: ../../../../pikotools/space/space.h init.o: ../../../../winix/winixd/core/log.h -init.o: ../../../../winix/winixd/core/textstream.h init.o: ../../../../winix/winixd/core/logmanipulators.h -init.o: ../../../../winix/winixd/core/filelog.h -init.o: ../../../../winix/winixd/core/synchro.h +init.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h init.o: ../../../../winix/winixd/core/log.h +init.o: ../../../../winix/winixd/core/synchro.h init.o: ../../../../winix/winixd/core/filelog.h init.o: ../../../../winix/winixd/core/lock.h init.o: ../../../../winix/winixd/core/synchro.h @@ -525,6 +527,7 @@ init.o: ../../../../winix/winixd/core/lastcontainer.h init.o: ../../../../winix/winixd/core/cur.h init.o: ../../../../winix/winixd/core/session.h init.o: ../../../../winix/winixd/core/rebus.h +init.o: ../../../../winix/winixd/core/textstream.h init.o: ../../../../winix/winixd/core/ipban.h init.o: ../../../../winix/winixd/core/groups.h init.o: ../../../../winix/winixd/core/group.h @@ -646,11 +649,11 @@ showtickets.o: ../../../../winix/winixd/core/config.h showtickets.o: ../../../../pikotools/space/spaceparser.h showtickets.o: ../../../../pikotools/space/space.h showtickets.o: ../../../../winix/winixd/core/log.h -showtickets.o: ../../../../winix/winixd/core/textstream.h showtickets.o: ../../../../winix/winixd/core/logmanipulators.h -showtickets.o: ../../../../winix/winixd/core/filelog.h -showtickets.o: ../../../../winix/winixd/core/synchro.h +showtickets.o: ../../../../pikotools/log/log.h +showtickets.o: ../../../../pikotools/log/filelog.h showtickets.o: ../../../../winix/winixd/core/log.h +showtickets.o: ../../../../winix/winixd/core/synchro.h showtickets.o: ../../../../winix/winixd/core/filelog.h showtickets.o: ../../../../winix/winixd/core/lock.h showtickets.o: ../../../../winix/winixd/core/synchro.h @@ -688,6 +691,7 @@ showtickets.o: ../../../../winix/winixd/core/lastcontainer.h showtickets.o: ../../../../winix/winixd/core/cur.h showtickets.o: ../../../../winix/winixd/core/session.h showtickets.o: ../../../../winix/winixd/core/rebus.h +showtickets.o: ../../../../winix/winixd/core/textstream.h showtickets.o: ../../../../winix/winixd/core/ipban.h showtickets.o: ../../../../winix/winixd/core/groups.h showtickets.o: ../../../../winix/winixd/core/group.h @@ -798,11 +802,10 @@ tdb.o: ../../../../winix/winixd/core/config.h tdb.o: ../../../../pikotools/space/spaceparser.h tdb.o: ../../../../pikotools/space/space.h tdb.o: ../../../../winix/winixd/core/log.h -tdb.o: ../../../../winix/winixd/core/textstream.h tdb.o: ../../../../winix/winixd/core/logmanipulators.h -tdb.o: ../../../../winix/winixd/core/filelog.h -tdb.o: ../../../../winix/winixd/core/synchro.h +tdb.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h tdb.o: ../../../../winix/winixd/core/log.h +tdb.o: ../../../../winix/winixd/core/synchro.h tdb.o: ../../../../winix/winixd/core/filelog.h tdb.o: ../../../../winix/winixd/core/lock.h tdb.o: ../../../../winix/winixd/core/synchro.h @@ -828,7 +831,9 @@ templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h templates.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h templates.o: ../../../../ezc/src/expressionparser.h -templates.o: ../../../../ezc/src/patternparser.h ticketinfo.h ticket.h +templates.o: ../../../../ezc/src/patternparser.h +templates.o: ../../../../pikotools/log/log.h +templates.o: ../../../../pikotools/log/filelog.h ticketinfo.h ticket.h templates.o: ../../../../winix/winixd/core/item.h templates.o: ../../../../winix/winixd/core/system.h templates.o: ../../../../winix/winixd/core/job.h @@ -840,11 +845,9 @@ templates.o: ../../../../winix/winixd/core/config.h templates.o: ../../../../pikotools/space/spaceparser.h templates.o: ../../../../pikotools/space/space.h templates.o: ../../../../winix/winixd/core/log.h -templates.o: ../../../../winix/winixd/core/textstream.h templates.o: ../../../../winix/winixd/core/logmanipulators.h -templates.o: ../../../../winix/winixd/core/filelog.h -templates.o: ../../../../winix/winixd/core/synchro.h templates.o: ../../../../winix/winixd/core/log.h +templates.o: ../../../../winix/winixd/core/synchro.h templates.o: ../../../../winix/winixd/core/filelog.h templates.o: ../../../../winix/winixd/core/lock.h templates.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h @@ -875,6 +878,7 @@ templates.o: ../../../../winix/winixd/core/lastcontainer.h templates.o: ../../../../winix/winixd/core/cur.h templates.o: ../../../../winix/winixd/core/session.h templates.o: ../../../../winix/winixd/core/rebus.h +templates.o: ../../../../winix/winixd/core/textstream.h templates.o: ../../../../winix/winixd/core/ipban.h templates.o: ../../../../winix/winixd/core/groups.h templates.o: ../../../../winix/winixd/core/group.h @@ -982,8 +986,8 @@ ticketinfo.o: ../../../../winix/winixd/core/config.h ticketinfo.o: ../../../../pikotools/space/spaceparser.h ticketinfo.o: ../../../../pikotools/space/space.h ticketinfo.o: ../../../../winix/winixd/core/log.h -ticketinfo.o: ../../../../winix/winixd/core/textstream.h ticketinfo.o: ../../../../winix/winixd/core/logmanipulators.h +ticketinfo.o: ../../../../pikotools/log/log.h ticketinfo.o: ../../../../pikotools/textstream/textstream.h ticketinfo.o: ../../../../pikotools/space/space.h ticketinfo.o: ../../../../pikotools/textstream/types.h @@ -999,9 +1003,9 @@ ticketinfo.o: ../../../../pikotools/utf8/utf8.h ticketinfo.o: ../../../../winix/winixd/core/winix_const.h ticketinfo.o: ../../../../pikotools/membuffer/membuffer.h ticketinfo.o: ../../../../pikotools/textstream/types.h -ticketinfo.o: ../../../../winix/winixd/core/filelog.h -ticketinfo.o: ../../../../winix/winixd/core/synchro.h +ticketinfo.o: ../../../../pikotools/log/filelog.h ticketinfo.o: ../../../../winix/winixd/core/log.h +ticketinfo.o: ../../../../winix/winixd/core/synchro.h ticketinfo.o: ../../../../winix/winixd/core/filelog.h ticketinfo.o: ../../../../winix/winixd/core/lock.h ticketinfo.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h @@ -1032,6 +1036,7 @@ ticketinfo.o: ../../../../winix/winixd/core/lastcontainer.h ticketinfo.o: ../../../../winix/winixd/core/cur.h ticketinfo.o: ../../../../winix/winixd/core/session.h ticketinfo.o: ../../../../winix/winixd/core/rebus.h +ticketinfo.o: ../../../../winix/winixd/core/textstream.h ticketinfo.o: ../../../../winix/winixd/core/ipban.h ticketinfo.o: ../../../../winix/winixd/core/groups.h ticketinfo.o: ../../../../winix/winixd/core/group.h diff --git a/winixd/templates/Makefile.dep b/winixd/templates/Makefile.dep index 65d119f..290ab6b 100644 --- a/winixd/templates/Makefile.dep +++ b/winixd/templates/Makefile.dep @@ -6,22 +6,20 @@ adduser.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h adduser.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h adduser.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h adduser.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -adduser.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -adduser.o: ../../../pikotools/space/spaceparser.h +adduser.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +adduser.o: ../../../pikotools/textstream/textstream.h adduser.o: ../../../pikotools/space/space.h adduser.o: ../../../pikotools/textstream/types.h -adduser.o: ../../../pikotools/textstream/textstream.h -adduser.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +adduser.o: ../../../pikotools/date/date.h adduser.o: ../../../pikotools/convert/convert.h adduser.o: ../../../pikotools/convert/inttostr.h adduser.o: ../../../pikotools/convert/strtoint.h -adduser.o: ../../../pikotools/convert/text.h -adduser.o: ../../../pikotools/membuffer/membuffer.h -adduser.o: ../../../pikotools/textstream/types.h +adduser.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +adduser.o: ../../../pikotools/space/spaceparser.h +adduser.o: ../../../pikotools/space/space.h adduser.o: ../../../winix/winixd/core/winixbase.h adduser.o: ../../../winix/winixd/core/config.h adduser.o: ../../../winix/winixd/core/log.h -adduser.o: ../../../winix/winixd/core/textstream.h adduser.o: ../../../winix/winixd/core/logmanipulators.h adduser.o: ../../../winix/winixd/core/filelog.h adduser.o: ../../../winix/winixd/core/synchro.h @@ -29,13 +27,16 @@ adduser.o: ../../../winix/winixd/core/log.h adduser.o: ../../../winix/winixd/core/filelog.h adduser.o: ../../../winix/winixd/core/lock.h adduser.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -adduser.o: ../../../winix/winixd/core/textstream.h patterncacher.h +adduser.o: ../../../winix/winixd/core/textstream.h +adduser.o: ../../../pikotools/membuffer/membuffer.h +adduser.o: ../../../pikotools/textstream/types.h patterncacher.h adduser.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h adduser.o: changepatterns.h ../../../winix/winixd/core/cur.h adduser.o: ../../../winix/winixd/core/request.h adduser.o: ../../../winix/winixd/core/requesttypes.h adduser.o: ../../../winix/winixd/core/error.h adduser.o: ../../../winix/winixd/core/config.h +adduser.o: ../../../winix/winixd/core/textstream.h adduser.o: ../../../winix/winixd/templates/htmltextstream.h adduser.o: ../../../pikotools/space/spacetojson.h adduser.o: ../../../winix/winixd/core/session.h @@ -104,22 +105,20 @@ antispam.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h antispam.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h antispam.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h antispam.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -antispam.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -antispam.o: ../../../pikotools/space/spaceparser.h +antispam.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +antispam.o: ../../../pikotools/textstream/textstream.h antispam.o: ../../../pikotools/space/space.h antispam.o: ../../../pikotools/textstream/types.h -antispam.o: ../../../pikotools/textstream/textstream.h -antispam.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +antispam.o: ../../../pikotools/date/date.h antispam.o: ../../../pikotools/convert/convert.h antispam.o: ../../../pikotools/convert/inttostr.h antispam.o: ../../../pikotools/convert/strtoint.h -antispam.o: ../../../pikotools/convert/text.h -antispam.o: ../../../pikotools/membuffer/membuffer.h -antispam.o: ../../../pikotools/textstream/types.h +antispam.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +antispam.o: ../../../pikotools/space/spaceparser.h +antispam.o: ../../../pikotools/space/space.h antispam.o: ../../../winix/winixd/core/winixbase.h antispam.o: ../../../winix/winixd/core/config.h antispam.o: ../../../winix/winixd/core/log.h -antispam.o: ../../../winix/winixd/core/textstream.h antispam.o: ../../../winix/winixd/core/logmanipulators.h antispam.o: ../../../winix/winixd/core/filelog.h antispam.o: ../../../winix/winixd/core/synchro.h @@ -127,13 +126,16 @@ antispam.o: ../../../winix/winixd/core/log.h antispam.o: ../../../winix/winixd/core/filelog.h antispam.o: ../../../winix/winixd/core/lock.h antispam.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -antispam.o: ../../../winix/winixd/core/textstream.h patterncacher.h +antispam.o: ../../../winix/winixd/core/textstream.h +antispam.o: ../../../pikotools/membuffer/membuffer.h +antispam.o: ../../../pikotools/textstream/types.h patterncacher.h antispam.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h antispam.o: changepatterns.h ../../../winix/winixd/core/cur.h antispam.o: ../../../winix/winixd/core/request.h antispam.o: ../../../winix/winixd/core/requesttypes.h antispam.o: ../../../winix/winixd/core/error.h antispam.o: ../../../winix/winixd/core/config.h +antispam.o: ../../../winix/winixd/core/textstream.h antispam.o: ../../../winix/winixd/templates/htmltextstream.h antispam.o: ../../../pikotools/space/spacetojson.h antispam.o: ../../../winix/winixd/core/session.h @@ -201,9 +203,9 @@ antispam.o: ../../../winix/winixd/core/winix_const.h changepatterns.o: changepatterns.h patterns.h locale.h changepatterns.o: ../../../pikotools/space/spaceparser.h changepatterns.o: ../../../pikotools/space/space.h -changepatterns.o: ../../../pikotools/textstream/types.h changepatterns.o: ../../../pikotools/textstream/textstream.h changepatterns.o: ../../../pikotools/space/space.h +changepatterns.o: ../../../pikotools/textstream/types.h changepatterns.o: ../../../pikotools/date/date.h changepatterns.o: ../../../pikotools/convert/convert.h changepatterns.o: ../../../pikotools/convert/inttostr.h @@ -217,13 +219,13 @@ changepatterns.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h changepatterns.o: ../../../ezc/src/outstreams.h changepatterns.o: ../../../ezc/src/expressionparser.h changepatterns.o: ../../../ezc/src/patternparser.h +changepatterns.o: ../../../pikotools/log/log.h +changepatterns.o: ../../../winix/winixd/core/filelog.h +changepatterns.o: ../../../winix/winixd/core/synchro.h changepatterns.o: ../../../winix/winixd/core/winixbase.h changepatterns.o: ../../../winix/winixd/core/config.h changepatterns.o: ../../../winix/winixd/core/log.h -changepatterns.o: ../../../winix/winixd/core/textstream.h changepatterns.o: ../../../winix/winixd/core/logmanipulators.h -changepatterns.o: ../../../winix/winixd/core/filelog.h -changepatterns.o: ../../../winix/winixd/core/synchro.h changepatterns.o: ../../../winix/winixd/core/log.h changepatterns.o: ../../../winix/winixd/core/filelog.h changepatterns.o: ../../../winix/winixd/core/lock.h @@ -237,22 +239,19 @@ config.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h config.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h config.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h config.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -config.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -config.o: ../../../pikotools/space/spaceparser.h +config.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +config.o: ../../../pikotools/textstream/textstream.h config.o: ../../../pikotools/space/space.h config.o: ../../../pikotools/textstream/types.h -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/date/date.h ../../../pikotools/convert/convert.h config.o: ../../../pikotools/convert/inttostr.h config.o: ../../../pikotools/convert/strtoint.h -config.o: ../../../pikotools/convert/text.h -config.o: ../../../pikotools/membuffer/membuffer.h -config.o: ../../../pikotools/textstream/types.h +config.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +config.o: ../../../pikotools/space/spaceparser.h +config.o: ../../../pikotools/space/space.h config.o: ../../../winix/winixd/core/winixbase.h config.o: ../../../winix/winixd/core/config.h config.o: ../../../winix/winixd/core/log.h -config.o: ../../../winix/winixd/core/textstream.h config.o: ../../../winix/winixd/core/logmanipulators.h config.o: ../../../winix/winixd/core/filelog.h config.o: ../../../winix/winixd/core/synchro.h @@ -260,13 +259,16 @@ config.o: ../../../winix/winixd/core/log.h config.o: ../../../winix/winixd/core/filelog.h config.o: ../../../winix/winixd/core/lock.h config.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -config.o: ../../../winix/winixd/core/textstream.h patterncacher.h +config.o: ../../../winix/winixd/core/textstream.h +config.o: ../../../pikotools/membuffer/membuffer.h +config.o: ../../../pikotools/textstream/types.h patterncacher.h config.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h config.o: changepatterns.h ../../../winix/winixd/core/cur.h config.o: ../../../winix/winixd/core/request.h config.o: ../../../winix/winixd/core/requesttypes.h config.o: ../../../winix/winixd/core/error.h config.o: ../../../winix/winixd/core/config.h +config.o: ../../../winix/winixd/core/textstream.h config.o: ../../../winix/winixd/templates/htmltextstream.h config.o: ../../../pikotools/space/spacetojson.h config.o: ../../../winix/winixd/core/session.h @@ -334,23 +336,20 @@ currentdate.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h currentdate.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h currentdate.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h currentdate.o: ../../../ezc/src/expressionparser.h -currentdate.o: ../../../ezc/src/patternparser.h misc.h localefilter.h -currentdate.o: locale.h ../../../pikotools/space/spaceparser.h -currentdate.o: ../../../pikotools/space/space.h -currentdate.o: ../../../pikotools/textstream/types.h +currentdate.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h currentdate.o: ../../../pikotools/textstream/textstream.h currentdate.o: ../../../pikotools/space/space.h +currentdate.o: ../../../pikotools/textstream/types.h currentdate.o: ../../../pikotools/date/date.h currentdate.o: ../../../pikotools/convert/convert.h currentdate.o: ../../../pikotools/convert/inttostr.h currentdate.o: ../../../pikotools/convert/strtoint.h -currentdate.o: ../../../pikotools/convert/text.h -currentdate.o: ../../../pikotools/membuffer/membuffer.h -currentdate.o: ../../../pikotools/textstream/types.h +currentdate.o: ../../../pikotools/convert/text.h misc.h localefilter.h +currentdate.o: locale.h ../../../pikotools/space/spaceparser.h +currentdate.o: ../../../pikotools/space/space.h currentdate.o: ../../../winix/winixd/core/winixbase.h currentdate.o: ../../../winix/winixd/core/config.h currentdate.o: ../../../winix/winixd/core/log.h -currentdate.o: ../../../winix/winixd/core/textstream.h currentdate.o: ../../../winix/winixd/core/logmanipulators.h currentdate.o: ../../../winix/winixd/core/filelog.h currentdate.o: ../../../winix/winixd/core/synchro.h @@ -358,13 +357,16 @@ currentdate.o: ../../../winix/winixd/core/log.h currentdate.o: ../../../winix/winixd/core/filelog.h currentdate.o: ../../../winix/winixd/core/lock.h currentdate.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -currentdate.o: ../../../winix/winixd/core/textstream.h patterncacher.h +currentdate.o: ../../../winix/winixd/core/textstream.h +currentdate.o: ../../../pikotools/membuffer/membuffer.h +currentdate.o: ../../../pikotools/textstream/types.h patterncacher.h currentdate.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h currentdate.o: changepatterns.h ../../../winix/winixd/core/cur.h currentdate.o: ../../../winix/winixd/core/request.h currentdate.o: ../../../winix/winixd/core/requesttypes.h currentdate.o: ../../../winix/winixd/core/error.h currentdate.o: ../../../winix/winixd/core/config.h +currentdate.o: ../../../winix/winixd/core/textstream.h currentdate.o: ../../../winix/winixd/templates/htmltextstream.h currentdate.o: ../../../pikotools/space/spacetojson.h currentdate.o: ../../../winix/winixd/core/session.h @@ -480,31 +482,31 @@ dir.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h dir.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h dir.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h dir.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -dir.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -dir.o: ../../../pikotools/space/spaceparser.h -dir.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +dir.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h dir.o: ../../../pikotools/textstream/textstream.h -dir.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h -dir.o: ../../../pikotools/convert/convert.h +dir.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +dir.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h dir.o: ../../../pikotools/convert/inttostr.h dir.o: ../../../pikotools/convert/strtoint.h -dir.o: ../../../pikotools/convert/text.h -dir.o: ../../../pikotools/membuffer/membuffer.h -dir.o: ../../../pikotools/textstream/types.h +dir.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +dir.o: ../../../pikotools/space/spaceparser.h +dir.o: ../../../pikotools/space/space.h dir.o: ../../../winix/winixd/core/winixbase.h dir.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -dir.o: ../../../winix/winixd/core/textstream.h dir.o: ../../../winix/winixd/core/logmanipulators.h dir.o: ../../../winix/winixd/core/filelog.h dir.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h dir.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h dir.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -dir.o: ../../../winix/winixd/core/textstream.h patterncacher.h +dir.o: ../../../winix/winixd/core/textstream.h +dir.o: ../../../pikotools/membuffer/membuffer.h +dir.o: ../../../pikotools/textstream/types.h patterncacher.h dir.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h dir.o: changepatterns.h ../../../winix/winixd/core/cur.h dir.o: ../../../winix/winixd/core/request.h dir.o: ../../../winix/winixd/core/requesttypes.h dir.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +dir.o: ../../../winix/winixd/core/textstream.h dir.o: ../../../winix/winixd/templates/htmltextstream.h dir.o: ../../../pikotools/space/spacetojson.h dir.o: ../../../winix/winixd/core/session.h ../../../winix/winixd/core/user.h @@ -612,31 +614,31 @@ doc.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h doc.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h doc.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h doc.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -doc.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -doc.o: ../../../pikotools/space/spaceparser.h -doc.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +doc.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h doc.o: ../../../pikotools/textstream/textstream.h -doc.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h -doc.o: ../../../pikotools/convert/convert.h +doc.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +doc.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h doc.o: ../../../pikotools/convert/inttostr.h doc.o: ../../../pikotools/convert/strtoint.h -doc.o: ../../../pikotools/convert/text.h -doc.o: ../../../pikotools/membuffer/membuffer.h -doc.o: ../../../pikotools/textstream/types.h +doc.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +doc.o: ../../../pikotools/space/spaceparser.h +doc.o: ../../../pikotools/space/space.h doc.o: ../../../winix/winixd/core/winixbase.h doc.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -doc.o: ../../../winix/winixd/core/textstream.h doc.o: ../../../winix/winixd/core/logmanipulators.h doc.o: ../../../winix/winixd/core/filelog.h doc.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h doc.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h doc.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -doc.o: ../../../winix/winixd/core/textstream.h patterncacher.h +doc.o: ../../../winix/winixd/core/textstream.h +doc.o: ../../../pikotools/membuffer/membuffer.h +doc.o: ../../../pikotools/textstream/types.h patterncacher.h doc.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h doc.o: changepatterns.h ../../../winix/winixd/core/cur.h doc.o: ../../../winix/winixd/core/request.h doc.o: ../../../winix/winixd/core/requesttypes.h doc.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +doc.o: ../../../winix/winixd/core/textstream.h doc.o: ../../../winix/winixd/templates/htmltextstream.h doc.o: ../../../pikotools/space/spacetojson.h doc.o: ../../../winix/winixd/core/session.h ../../../winix/winixd/core/user.h @@ -700,31 +702,31 @@ env.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h env.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h env.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h env.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -env.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -env.o: ../../../pikotools/space/spaceparser.h -env.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +env.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h env.o: ../../../pikotools/textstream/textstream.h -env.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h -env.o: ../../../pikotools/convert/convert.h +env.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +env.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h env.o: ../../../pikotools/convert/inttostr.h env.o: ../../../pikotools/convert/strtoint.h -env.o: ../../../pikotools/convert/text.h -env.o: ../../../pikotools/membuffer/membuffer.h -env.o: ../../../pikotools/textstream/types.h +env.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +env.o: ../../../pikotools/space/spaceparser.h +env.o: ../../../pikotools/space/space.h env.o: ../../../winix/winixd/core/winixbase.h env.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -env.o: ../../../winix/winixd/core/textstream.h env.o: ../../../winix/winixd/core/logmanipulators.h env.o: ../../../winix/winixd/core/filelog.h env.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h env.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h env.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -env.o: ../../../winix/winixd/core/textstream.h patterncacher.h +env.o: ../../../winix/winixd/core/textstream.h +env.o: ../../../pikotools/membuffer/membuffer.h +env.o: ../../../pikotools/textstream/types.h patterncacher.h env.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h env.o: changepatterns.h ../../../winix/winixd/core/cur.h env.o: ../../../winix/winixd/core/request.h env.o: ../../../winix/winixd/core/requesttypes.h env.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +env.o: ../../../winix/winixd/core/textstream.h env.o: ../../../winix/winixd/templates/htmltextstream.h env.o: ../../../pikotools/space/spacetojson.h env.o: ../../../winix/winixd/core/session.h ../../../winix/winixd/core/user.h @@ -832,22 +834,20 @@ filters.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h filters.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h filters.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h filters.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -filters.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -filters.o: ../../../pikotools/space/spaceparser.h +filters.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +filters.o: ../../../pikotools/textstream/textstream.h filters.o: ../../../pikotools/space/space.h filters.o: ../../../pikotools/textstream/types.h -filters.o: ../../../pikotools/textstream/textstream.h -filters.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +filters.o: ../../../pikotools/date/date.h filters.o: ../../../pikotools/convert/convert.h filters.o: ../../../pikotools/convert/inttostr.h filters.o: ../../../pikotools/convert/strtoint.h -filters.o: ../../../pikotools/convert/text.h -filters.o: ../../../pikotools/membuffer/membuffer.h -filters.o: ../../../pikotools/textstream/types.h +filters.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +filters.o: ../../../pikotools/space/spaceparser.h +filters.o: ../../../pikotools/space/space.h filters.o: ../../../winix/winixd/core/winixbase.h filters.o: ../../../winix/winixd/core/config.h filters.o: ../../../winix/winixd/core/log.h -filters.o: ../../../winix/winixd/core/textstream.h filters.o: ../../../winix/winixd/core/logmanipulators.h filters.o: ../../../winix/winixd/core/filelog.h filters.o: ../../../winix/winixd/core/synchro.h @@ -855,13 +855,16 @@ filters.o: ../../../winix/winixd/core/log.h filters.o: ../../../winix/winixd/core/filelog.h filters.o: ../../../winix/winixd/core/lock.h filters.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -filters.o: ../../../winix/winixd/core/textstream.h patterncacher.h +filters.o: ../../../winix/winixd/core/textstream.h +filters.o: ../../../pikotools/membuffer/membuffer.h +filters.o: ../../../pikotools/textstream/types.h patterncacher.h filters.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h filters.o: changepatterns.h ../../../winix/winixd/core/cur.h filters.o: ../../../winix/winixd/core/request.h filters.o: ../../../winix/winixd/core/requesttypes.h filters.o: ../../../winix/winixd/core/error.h filters.o: ../../../winix/winixd/core/config.h +filters.o: ../../../winix/winixd/core/textstream.h filters.o: ../../../winix/winixd/templates/htmltextstream.h filters.o: ../../../pikotools/space/spacetojson.h filters.o: ../../../winix/winixd/core/session.h @@ -931,22 +934,20 @@ generic.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h generic.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h generic.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h generic.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -generic.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -generic.o: ../../../pikotools/space/spaceparser.h +generic.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +generic.o: ../../../pikotools/textstream/textstream.h generic.o: ../../../pikotools/space/space.h generic.o: ../../../pikotools/textstream/types.h -generic.o: ../../../pikotools/textstream/textstream.h -generic.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +generic.o: ../../../pikotools/date/date.h generic.o: ../../../pikotools/convert/convert.h generic.o: ../../../pikotools/convert/inttostr.h generic.o: ../../../pikotools/convert/strtoint.h -generic.o: ../../../pikotools/convert/text.h -generic.o: ../../../pikotools/membuffer/membuffer.h -generic.o: ../../../pikotools/textstream/types.h +generic.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +generic.o: ../../../pikotools/space/spaceparser.h +generic.o: ../../../pikotools/space/space.h generic.o: ../../../winix/winixd/core/winixbase.h generic.o: ../../../winix/winixd/core/config.h generic.o: ../../../winix/winixd/core/log.h -generic.o: ../../../winix/winixd/core/textstream.h generic.o: ../../../winix/winixd/core/logmanipulators.h generic.o: ../../../winix/winixd/core/filelog.h generic.o: ../../../winix/winixd/core/synchro.h @@ -954,13 +955,16 @@ generic.o: ../../../winix/winixd/core/log.h generic.o: ../../../winix/winixd/core/filelog.h generic.o: ../../../winix/winixd/core/lock.h generic.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -generic.o: ../../../winix/winixd/core/textstream.h patterncacher.h +generic.o: ../../../winix/winixd/core/textstream.h +generic.o: ../../../pikotools/membuffer/membuffer.h +generic.o: ../../../pikotools/textstream/types.h patterncacher.h generic.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h generic.o: changepatterns.h ../../../winix/winixd/core/cur.h generic.o: ../../../winix/winixd/core/request.h generic.o: ../../../winix/winixd/core/requesttypes.h generic.o: ../../../winix/winixd/core/error.h generic.o: ../../../winix/winixd/core/config.h +generic.o: ../../../winix/winixd/core/textstream.h generic.o: ../../../winix/winixd/templates/htmltextstream.h generic.o: ../../../pikotools/space/spacetojson.h generic.o: ../../../winix/winixd/core/session.h @@ -1026,6 +1030,37 @@ generic.o: ../../../winix/winixd/core/request.h generic.o: ../../../winix/winixd/core/misc.h generic.o: ../../../winix/winixd/core/winix_const.h htmltextstream.o: htmltextstream.h ../../../winix/winixd/core/textstream.h +htmltextstream.o: misc.h localefilter.h locale.h +htmltextstream.o: ../../../pikotools/space/spaceparser.h +htmltextstream.o: ../../../pikotools/space/space.h +htmltextstream.o: ../../../pikotools/textstream/textstream.h +htmltextstream.o: ../../../pikotools/space/space.h +htmltextstream.o: ../../../pikotools/textstream/types.h +htmltextstream.o: ../../../pikotools/date/date.h +htmltextstream.o: ../../../pikotools/convert/convert.h +htmltextstream.o: ../../../pikotools/convert/inttostr.h +htmltextstream.o: ../../../pikotools/convert/strtoint.h +htmltextstream.o: ../../../pikotools/convert/text.h +htmltextstream.o: ../../../pikotools/membuffer/membuffer.h +htmltextstream.o: ../../../pikotools/textstream/types.h +htmltextstream.o: ../../../winix/winixd/core/winixbase.h +htmltextstream.o: ../../../winix/winixd/core/config.h +htmltextstream.o: ../../../winix/winixd/core/log.h +htmltextstream.o: ../../../winix/winixd/core/logmanipulators.h +htmltextstream.o: ../../../pikotools/log/log.h +htmltextstream.o: ../../../winix/winixd/core/filelog.h +htmltextstream.o: ../../../winix/winixd/core/synchro.h +htmltextstream.o: ../../../winix/winixd/core/log.h +htmltextstream.o: ../../../winix/winixd/core/filelog.h +htmltextstream.o: ../../../winix/winixd/core/lock.h +htmltextstream.o: ../../../winix/winixd/core/synchro.h ../../../ezc/src/ezc.h +htmltextstream.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h +htmltextstream.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h +htmltextstream.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h +htmltextstream.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h +htmltextstream.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h +htmltextstream.o: ../../../ezc/src/expressionparser.h +htmltextstream.o: ../../../ezc/src/patternparser.h indexpatterns.o: indexpatterns.h ../../../ezc/src/ezc.h indexpatterns.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h indexpatterns.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h @@ -1033,21 +1068,21 @@ indexpatterns.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h indexpatterns.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h indexpatterns.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h indexpatterns.o: ../../../ezc/src/expressionparser.h -indexpatterns.o: ../../../ezc/src/patternparser.h patterns.h locale.h -indexpatterns.o: ../../../pikotools/space/spaceparser.h -indexpatterns.o: ../../../pikotools/space/space.h -indexpatterns.o: ../../../pikotools/textstream/types.h +indexpatterns.o: ../../../ezc/src/patternparser.h +indexpatterns.o: ../../../pikotools/log/log.h indexpatterns.o: ../../../pikotools/textstream/textstream.h indexpatterns.o: ../../../pikotools/space/space.h +indexpatterns.o: ../../../pikotools/textstream/types.h indexpatterns.o: ../../../pikotools/date/date.h indexpatterns.o: ../../../pikotools/convert/convert.h indexpatterns.o: ../../../pikotools/convert/inttostr.h indexpatterns.o: ../../../pikotools/convert/strtoint.h indexpatterns.o: ../../../pikotools/convert/text.h misc.h localefilter.h +indexpatterns.o: locale.h ../../../pikotools/space/spaceparser.h +indexpatterns.o: ../../../pikotools/space/space.h indexpatterns.o: ../../../winix/winixd/core/winixbase.h indexpatterns.o: ../../../winix/winixd/core/config.h indexpatterns.o: ../../../winix/winixd/core/log.h -indexpatterns.o: ../../../winix/winixd/core/textstream.h indexpatterns.o: ../../../winix/winixd/core/logmanipulators.h indexpatterns.o: ../../../winix/winixd/core/filelog.h indexpatterns.o: ../../../winix/winixd/core/synchro.h @@ -1057,29 +1092,26 @@ indexpatterns.o: ../../../winix/winixd/core/lock.h indexpatterns.o: ../../../winix/winixd/core/synchro.h htmltextstream.h indexpatterns.o: ../../../winix/winixd/core/textstream.h indexpatterns.o: ../../../pikotools/membuffer/membuffer.h -indexpatterns.o: ../../../pikotools/textstream/types.h +indexpatterns.o: ../../../pikotools/textstream/types.h patterns.h insert.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h insert.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h insert.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h insert.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h insert.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h insert.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -insert.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -insert.o: ../../../pikotools/space/spaceparser.h +insert.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +insert.o: ../../../pikotools/textstream/textstream.h insert.o: ../../../pikotools/space/space.h insert.o: ../../../pikotools/textstream/types.h -insert.o: ../../../pikotools/textstream/textstream.h -insert.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h -insert.o: ../../../pikotools/convert/convert.h +insert.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h insert.o: ../../../pikotools/convert/inttostr.h insert.o: ../../../pikotools/convert/strtoint.h -insert.o: ../../../pikotools/convert/text.h -insert.o: ../../../pikotools/membuffer/membuffer.h -insert.o: ../../../pikotools/textstream/types.h +insert.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +insert.o: ../../../pikotools/space/spaceparser.h +insert.o: ../../../pikotools/space/space.h insert.o: ../../../winix/winixd/core/winixbase.h insert.o: ../../../winix/winixd/core/config.h insert.o: ../../../winix/winixd/core/log.h -insert.o: ../../../winix/winixd/core/textstream.h insert.o: ../../../winix/winixd/core/logmanipulators.h insert.o: ../../../winix/winixd/core/filelog.h insert.o: ../../../winix/winixd/core/synchro.h @@ -1087,13 +1119,16 @@ insert.o: ../../../winix/winixd/core/log.h insert.o: ../../../winix/winixd/core/filelog.h insert.o: ../../../winix/winixd/core/lock.h insert.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -insert.o: ../../../winix/winixd/core/textstream.h patterncacher.h +insert.o: ../../../winix/winixd/core/textstream.h +insert.o: ../../../pikotools/membuffer/membuffer.h +insert.o: ../../../pikotools/textstream/types.h patterncacher.h insert.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h insert.o: changepatterns.h ../../../winix/winixd/core/cur.h insert.o: ../../../winix/winixd/core/request.h insert.o: ../../../winix/winixd/core/requesttypes.h insert.o: ../../../winix/winixd/core/error.h insert.o: ../../../winix/winixd/core/config.h +insert.o: ../../../winix/winixd/core/textstream.h insert.o: ../../../winix/winixd/templates/htmltextstream.h insert.o: ../../../pikotools/space/spacetojson.h insert.o: ../../../winix/winixd/core/session.h @@ -1163,21 +1198,18 @@ ipban.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h ipban.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h ipban.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h ipban.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -ipban.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -ipban.o: ../../../pikotools/space/spaceparser.h -ipban.o: ../../../pikotools/space/space.h -ipban.o: ../../../pikotools/textstream/types.h +ipban.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h ipban.o: ../../../pikotools/textstream/textstream.h -ipban.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +ipban.o: ../../../pikotools/space/space.h +ipban.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h ipban.o: ../../../pikotools/convert/convert.h ipban.o: ../../../pikotools/convert/inttostr.h ipban.o: ../../../pikotools/convert/strtoint.h -ipban.o: ../../../pikotools/convert/text.h -ipban.o: ../../../pikotools/membuffer/membuffer.h -ipban.o: ../../../pikotools/textstream/types.h +ipban.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +ipban.o: ../../../pikotools/space/spaceparser.h +ipban.o: ../../../pikotools/space/space.h ipban.o: ../../../winix/winixd/core/winixbase.h ipban.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -ipban.o: ../../../winix/winixd/core/textstream.h ipban.o: ../../../winix/winixd/core/logmanipulators.h ipban.o: ../../../winix/winixd/core/filelog.h ipban.o: ../../../winix/winixd/core/synchro.h @@ -1185,13 +1217,16 @@ ipban.o: ../../../winix/winixd/core/log.h ipban.o: ../../../winix/winixd/core/filelog.h ipban.o: ../../../winix/winixd/core/lock.h ipban.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -ipban.o: ../../../winix/winixd/core/textstream.h patterncacher.h +ipban.o: ../../../winix/winixd/core/textstream.h +ipban.o: ../../../pikotools/membuffer/membuffer.h +ipban.o: ../../../pikotools/textstream/types.h patterncacher.h ipban.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h ipban.o: changepatterns.h ../../../winix/winixd/core/cur.h ipban.o: ../../../winix/winixd/core/request.h ipban.o: ../../../winix/winixd/core/requesttypes.h ipban.o: ../../../winix/winixd/core/error.h ipban.o: ../../../winix/winixd/core/config.h +ipban.o: ../../../winix/winixd/core/textstream.h ipban.o: ../../../winix/winixd/templates/htmltextstream.h ipban.o: ../../../pikotools/space/spacetojson.h ipban.o: ../../../winix/winixd/core/session.h @@ -1302,34 +1337,34 @@ item.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h item.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h item.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h item.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -item.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -item.o: ../../../pikotools/space/spaceparser.h -item.o: ../../../pikotools/space/space.h -item.o: ../../../pikotools/textstream/types.h +item.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h item.o: ../../../pikotools/textstream/textstream.h -item.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +item.o: ../../../pikotools/space/space.h +item.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.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 +item.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +item.o: ../../../pikotools/space/spaceparser.h +item.o: ../../../pikotools/space/space.h item.o: ../../../winix/winixd/core/winixbase.h item.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -item.o: ../../../winix/winixd/core/textstream.h item.o: ../../../winix/winixd/core/logmanipulators.h item.o: ../../../winix/winixd/core/filelog.h item.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h item.o: ../../../winix/winixd/core/filelog.h item.o: ../../../winix/winixd/core/lock.h item.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -item.o: ../../../winix/winixd/core/textstream.h patterncacher.h +item.o: ../../../winix/winixd/core/textstream.h +item.o: ../../../pikotools/membuffer/membuffer.h +item.o: ../../../pikotools/textstream/types.h patterncacher.h item.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h item.o: changepatterns.h ../../../winix/winixd/core/cur.h item.o: ../../../winix/winixd/core/request.h item.o: ../../../winix/winixd/core/requesttypes.h item.o: ../../../winix/winixd/core/error.h item.o: ../../../winix/winixd/core/config.h +item.o: ../../../winix/winixd/core/textstream.h item.o: ../../../winix/winixd/templates/htmltextstream.h item.o: ../../../pikotools/space/spacetojson.h item.o: ../../../winix/winixd/core/session.h @@ -1397,34 +1432,34 @@ last.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h last.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h last.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h last.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -last.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -last.o: ../../../pikotools/space/spaceparser.h -last.o: ../../../pikotools/space/space.h -last.o: ../../../pikotools/textstream/types.h +last.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h last.o: ../../../pikotools/textstream/textstream.h -last.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +last.o: ../../../pikotools/space/space.h +last.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h last.o: ../../../pikotools/convert/convert.h last.o: ../../../pikotools/convert/inttostr.h last.o: ../../../pikotools/convert/strtoint.h -last.o: ../../../pikotools/convert/text.h -last.o: ../../../pikotools/membuffer/membuffer.h -last.o: ../../../pikotools/textstream/types.h +last.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +last.o: ../../../pikotools/space/spaceparser.h +last.o: ../../../pikotools/space/space.h last.o: ../../../winix/winixd/core/winixbase.h last.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -last.o: ../../../winix/winixd/core/textstream.h last.o: ../../../winix/winixd/core/logmanipulators.h last.o: ../../../winix/winixd/core/filelog.h last.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h last.o: ../../../winix/winixd/core/filelog.h last.o: ../../../winix/winixd/core/lock.h last.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -last.o: ../../../winix/winixd/core/textstream.h patterncacher.h +last.o: ../../../winix/winixd/core/textstream.h +last.o: ../../../pikotools/membuffer/membuffer.h +last.o: ../../../pikotools/textstream/types.h patterncacher.h last.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h last.o: changepatterns.h ../../../winix/winixd/core/cur.h last.o: ../../../winix/winixd/core/request.h last.o: ../../../winix/winixd/core/requesttypes.h last.o: ../../../winix/winixd/core/error.h last.o: ../../../winix/winixd/core/config.h +last.o: ../../../winix/winixd/core/textstream.h last.o: ../../../winix/winixd/templates/htmltextstream.h last.o: ../../../pikotools/space/spacetojson.h last.o: ../../../winix/winixd/core/session.h @@ -1485,10 +1520,10 @@ last.o: ../core/request.h ../core/misc.h last.o: ../../../winix/winixd/core/winix_const.h locale.o: locale.h ../../../pikotools/space/spaceparser.h locale.o: ../../../pikotools/space/space.h -locale.o: ../../../pikotools/textstream/types.h locale.o: ../../../pikotools/textstream/textstream.h -locale.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h -locale.o: ../../../pikotools/convert/convert.h +locale.o: ../../../pikotools/space/space.h +locale.o: ../../../pikotools/textstream/types.h +locale.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h locale.o: ../../../pikotools/convert/inttostr.h locale.o: ../../../pikotools/convert/strtoint.h locale.o: ../../../pikotools/convert/text.h misc.h localefilter.h @@ -1498,14 +1533,13 @@ locale.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h locale.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h locale.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h locale.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -locale.o: ../../../ezc/src/patternparser.h +locale.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +locale.o: ../../../winix/winixd/core/filelog.h +locale.o: ../../../winix/winixd/core/synchro.h locale.o: ../../../winix/winixd/core/winixbase.h locale.o: ../../../winix/winixd/core/config.h locale.o: ../../../winix/winixd/core/log.h -locale.o: ../../../winix/winixd/core/textstream.h locale.o: ../../../winix/winixd/core/logmanipulators.h -locale.o: ../../../winix/winixd/core/filelog.h -locale.o: ../../../winix/winixd/core/synchro.h locale.o: ../../../winix/winixd/core/log.h locale.o: ../../../winix/winixd/core/filelog.h locale.o: ../../../winix/winixd/core/lock.h @@ -1519,9 +1553,9 @@ locale.o: ../../../winix/winixd/core/winix_const.h localefilter.o: localefilter.h locale.h localefilter.o: ../../../pikotools/space/spaceparser.h localefilter.o: ../../../pikotools/space/space.h -localefilter.o: ../../../pikotools/textstream/types.h localefilter.o: ../../../pikotools/textstream/textstream.h localefilter.o: ../../../pikotools/space/space.h +localefilter.o: ../../../pikotools/textstream/types.h localefilter.o: ../../../pikotools/date/date.h localefilter.o: ../../../pikotools/convert/convert.h localefilter.o: ../../../pikotools/convert/inttostr.h @@ -1534,17 +1568,16 @@ localefilter.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h localefilter.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h localefilter.o: ../../../ezc/src/outstreams.h localefilter.o: ../../../ezc/src/expressionparser.h -localefilter.o: ../../../ezc/src/patternparser.h htmltextstream.h +localefilter.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +localefilter.o: ../../../winix/winixd/core/filelog.h +localefilter.o: ../../../winix/winixd/core/synchro.h htmltextstream.h localefilter.o: ../../../winix/winixd/core/textstream.h localefilter.o: ../../../pikotools/membuffer/membuffer.h localefilter.o: ../../../pikotools/textstream/types.h localefilter.o: ../../../winix/winixd/core/winixbase.h localefilter.o: ../../../winix/winixd/core/config.h localefilter.o: ../../../winix/winixd/core/log.h -localefilter.o: ../../../winix/winixd/core/textstream.h localefilter.o: ../../../winix/winixd/core/logmanipulators.h -localefilter.o: ../../../winix/winixd/core/filelog.h -localefilter.o: ../../../winix/winixd/core/synchro.h localefilter.o: ../../../winix/winixd/core/log.h localefilter.o: ../../../winix/winixd/core/filelog.h localefilter.o: ../../../winix/winixd/core/lock.h @@ -1558,21 +1591,18 @@ login.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h login.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h login.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h login.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -login.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -login.o: ../../../pikotools/space/spaceparser.h -login.o: ../../../pikotools/space/space.h -login.o: ../../../pikotools/textstream/types.h +login.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h login.o: ../../../pikotools/textstream/textstream.h -login.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +login.o: ../../../pikotools/space/space.h +login.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h login.o: ../../../pikotools/convert/convert.h login.o: ../../../pikotools/convert/inttostr.h login.o: ../../../pikotools/convert/strtoint.h -login.o: ../../../pikotools/convert/text.h -login.o: ../../../pikotools/membuffer/membuffer.h -login.o: ../../../pikotools/textstream/types.h +login.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +login.o: ../../../pikotools/space/spaceparser.h +login.o: ../../../pikotools/space/space.h login.o: ../../../winix/winixd/core/winixbase.h login.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -login.o: ../../../winix/winixd/core/textstream.h login.o: ../../../winix/winixd/core/logmanipulators.h login.o: ../../../winix/winixd/core/filelog.h login.o: ../../../winix/winixd/core/synchro.h @@ -1580,13 +1610,16 @@ login.o: ../../../winix/winixd/core/log.h login.o: ../../../winix/winixd/core/filelog.h login.o: ../../../winix/winixd/core/lock.h login.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -login.o: ../../../winix/winixd/core/textstream.h patterncacher.h +login.o: ../../../winix/winixd/core/textstream.h +login.o: ../../../pikotools/membuffer/membuffer.h +login.o: ../../../pikotools/textstream/types.h patterncacher.h login.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h login.o: changepatterns.h ../../../winix/winixd/core/cur.h login.o: ../../../winix/winixd/core/request.h login.o: ../../../winix/winixd/core/requesttypes.h login.o: ../../../winix/winixd/core/error.h login.o: ../../../winix/winixd/core/config.h +login.o: ../../../winix/winixd/core/textstream.h login.o: ../../../winix/winixd/templates/htmltextstream.h login.o: ../../../pikotools/space/spacetojson.h login.o: ../../../winix/winixd/core/session.h @@ -1695,30 +1728,29 @@ ls.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h ls.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h ls.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h ls.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -ls.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -ls.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h -ls.o: ../../../pikotools/textstream/types.h +ls.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h ls.o: ../../../pikotools/textstream/textstream.h -ls.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h -ls.o: ../../../pikotools/convert/convert.h +ls.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +ls.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h ls.o: ../../../pikotools/convert/inttostr.h ls.o: ../../../pikotools/convert/strtoint.h ../../../pikotools/convert/text.h -ls.o: ../../../pikotools/membuffer/membuffer.h -ls.o: ../../../pikotools/textstream/types.h -ls.o: ../../../winix/winixd/core/winixbase.h +ls.o: misc.h localefilter.h locale.h ../../../pikotools/space/spaceparser.h +ls.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/winixbase.h ls.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -ls.o: ../../../winix/winixd/core/textstream.h ls.o: ../../../winix/winixd/core/logmanipulators.h ls.o: ../../../winix/winixd/core/filelog.h ls.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h ls.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h ls.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -ls.o: ../../../winix/winixd/core/textstream.h patterncacher.h +ls.o: ../../../winix/winixd/core/textstream.h +ls.o: ../../../pikotools/membuffer/membuffer.h +ls.o: ../../../pikotools/textstream/types.h patterncacher.h ls.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h ls.o: changepatterns.h ../../../winix/winixd/core/cur.h ls.o: ../../../winix/winixd/core/request.h ls.o: ../../../winix/winixd/core/requesttypes.h ls.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +ls.o: ../../../winix/winixd/core/textstream.h ls.o: ../../../winix/winixd/templates/htmltextstream.h ls.o: ../../../pikotools/space/spacetojson.h ls.o: ../../../winix/winixd/core/session.h ../../../winix/winixd/core/user.h @@ -1778,31 +1810,31 @@ man.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h man.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h man.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h man.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -man.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -man.o: ../../../pikotools/space/spaceparser.h -man.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +man.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h man.o: ../../../pikotools/textstream/textstream.h -man.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h -man.o: ../../../pikotools/convert/convert.h +man.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +man.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h man.o: ../../../pikotools/convert/inttostr.h man.o: ../../../pikotools/convert/strtoint.h -man.o: ../../../pikotools/convert/text.h -man.o: ../../../pikotools/membuffer/membuffer.h -man.o: ../../../pikotools/textstream/types.h +man.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +man.o: ../../../pikotools/space/spaceparser.h +man.o: ../../../pikotools/space/space.h man.o: ../../../winix/winixd/core/winixbase.h man.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -man.o: ../../../winix/winixd/core/textstream.h man.o: ../../../winix/winixd/core/logmanipulators.h man.o: ../../../winix/winixd/core/filelog.h man.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h man.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h man.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -man.o: ../../../winix/winixd/core/textstream.h patterncacher.h +man.o: ../../../winix/winixd/core/textstream.h +man.o: ../../../pikotools/membuffer/membuffer.h +man.o: ../../../pikotools/textstream/types.h patterncacher.h man.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h man.o: changepatterns.h ../../../winix/winixd/core/cur.h man.o: ../../../winix/winixd/core/request.h man.o: ../../../winix/winixd/core/requesttypes.h man.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +man.o: ../../../winix/winixd/core/textstream.h man.o: ../../../winix/winixd/templates/htmltextstream.h man.o: ../../../pikotools/space/spacetojson.h man.o: ../../../winix/winixd/core/session.h ../../../winix/winixd/core/user.h @@ -1910,34 +1942,34 @@ misc.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h misc.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h misc.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h misc.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -misc.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -misc.o: ../../../pikotools/space/spaceparser.h -misc.o: ../../../pikotools/space/space.h -misc.o: ../../../pikotools/textstream/types.h +misc.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h misc.o: ../../../pikotools/textstream/textstream.h -misc.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +misc.o: ../../../pikotools/space/space.h +misc.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.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 +misc.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +misc.o: ../../../pikotools/space/spaceparser.h +misc.o: ../../../pikotools/space/space.h misc.o: ../../../winix/winixd/core/winixbase.h misc.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -misc.o: ../../../winix/winixd/core/textstream.h misc.o: ../../../winix/winixd/core/logmanipulators.h misc.o: ../../../winix/winixd/core/filelog.h misc.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h misc.o: ../../../winix/winixd/core/filelog.h misc.o: ../../../winix/winixd/core/lock.h misc.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -misc.o: ../../../winix/winixd/core/textstream.h patterncacher.h +misc.o: ../../../winix/winixd/core/textstream.h +misc.o: ../../../pikotools/membuffer/membuffer.h +misc.o: ../../../pikotools/textstream/types.h patterncacher.h misc.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h misc.o: changepatterns.h ../../../winix/winixd/core/cur.h misc.o: ../../../winix/winixd/core/request.h misc.o: ../../../winix/winixd/core/requesttypes.h misc.o: ../../../winix/winixd/core/error.h misc.o: ../../../winix/winixd/core/config.h +misc.o: ../../../winix/winixd/core/textstream.h misc.o: ../../../winix/winixd/templates/htmltextstream.h misc.o: ../../../pikotools/space/spacetojson.h misc.o: ../../../winix/winixd/core/session.h @@ -2003,22 +2035,20 @@ miscspace.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h miscspace.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h miscspace.o: ../../../ezc/src/outstreams.h miscspace.o: ../../../ezc/src/expressionparser.h -miscspace.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -miscspace.o: ../../../pikotools/space/spaceparser.h +miscspace.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +miscspace.o: ../../../pikotools/textstream/textstream.h miscspace.o: ../../../pikotools/space/space.h miscspace.o: ../../../pikotools/textstream/types.h -miscspace.o: ../../../pikotools/textstream/textstream.h -miscspace.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +miscspace.o: ../../../pikotools/date/date.h miscspace.o: ../../../pikotools/convert/convert.h miscspace.o: ../../../pikotools/convert/inttostr.h miscspace.o: ../../../pikotools/convert/strtoint.h -miscspace.o: ../../../pikotools/convert/text.h -miscspace.o: ../../../pikotools/membuffer/membuffer.h -miscspace.o: ../../../pikotools/textstream/types.h +miscspace.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +miscspace.o: ../../../pikotools/space/spaceparser.h +miscspace.o: ../../../pikotools/space/space.h miscspace.o: ../../../winix/winixd/core/winixbase.h miscspace.o: ../../../winix/winixd/core/config.h miscspace.o: ../../../winix/winixd/core/log.h -miscspace.o: ../../../winix/winixd/core/textstream.h miscspace.o: ../../../winix/winixd/core/logmanipulators.h miscspace.o: ../../../winix/winixd/core/filelog.h miscspace.o: ../../../winix/winixd/core/synchro.h @@ -2026,13 +2056,16 @@ miscspace.o: ../../../winix/winixd/core/log.h miscspace.o: ../../../winix/winixd/core/filelog.h miscspace.o: ../../../winix/winixd/core/lock.h miscspace.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -miscspace.o: ../../../winix/winixd/core/textstream.h patterncacher.h +miscspace.o: ../../../winix/winixd/core/textstream.h +miscspace.o: ../../../pikotools/membuffer/membuffer.h +miscspace.o: ../../../pikotools/textstream/types.h patterncacher.h miscspace.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h miscspace.o: changepatterns.h ../../../winix/winixd/core/cur.h miscspace.o: ../../../winix/winixd/core/request.h miscspace.o: ../../../winix/winixd/core/requesttypes.h miscspace.o: ../../../winix/winixd/core/error.h miscspace.o: ../../../winix/winixd/core/config.h +miscspace.o: ../../../winix/winixd/core/textstream.h miscspace.o: ../../../winix/winixd/templates/htmltextstream.h miscspace.o: ../../../pikotools/space/spacetojson.h miscspace.o: ../../../winix/winixd/core/session.h @@ -2100,21 +2133,18 @@ mount.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h mount.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h mount.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h mount.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -mount.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -mount.o: ../../../pikotools/space/spaceparser.h -mount.o: ../../../pikotools/space/space.h -mount.o: ../../../pikotools/textstream/types.h +mount.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h mount.o: ../../../pikotools/textstream/textstream.h -mount.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +mount.o: ../../../pikotools/space/space.h +mount.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.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 +mount.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +mount.o: ../../../pikotools/space/spaceparser.h +mount.o: ../../../pikotools/space/space.h mount.o: ../../../winix/winixd/core/winixbase.h mount.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -mount.o: ../../../winix/winixd/core/textstream.h mount.o: ../../../winix/winixd/core/logmanipulators.h mount.o: ../../../winix/winixd/core/filelog.h mount.o: ../../../winix/winixd/core/synchro.h @@ -2122,13 +2152,16 @@ mount.o: ../../../winix/winixd/core/log.h mount.o: ../../../winix/winixd/core/filelog.h mount.o: ../../../winix/winixd/core/lock.h mount.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -mount.o: ../../../winix/winixd/core/textstream.h patterncacher.h +mount.o: ../../../winix/winixd/core/textstream.h +mount.o: ../../../pikotools/membuffer/membuffer.h +mount.o: ../../../pikotools/textstream/types.h patterncacher.h mount.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h mount.o: changepatterns.h ../../../winix/winixd/core/cur.h mount.o: ../../../winix/winixd/core/request.h mount.o: ../../../winix/winixd/core/requesttypes.h mount.o: ../../../winix/winixd/core/error.h mount.o: ../../../winix/winixd/core/config.h +mount.o: ../../../winix/winixd/core/textstream.h mount.o: ../../../winix/winixd/templates/htmltextstream.h mount.o: ../../../pikotools/space/spacetojson.h mount.o: ../../../winix/winixd/core/session.h @@ -2195,22 +2228,19 @@ passwd.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h passwd.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h passwd.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h passwd.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -passwd.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -passwd.o: ../../../pikotools/space/spaceparser.h +passwd.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +passwd.o: ../../../pikotools/textstream/textstream.h passwd.o: ../../../pikotools/space/space.h passwd.o: ../../../pikotools/textstream/types.h -passwd.o: ../../../pikotools/textstream/textstream.h -passwd.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h -passwd.o: ../../../pikotools/convert/convert.h +passwd.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h passwd.o: ../../../pikotools/convert/inttostr.h passwd.o: ../../../pikotools/convert/strtoint.h -passwd.o: ../../../pikotools/convert/text.h -passwd.o: ../../../pikotools/membuffer/membuffer.h -passwd.o: ../../../pikotools/textstream/types.h +passwd.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +passwd.o: ../../../pikotools/space/spaceparser.h +passwd.o: ../../../pikotools/space/space.h passwd.o: ../../../winix/winixd/core/winixbase.h passwd.o: ../../../winix/winixd/core/config.h passwd.o: ../../../winix/winixd/core/log.h -passwd.o: ../../../winix/winixd/core/textstream.h passwd.o: ../../../winix/winixd/core/logmanipulators.h passwd.o: ../../../winix/winixd/core/filelog.h passwd.o: ../../../winix/winixd/core/synchro.h @@ -2218,13 +2248,16 @@ passwd.o: ../../../winix/winixd/core/log.h passwd.o: ../../../winix/winixd/core/filelog.h passwd.o: ../../../winix/winixd/core/lock.h passwd.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -passwd.o: ../../../winix/winixd/core/textstream.h patterncacher.h +passwd.o: ../../../winix/winixd/core/textstream.h +passwd.o: ../../../pikotools/membuffer/membuffer.h +passwd.o: ../../../pikotools/textstream/types.h patterncacher.h passwd.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h passwd.o: changepatterns.h ../../../winix/winixd/core/cur.h passwd.o: ../../../winix/winixd/core/request.h passwd.o: ../../../winix/winixd/core/requesttypes.h passwd.o: ../../../winix/winixd/core/error.h passwd.o: ../../../winix/winixd/core/config.h +passwd.o: ../../../winix/winixd/core/textstream.h passwd.o: ../../../winix/winixd/templates/htmltextstream.h passwd.o: ../../../pikotools/space/spacetojson.h passwd.o: ../../../winix/winixd/core/session.h @@ -2287,6 +2320,7 @@ passwd.o: ../../../winix/winixd/core/winixsystem.h passwd.o: ../../../winix/winixd/core/slog.h patterncacher.o: patterncacher.h ../../../winix/winixd/core/item.h patterncacher.o: ../../../pikotools/space/space.h +patterncacher.o: ../../../pikotools/textstream/types.h patterncacher.o: ../../../pikotools/date/date.h patterncacher.o: ../../../pikotools/convert/convert.h patterncacher.o: ../../../pikotools/convert/inttostr.h @@ -2294,16 +2328,14 @@ patterncacher.o: ../../../pikotools/convert/strtoint.h patterncacher.o: ../../../pikotools/convert/text.h misc.h localefilter.h patterncacher.o: locale.h ../../../pikotools/space/spaceparser.h patterncacher.o: ../../../pikotools/space/space.h -patterncacher.o: ../../../pikotools/textstream/types.h patterncacher.o: ../../../pikotools/textstream/textstream.h patterncacher.o: ../../../pikotools/membuffer/membuffer.h patterncacher.o: ../../../pikotools/textstream/types.h patterncacher.o: ../../../winix/winixd/core/winixbase.h patterncacher.o: ../../../winix/winixd/core/config.h patterncacher.o: ../../../winix/winixd/core/log.h -patterncacher.o: ../../../winix/winixd/core/textstream.h -patterncacher.o: ../../../pikotools/utf8/utf8.h patterncacher.o: ../../../winix/winixd/core/logmanipulators.h +patterncacher.o: ../../../pikotools/log/log.h patterncacher.o: ../../../winix/winixd/core/filelog.h patterncacher.o: ../../../winix/winixd/core/synchro.h patterncacher.o: ../../../winix/winixd/core/log.h @@ -2312,17 +2344,18 @@ patterncacher.o: ../../../winix/winixd/core/lock.h patterncacher.o: ../../../winix/winixd/core/synchro.h ../../../ezc/src/ezc.h patterncacher.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h patterncacher.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h -patterncacher.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -patterncacher.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -patterncacher.o: ../../../ezc/src/outstreams.h +patterncacher.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h +patterncacher.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h +patterncacher.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h patterncacher.o: ../../../ezc/src/expressionparser.h patterncacher.o: ../../../ezc/src/patternparser.h htmltextstream.h patterncacher.o: ../../../winix/winixd/core/textstream.h patterns.o: patterns.h locale.h ../../../pikotools/space/spaceparser.h patterns.o: ../../../pikotools/space/space.h -patterns.o: ../../../pikotools/textstream/types.h patterns.o: ../../../pikotools/textstream/textstream.h -patterns.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +patterns.o: ../../../pikotools/space/space.h +patterns.o: ../../../pikotools/textstream/types.h +patterns.o: ../../../pikotools/date/date.h patterns.o: ../../../pikotools/convert/convert.h patterns.o: ../../../pikotools/convert/inttostr.h patterns.o: ../../../pikotools/convert/strtoint.h @@ -2333,14 +2366,13 @@ patterns.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h patterns.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h patterns.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h patterns.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -patterns.o: ../../../ezc/src/patternparser.h +patterns.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +patterns.o: ../../../winix/winixd/core/filelog.h +patterns.o: ../../../winix/winixd/core/synchro.h patterns.o: ../../../winix/winixd/core/winixbase.h patterns.o: ../../../winix/winixd/core/config.h patterns.o: ../../../winix/winixd/core/log.h -patterns.o: ../../../winix/winixd/core/textstream.h patterns.o: ../../../winix/winixd/core/logmanipulators.h -patterns.o: ../../../winix/winixd/core/filelog.h -patterns.o: ../../../winix/winixd/core/synchro.h patterns.o: ../../../winix/winixd/core/log.h patterns.o: ../../../winix/winixd/core/filelog.h patterns.o: ../../../winix/winixd/core/lock.h @@ -2354,34 +2386,34 @@ priv.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h priv.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h priv.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h priv.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -priv.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -priv.o: ../../../pikotools/space/spaceparser.h -priv.o: ../../../pikotools/space/space.h -priv.o: ../../../pikotools/textstream/types.h +priv.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h priv.o: ../../../pikotools/textstream/textstream.h -priv.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +priv.o: ../../../pikotools/space/space.h +priv.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h priv.o: ../../../pikotools/convert/convert.h priv.o: ../../../pikotools/convert/inttostr.h priv.o: ../../../pikotools/convert/strtoint.h -priv.o: ../../../pikotools/convert/text.h -priv.o: ../../../pikotools/membuffer/membuffer.h -priv.o: ../../../pikotools/textstream/types.h +priv.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +priv.o: ../../../pikotools/space/spaceparser.h +priv.o: ../../../pikotools/space/space.h priv.o: ../../../winix/winixd/core/winixbase.h priv.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -priv.o: ../../../winix/winixd/core/textstream.h priv.o: ../../../winix/winixd/core/logmanipulators.h priv.o: ../../../winix/winixd/core/filelog.h priv.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h priv.o: ../../../winix/winixd/core/filelog.h priv.o: ../../../winix/winixd/core/lock.h priv.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -priv.o: ../../../winix/winixd/core/textstream.h patterncacher.h +priv.o: ../../../winix/winixd/core/textstream.h +priv.o: ../../../pikotools/membuffer/membuffer.h +priv.o: ../../../pikotools/textstream/types.h patterncacher.h priv.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h priv.o: changepatterns.h ../../../winix/winixd/core/cur.h priv.o: ../../../winix/winixd/core/request.h priv.o: ../../../winix/winixd/core/requesttypes.h priv.o: ../../../winix/winixd/core/error.h priv.o: ../../../winix/winixd/core/config.h +priv.o: ../../../winix/winixd/core/textstream.h priv.o: ../../../winix/winixd/templates/htmltextstream.h priv.o: ../../../pikotools/space/spacetojson.h priv.o: ../../../winix/winixd/core/session.h @@ -2492,21 +2524,18 @@ rebus.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h rebus.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h rebus.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h rebus.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -rebus.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -rebus.o: ../../../pikotools/space/spaceparser.h -rebus.o: ../../../pikotools/space/space.h -rebus.o: ../../../pikotools/textstream/types.h +rebus.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h rebus.o: ../../../pikotools/textstream/textstream.h -rebus.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +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 -rebus.o: ../../../pikotools/membuffer/membuffer.h -rebus.o: ../../../pikotools/textstream/types.h +rebus.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +rebus.o: ../../../pikotools/space/spaceparser.h +rebus.o: ../../../pikotools/space/space.h rebus.o: ../../../winix/winixd/core/winixbase.h rebus.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -rebus.o: ../../../winix/winixd/core/textstream.h rebus.o: ../../../winix/winixd/core/logmanipulators.h rebus.o: ../../../winix/winixd/core/filelog.h rebus.o: ../../../winix/winixd/core/synchro.h @@ -2514,13 +2543,16 @@ rebus.o: ../../../winix/winixd/core/log.h rebus.o: ../../../winix/winixd/core/filelog.h rebus.o: ../../../winix/winixd/core/lock.h rebus.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -rebus.o: ../../../winix/winixd/core/textstream.h patterncacher.h +rebus.o: ../../../winix/winixd/core/textstream.h +rebus.o: ../../../pikotools/membuffer/membuffer.h +rebus.o: ../../../pikotools/textstream/types.h patterncacher.h rebus.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h rebus.o: changepatterns.h ../../../winix/winixd/core/cur.h rebus.o: ../../../winix/winixd/core/request.h rebus.o: ../../../winix/winixd/core/requesttypes.h rebus.o: ../../../winix/winixd/core/error.h rebus.o: ../../../winix/winixd/core/config.h +rebus.o: ../../../winix/winixd/core/textstream.h rebus.o: ../../../winix/winixd/templates/htmltextstream.h rebus.o: ../../../pikotools/space/spacetojson.h rebus.o: ../../../winix/winixd/core/session.h @@ -2584,22 +2616,19 @@ server.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h server.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h server.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h server.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -server.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -server.o: ../../../pikotools/space/spaceparser.h +server.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +server.o: ../../../pikotools/textstream/textstream.h server.o: ../../../pikotools/space/space.h server.o: ../../../pikotools/textstream/types.h -server.o: ../../../pikotools/textstream/textstream.h -server.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h -server.o: ../../../pikotools/convert/convert.h +server.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h server.o: ../../../pikotools/convert/inttostr.h server.o: ../../../pikotools/convert/strtoint.h -server.o: ../../../pikotools/convert/text.h -server.o: ../../../pikotools/membuffer/membuffer.h -server.o: ../../../pikotools/textstream/types.h +server.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +server.o: ../../../pikotools/space/spaceparser.h +server.o: ../../../pikotools/space/space.h server.o: ../../../winix/winixd/core/winixbase.h server.o: ../../../winix/winixd/core/config.h server.o: ../../../winix/winixd/core/log.h -server.o: ../../../winix/winixd/core/textstream.h server.o: ../../../winix/winixd/core/logmanipulators.h server.o: ../../../winix/winixd/core/filelog.h server.o: ../../../winix/winixd/core/synchro.h @@ -2607,13 +2636,16 @@ server.o: ../../../winix/winixd/core/log.h server.o: ../../../winix/winixd/core/filelog.h server.o: ../../../winix/winixd/core/lock.h server.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -server.o: ../../../winix/winixd/core/textstream.h patterncacher.h +server.o: ../../../winix/winixd/core/textstream.h +server.o: ../../../pikotools/membuffer/membuffer.h +server.o: ../../../pikotools/textstream/types.h patterncacher.h server.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h server.o: changepatterns.h ../../../winix/winixd/core/cur.h server.o: ../../../winix/winixd/core/request.h server.o: ../../../winix/winixd/core/requesttypes.h server.o: ../../../winix/winixd/core/error.h server.o: ../../../winix/winixd/core/config.h +server.o: ../../../winix/winixd/core/textstream.h server.o: ../../../winix/winixd/templates/htmltextstream.h server.o: ../../../pikotools/space/spacetojson.h server.o: ../../../winix/winixd/core/session.h @@ -2721,39 +2753,40 @@ server.o: ../../../winix/winixd/functions/who.h server.o: ../../../winix/winixd/functions/vim.h slog.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/cur.h slog.o: ../../../winix/winixd/core/logmanipulators.h -slog.o: ../../../winix/winixd/templates/locale.h +slog.o: ../../../pikotools/log/log.h slog.o: ../../../pikotools/textstream/textstream.h -slog.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +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 localefilter.h locale.h slog.o: ../../../pikotools/space/spaceparser.h slog.o: ../../../pikotools/space/space.h -slog.o: ../../../pikotools/textstream/types.h slog.o: ../../../winix/winixd/core/winixbase.h slog.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -slog.o: ../../../winix/winixd/core/textstream.h -slog.o: ../../../pikotools/utf8/utf8.h ../../../winix/winixd/core/filelog.h +slog.o: ../../../winix/winixd/core/filelog.h slog.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h slog.o: ../../../winix/winixd/core/filelog.h slog.o: ../../../winix/winixd/core/lock.h slog.o: ../../../winix/winixd/core/synchro.h ../../../ezc/src/ezc.h slog.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h slog.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h -slog.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -slog.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -slog.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -slog.o: ../../../ezc/src/patternparser.h htmltextstream.h -slog.o: ../../../winix/winixd/core/textstream.h +slog.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h +slog.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h +slog.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h +slog.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h +slog.o: htmltextstream.h ../../../winix/winixd/core/textstream.h slog.o: ../../../pikotools/membuffer/membuffer.h -slog.o: ../../../pikotools/textstream/types.h templates.h patterncacher.h +slog.o: ../../../pikotools/textstream/types.h +slog.o: ../../../winix/winixd/templates/locale.h templates.h patterncacher.h slog.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h slog.o: changepatterns.h ../../../winix/winixd/core/cur.h slog.o: ../../../winix/winixd/core/request.h slog.o: ../../../winix/winixd/core/requesttypes.h slog.o: ../../../winix/winixd/core/error.h slog.o: ../../../winix/winixd/core/config.h +slog.o: ../../../winix/winixd/core/textstream.h slog.o: ../../../winix/winixd/templates/htmltextstream.h slog.o: ../../../pikotools/space/spacetojson.h slog.o: ../../../winix/winixd/core/session.h @@ -2814,34 +2847,34 @@ stat.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h stat.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h stat.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h stat.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -stat.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -stat.o: ../../../pikotools/space/spaceparser.h -stat.o: ../../../pikotools/space/space.h -stat.o: ../../../pikotools/textstream/types.h +stat.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h stat.o: ../../../pikotools/textstream/textstream.h -stat.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +stat.o: ../../../pikotools/space/space.h +stat.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h stat.o: ../../../pikotools/convert/convert.h stat.o: ../../../pikotools/convert/inttostr.h stat.o: ../../../pikotools/convert/strtoint.h -stat.o: ../../../pikotools/convert/text.h -stat.o: ../../../pikotools/membuffer/membuffer.h -stat.o: ../../../pikotools/textstream/types.h +stat.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +stat.o: ../../../pikotools/space/spaceparser.h +stat.o: ../../../pikotools/space/space.h stat.o: ../../../winix/winixd/core/winixbase.h stat.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -stat.o: ../../../winix/winixd/core/textstream.h stat.o: ../../../winix/winixd/core/logmanipulators.h stat.o: ../../../winix/winixd/core/filelog.h stat.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h stat.o: ../../../winix/winixd/core/filelog.h stat.o: ../../../winix/winixd/core/lock.h stat.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -stat.o: ../../../winix/winixd/core/textstream.h patterncacher.h +stat.o: ../../../winix/winixd/core/textstream.h +stat.o: ../../../pikotools/membuffer/membuffer.h +stat.o: ../../../pikotools/textstream/types.h patterncacher.h stat.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h stat.o: changepatterns.h ../../../winix/winixd/core/cur.h stat.o: ../../../winix/winixd/core/request.h stat.o: ../../../winix/winixd/core/requesttypes.h stat.o: ../../../winix/winixd/core/error.h stat.o: ../../../winix/winixd/core/config.h +stat.o: ../../../winix/winixd/core/textstream.h stat.o: ../../../winix/winixd/templates/htmltextstream.h stat.o: ../../../pikotools/space/spacetojson.h stat.o: ../../../winix/winixd/core/session.h @@ -2907,31 +2940,31 @@ sys.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h sys.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h sys.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h sys.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -sys.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -sys.o: ../../../pikotools/space/spaceparser.h -sys.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +sys.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h sys.o: ../../../pikotools/textstream/textstream.h -sys.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h -sys.o: ../../../pikotools/convert/convert.h +sys.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +sys.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h sys.o: ../../../pikotools/convert/inttostr.h sys.o: ../../../pikotools/convert/strtoint.h -sys.o: ../../../pikotools/convert/text.h -sys.o: ../../../pikotools/membuffer/membuffer.h -sys.o: ../../../pikotools/textstream/types.h +sys.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +sys.o: ../../../pikotools/space/spaceparser.h +sys.o: ../../../pikotools/space/space.h sys.o: ../../../winix/winixd/core/winixbase.h sys.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -sys.o: ../../../winix/winixd/core/textstream.h sys.o: ../../../winix/winixd/core/logmanipulators.h sys.o: ../../../winix/winixd/core/filelog.h sys.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h sys.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h sys.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -sys.o: ../../../winix/winixd/core/textstream.h patterncacher.h +sys.o: ../../../winix/winixd/core/textstream.h +sys.o: ../../../pikotools/membuffer/membuffer.h +sys.o: ../../../pikotools/textstream/types.h patterncacher.h sys.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h sys.o: changepatterns.h ../../../winix/winixd/core/cur.h sys.o: ../../../winix/winixd/core/request.h sys.o: ../../../winix/winixd/core/requesttypes.h sys.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +sys.o: ../../../winix/winixd/core/textstream.h sys.o: ../../../winix/winixd/templates/htmltextstream.h sys.o: ../../../pikotools/space/spacetojson.h sys.o: ../../../winix/winixd/core/session.h ../../../winix/winixd/core/user.h @@ -2994,22 +3027,20 @@ template.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h template.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h template.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h template.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -template.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -template.o: ../../../pikotools/space/spaceparser.h +template.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +template.o: ../../../pikotools/textstream/textstream.h template.o: ../../../pikotools/space/space.h template.o: ../../../pikotools/textstream/types.h -template.o: ../../../pikotools/textstream/textstream.h -template.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +template.o: ../../../pikotools/date/date.h template.o: ../../../pikotools/convert/convert.h template.o: ../../../pikotools/convert/inttostr.h template.o: ../../../pikotools/convert/strtoint.h -template.o: ../../../pikotools/convert/text.h -template.o: ../../../pikotools/membuffer/membuffer.h -template.o: ../../../pikotools/textstream/types.h +template.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +template.o: ../../../pikotools/space/spaceparser.h +template.o: ../../../pikotools/space/space.h template.o: ../../../winix/winixd/core/winixbase.h template.o: ../../../winix/winixd/core/config.h template.o: ../../../winix/winixd/core/log.h -template.o: ../../../winix/winixd/core/textstream.h template.o: ../../../winix/winixd/core/logmanipulators.h template.o: ../../../winix/winixd/core/filelog.h template.o: ../../../winix/winixd/core/synchro.h @@ -3017,13 +3048,16 @@ template.o: ../../../winix/winixd/core/log.h template.o: ../../../winix/winixd/core/filelog.h template.o: ../../../winix/winixd/core/lock.h template.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -template.o: ../../../winix/winixd/core/textstream.h patterncacher.h +template.o: ../../../winix/winixd/core/textstream.h +template.o: ../../../pikotools/membuffer/membuffer.h +template.o: ../../../pikotools/textstream/types.h patterncacher.h template.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h template.o: changepatterns.h ../../../winix/winixd/core/cur.h template.o: ../../../winix/winixd/core/request.h template.o: ../../../winix/winixd/core/requesttypes.h template.o: ../../../winix/winixd/core/error.h template.o: ../../../winix/winixd/core/config.h +template.o: ../../../winix/winixd/core/textstream.h template.o: ../../../winix/winixd/templates/htmltextstream.h template.o: ../../../pikotools/space/spacetojson.h template.o: ../../../winix/winixd/core/session.h @@ -3094,22 +3128,20 @@ templates.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h templates.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h templates.o: ../../../ezc/src/outstreams.h templates.o: ../../../ezc/src/expressionparser.h -templates.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -templates.o: ../../../pikotools/space/spaceparser.h +templates.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +templates.o: ../../../pikotools/textstream/textstream.h templates.o: ../../../pikotools/space/space.h templates.o: ../../../pikotools/textstream/types.h -templates.o: ../../../pikotools/textstream/textstream.h -templates.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +templates.o: ../../../pikotools/date/date.h templates.o: ../../../pikotools/convert/convert.h templates.o: ../../../pikotools/convert/inttostr.h templates.o: ../../../pikotools/convert/strtoint.h -templates.o: ../../../pikotools/convert/text.h -templates.o: ../../../pikotools/membuffer/membuffer.h -templates.o: ../../../pikotools/textstream/types.h +templates.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +templates.o: ../../../pikotools/space/spaceparser.h +templates.o: ../../../pikotools/space/space.h templates.o: ../../../winix/winixd/core/winixbase.h templates.o: ../../../winix/winixd/core/config.h templates.o: ../../../winix/winixd/core/log.h -templates.o: ../../../winix/winixd/core/textstream.h templates.o: ../../../winix/winixd/core/logmanipulators.h templates.o: ../../../winix/winixd/core/filelog.h templates.o: ../../../winix/winixd/core/synchro.h @@ -3117,13 +3149,16 @@ templates.o: ../../../winix/winixd/core/log.h templates.o: ../../../winix/winixd/core/filelog.h templates.o: ../../../winix/winixd/core/lock.h templates.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -templates.o: ../../../winix/winixd/core/textstream.h patterncacher.h +templates.o: ../../../winix/winixd/core/textstream.h +templates.o: ../../../pikotools/membuffer/membuffer.h +templates.o: ../../../pikotools/textstream/types.h patterncacher.h templates.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h templates.o: changepatterns.h ../../../winix/winixd/core/cur.h templates.o: ../../../winix/winixd/core/request.h templates.o: ../../../winix/winixd/core/requesttypes.h templates.o: ../../../winix/winixd/core/error.h templates.o: ../../../winix/winixd/core/config.h +templates.o: ../../../winix/winixd/core/textstream.h templates.o: ../../../winix/winixd/templates/htmltextstream.h templates.o: ../../../pikotools/space/spacetojson.h templates.o: ../../../winix/winixd/core/session.h @@ -3234,22 +3269,24 @@ templates.o: ../../../winix/winixd/functions/uptime.h templates.o: ../../../winix/winixd/functions/who.h templates.o: ../../../winix/winixd/functions/vim.h textextstream.o: textextstream.h ../../../winix/winixd/core/textstream.h +textextstream.o: misc.h localefilter.h locale.h +textextstream.o: ../../../pikotools/space/spaceparser.h +textextstream.o: ../../../pikotools/space/space.h textextstream.o: ../../../pikotools/textstream/textstream.h textextstream.o: ../../../pikotools/space/space.h +textextstream.o: ../../../pikotools/textstream/types.h textextstream.o: ../../../pikotools/date/date.h textextstream.o: ../../../pikotools/convert/convert.h textextstream.o: ../../../pikotools/convert/inttostr.h textextstream.o: ../../../pikotools/convert/strtoint.h -textextstream.o: ../../../pikotools/convert/text.h misc.h localefilter.h -textextstream.o: locale.h ../../../pikotools/space/spaceparser.h -textextstream.o: ../../../pikotools/space/space.h +textextstream.o: ../../../pikotools/convert/text.h +textextstream.o: ../../../pikotools/membuffer/membuffer.h textextstream.o: ../../../pikotools/textstream/types.h textextstream.o: ../../../winix/winixd/core/winixbase.h textextstream.o: ../../../winix/winixd/core/config.h textextstream.o: ../../../winix/winixd/core/log.h -textextstream.o: ../../../winix/winixd/core/textstream.h -textextstream.o: ../../../pikotools/utf8/utf8.h textextstream.o: ../../../winix/winixd/core/logmanipulators.h +textextstream.o: ../../../pikotools/log/log.h textextstream.o: ../../../winix/winixd/core/filelog.h textextstream.o: ../../../winix/winixd/core/synchro.h textextstream.o: ../../../winix/winixd/core/log.h @@ -3258,13 +3295,11 @@ textextstream.o: ../../../winix/winixd/core/lock.h textextstream.o: ../../../winix/winixd/core/synchro.h ../../../ezc/src/ezc.h textextstream.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h textextstream.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h -textextstream.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -textextstream.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -textextstream.o: ../../../ezc/src/outstreams.h +textextstream.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h +textextstream.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h +textextstream.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h textextstream.o: ../../../ezc/src/expressionparser.h textextstream.o: ../../../ezc/src/patternparser.h htmltextstream.h -textextstream.o: ../../../pikotools/membuffer/membuffer.h -textextstream.o: ../../../pikotools/textstream/types.h upload.o: ../../../winix/winixd/core/request.h templates.h upload.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h upload.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h @@ -3272,22 +3307,19 @@ upload.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h upload.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h upload.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h upload.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -upload.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -upload.o: ../../../pikotools/space/spaceparser.h +upload.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +upload.o: ../../../pikotools/textstream/textstream.h upload.o: ../../../pikotools/space/space.h upload.o: ../../../pikotools/textstream/types.h -upload.o: ../../../pikotools/textstream/textstream.h -upload.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h -upload.o: ../../../pikotools/convert/convert.h +upload.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h upload.o: ../../../pikotools/convert/inttostr.h upload.o: ../../../pikotools/convert/strtoint.h -upload.o: ../../../pikotools/convert/text.h -upload.o: ../../../pikotools/membuffer/membuffer.h -upload.o: ../../../pikotools/textstream/types.h +upload.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +upload.o: ../../../pikotools/space/spaceparser.h +upload.o: ../../../pikotools/space/space.h upload.o: ../../../winix/winixd/core/winixbase.h upload.o: ../../../winix/winixd/core/config.h upload.o: ../../../winix/winixd/core/log.h -upload.o: ../../../winix/winixd/core/textstream.h upload.o: ../../../winix/winixd/core/logmanipulators.h upload.o: ../../../winix/winixd/core/filelog.h upload.o: ../../../winix/winixd/core/synchro.h @@ -3295,13 +3327,16 @@ upload.o: ../../../winix/winixd/core/log.h upload.o: ../../../winix/winixd/core/filelog.h upload.o: ../../../winix/winixd/core/lock.h upload.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -upload.o: ../../../winix/winixd/core/textstream.h patterncacher.h +upload.o: ../../../winix/winixd/core/textstream.h +upload.o: ../../../pikotools/membuffer/membuffer.h +upload.o: ../../../pikotools/textstream/types.h patterncacher.h upload.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h upload.o: changepatterns.h ../../../winix/winixd/core/cur.h upload.o: ../../../winix/winixd/core/request.h upload.o: ../../../winix/winixd/core/requesttypes.h upload.o: ../../../winix/winixd/core/error.h upload.o: ../../../winix/winixd/core/config.h +upload.o: ../../../winix/winixd/core/textstream.h upload.o: ../../../winix/winixd/templates/htmltextstream.h upload.o: ../../../pikotools/space/spacetojson.h upload.o: ../../../winix/winixd/core/session.h @@ -3368,22 +3403,19 @@ uptime.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h uptime.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h uptime.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h uptime.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -uptime.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -uptime.o: ../../../pikotools/space/spaceparser.h +uptime.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +uptime.o: ../../../pikotools/textstream/textstream.h uptime.o: ../../../pikotools/space/space.h uptime.o: ../../../pikotools/textstream/types.h -uptime.o: ../../../pikotools/textstream/textstream.h -uptime.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h -uptime.o: ../../../pikotools/convert/convert.h +uptime.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h uptime.o: ../../../pikotools/convert/inttostr.h uptime.o: ../../../pikotools/convert/strtoint.h -uptime.o: ../../../pikotools/convert/text.h -uptime.o: ../../../pikotools/membuffer/membuffer.h -uptime.o: ../../../pikotools/textstream/types.h +uptime.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +uptime.o: ../../../pikotools/space/spaceparser.h +uptime.o: ../../../pikotools/space/space.h uptime.o: ../../../winix/winixd/core/winixbase.h uptime.o: ../../../winix/winixd/core/config.h uptime.o: ../../../winix/winixd/core/log.h -uptime.o: ../../../winix/winixd/core/textstream.h uptime.o: ../../../winix/winixd/core/logmanipulators.h uptime.o: ../../../winix/winixd/core/filelog.h uptime.o: ../../../winix/winixd/core/synchro.h @@ -3391,13 +3423,16 @@ uptime.o: ../../../winix/winixd/core/log.h uptime.o: ../../../winix/winixd/core/filelog.h uptime.o: ../../../winix/winixd/core/lock.h uptime.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -uptime.o: ../../../winix/winixd/core/textstream.h patterncacher.h +uptime.o: ../../../winix/winixd/core/textstream.h +uptime.o: ../../../pikotools/membuffer/membuffer.h +uptime.o: ../../../pikotools/textstream/types.h patterncacher.h uptime.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h uptime.o: changepatterns.h ../../../winix/winixd/core/cur.h uptime.o: ../../../winix/winixd/core/request.h uptime.o: ../../../winix/winixd/core/requesttypes.h uptime.o: ../../../winix/winixd/core/error.h uptime.o: ../../../winix/winixd/core/config.h +uptime.o: ../../../winix/winixd/core/textstream.h uptime.o: ../../../winix/winixd/templates/htmltextstream.h uptime.o: ../../../pikotools/space/spacetojson.h uptime.o: ../../../winix/winixd/core/session.h @@ -3464,34 +3499,34 @@ user.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h user.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h user.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h user.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -user.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -user.o: ../../../pikotools/space/spaceparser.h -user.o: ../../../pikotools/space/space.h -user.o: ../../../pikotools/textstream/types.h +user.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h user.o: ../../../pikotools/textstream/textstream.h -user.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +user.o: ../../../pikotools/space/space.h +user.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h user.o: ../../../pikotools/convert/convert.h user.o: ../../../pikotools/convert/inttostr.h user.o: ../../../pikotools/convert/strtoint.h -user.o: ../../../pikotools/convert/text.h -user.o: ../../../pikotools/membuffer/membuffer.h -user.o: ../../../pikotools/textstream/types.h +user.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +user.o: ../../../pikotools/space/spaceparser.h +user.o: ../../../pikotools/space/space.h user.o: ../../../winix/winixd/core/winixbase.h user.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -user.o: ../../../winix/winixd/core/textstream.h user.o: ../../../winix/winixd/core/logmanipulators.h user.o: ../../../winix/winixd/core/filelog.h user.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h user.o: ../../../winix/winixd/core/filelog.h user.o: ../../../winix/winixd/core/lock.h user.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -user.o: ../../../winix/winixd/core/textstream.h patterncacher.h +user.o: ../../../winix/winixd/core/textstream.h +user.o: ../../../pikotools/membuffer/membuffer.h +user.o: ../../../pikotools/textstream/types.h patterncacher.h user.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h user.o: changepatterns.h ../../../winix/winixd/core/cur.h user.o: ../../../winix/winixd/core/request.h user.o: ../../../winix/winixd/core/requesttypes.h user.o: ../../../winix/winixd/core/error.h user.o: ../../../winix/winixd/core/config.h +user.o: ../../../winix/winixd/core/textstream.h user.o: ../../../winix/winixd/templates/htmltextstream.h user.o: ../../../pikotools/space/spacetojson.h user.o: ../../../winix/winixd/core/session.h @@ -3557,31 +3592,31 @@ who.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h who.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h who.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h who.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -who.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -who.o: ../../../pikotools/space/spaceparser.h -who.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +who.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h who.o: ../../../pikotools/textstream/textstream.h -who.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h -who.o: ../../../pikotools/convert/convert.h +who.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +who.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h who.o: ../../../pikotools/convert/inttostr.h who.o: ../../../pikotools/convert/strtoint.h -who.o: ../../../pikotools/convert/text.h -who.o: ../../../pikotools/membuffer/membuffer.h -who.o: ../../../pikotools/textstream/types.h +who.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +who.o: ../../../pikotools/space/spaceparser.h +who.o: ../../../pikotools/space/space.h who.o: ../../../winix/winixd/core/winixbase.h who.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -who.o: ../../../winix/winixd/core/textstream.h who.o: ../../../winix/winixd/core/logmanipulators.h who.o: ../../../winix/winixd/core/filelog.h who.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h who.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h who.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -who.o: ../../../winix/winixd/core/textstream.h patterncacher.h +who.o: ../../../winix/winixd/core/textstream.h +who.o: ../../../pikotools/membuffer/membuffer.h +who.o: ../../../pikotools/textstream/types.h patterncacher.h who.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h who.o: changepatterns.h ../../../winix/winixd/core/cur.h who.o: ../../../winix/winixd/core/request.h who.o: ../../../winix/winixd/core/requesttypes.h who.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h +who.o: ../../../winix/winixd/core/textstream.h who.o: ../../../winix/winixd/templates/htmltextstream.h who.o: ../../../pikotools/space/spacetojson.h who.o: ../../../winix/winixd/core/session.h ../../../winix/winixd/core/user.h @@ -3645,21 +3680,18 @@ winix.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h winix.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h winix.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h winix.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h -winix.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h -winix.o: ../../../pikotools/space/spaceparser.h -winix.o: ../../../pikotools/space/space.h -winix.o: ../../../pikotools/textstream/types.h +winix.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h winix.o: ../../../pikotools/textstream/textstream.h -winix.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +winix.o: ../../../pikotools/space/space.h +winix.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h winix.o: ../../../pikotools/convert/convert.h winix.o: ../../../pikotools/convert/inttostr.h winix.o: ../../../pikotools/convert/strtoint.h -winix.o: ../../../pikotools/convert/text.h -winix.o: ../../../pikotools/membuffer/membuffer.h -winix.o: ../../../pikotools/textstream/types.h +winix.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h +winix.o: ../../../pikotools/space/spaceparser.h +winix.o: ../../../pikotools/space/space.h winix.o: ../../../winix/winixd/core/winixbase.h winix.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h -winix.o: ../../../winix/winixd/core/textstream.h winix.o: ../../../winix/winixd/core/logmanipulators.h winix.o: ../../../winix/winixd/core/filelog.h winix.o: ../../../winix/winixd/core/synchro.h @@ -3667,13 +3699,16 @@ winix.o: ../../../winix/winixd/core/log.h winix.o: ../../../winix/winixd/core/filelog.h winix.o: ../../../winix/winixd/core/lock.h winix.o: ../../../winix/winixd/core/synchro.h htmltextstream.h -winix.o: ../../../winix/winixd/core/textstream.h patterncacher.h +winix.o: ../../../winix/winixd/core/textstream.h +winix.o: ../../../pikotools/membuffer/membuffer.h +winix.o: ../../../pikotools/textstream/types.h patterncacher.h winix.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h winix.o: changepatterns.h ../../../winix/winixd/core/cur.h winix.o: ../../../winix/winixd/core/request.h winix.o: ../../../winix/winixd/core/requesttypes.h winix.o: ../../../winix/winixd/core/error.h winix.o: ../../../winix/winixd/core/config.h +winix.o: ../../../winix/winixd/core/textstream.h winix.o: ../../../winix/winixd/templates/htmltextstream.h winix.o: ../../../pikotools/space/spacetojson.h winix.o: ../../../winix/winixd/core/session.h diff --git a/winixd/templates/patterncacher.cpp b/winixd/templates/patterncacher.cpp index be8684d..22d089a 100644 --- a/winixd/templates/patterncacher.cpp +++ b/winixd/templates/patterncacher.cpp @@ -125,10 +125,10 @@ void PatternCacher::CreatePattern(const Item & item, Ezc::Pattern & pattern) */ pattern_parser.AllowInclude(false); pattern_parser.DeleteWhiteTextItems(false); + pattern_parser.SetLogger(&log); pattern_parser.ParseString(item.content, pattern); RebuildCache(pattern); - } diff --git a/winixd/templates/patterns.cpp b/winixd/templates/patterns.cpp index 0d57c8d..0020ba0 100644 --- a/winixd/templates/patterns.cpp +++ b/winixd/templates/patterns.cpp @@ -145,6 +145,7 @@ void Patterns::ReadPatterns(Template & templ) */ pattern_parser.DeleteWhiteTextItems(del_white_items); pattern_parser.Directory(templates_dir, templates_dir_def); + pattern_parser.SetLogger(&log); if( ezc_blocks ) pattern_parser.SetBlocks(*ezc_blocks); diff --git a/winixd/templates/templates.cpp b/winixd/templates/templates.cpp index b8f4569..a244529 100644 --- a/winixd/templates/templates.cpp +++ b/winixd/templates/templates.cpp @@ -1185,7 +1185,6 @@ void Templates::set_dependency(WinixRequest * winix_request) TemplatesFunctions::html_filter.set_dependency(winix_request); TemplatesFunctions::log.SetDependency(&this->log); - TemplatesFunctions::log.Init(config->log_request); plugin = winix_request->get_plugin(); }