Update for bglibs v2

NEWS

@@ -1,3 +1,5 @@
+- Updated for bglibs v2
+-------------------------------------------------------------------------------
 Changes in version 2.10
 
 - Added new "rbl" plugin, to block messages from IPs in an RBL.

README.in

@@ -26,8 +26,8 @@ Development versions of @PACKAGE@ are available at:
 
 Requirements:
 
-- bglibs version 1.101
-- cvm version 0.82
+- bglibs version 2.01
+- cvm version 0.97
 - Lua version 5 or later (optional)
 
 Installation:

backend-echo.c

@@ -1,9 +1,9 @@
-#include <sysdeps.h>
+#include <bglibs/sysdeps.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <msg/msg.h>
-#include <str/iter.h>
+#include <bglibs/msg.h>
+#include <bglibs/striter.h>
 #include "mailfront.h"
 
 static response resp = { 250, 0 };

backend-qmail.c

@@ -1,12 +1,12 @@
-#include <sysdeps.h>
+#include <bglibs/sysdeps.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <misc/misc.h>
-#include <msg/msg.h>
-#include <unix/sig.h>
+#include <bglibs/misc.h>
+#include <bglibs/msg.h>
+#include <bglibs/sig.h>
 #include "mailfront.h"
 #include "conf_qmail.c"
 

backend-queuedir.c

@@ -1,14 +1,14 @@
 #include "mailfront.h"
 
-#include <sysdeps.h>
-#include <systime.h>
+#include <bglibs/sysdeps.h>
+#include <bglibs/systime.h>
 #include <errno.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include <iobuf/iobuf.h>
-#include <path/path.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/path.h>
+#include <bglibs/str.h>
 
 static str destpath;
 static str temppath;

getprotoenv.c

@@ -1,7 +1,7 @@
-#include <systime.h>
+#include <bglibs/systime.h>
 #include <stdlib.h>
-#include <msg/msg.h>
-#include <msg/wrap.h>
+#include <bglibs/msg.h>
+#include <bglibs/wrap.h>
 #include "mailfront.h"
 
 static const char* proto;

imapfront-auth.c

@@ -22,16 +22,16 @@
  * http://www.FutureQuest.net/
  * [email protected]
  */
-#include <sysdeps.h>
+#include <bglibs/sysdeps.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <cvm/sasl.h>
 #include <cvm/v2client.h>
-#include <iobuf/iobuf.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/str.h>
 
 const char program[] = "imapfront-auth";
 const int msg_show_pid = 1;

iobytes.c

