diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-03-20 13:13:59 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-03-20 13:13:59 +0000 |
commit | 057cf311da3e5b53078cc92aa6f3ab62b82040ba (patch) | |
tree | 6f54d59776afa8dad71b6d172a504eefe04f9e72 /mflib | |
parent | f49b5fd0ca133ab5dab4f715ed5d7921b8ddd9df (diff) | |
download | mailfromd-057cf311da3e5b53078cc92aa6f3ab62b82040ba.tar.gz mailfromd-057cf311da3e5b53078cc92aa6f3ab62b82040ba.tar.bz2 |
Update
git-svn-id: file:///svnroot/mailfromd/trunk@1300 7a8a7f39-df28-0410-adc6-e0d955640f24
Diffstat (limited to 'mflib')
-rw-r--r-- | mflib/safedb.mf | 9 | ||||
-rw-r--r-- | mflib/strip_domain_part.mf | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mflib/safedb.mf b/mflib/safedb.mf index 3ed6babb..94b72797 100644 --- a/mflib/safedb.mf +++ b/mflib/safedb.mf @@ -18,21 +18,22 @@ #include_once <status.mfh> -func safedbget(string name, string key) returns string +func safedbget(string name, string key ; string defval, number null) + returns string do catch dbfailure do return "" done - return dbget(%name, %key) + return dbget(%name, %key, %defval, %null) done -func safedbput(string name, string key, string value) +func safedbput(string name, string key, string value ; number null) do catch dbfailure do return done - dbput(%name, %key, %value) + dbput(%name, %key, %value, %null) done diff --git a/mflib/strip_domain_part.mf b/mflib/strip_domain_part.mf index c6f8f920..13c7bbec 100644 --- a/mflib/strip_domain_part.mf +++ b/mflib/strip_domain_part.mf @@ -22,7 +22,7 @@ func strip_domain_part(string domain, number n) returns string do if %n = 0 return domainpart %domain - elif domainpart(%domain) matches '.*((\.[^.]+){' $2 '})' + elif domainpart(%domain) matches '.*((\.[^.]+){' %n '})' return substring(\1, 1, -1) else return %domain |