tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

updated to the new Pikotools API

Browse Source 
git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1071 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2018-01-06 18:12:53 +00:00
parent 3eff400d88
commit ccf78dcb02
48 changed files with 766 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
winixd/templates/Makefile.dep
+115 -28
View File
@@ -14,6 +14,8 @@ adduser.o: ../../../pikotools/textstream/textstream.h
adduser.o: ../../../pikotools/space/space.h ../../../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 htmltextstream.h
adduser.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -92,16 +94,18 @@ changepatterns.o: ../../../pikotools/space/space.h
changepatterns.o: ../../../pikotools/date/date.h
changepatterns.o: ../../../pikotools/convert/convert.h
changepatterns.o: ../../../pikotools/convert/inttostr.h
changepatterns.o: ../../../pikotools/membuffer/membuffer.h
changepatterns.o: ../../../pikotools/textstream/types.h localefilter.h
changepatterns.o: ../../../pikotools/convert/strtoint.h
changepatterns.o: ../../../pikotools/convert/text.h misc.h localefilter.h
changepatterns.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
changepatterns.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
changepatterns.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
changepatterns.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
changepatterns.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
changepatterns.o: ../../../ezc/src/outstreams.h
changepatterns.o: ../../../ezc/src/patternparser.h misc.h htmltextstream.h
changepatterns.o: ../../../ezc/src/patternparser.h htmltextstream.h
changepatterns.o: ../../../winix/winixd/core/textstream.h
changepatterns.o: ../../../pikotools/membuffer/membuffer.h
changepatterns.o: ../../../pikotools/textstream/types.h
changepatterns.o: ../../../winix/winixd/core/log.h
changepatterns.o: ../../../winix/winixd/core/textstream.h
changepatterns.o: ../../../winix/winixd/core/logmanipulators.h
@@ -122,6 +126,8 @@ 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
config.o: ../../../pikotools/membuffer/membuffer.h
config.o: ../../../pikotools/textstream/types.h htmltextstream.h
config.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -204,6 +210,8 @@ currentdate.o: ../../../pikotools/space/space.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 htmltextstream.h
currentdate.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -334,6 +342,8 @@ 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/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 htmltextstream.h
dir.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -453,6 +463,8 @@ 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/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 htmltextstream.h
doc.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -526,6 +538,8 @@ 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/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 htmltextstream.h
env.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -647,6 +661,8 @@ filters.o: ../../../pikotools/textstream/textstream.h
filters.o: ../../../pikotools/space/space.h ../../../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 htmltextstream.h
filters.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -731,6 +747,8 @@ generic.o: ../../../pikotools/textstream/textstream.h
generic.o: ../../../pikotools/space/space.h ../../../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 htmltextstream.h
generic.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -812,6 +830,8 @@ htmltextstream.o: ../../../pikotools/space/space.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: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
@@ -836,9 +856,11 @@ indexpatterns.o: ../../../pikotools/space/space.h
indexpatterns.o: ../../../pikotools/date/date.h
indexpatterns.o: ../../../pikotools/convert/convert.h
indexpatterns.o: ../../../pikotools/convert/inttostr.h
indexpatterns.o: ../../../pikotools/membuffer/membuffer.h
indexpatterns.o: ../../../pikotools/textstream/types.h localefilter.h misc.h
indexpatterns.o: ../../../pikotools/convert/strtoint.h
indexpatterns.o: ../../../pikotools/convert/text.h misc.h localefilter.h
indexpatterns.o: htmltextstream.h ../../../winix/winixd/core/textstream.h
indexpatterns.o: ../../../pikotools/membuffer/membuffer.h
indexpatterns.o: ../../../pikotools/textstream/types.h
indexpatterns.o: ../../../winix/winixd/core/log.h
indexpatterns.o: ../../../winix/winixd/core/textstream.h
indexpatterns.o: ../../../winix/winixd/core/logmanipulators.h
@@ -859,6 +881,8 @@ 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/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 htmltextstream.h
insert.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -943,6 +967,8 @@ ipban.o: ../../../pikotools/textstream/textstream.h
ipban.o: ../../../pikotools/space/space.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 htmltextstream.h
ipban.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -1069,6 +1095,8 @@ item.o: ../../../pikotools/textstream/textstream.h
item.o: ../../../pikotools/space/space.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 htmltextstream.h
item.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -1149,6 +1177,8 @@ last.o: ../../../pikotools/textstream/textstream.h
last.o: ../../../pikotools/space/space.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 htmltextstream.h
last.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -1221,6 +1251,15 @@ 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/convert/inttostr.h
locale.o: ../../../pikotools/convert/strtoint.h
locale.o: ../../../pikotools/convert/text.h misc.h localefilter.h
locale.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
locale.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
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/patternparser.h
locale.o: htmltextstream.h ../../../winix/winixd/core/textstream.h
locale.o: ../../../pikotools/membuffer/membuffer.h
locale.o: ../../../pikotools/textstream/types.h
locale.o: ../../../winix/winixd/core/log.h
@@ -1228,9 +1267,8 @@ locale.o: ../../../winix/winixd/core/textstream.h
locale.o: ../../../winix/winixd/core/logmanipulators.h
locale.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/cur.h
locale.o: ../../../winix/winixd/templates/locale.h
locale.o: ../../../winix/winixd/core/misc.h ../../../ezc/src/item.h
locale.o: ../../../winix/winixd/core/misc.h
locale.o: ../../../winix/winixd/core/requesttypes.h
locale.o: ../../../pikotools/utf8/utf8.h
locale.o: ../../../winix/winixd/core/winix_const.h
localefilter.o: localefilter.h locale.h
localefilter.o: ../../../pikotools/space/spaceparser.h
@@ -1241,14 +1279,18 @@ localefilter.o: ../../../pikotools/space/space.h
localefilter.o: ../../../pikotools/date/date.h
localefilter.o: ../../../pikotools/convert/convert.h
localefilter.o: ../../../pikotools/convert/inttostr.h
localefilter.o: ../../../pikotools/convert/strtoint.h
localefilter.o: ../../../pikotools/convert/text.h misc.h
localefilter.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
localefilter.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
localefilter.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
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/patternparser.h htmltextstream.h
localefilter.o: ../../../winix/winixd/core/textstream.h
localefilter.o: ../../../pikotools/membuffer/membuffer.h
localefilter.o: ../../../pikotools/textstream/types.h ../../../ezc/src/ezc.h
localefilter.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
localefilter.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h
localefilter.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h
localefilter.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
localefilter.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h
localefilter.o: ../../../ezc/src/patternparser.h ../core/misc.h
localefilter.o: ../../../pikotools/textstream/types.h ../core/misc.h
localefilter.o: ../../../winix/winixd/core/requesttypes.h
localefilter.o: ../../../winix/winixd/core/winix_const.h
login.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
@@ -1265,6 +1307,8 @@ login.o: ../../../pikotools/textstream/textstream.h
login.o: ../../../pikotools/space/space.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 htmltextstream.h
login.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -1388,6 +1432,7 @@ 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/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 htmltextstream.h
ls.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -1458,6 +1503,8 @@ 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/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 htmltextstream.h
man.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -1577,6 +1624,8 @@ misc.o: ../../../pikotools/textstream/textstream.h
misc.o: ../../../pikotools/space/space.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 htmltextstream.h
misc.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -1657,6 +1706,8 @@ miscspace.o: ../../../pikotools/textstream/textstream.h
miscspace.o: ../../../pikotools/space/space.h ../../../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 htmltextstream.h
miscspace.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -1740,6 +1791,8 @@ mount.o: ../../../pikotools/textstream/textstream.h
mount.o: ../../../pikotools/space/space.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 htmltextstream.h
mount.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -1823,6 +1876,8 @@ 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/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 htmltextstream.h
passwd.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -1899,6 +1954,8 @@ patterncacher.o: ../../../pikotools/textstream/types.h
patterncacher.o: ../../../pikotools/textstream/textstream.h
patterncacher.o: ../../../pikotools/convert/convert.h
patterncacher.o: ../../../pikotools/convert/inttostr.h
patterncacher.o: ../../../pikotools/convert/strtoint.h
patterncacher.o: ../../../pikotools/convert/text.h
patterncacher.o: ../../../pikotools/membuffer/membuffer.h
patterncacher.o: ../../../pikotools/textstream/types.h ../../../ezc/src/ezc.h
patterncacher.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
@@ -1921,15 +1978,17 @@ patterns.o: ../../../pikotools/textstream/textstream.h
patterns.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
patterns.o: ../../../pikotools/convert/convert.h
patterns.o: ../../../pikotools/convert/inttostr.h
patterns.o: ../../../pikotools/membuffer/membuffer.h
patterns.o: ../../../pikotools/textstream/types.h localefilter.h
patterns.o: ../../../pikotools/convert/strtoint.h
patterns.o: ../../../pikotools/convert/text.h misc.h localefilter.h
patterns.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
patterns.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
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/patternparser.h
patterns.o: misc.h htmltextstream.h ../../../winix/winixd/core/textstream.h
patterns.o: htmltextstream.h ../../../winix/winixd/core/textstream.h
patterns.o: ../../../pikotools/membuffer/membuffer.h
patterns.o: ../../../pikotools/textstream/types.h
patterns.o: ../../../winix/winixd/core/log.h
patterns.o: ../../../winix/winixd/core/textstream.h
patterns.o: ../../../winix/winixd/core/logmanipulators.h
@@ -1949,6 +2008,8 @@ priv.o: ../../../pikotools/textstream/textstream.h
priv.o: ../../../pikotools/space/space.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 htmltextstream.h
priv.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -2075,6 +2136,8 @@ 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
rebus.o: ../../../pikotools/membuffer/membuffer.h
rebus.o: ../../../pikotools/textstream/types.h htmltextstream.h
rebus.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -2154,6 +2217,8 @@ 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/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 htmltextstream.h
server.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -2274,18 +2339,20 @@ slog.o: ../../../pikotools/textstream/textstream.h
slog.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
slog.o: ../../../pikotools/convert/convert.h
slog.o: ../../../pikotools/convert/inttostr.h
slog.o: ../../../pikotools/membuffer/membuffer.h
slog.o: ../../../pikotools/textstream/types.h templates.h
slog.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
slog.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
slog.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
slog.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
slog.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
slog.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h misc.h
slog.o: localefilter.h locale.h ../../../pikotools/space/spaceparser.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 htmltextstream.h
slog.o: ../../../winix/winixd/core/textstream.h patterncacher.h
slog.o: ../../../pikotools/textstream/types.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 ../../../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/patternparser.h htmltextstream.h
slog.o: ../../../winix/winixd/core/textstream.h
slog.o: ../../../pikotools/membuffer/membuffer.h
slog.o: ../../../pikotools/textstream/types.h templates.h patterncacher.h
slog.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
slog.o: changepatterns.h ../../../winix/winixd/core/config.h
slog.o: ../../../winix/winixd/core/htmlfilter.h
@@ -2356,6 +2423,8 @@ stat.o: ../../../pikotools/textstream/textstream.h
stat.o: ../../../pikotools/space/space.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 htmltextstream.h
stat.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -2434,6 +2503,8 @@ 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/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 htmltextstream.h
sys.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -2558,6 +2629,8 @@ template.o: ../../../pikotools/textstream/textstream.h
template.o: ../../../pikotools/space/space.h ../../../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 htmltextstream.h
template.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -2643,6 +2716,8 @@ templates.o: ../../../pikotools/textstream/textstream.h
templates.o: ../../../pikotools/space/space.h ../../../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 htmltextstream.h
templates.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -2774,6 +2849,8 @@ textextstream.o: ../../../pikotools/space/space.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
textextstream.o: ../../../pikotools/membuffer/membuffer.h
textextstream.o: ../../../pikotools/textstream/types.h ../../../ezc/src/ezc.h
textextstream.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
@@ -2797,6 +2874,8 @@ 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/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 htmltextstream.h
upload.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -2878,6 +2957,8 @@ 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/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 htmltextstream.h
uptime.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -2958,6 +3039,8 @@ user.o: ../../../pikotools/textstream/textstream.h
user.o: ../../../pikotools/space/space.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 htmltextstream.h
user.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -3036,6 +3119,8 @@ 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/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 htmltextstream.h
who.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@@ -3111,6 +3196,8 @@ winix.o: ../../../pikotools/textstream/textstream.h
winix.o: ../../../pikotools/space/space.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 htmltextstream.h
winix.o: ../../../winix/winixd/core/textstream.h patterncacher.h
winixd/templates/Makefile.o.dep
+1 -1
View File
@@ -1 +1 @@
o = adduser.o changepatterns.o config.o currentdate.o dir.o doc.o env.o filters.o generic.o htmltextstream.o indexpatterns.o insert.o ipban.o item.o last.o locale.o localefilter.o login.o ls.o man.o misc.o miscspace.o mount.o passwd.o patterncacher.o patterns.o priv.o rebus.o server.o slog.o stat.o sys.o template.o templates.o textextstream.o upload.o uptime.o user.o who.o winix.o
o = adduser.o changepatterns.o config.o currentdate.o dir.o doc.o env.o filters.o generic.o htmltextstream.o indexpatterns.o insert.o ipban.o item.o last.o locale.o localefilter.o login.o ls.o man.o misc.o miscspace.o mount.o passwd.o patterncacher.o patterns.o priv.o rebus.o server.o slog.o stat.o sys.o template.o templates.o textextstream.o upload.o uptime.o user.o who.o winix.o
winixd/templates/locale.cpp
+12 -11
View File
@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -112,9 +112,7 @@ bool read = false;
file_name += '/';
file_name += file;
loc_parser.SplitSingle(true);
loc_parser.SetSpace(temp_space);
PT::SpaceParser::Status status = loc_parser.Parse(file_name);
if( status == PT::SpaceParser::ok )
@@ -135,7 +133,7 @@ return read;
void Locale::AddLocale(const char * file)
{
std::wstring * id_str = temp_space.GetValue(L"winix_locale_id");
std::wstring * id_str = temp_space.GetFirstValue(L"winix_locale_id");
if( !id_str )
{
@@ -186,16 +184,19 @@ bool read = false;
file_name += '/';
file_name += "substitute";
loc_parser.SplitSingle(true);
loc_parser.SetSpace(temp_space);
if( loc_parser.Parse(file_name) == PT::SpaceParser::ok )
{
read = true;
CreateSubstVector(subst_url, temp_space.table_single[L"url_original"], temp_space.table_single[L"url_changeto"]);
CreateSubstVector(subst_smalllet, temp_space.table_single[L"smallleters"], temp_space.table_single[L"capitalics"]);
CreateSubstVector(subst_capitallet, temp_space.table_single[L"capitalics"], temp_space.table_single[L"smallleters"]);
CreateSubstSortVector(subst_sort, temp_space.table[L"sort"]);
CreateSubstVector(subst_url, temp_space.Text(L"url_original"), temp_space.Text(L"url_changeto"));
CreateSubstVector(subst_smalllet, temp_space.Text(L"smallleters"), temp_space.Text(L"capitalics"));
CreateSubstVector(subst_capitallet, temp_space.Text(L"capitalics"), temp_space.Text(L"smallleters"));
std::vector<std::wstring> * sort_vec = temp_space.GetValue(L"sort");
if( sort_vec )
CreateSubstSortVector(subst_sort, *sort_vec);
log << log3 << "Locale: read characters substitution tables from: " << file_name << logend;
}
@@ -360,7 +361,7 @@ const std::wstring * Locale::GetKeyInLanguage(const std::wstring & key, size_t l
size_t index = locale_indices[lang_id];
if( index < locale_tab.size() )
return locale_tab[index].GetValue(key);
return locale_tab[index].GetFirstValue(key);
}
return 0;
@@ -581,7 +582,7 @@ const std::wstring & Locale::GetByIndex(const std::wstring & key, size_t index,
{
if( index < locale_tab.size() )
{
const std::wstring * value = locale_tab[index].GetValue(key);
const std::wstring * value = locale_tab[index].GetFirstValue(key);
if( value )
return *value;
winixd/templates/misc.cpp
+2 -2
View File
@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -143,7 +143,7 @@ void print_date_nice(Info & i, const PT::Date & date)
// cannot be a const reference at the moment (PT::Space is used)
void print_user_name(Info & i, User & user)
{
std::wstring * dname = user.aenv.GetValue(L"display_name");
std::wstring * dname = user.aenv.GetFirstValue(L"display_name");
if( dname && !IsWhite(*dname, true) )
i.out << *dname;
winixd/templates/miscspace.cpp
+2 -2
View File
@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2012-2016, Tomasz Sowa
* Copyright (c) 2012-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -155,7 +155,7 @@ void space_value(Info & i, PT::Space & space, bool escape)
if( space_info.last_space )
{
const std::wstring & param = i.params.back().str;
const std::wstring * value = space_info.last_space->GetValue(param);
const std::wstring * value = space_info.last_space->GetFirstValue(param);
if( value )
{