integrate db_check() into the main function and remove src/db_rawcheck.c

Makefile

@@ -27,9 +27,9 @@ BUILDFLAGS=-O2 $(STACK_PROT) $(ADD_LNKFLAGS)
 DOCFILES_TO_INST=AUTHORS CHANGELOG HISTORY README.md INSTALL LICENSE database/usenet.db_struct database/mysql_db_struct.sql
 MANPAGES=docs/wendzelnntpd.8 docs/wendzelnntpadm.8
 
-all : wendzelnntpadm main.o db_rawcheck.o log.o database.o cdpstrings.o server.o lexyacc charstack.o libfunc.o acl.o db_abstraction.o hash.o $(SQLITEOBJ) $(MYSQLOBJ) $(POSTGRESOBJ) $(OPENSSLOBJ) globals.o
+all : wendzelnntpadm main.o log.o database.o cdpstrings.o server.o lexyacc charstack.o libfunc.o acl.o db_abstraction.o hash.o $(SQLITEOBJ) $(MYSQLOBJ) $(POSTGRESOBJ) $(OPENSSLOBJ) globals.o
 	expr `cat build` \+ 1 >build
-	$(CC) $(DEBUG) $(BUILDFLAGS) -o bin/wendzelnntpd main.o log.o server.o lex.yy.o config.tab.o database.o globals.o cdpstrings.o db_rawcheck.o acl.o db_abstraction.o hash.o $(SQLITEOBJ) $(MYSQLOBJ) $(POSTGRESOBJ) charstack.o libfunc.o $(OPENSSLOBJ) $(SOLNETLIBS) $(SQLITELIB) $(MYSQLLIB) $(POSTGRESLIB) $(LIBDIRS) $(SOLNETLIBS) $(GCCLOCALPTHREAD) $(LIBPTHREAD) $(LIBMHASH) $(OPENSSLLIB)
+	$(CC) $(DEBUG) $(BUILDFLAGS) -o bin/wendzelnntpd main.o log.o server.o lex.yy.o config.tab.o database.o globals.o cdpstrings.o acl.o db_abstraction.o hash.o $(SQLITEOBJ) $(MYSQLOBJ) $(POSTGRESOBJ) charstack.o libfunc.o $(OPENSSLOBJ) $(SOLNETLIBS) $(SQLITELIB) $(MYSQLLIB) $(POSTGRESLIB) $(LIBDIRS) $(SOLNETLIBS) $(GCCLOCALPTHREAD) $(LIBPTHREAD) $(LIBMHASH) $(OPENSSLLIB)
 	#strip bin/wendzelnntpd
 
 lexyacc : lex.yy.o config.tab.o
@@ -54,9 +54,6 @@ log.o : $(SRC)/log.c $(HEADERS)
 libfunc.o : $(SRC)/libfunc.c $(HEADERS)
 	$(CC) $(DEBUG) $(BUILD) $(CFLAGS) $(INCDIRS) $<
 
-db_rawcheck.o : $(SRC)/db_rawcheck.c $(HEADERS)
-	$(CC) $(DEBUG) $(BUILD) $(CFLAGS) $(INCDIRS) $<
-
 acl.o : $(SRC)/acl.c $(HEADERS)
 	$(CC) $(DEBUG) $(BUILD) $(CFLAGS) $(INCDIRS) $<
 

build

@@ -1 +1 @@
-3243
+3245

src/include/main.h

@@ -572,9 +572,6 @@ void onxxdebug(char *str);
 void onxxdebugm(char *str, ...);
 void logstr(char *, int, char *, char *);
 
-/* db_rawcheck.c */
-void check_db(void);
-
 /* libfunc.c */
 #if defined(__WIN32__) || defined(NOSUPPORT_STRNDUP)
 char *strndup(char *, int);

src/main.c

@@ -29,6 +29,9 @@ extern short global_mode;
 extern sig_atomic_t rec_sighup;    //SIGHUP has been sent to process - global.c
 extern sig_atomic_t rec_sigterm;   //SIGTERM (KILL) has been sent to process - global.c
 
+extern unsigned short dbase;	/* from config.y */
+extern short be_verbose;
+
 /* need this global for server.c */
 struct sockaddr_in sa;
 struct sockaddr_in6 sa6;
@@ -49,6 +52,44 @@ usage_(void)
 					"-v     print the version and exit\n");
 }
 
+static void
+check_db(void)
+{
+	server_cb_inf inf;
+
+	if (!(inf.servinf = (serverinfo_t *) calloc(1, sizeof(serverinfo_t)))) {
+		fprintf(stderr, "Unable to allocate memory");
+		exit(ERR_EXIT);
+	}
+
+	/* Make sure we have a database engine */
+	switch (dbase) {
+	case DBASE_NONE:
+		fprintf(stderr, "There is no database specified in the configuration!\n");
+		fprintf(stderr, "Please write at least 'database-engine sqlite3' in \n");
+		fprintf(stderr, "your config file.\n");
+		DO_SYSL("Exiting. No database engine specified.");
+		exit(ERR_EXIT);
+		/*NOTREACHED*/
+		break;
+	case DBASE_SQLITE3:
+	case DBASE_MYSQL:
+	case DBASE_POSTGRES:
+		db_open_connection(&inf);
+		db_close_connection(&inf);
+		break;
+	default:
+		fprintf(stderr, "DB engine not supported. exiting.");
+		DO_SYSL("DB engine not supported. exiting.");
+		exit(ERR_EXIT);
+		break;
+	}
+	if (be_verbose) {
+	    printf("Database check %s: Success.\n",
+		(dbase == DBASE_SQLITE3 ? "Sqlite3" : (dbase == DBASE_MYSQL ? "MySQL" : "PostgreSQL")));
+	}
+}
+
 static void
 welcome_(int ready)
 {