Kill Travis

[solanum.git] / bandb / bantool.c

diff --git a/bandb/bantool.c b/bandb/bantool.c
index a3af93cc8fe6d5d5c704c2014dc12f5edd223d07..5563a4a921af2ef2b97cbf73da72c524c291f0cb 100644 (file)
--- a/bandb/bantool.c
+++ b/bandb/bantool.c
@@ -40,11 +40,9 @@
 #include <time.h>
 
 #include "stdinc.h"
-#include "common.h"
 #include "rsdb.h"
 
 #define EmptyString(x) ((x == NULL) || (*(x) == '\0'))
-#define CheckEmpty(x) EmptyString(x) ? "" : x
 
 #define BT_VERSION "0.4.1"
 
@@ -120,7 +118,7 @@ static void db_reclaim_slack(void);
 static void export_config(const char *conf, int id);
 static void import_config(const char *conf, int id);
 static void check_schema(void);
-static void print_help(int i_exit);
+static void print_help(int i_exit) __attribute__((noreturn));
 static void wipe_schema(void);
 static void drop_dupes(const char *user, const char *host, const char *t);
 
@@ -198,7 +196,7 @@ main(int argc, char *argv[])
                rb_strlcpy(etc, ETCPATH, sizeof(ETCPATH));
 
        fprintf(stdout,
-               "* charybdis bantool v.%s\n", BT_VERSION);
+               "* solanum bantool v.%s\n", BT_VERSION);
 
        if(flag.pretend == false)
        {
@@ -232,8 +230,11 @@ main(int argc, char *argv[])
        /* checking for our files to import or export */
        for(i = 0; i < LAST_BANDB_TYPE; i++)
        {
-               snprintf(conf, sizeof(conf), "%s/%s.conf%s",
-                           etc, bandb_table[i], bandb_suffix[i]);
+               if (snprintf(conf, sizeof(conf), "%s/%s.conf%s",
+                           etc, bandb_table[i], bandb_suffix[i]) >= sizeof(conf)) {
+                       fprintf(stderr, "* Error: Config filename too long\n");
+                       exit(EXIT_FAILURE);
+               }
 
                if(flag.import && flag.pretend == false)
                        rsdb_transaction(RSDB_TRANS_START);
@@ -742,7 +743,7 @@ check_schema(void)
                NULL
        };
 
-       for(i = 0; i < LAST_BANDB_TYPE; i++)
+       for(i = 0; i < LAST_BANDB_TYPE; i += 2 /* skip over _PERM */)
        {
                if(!table_exists(bandb_table[i]))
                {
@@ -769,8 +770,6 @@ check_schema(void)
                                          columns[j], type);
                        }
                }
-
-               i++;            /* skip over .perm */
        }
 }
 
@@ -808,17 +807,16 @@ table_has_rows(const char *dbtab)
 }
 
 /**
- * completly wipes out an existing ban.db of all entries.
+ * completely wipes out an existing ban.db of all entries.
  */
 static void
 wipe_schema(void)
 {
        int i;
        rsdb_transaction(RSDB_TRANS_START);
-       for(i = 0; i < LAST_BANDB_TYPE; i++)
+       for(i = 0; i < LAST_BANDB_TYPE; i += 2 /* double increment to skip over _PERM */)
        {
                rsdb_exec(NULL, "DROP TABLE %s", bandb_table[i]);
-               i++;            /* double increment to skip over .perm */
        }
        rsdb_transaction(RSDB_TRANS_END);
 
@@ -866,7 +864,7 @@ bt_smalldate(const char *string)
 void
 print_help(int i_exit)
 {
-       fprintf(stderr, "bantool v.%s - the charybdis database tool.\n", BT_VERSION);
+       fprintf(stderr, "bantool v.%s - the solanum database tool.\n", BT_VERSION);
        fprintf(stderr, "Copyright (C) 2008 Daniel J Reidy <dubkat@gmail.com>\n");
        fprintf(stderr, "This program is distributed in the hope that it will be useful,\n"
                "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -882,15 +880,15 @@ print_help(int i_exit)
        fprintf(stderr, "       -s : Reclaim empty slack space the database may be taking up.\n");
        fprintf(stderr, "       -u : Update the database tables to support any new features.\n");
        fprintf(stderr,
-               "            This is automaticlly done if you are importing or exporting\n");
+               "            This is automatically done if you are importing or exporting\n");
        fprintf(stderr, "            but should be run whenever you upgrade the ircd.\n");
        fprintf(stderr,
                "       -p : pretend, checks for the configs, and parses them, then tells you some data...\n");
        fprintf(stderr, "            but does not touch your database.\n");
        fprintf(stderr,
                "       -v : Be verbose... and it *is* very verbose! (intended for debugging)\n");
-       fprintf(stderr, "       -d : Enable checking for redunant entries.\n");
-       fprintf(stderr, "       -w : Completly wipe your database clean. May be used with -i \n");
+       fprintf(stderr, "       -d : Enable checking for redundant entries.\n");
+       fprintf(stderr, "       -w : Completely wipe your database clean. May be used with -i \n");
        fprintf(stderr,
                "     path : An optional directory containing old ratbox configs for import, or export.\n");
        fprintf(stderr, "            If not specified, it looks in PREFIX/etc.\n");