Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: adchpp: [96] adchpp/trunk
|
From: <arn...@us...> - 2007-11-25 21:44:38
|
Revision: 96
http://adchpp.svn.sourceforge.net/adchpp/?rev=96&view=rev
Author: arnetheduck
Date: 2007-11-25 13:44:36 -0800 (Sun, 25 Nov 2007)
Log Message:
-----------
Add simple gettext support, fix settings
Modified Paths:
--------------
adchpp/trunk/SConstruct
adchpp/trunk/adchpp/ClientManager.cpp
adchpp/trunk/adchpp/ClientManager.h
adchpp/trunk/adchpp/Exception.h
adchpp/trunk/adchpp/ManagedSocket.h
adchpp/trunk/adchpp/SConscript
adchpp/trunk/adchpp/SettingsManager.cpp
adchpp/trunk/adchpp/SettingsManager.h
adchpp/trunk/adchpp/SocketManager.cpp
adchpp/trunk/adchpp/SocketManager.h
adchpp/trunk/adchpp/adchpp.h
adchpp/trunk/build_util.py
adchpp/trunk/unix/SConscript
adchpp/trunk/unix/main.cpp
Added Paths:
-----------
adchpp/trunk/adchpp/forward.h
adchpp/trunk/intl/
adchpp/trunk/intl/COPYING.LIB-2.0
adchpp/trunk/intl/COPYING.LIB-2.1
adchpp/trunk/intl/SConscript
adchpp/trunk/intl/bindtextdom.c
adchpp/trunk/intl/config.h
adchpp/trunk/intl/dcgettext.c
adchpp/trunk/intl/dcigettext.c
adchpp/trunk/intl/dcngettext.c
adchpp/trunk/intl/dgettext.c
adchpp/trunk/intl/dngettext.c
adchpp/trunk/intl/eval-plural.h
adchpp/trunk/intl/explodename.c
adchpp/trunk/intl/finddomain.c
adchpp/trunk/intl/gettext.c
adchpp/trunk/intl/gettextP.h
adchpp/trunk/intl/gmo.h
adchpp/trunk/intl/hash-string.c
adchpp/trunk/intl/hash-string.h
adchpp/trunk/intl/intl-compat.c
adchpp/trunk/intl/l10nflist.c
adchpp/trunk/intl/langprefs.c
adchpp/trunk/intl/libgnuintl.h
adchpp/trunk/intl/libgnuintl.h.in
adchpp/trunk/intl/libintl.h
adchpp/trunk/intl/loadinfo.h
adchpp/trunk/intl/loadmsgcat.c
adchpp/trunk/intl/localcharset.c
adchpp/trunk/intl/localcharset.h
adchpp/trunk/intl/locale.alias
adchpp/trunk/intl/localealias.c
adchpp/trunk/intl/localename.c
adchpp/trunk/intl/lock.c
adchpp/trunk/intl/lock.h
adchpp/trunk/intl/log.c
adchpp/trunk/intl/ngettext.c
adchpp/trunk/intl/plural-exp.c
adchpp/trunk/intl/plural-exp.h
adchpp/trunk/intl/plural.c
adchpp/trunk/intl/plural.y
adchpp/trunk/intl/printf-args.c
adchpp/trunk/intl/printf-args.h
adchpp/trunk/intl/printf-parse.c
adchpp/trunk/intl/printf-parse.h
adchpp/trunk/intl/printf.c
adchpp/trunk/intl/relocatable.c
adchpp/trunk/intl/relocatable.h
adchpp/trunk/intl/textdomain.c
adchpp/trunk/intl/vasnprintf.c
adchpp/trunk/intl/vasnprintf.h
adchpp/trunk/intl/vasnwprintf.h
adchpp/trunk/intl/version.c
adchpp/trunk/intl/wprintf-parse.h
adchpp/trunk/intl/xsize.h
adchpp/trunk/unix/po/
adchpp/trunk/unix/po/adchppd.pot
Modified: adchpp/trunk/SConstruct
===================================================================
--- adchpp/trunk/SConstruct 2007-11-19 14:20:21 UTC (rev 95)
+++ adchpp/trunk/SConstruct 2007-11-25 21:44:36 UTC (rev 96)
@@ -72,6 +72,7 @@
BoolOption('nativestl', 'Use native STL instead of STLPort', 'yes'),
BoolOption('verbose', 'Show verbose command lines', 'no'),
BoolOption('savetemps', 'Save intermediate compilation files (assembly output)', 'no'),
+ BoolOption('nls', 'Build with internationalization support', 'yes'),
('prefix', 'Prefix to use when cross compiling', 'i386-mingw32-')
)
@@ -153,6 +154,63 @@
)
env.Append(SCANNERS=[SWIGScanner])
+#
+# internationalization (taken from the ardour build files (ardour.org)
+#
+
+# po_builder: builder function to copy po files to the parent directory while updating them
+#
+# first source: .po file
+# second source: .pot file
+#
+
+def po_builder(target,source,env):
+ args = [ 'msgmerge',
+ '--update',
+ str(target[0]),
+ str(source[0])
+ ]
+ print 'Updating ' + str(target[0])
+ return os.spawnvp (os.P_WAIT, 'msgmerge', args)
+
+po_bld = Builder (action = po_builder)
+env.Append(BUILDERS = {'PoBuild' : po_bld})
+
+# mo_builder: builder function for (binary) message catalogs (.mo)
+#
+# first source: .po file
+#
+def mo_builder(target,source,env):
+ args = [ 'msgfmt',
+ '-c',
+ '-o',
+ target[0].get_path(),
+ source[0].get_path()
+ ]
+ return os.spawnvp (os.P_WAIT, 'msgfmt', args)
+
+mo_bld = Builder (action = mo_builder)
+env.Append(BUILDERS = {'MoBuild' : mo_bld})
+
+# pot_builder: builder function for message templates (.pot)
+#
+# source: list of C/C++ etc. files to extract messages from
+#
+def pot_builder(target,source,env):
+ args = [ 'xgettext',
+ '--keyword=_',
+ '--keyword=N_',
+ '--from-code=UTF-8',
+ '-o', target[0].get_path(),
+ '--foreign-user',
+ '--package-name="adchpp"'
+ '--copyright-holder="Jacek Sieka"' ]
+ args += [ src.get_path() for src in source ]
+ return os.spawnvp (os.P_WAIT, 'xgettext', args)
+
+pot_bld = Builder (action = pot_builder)
+env.Append(BUILDERS = {'PotBuild' : pot_bld})
+
conf = Configure(env)
if conf.CheckCHeader('sys/epoll.h'):
@@ -164,6 +222,8 @@
env = conf.Finish()
+dev.intl = dev.build('intl/')
+
dev.adchpp = dev.build('adchpp/')
if dev.is_win32():
Modified: adchpp/trunk/adchpp/ClientManager.cpp
===================================================================
--- adchpp/trunk/adchpp/ClientManager.cpp 2007-11-19 14:20:21 UTC (rev 95)
+++ adchpp/trunk/adchpp/ClientManager.cpp 2007-11-25 21:44:36 UTC (rev 96)
@@ -40,50 +40,50 @@
ClientManager::ClientManager() throw() {
supports.push_back("BASE");
supports.push_back("TIGR");
+
+ SocketManager::getInstance()->setIncomingHandler(&Client::create);
}
ClientManager::~ClientManager() throw() {
-
+
}
void ClientManager::send(const AdcCommand& cmd, bool lowPrio /* = false */) throw() {
const string& txt = cmd.toString();
- switch(cmd.getType()) {
- case AdcCommand::TYPE_FEATURE:
- case AdcCommand::TYPE_BROADCAST:
- {
- bool all = (cmd.getType() == AdcCommand::TYPE_BROADCAST);
- FastMutex::Lock l(ManagedSocket::getWriteMutex());
- for(ClientIter i = clients.begin(); i != clients.end(); ++i) {
- if(all || !i->second->isFiltered(cmd.getFeatures()))
- i->second->fastSend(txt, lowPrio);
- }
+ switch (cmd.getType()) {
+ case AdcCommand::TYPE_FEATURE:
+ case AdcCommand::TYPE_BROADCAST: {
+ bool all = (cmd.getType() == AdcCommand::TYPE_BROADCAST);
+ FastMutex::Lock l(ManagedSocket::getWriteMutex());
+ for (ClientIter i = clients.begin(); i != clients.end(); ++i) {
+ if (all || !i->second->isFiltered(cmd.getFeatures()))
+ i->second->fastSend(txt, lowPrio);
}
+ }
SocketManager::getInstance()->addAllWriters();
break;
- case AdcCommand::TYPE_DIRECT: // Fallthrough
- case AdcCommand::TYPE_ECHO:
- {
- ClientIter i = clients.find(cmd.getTo());
- if(i != clients.end()) {
+ case AdcCommand::TYPE_DIRECT: // Fallthrough
+ case AdcCommand::TYPE_ECHO: {
+ ClientIter i = clients.find(cmd.getTo());
+ if (i != clients.end()) {
+ i->second->send(txt);
+ if (COMPATIBILITY || cmd.getType() == AdcCommand::TYPE_ECHO) {
+ i = clients.find(cmd.getFrom());
+ if (i != clients.end()) {
i->second->send(txt);
- if(COMPATIBILITY || cmd.getType() == AdcCommand::TYPE_ECHO) {
- i = clients.find(cmd.getFrom());
- if(i != clients.end()) {
- i->second->send(txt);
- }
- }
}
}
- break;
+ }
}
+ break;
+ }
}
void ClientManager::sendToAll(const string& cmd) throw() {
{
FastMutex::Lock l(ManagedSocket::getWriteMutex());
- for(ClientIter i = clients.begin(); i != clients.end(); ++i) {
+ for (ClientIter i = clients.begin(); i != clients.end(); ++i) {
i->second->fastSend(cmd);
}
}
@@ -92,9 +92,9 @@
size_t ClientManager::getQueuedBytes() throw() {
size_t total = 0;
-
+
FastMutex::Lock l(ManagedSocket::getWriteMutex());
- for(ClientIter i = clients.begin(); i != clients.end(); ++i) {
+ for (ClientIter i = clients.begin(); i != clients.end(); ++i) {
total += i->second->getQueuedBytes();
}
return total;
@@ -102,7 +102,7 @@
void ClientManager::sendTo(const AdcCommand& cmd, const uint32_t& to) throw() {
ClientIter i = clients.find(to);
- if(i != clients.end()) {
+ if (i != clients.end()) {
i->second->send(cmd.toString());
}
}
@@ -110,36 +110,33 @@
void ClientManager::updateCache() throw() {
// Update static strings...
AdcCommand s(AdcCommand::CMD_SUP);
- for(StringIter i = supports.begin(); i != supports.end(); ++i)
+ for (StringIter i = supports.begin(); i != supports.end(); ++i)
s.addParam("AD" + *i);
strings.sup = s.toString();
strings.inf = AdcCommand(AdcCommand::CMD_INF)
- .addParam("NI", SETTING(HUB_NAME))
- .addParam("HI1")
- .addParam("DE", SETTING(DESCRIPTION))
- .addParam("VE", versionString)
- .addParam("CT5")
- .addParam("HU1") // ADC <=0.13
- .toString();
+ .addParam("NI", SETTING(HUB_NAME))
+ .addParam("HI1")
+ .addParam("DE", SETTING(DESCRIPTION))
+ .addParam("VE", versionString)
+ .addParam("CT5")
+ .addParam("HU1") // ADC <=0.13
+ .toString();
}
bool ClientManager::checkFlooding(Client& c, const AdcCommand& cmd) throw() {
- time_t add = ((cmd.getType() == AdcCommand::TYPE_BROADCAST || cmd.getType() == AdcCommand::TYPE_FEATURE) ? 1 : 0) * SETTING(FLOOD_ADD);
- if(c.isFlooding(add)) {
+ time_t add = ((cmd.getType() == AdcCommand::TYPE_BROADCAST || cmd.getType() == AdcCommand::TYPE_FEATURE) ? 1 : 0)
+ * SETTING(FLOOD_ADD);
+ if (c.isFlooding(add)) {
c.disconnect(Util::REASON_FLOODING);
return true;
}
-
+
return false;
}
-void ClientManager::incomingConnection(const ManagedSocketPtr& ms) throw() {
- Client::create(ms);
-}
-
uint32_t ClientManager::makeSID() {
- while(true) {
+ while (true) {
union {
uint32_t sid;
char chars[4];
@@ -148,7 +145,7 @@
sid.chars[1] = Encoder::base32Alphabet[Util::rand(sizeof(Encoder::base32Alphabet))];
sid.chars[2] = Encoder::base32Alphabet[Util::rand(sizeof(Encoder::base32Alphabet))];
sid.chars[3] = Encoder::base32Alphabet[Util::rand(sizeof(Encoder::base32Alphabet))];
- if(sids.find(sid.sid) == sids.end()) {
+ if (sids.find(sid.sid) == sids.end()) {
sids.insert(sid.sid);
return sid.sid;
}
@@ -157,8 +154,8 @@
void ClientManager::onConnected(Client& c) throw() {
// First let's check if any clients have passed the login timeout...
- time_t timeout = GET_TIME() - SETTING(LOGIN_TIMEOUT);
- while(!logins.empty() && (timeout > logins.front().second) ) {
+ time_t timeout= GET_TIME() - SETTING(LOGIN_TIMEOUT);
+ while (!logins.empty() && (timeout > logins.front().second)) {
Client* cc = logins.front().first;
dcdebug("ClientManager: Login timeout in state %d\n", cc->getState());
@@ -173,31 +170,26 @@
void ClientManager::onReceive(Client& c, AdcCommand& cmd) throw() {
int override = 0;
- if(!(
- cmd.getType() == AdcCommand::TYPE_BROADCAST ||
- cmd.getType() == AdcCommand::TYPE_DIRECT ||
- cmd.getType() == AdcCommand::TYPE_ECHO ||
- cmd.getType() == AdcCommand::TYPE_FEATURE ||
- cmd.getType() == AdcCommand::TYPE_HUB))
- {
+ if (!(cmd.getType() == AdcCommand::TYPE_BROADCAST || cmd.getType() == AdcCommand::TYPE_DIRECT || cmd.getType()
+ == AdcCommand::TYPE_ECHO || cmd.getType() == AdcCommand::TYPE_FEATURE || cmd.getType() == AdcCommand::TYPE_HUB)) {
c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_PROTOCOL_GENERIC, "Invalid command type"));
c.disconnect(Util::REASON_INVALID_COMMAND_TYPE);
return;
}
- if(checkFlooding(c, cmd)) {
+ if (checkFlooding(c, cmd)) {
return;
}
-
+
signalReceive_(c, cmd, override);
- if(!(override & DONT_DISPATCH)) {
- if(!dispatch(c, cmd)) {
+ if (!(override & DONT_DISPATCH)) {
+ if (!dispatch(c, cmd)) {
return;
}
}
-
- if(!(override & DONT_SEND)) {
+
+ if (!(override & DONT_SEND)) {
send(cmd);
}
}
@@ -209,24 +201,24 @@
void ClientManager::badState(Client& c, const AdcCommand& cmd) throw() {
c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_BAD_STATE, "Invalid state for command").addParam("FC", cmd.toString().substr(0, 4)));
c.disconnect(Util::REASON_BAD_STATE);
-}
+}
bool ClientManager::handleDefault(Client& c, AdcCommand& cmd) throw() {
- if(c.getState() != Client::STATE_NORMAL) {
+ if (c.getState() != Client::STATE_NORMAL) {
badState(c, cmd);
return false;
- }
- return true;
+ }
+ return true;
}
bool ClientManager::handle(AdcCommand::SUP, Client& c, AdcCommand& cmd) throw() {
- if(!verifySUP(c, cmd)) {
+ if (!verifySUP(c, cmd)) {
return false;
}
- if(c.getState() == Client::STATE_PROTOCOL) {
+ if (c.getState() == Client::STATE_PROTOCOL) {
enterIdentify(c, true);
- } else if(c.getState() != Client::STATE_NORMAL) {
+ } else if (c.getState() != Client::STATE_NORMAL) {
badState(c, cmd);
return false;
}
@@ -235,97 +227,100 @@
bool ClientManager::verifySUP(Client& c, AdcCommand& cmd) throw() {
c.updateSupports(cmd);
- if(!c.supports("BASE")) {
- if(COMPATIBILITY && c.supports("BAS0")) {
+ if (!c.supports("BASE")) {
+ if (COMPATIBILITY && c.supports("BAS0")) {
c.send(AdcCommand(AdcCommand::CMD_MSG).addParam("Your client only supports an experimental version of ADC, please upgrade as soon as possible as you will not be able to connect in the future"));
} else {
- c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_PROTOCOL_GENERIC, "This hub requires BASE support"));
+ c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_PROTOCOL_GENERIC,
+ "This hub requires BASE support"));
c.disconnect(Util::REASON_NO_BASE_SUPPORT);
}
}
-
- if(c.supports("BASE") && !c.supports("TIGR")) {
- if(COMPATIBILITY) {
+
+ if (c.supports("BASE") && !c.supports("TIGR")) {
+ if (COMPATIBILITY) {
// ADC <= 0.13
c.send(AdcCommand(AdcCommand::CMD_MSG).addParam("Your client claims to support BASE but not TIGR, please upgrade as soon as possible"));
} else {
- c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_PROTOCOL_GENERIC, "This hub requires TIGR support"));
+ c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_PROTOCOL_GENERIC,
+ "This hub requires TIGR support"));
c.disconnect(Util::REASON_NO_TIGR_SUPPORT);
}
}
-
+
return true;
}
bool ClientManager::verifyINF(Client& c, AdcCommand& cmd) throw() {
- if(!verifyIp(c, cmd))
+ if (!verifyIp(c, cmd))
return false;
- if(!verifyCID(c, cmd))
+ if (!verifyCID(c, cmd))
return false;
- if(!verifyNick(c, cmd))
+ if (!verifyNick(c, cmd))
return false;
c.updateFields(cmd);
return true;
}
-bool ClientManager::verifyPassword(Client& c, const string& password, const vector<uint8_t>& salt, const string& suppliedHash) {
+bool ClientManager::verifyPassword(Client& c, const string& password, const vector<uint8_t>& salt,
+ const string& suppliedHash) {
TigerHash tiger;
tiger.update(&password[0], password.size());
tiger.update(&salt[0], salt.size());
uint8_t tmp[TigerHash::HASH_SIZE];
Encoder::fromBase32(suppliedHash.c_str(), tmp, TigerHash::HASH_SIZE);
- if(memcmp(tiger.finalize(), tmp, TigerHash::HASH_SIZE) == 0)
+ if (memcmp(tiger.finalize(), tmp, TigerHash::HASH_SIZE) == 0)
return true;
-
- if(!COMPATIBILITY)
+
+ if (!COMPATIBILITY)
return false;
-
+
TigerHash tiger2;
// Support dc++ 0.69 for a while
string cid = c.getCID().toBase32();
tiger2.update(c.getCID().data(), CID::SIZE);
tiger2.update(&password[0], password.size());
tiger2.update(&salt[0], salt.size());
- if(memcmp(tiger2.finalize(), tmp, TigerHash::HASH_SIZE) == 0) {
+ if (memcmp(tiger2.finalize(), tmp, TigerHash::HASH_SIZE) == 0) {
c.send(AdcCommand(AdcCommand::CMD_MSG).addParam("Your client uses an old PAS encoding, please upgrade"));
return true;
}
- return false;
+ return false;
}
bool ClientManager::handle(AdcCommand::INF, Client& c, AdcCommand& cmd) throw() {
- if(c.getState() != Client::STATE_IDENTIFY && c.getState() != Client::STATE_NORMAL) {
+ if (c.getState() != Client::STATE_IDENTIFY && c.getState() != Client::STATE_NORMAL) {
badState(c, cmd);
return false;
}
-
- if(!verifyINF(c, cmd))
+
+ if (!verifyINF(c, cmd))
return false;
- if(c.getState() == Client::STATE_IDENTIFY) {
+ if (c.getState() == Client::STATE_IDENTIFY) {
enterNormal(c, true, false);
}
-
+
return true;
}
bool ClientManager::verifyIp(Client& c, AdcCommand& cmd) throw() {
- if(c.isSet(Client::FLAG_OK_IP))
+ if (c.isSet(Client::FLAG_OK_IP))
return true;
-
- for(StringIter j = cmd.getParameters().begin(); j != cmd.getParameters().end(); ++j) {
- if(j->compare(0, 2, "I4") == 0) {
+
+ for (StringIter j = cmd.getParameters().begin(); j != cmd.getParameters().end(); ++j) {
+ if (j->compare(0, 2, "I4") == 0) {
dcdebug("%s verifying ip\n", AdcCommand::fromSID(c.getSID()).c_str());
- if(j->size() == 2) {
+ if (j->size() == 2) {
// Clearing is ok
- } else if(j->compare(2, j->size()-2, "0.0.0.0") == 0) {
+ } else if (j->compare(2, j->size()-2, "0.0.0.0") == 0) {
c.setField("I4", c.getIp());
*j = "I4" + c.getIp();
cmd.resetString();
- } else if(j->size()-2 != c.getIp().size() || j->compare(2, j->size()-2, c.getIp()) != 0) {
+ } else if (j->size()-2 != c.getIp().size() || j->compare(2, j->size()-2, c.getIp()) != 0) {
c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_BAD_IP, "Your ip is " + c.getIp()).addParam("IP", c.getIp()));
c.disconnect(Util::REASON_INVALID_IP);
return false;
@@ -336,41 +331,41 @@
}
bool ClientManager::verifyCID(Client& c, AdcCommand& cmd) throw() {
- if(cmd.getParam("ID", 0, strtmp)) {
+ if (cmd.getParam("ID", 0, strtmp)) {
dcdebug("%s verifying CID\n", AdcCommand::fromSID(c.getSID()).c_str());
- if(c.getState() != Client::STATE_IDENTIFY) {
+ if (c.getState() != Client::STATE_IDENTIFY) {
c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_PROTOCOL_GENERIC, "CID changes not allowed"));
c.disconnect(Util::REASON_CID_CHANGE);
- return false;
+ return false;
}
-
+
string spid;
- if(!cmd.getParam("PD", 0, spid)) {
+ if (!cmd.getParam("PD", 0, spid)) {
c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_INF_MISSING, "PID missing").addParam("FLPD"));
c.disconnect(Util::REASON_PID_MISSING);
return false;
}
-
- if(strtmp.size() != CID::BASE32_SIZE || spid.size() != CID::BASE32_SIZE) {
+
+ if (strtmp.size() != CID::BASE32_SIZE || spid.size() != CID::BASE32_SIZE) {
c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_PROTOCOL_GENERIC, "Invalid CID/PID length"));
c.disconnect(Util::REASON_PID_CID_LENGTH);
return false;
- }
-
+ }
+
CID cid(strtmp);
CID pid(spid);
TigerHash th;
th.update(pid.data(), CID::SIZE);
- if(!(CID(th.finalize()) == cid)) {
+ if (!(CID(th.finalize()) == cid)) {
c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_INVALID_PID, "PID does not correspond to CID"));
c.disconnect(Util::REASON_PID_CID_MISMATCH);
return false;
}
CIDMap::iterator i = cids.find(cid);
- if(i != cids.end()) {
+ if (i != cids.end()) {
ClientIter j = clients.find(i->second);
- if(j != clients.end()) {
+ if (j != clients.end()) {
j->second->send("\n");
}
c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_CID_TAKEN, "CID taken, please try again later"));
@@ -382,8 +377,8 @@
cids.insert(make_pair(c.getCID(), c.getSID()));
cmd.delParam("PD", 0);
}
-
- if(cmd.getParam("PD", 0, strtmp)) {
+
+ if (cmd.getParam("PD", 0, strtmp)) {
c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_PROTOCOL_GENERIC, "CID required when sending PID"));
c.disconnect(Util::REASON_PID_WITHOUT_CID);
return false;
@@ -392,21 +387,22 @@
}
bool ClientManager::verifyNick(Client& c, const AdcCommand& cmd) throw() {
- if(cmd.getParam("NI", 0, strtmp)) {
+ if (cmd.getParam("NI", 0, strtmp)) {
dcdebug("%s verifying nick\n", AdcCommand::fromSID(c.getSID()).c_str());
- for(string::size_type i = 0; i < strtmp.length(); ++i) {
- if((uint8_t)strtmp[i] < 33) {
+ for (string::size_type i = 0; i < strtmp.length(); ++i) {
+ if ((uint8_t)strtmp[i] < 33) {
c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_NICK_INVALID, "Invalid character in nick"));
c.disconnect(Util::REASON_NICK_INVALID);
return false;
}
}
const string& oldNick = c.getField("NI");
- if(!oldNick.empty())
+ if (!oldNick.empty())
nicks.erase(oldNick);
-
- if(nicks.find(strtmp) != nicks.end()) {
- c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_NICK_TAKEN, "Nick taken, please pick another one"));
+
+ if (nicks.find(strtmp) != nicks.end()) {
+ c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_NICK_TAKEN,
+ "Nick taken, please pick another one"));
c.disconnect(Util::REASON_NICK_TAKEN);
return false;
}
@@ -426,7 +422,7 @@
void ClientManager::enterIdentify(Client& c, bool sendData) throw() {
dcassert(c.getState() == Client::STATE_PROTOCOL);
dcdebug("%s entering IDENTIFY\n", AdcCommand::fromSID(c.getSID()).c_str());
- if(sendData) {
+ if (sendData) {
c.send(strings.sup);
c.send(AdcCommand(AdcCommand::CMD_SID).addParam(AdcCommand::fromSID(c.getSID())));
c.send(strings.inf);
@@ -438,8 +434,8 @@
dcassert(c.getState() == Client::STATE_IDENTIFY);
dcdebug("%s entering VERIFY\n", AdcCommand::fromSID(c.getSID()).c_str());
vector<uint8_t> challenge;
- if(sendData) {
- for(int i = 0; i < 32/4; ++i) {
+ if (sendData) {
+ for (int i = 0; i < 32/4; ++i) {
uint32_t r = Util::rand();
challenge.insert(challenge.end(), (uint8_t*)&r, 4 + (uint8_t*)&r);
}
@@ -453,13 +449,13 @@
dcassert(c.getState() == Client::STATE_IDENTIFY || c.getState() == Client::STATE_VERIFY);
dcdebug("%s entering NORMAL\n", AdcCommand::fromSID(c.getSID()).c_str());
- if(sendData) {
+ if (sendData) {
string str;
- for(ClientIter i = clients.begin(); i != clients.end(); ++i) {
+ for (ClientIter i = clients.begin(); i != clients.end(); ++i) {
str += i->second->getINF();
}
c.send(str);
- if(sendOwnInf) {
+ if (sendOwnInf) {
sendToAll(c.getINF());
c.send(c.getINF());
}
@@ -474,8 +470,9 @@
}
void ClientManager::removeLogins(Client& c) throw() {
- deque<pair<Client*, time_t> >::iterator i = find_if(logins.begin(), logins.end(), CompareFirst<Client*, time_t>(&c));
- if(i != logins.end()) {
+ deque<pair<Client*, time_t> >::iterator i =
+ find_if(logins.begin(), logins.end(), CompareFirst<Client*, time_t>(&c));
+ if (i != logins.end()) {
logins.erase(i);
}
}
@@ -483,7 +480,7 @@
void ClientManager::removeClient(Client& c) throw() {
signalDisconnected_(c);
dcdebug("Removing %s\n", AdcCommand::fromSID(c.getSID()).c_str());
- if(c.getState() == Client::STATE_NORMAL) {
+ if (c.getState() == Client::STATE_NORMAL) {
clients.erase(c.getSID());
sendToAll(AdcCommand(AdcCommand::CMD_QUI).addParam(AdcCommand::fromSID(c.getSID())));
} else {
@@ -495,9 +492,9 @@
}
void ClientManager::addSupports(const string& str) throw() {
- if(find(supports.begin(), supports.end(), str) != supports.end())
+ if (find(supports.begin(), supports.end(), str) != supports.end())
return;
-
+
supports.push_back(str);
updateCache();
sendToAll(AdcCommand(AdcCommand::CMD_SUP).addParam("AD" + str));
@@ -505,7 +502,7 @@
void ClientManager::removeSupports(const string& str) throw() {
StringIter i = find(supports.begin(), supports.end(), str);
- if(i != supports.end()) {
+ if (i != supports.end()) {
supports.erase(i);
updateCache();
sendToAll(AdcCommand(AdcCommand::CMD_SUP).addParam("RM" + str));
@@ -519,11 +516,11 @@
uint32_t ClientManager::getSID(const CID& cid) const throw() {
CIDMap::const_iterator i = cids.find(cid);
- return (i == cids.end()) ? 0 : i->second;
+ return (i == cids.end()) ? 0 : i->second;
}
void ClientManager::shutdown() {
-
+
}
void ClientManager::onFailed(Client& c) throw() {
Modified: adchpp/trunk/adchpp/ClientManager.h
===================================================================
--- adchpp/trunk/adchpp/ClientManager.h 2007-11-19 14:20:21 UTC (rev 95)
+++ adchpp/trunk/adchpp/ClientManager.h 2007-11-25 21:44:36 UTC (rev 96)
@@ -146,12 +146,6 @@
ADCHPP_DLL size_t getQueuedBytes() throw();
- /**
- * The SocketManager calls this when a new connection has been accepted.
- * Don't touch.
- */
- void incomingConnection(const ManagedSocketPtr& ms) throw();
-
void startup() throw() { updateCache(); }
void shutdown();
Modified: adchpp/trunk/adchpp/Exception.h
===================================================================
--- adchpp/trunk/adchpp/Exception.h 2007-11-19 14:20:21 UTC (rev 95)
+++ adchpp/trunk/adchpp/Exception.h 2007-11-25 21:44:36 UTC (rev 96)
@@ -50,7 +50,7 @@
#define STANDARD_EXCEPTION(name) class ADCHPP_VISIBLE name : public Exception { \
public:\
name() throw() : Exception() { } \
- name(const string& aError) throw() : Exception(aError) { } \
+ name(const std::string& aError) throw() : Exception(aError) { } \
virtual ~name() throw() { } \
}
#endif
Modified: adchpp/trunk/adchpp/ManagedSocket.h
===================================================================
--- adchpp/trunk/adchpp/ManagedSocket.h 2007-11-19 14:20:21 UTC (rev 95)
+++ adchpp/trunk/adchpp/ManagedSocket.h 2007-11-25 21:44:36 UTC (rev 96)
@@ -20,6 +20,8 @@
#define ADCHPP_MANAGEDSOCKET_H
#include "common.h"
+
+#include "forward.h"
#include "Socket.h"
#include "Mutex.h"
#include "Signal.h"
@@ -27,9 +29,6 @@
namespace adchpp {
-class SocketManager;
-class Writer;
-
/**
* An asynchronous socket managed by SocketManager.
*/
@@ -113,8 +112,6 @@
ADCHPP_DLL static FastMutex writeMutex;
};
-typedef boost::intrusive_ptr<ManagedSocket> ManagedSocketPtr;
-
}
#endif // MANAGEDSOCKET_H
Modified: adchpp/trunk/adchpp/SConscript
===================================================================
--- adchpp/trunk/adchpp/SConscript 2007-11-19 14:20:21 UTC (rev 95)
+++ adchpp/trunk/adchpp/SConscript 2007-11-25 21:44:36 UTC (rev 96)
@@ -53,5 +53,5 @@
if env['PLATFORM'] != 'win32':
dev.env.Append(RPATH = env.Literal('\\$$ORIGIN'))
-
+
Return('ret')
Modified: adchpp/trunk/adchpp/SettingsManager.cpp
===================================================================
--- adchpp/trunk/adchpp/SettingsManager.cpp 2007-11-19 14:20:21 UTC (rev 95)
+++ adchpp/trunk/adchpp/SettingsManager.cpp 2007-11-25 21:44:36 UTC (rev 96)
@@ -42,9 +42,6 @@
"MaxSendSize", "MaxBufferSize", "BufferSize", "MaxCommandSize",
"OverflowTimeout", "DisconnectTimeout", "FloodAdd", "FloodThreshold",
"LoginTimeout",
- "SENTRY",
- // Int64
-
"SENTRY"
};
Modified: adchpp/trunk/adchpp/SettingsManager.h
===================================================================
--- adchpp/trunk/adchpp/SettingsManager.h 2007-11-19 14:20:21 UTC (rev 95)
+++ adchpp/trunk/adchpp/SettingsManager.h 2007-11-25 21:44:36 UTC (rev 96)
@@ -38,7 +38,6 @@
enum StrSetting { STR_FIRST,
HUB_NAME = STR_FIRST, SERVER_IP, LOG_FILE, DESCRIPTION,
- LANGUAGE_FILE,
STR_LAST };
enum IntSetting { INT_FIRST = STR_LAST + 1,
Modified: adchpp/trunk/adchpp/SocketManager.cpp
===================================================================
--- adchpp/trunk/adchpp/SocketManager.cpp 2007-11-19 14:20:21 UTC (rev 95)
+++ adchpp/trunk/adchpp/SocketManager.cpp 2007-11-25 21:44:36 UTC (rev 96)
@@ -22,7 +22,6 @@
#include "LogManager.h"
#include "TimerManager.h"
-#include "ClientManager.h"
#include "SettingsManager.h"
#include "Semaphores.h"
#include "ManagedSocket.h"
@@ -338,8 +337,7 @@
active.insert(ms);
accepting.erase(ms);
- ClientManager::getInstance()->incomingConnection(ms);
-
+ SocketManager::getInstance()->incomingHandler(ms);
ms->completeAccept();
prepareRead(ms);
@@ -801,7 +799,7 @@
active.insert(ms);
- ClientManager::getInstance()->incomingConnection(ms);
+ SocketManager::getInstance()->incomingHandler(ms);
ms->completeAccept();
@@ -1045,5 +1043,4 @@
writer->getErrors(acceptErrors_, readErrors_, writeErrors_);
}
-
}
Modified: adchpp/trunk/adchpp/SocketManager.h
===================================================================
--- adchpp/trunk/adchpp/SocketManager.h 2007-11-19 14:20:21 UTC (rev 95)
+++ adchpp/trunk/adchpp/SocketManager.h 2007-11-25 21:44:36 UTC (rev 96)
@@ -19,6 +19,9 @@
#ifndef ADCHPP_SOCKETMANAGER_H
#define ADCHPP_SOCKETMANAGER_H
+#include "common.h"
+
+#include "forward.h"
#include "Thread.h"
#include "Semaphores.h"
#include "Mutex.h"
@@ -26,9 +29,6 @@
namespace adchpp {
-class ManagedSocket;
-class Writer;
-
class SocketManager : public Singleton<SocketManager>, public Thread {
public:
typedef std::tr1::function<void()> Callback;
@@ -41,6 +41,9 @@
void addDisconnect(const boost::intrusive_ptr<ManagedSocket>& ms) throw();
void addAllWriters() throw();
+ typedef std::tr1::function<void (const ManagedSocketPtr&)> IncomingHandler;
+ void setIncomingHandler(const IncomingHandler& handler) { incomingHandler = handler; }
+
typedef std::tr1::unordered_map<int, size_t> ErrorMap;
ADCHPP_DLL void getErrors(ErrorMap& acceptErrors_, ErrorMap& readErrors_, ErrorMap& writeErrors_);
private:
@@ -59,6 +62,7 @@
Semaphore processSem;
std::auto_ptr<Writer> writer;
+ IncomingHandler incomingHandler;
static const std::string className;
Modified: adchpp/trunk/adchpp/adchpp.h
===================================================================
--- adchpp/trunk/adchpp/adchpp.h 2007-11-19 14:20:21 UTC (rev 95)
+++ adchpp/trunk/adchpp/adchpp.h 2007-11-25 21:44:36 UTC (rev 96)
@@ -151,4 +151,10 @@
# endif
#endif
+// TODO Maybe do this in the implementations?
+#ifndef _
+#define _(String) String
+#define bindtextdomain(Package, Directory)
+#endif
+
#endif // STDINC_H
Added: adchpp/trunk/adchpp/forward.h
===================================================================
--- adchpp/trunk/adchpp/forward.h (rev 0)
+++ adchpp/trunk/adchpp/forward.h 2007-11-25 21:44:36 UTC (rev 96)
@@ -0,0 +1,13 @@
+#ifndef FORWARD_H_
+#define FORWARD_H_
+
+namespace adchpp {
+class ManagedSocket;
+typedef boost::intrusive_ptr<ManagedSocket> ManagedSocketPtr;
+
+class SocketManager;
+class Writer;
+
+}
+
+#endif /*FORWARD_H_*/
Modified: adchpp/trunk/build_util.py
===================================================================
--- adchpp/trunk/build_util.py 2007-11-19 14:20:21 UTC (rev 95)
+++ adchpp/trunk/build_util.py 2007-11-25 21:44:36 UTC (rev 96)
@@ -1,5 +1,6 @@
import glob
import sys
+import os
class Dev:
def __init__(self, mode, tools, env):
@@ -40,6 +41,7 @@
self.env['PROGSUFFIX'] = '.exe'
self.env['LIBPREFIX'] = 'lib'
self.env['LIBSUFFIX'] = '.a'
+ self.env['SHLIBSUFFIX'] = '.dll'
def is_win32(self):
return sys.platform == 'win32' or 'mingw' in self.env['TOOLS']
@@ -72,6 +74,24 @@
full_path = local_env.Dir('.').path + '/' + source_path
return local_env.SConscript(source_path + 'SConscript', exports={'dev' : self, 'source_path' : full_path })
+ def i18n (self, source_path, buildenv, sources, name):
+ p_oze = glob.glob('po/*.po')
+ languages = [ os.path.basename(po).replace ('.po', '') for po in p_oze ]
+ potfile = 'po/' + name + '.pot'
+
+ ret = buildenv.PotBuild(potfile, sources)
+
+ for po_file in p_oze:
+ buildenv.Precious(buildenv.PoBuild(po_file, [potfile]))
+# mo_file = po_file.replace (".po", ".mo")
+# installenv.Alias ('install', buildenv.MoBuild (mo_file, po_file))
+
+# for lang in languages:
+# modir = (os.path.join (install_prefix, 'share/locale/' + lang + '/LC_MESSAGES/'))
+# moname = domain + '.mo'
+# installenv.Alias('install', installenv.InstallAs (os.path.join (modir, moname), lang + '.mo'))
+ return ret
+
def CheckPKGConfig(context, version):
context.Message( 'Checking for pkg-config... ' )
ret = context.TryAction('pkg-config --atleast-pkgconfig-version=%s' % version)[0]
Added: adchpp/trunk/intl/COPYING.LIB-2.0
===================================================================
--- adchpp/trunk/intl/COPYING.LIB-2.0 (rev 0)
+++ adchpp/trunk/intl/COPYING.LIB-2.0 2007-11-25 21:44:36 UTC (rev 96)
@@ -0,0 +1,482 @@
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL. It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it. You can use it for
+your libraries, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library. If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software. To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+ Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs. This
+license, the GNU Library General Public License, applies to certain
+designated libraries. This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+ The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it. Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program. However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+ Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries. We
+concluded that weaker conditions might promote sharing better.
+
+ However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves. This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them. (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.) The hope is that this
+will lead to faster development of free libraries.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+ Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License"). Each licensee is
+addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ c) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ d) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ Appendix: How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
Added: adchpp/trunk/intl/COPYING.LIB-2.1
===================================================================
--- adchpp/trunk/intl/COPYING.LIB-2.1 (rev 0)
+++ adchpp/trunk/intl/COPYING.LIB-2.1 2007-11-25 21:44:36 UTC (rev 96)
@@ -0,0 +1,516 @@
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library a...
[truncated message content] |