@@ -15,9 +15,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <iobuf/iobuf.h>
-#include <msg/msg.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/msg.h>
+#include <bglibs/str.h>
 
 void report_io_bytes(void)
 {

mailfront-internal.h

@@ -2,7 +2,7 @@
 #define MAIL_FRONT__MAILFRONT_INTERNAL__H__
 
 #include "mailfront.h"
-#include <adt/ghash.h>
+#include <bglibs/ghash.h>
 
 struct session
 {

mailfront.c

@@ -2,10 +2,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <systime.h>
-#include <msg/msg.h>
-#include <path/path.h>
-#include <str/str.h>
+#include <bglibs/systime.h>
+#include <bglibs/msg.h>
+#include <bglibs/path.h>
+#include <bglibs/str.h>
 
 #include "mailfront-internal.h"
 

mailfront.h

@@ -2,8 +2,8 @@
 #define MAIL_FRONT__MAILFRONT__H__
 
 #include "responses.h"
-#include <iobuf/iobuf.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/str.h>
 #include "constants.h"
 
 #define FLAG_NEED_FILE (1<<0)

modules.c

@@ -1,7 +1,7 @@
 #include <dlfcn.h>
 #include <stdlib.h>
 #include <string.h>
-#include <msg/msg.h>
+#include <bglibs/msg.h>
 #include "mailfront-internal.h"
 #include "conf_modules.c"
 

netstring.c

@@ -1,5 +1,5 @@
-#include <iobuf/iobuf.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/str.h>
 #include "mailfront.h"
 
 int get_netstring_len(ibuf* in, unsigned long* i)

plugin-add-received.c

@@ -1,8 +1,8 @@
-#include <systime.h>
+#include <bglibs/systime.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <msg/msg.h>
+#include <bglibs/msg.h>
 #include "mailfront.h"
 
 static str received;

plugin-clamav.c

@@ -1,14 +1,14 @@
 #include "mailfront.h"
 
-#include <sysdeps.h>
+#include <bglibs/sysdeps.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <msg/msg.h>
-#include <net/resolve.h>
-#include <net/socket.h>
-#include <uint32.h>
+#include <bglibs/msg.h>
+#include <bglibs/resolve.h>
+#include <bglibs/socket.h>
+#include <bglibs/uint32.h>
 
 static RESPONSE(no_hostname,451,"4.3.0 Could not resolve virus scanner hostname");
 static RESPONSE(no_scan,451,"4.3.0 Could not virus scan message");

plugin-counters.c

@@ -1,7 +1,7 @@
 #include "mailfront.h"
 #include <stdlib.h>
 #include <string.h>
-#include <str/iter.h>
+#include <bglibs/striter.h>
 
 static RESPONSE(too_big, 552, "5.2.3 The message would exceed the maximum message size.");
 static RESPONSE(too_long, 552, "5.2.3 Sorry, that message exceeds the maximum message length.");

plugin-lua.c

@@ -1,7 +1,7 @@
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include <msg/msg.h>
+#include <bglibs/msg.h>
 #include "mailfront.h"
 
 static int l_msg(lua_State *L)

plugin-mailrules.c

@@ -4,11 +4,11 @@
 
 #include "mailfront.h"
 
-#include <cdb/cdb.h>
-#include <dict/dict.h>
-#include <dict/load.h>
-#include <iobuf/iobuf.h>
-#include <str/str.h>
+#include <bglibs/cdb.h>
+#include <bglibs/dict.h>
+#include <bglibs/dict.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/str.h>
 
 static RESPONSE(erropen,421,"4.3.0 Could not open $MAILRULES file");
 static RESPONSE(syntax,421,"4.3.0 Syntax error in $MAILRULES");

plugin-patterns.c

@@ -1,10 +1,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <iobuf/iobuf.h>
-#include <msg/msg.h>
-#include <msg/wrap.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/msg.h>
+#include <bglibs/wrap.h>
+#include <bglibs/str.h>
 
 #include "mailfront.h"
 

plugin-qmail-validate.c

@@ -1,10 +1,10 @@
 #include <unistd.h>
 #include "mailfront.h"
-#include <iobuf/iobuf.h>
-#include <dict/dict.h>
-#include <dict/load.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/dict.h>
+#include <bglibs/dict.h>
 #include "conf_qmail.c"
-#include <cdb/cdb.h>
+#include <bglibs/cdb.h>
 
 static RESPONSE(accept,250,0);
 static RESPONSE(no_chdir,451,"4.3.0 Could not change to the qmail directory.");

plugin-rbl.c

@@ -1,10 +1,10 @@
 #include <string.h>
 
-#include <msg/msg.h>
-#include <msg/wrap.h>
-#include <net/dns.h>
-#include <net/ipv4.h>
-#include <str/str.h>
+#include <bglibs/msg.h>
+#include <bglibs/wrap.h>
+#include <bglibs/dns.h>
+#include <bglibs/ipv4.h>
+#include <bglibs/str.h>
 
 #include "mailfront.h"
 

plugin-spamassassin.c

@@ -1,13 +1,13 @@
 #include "mailfront.h"
 
-#include <sysdeps.h>
+#include <bglibs/sysdeps.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <msg/msg.h>
-#include <net/resolve.h>
-#include <net/socket.h>
+#include <bglibs/msg.h>
+#include <bglibs/resolve.h>
+#include <bglibs/socket.h>
 
 static RESPONSE(no_hostname,451,"4.3.0 Could not resolve SpamAssassin hostname");
 static RESPONSE(no_scan,451,"4.3.0 Could not SpamAssassin scan message");

plugin-starttls-ucspi.c

@@ -1,7 +1,7 @@
 #include "mailfront.h"
 #include <stdlib.h>
 #include <unistd.h>
-#include <iobuf/iobuf.h>
+#include <bglibs/iobuf.h>
 
 static RESPONSE(start, 220, "2.0.0 Ready to start TLS");
 static RESPONSE(earlytalker, 500, "5.5.1 Unexpected pipelined commands following STARTTLS");

pop3-capa.c

@@ -23,8 +23,8 @@
  * [email protected]
  */
 #include <string.h>
-#include <iobuf/obuf.h>
-#include <str/str.h>
+#include <bglibs/obuf.h>
+#include <bglibs/str.h>
 #include <cvm/sasl.h>
 #include "pop3.h"
 

pop3-mainloop.c

@@ -24,8 +24,8 @@
  */
 #include <stdlib.h>
 #include <string.h>
-#include <iobuf/iobuf.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/str.h>
 #include "pop3.h"
 
 const int msg_show_pid = 1;

pop3-response.c

@@ -26,8 +26,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <iobuf/iobuf.h>
-#include <msg/msg.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/msg.h>
 #include "pop3.h"
 
 const char err_internal[] = "-ERR Internal error";

pop3front-auth.c

@@ -26,9 +26,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <cvm/v2client.h>
-#include <iobuf/iobuf.h>
-#include <str/iter.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/striter.h>
+#include <bglibs/str.h>
 #include <cvm/sasl.h>
 #include "pop3.h"
 

pop3front-maildir.c

@@ -29,10 +29,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <sysdeps.h>
-#include <iobuf/iobuf.h>
-#include <msg/msg.h>
-#include <str/str.h>
+#include <bglibs/sysdeps.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/msg.h>
+#include <bglibs/str.h>
 #include "pop3.h"
 
 typedef struct

protocol-qmqp.c

@@ -2,10 +2,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <systime.h>
-#include <iobuf/iobuf.h>
-#include <msg/msg.h>
-#include <str/str.h>
+#include <bglibs/systime.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/msg.h>
+#include <bglibs/str.h>
 
 #include "mailfront.h"
 #include "qmtp.h"

protocol-qmtp.c

@@ -2,10 +2,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <systime.h>
-#include <iobuf/iobuf.h>
-#include <msg/msg.h>
-#include <str/str.h>
+#include <bglibs/systime.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/msg.h>
+#include <bglibs/str.h>
 
 #include "mailfront.h"
 #include "qmtp.h"