several fixes for Windows (glib, strcasecmp, webserver and interactive

mode fixes)

1 files changed, 10 insertions, 5 deletions

diff --git a/src/biruda.c b/src/biruda.c
index f02425e..da8b215 100644
--- a/src/biruda.c
+++ b/src/biruda.c
@@ -100,22 +100,18 @@ static int read_config( const char *filename, cfg_t **cfg )
 		CFG_END( )
 	};
 
-#ifndef _WIN32	
 	cfg_opt_t opts_webserver[] = {
 		CFG_STR( "host", (char *)DEFAULT_WEBSERVER_HOST, CFGF_NONE ),
 		CFG_INT( "port", DEFAULT_WEBSERVER_PORT, CFGF_NONE ),
 		CFG_INT( "threads", DEFAULT_WEBSERVER_THREADS, CFGF_NONE ),
 		CFG_END( )
 	};
-#endif
 	
 	cfg_opt_t opts[] = {
 		CFG_SEC( "master", opts_master, CFGF_MULTI ),
 		CFG_SEC( "coordinator", opts_coordinator, CFGF_MULTI ),
 		CFG_SEC( "worker", opts_worker, CFGF_MULTI | CFGF_TITLE ),
-#ifndef _WIN32
 		CFG_SEC( "webserver", opts_webserver, CFGF_MULTI ),
-#endif
 		CFG_END( )
 	};
 	
@@ -163,7 +159,7 @@ static void print_config( struct gengetopt_args_info *args_info, cfg_t *cfg )
 			
 			printf( "  Worker %s:\n", cfg_title( worker_cfg ) );
 			printf( "    Control channel: %s\n", cfg_getstr( worker_cfg, "control" ) );
-			printf( "    Execution mode: %s\n", worker_exection_mode_str( cfg_getint( worker_cfg, "execution" ) ) );
+			printf( "    Execution mode: %s\n", worker_exection_mode_str( (worker_execution_mode_t)cfg_getint( worker_cfg, "execution" ) ) );
 			if( cfg_getint( worker_cfg, "execution" ) == WORKER_EXECUTION_DIRECT ) {
 				char *command = cfg_getstr( worker_cfg, "command" );
 				if( command != NULL ) {
@@ -187,6 +183,8 @@ static void print_config( struct gengetopt_args_info *args_info, cfg_t *cfg )
 		printf( "  Number of threads: %ld\n", cfg_getint( webserver_cfg, "threads" ) );
 		puts( "" );
 	}
+#else
+	fprintf( stderr, "WARNING: Currently no built-in webserver available for master on Windows!\n" );
 #endif
 }
 
@@ -545,7 +543,12 @@ int main( int argc, char *argv[] )
 	}
 
 	if( args_info.cli_given ) {
+#ifndef _WIN32
 		int ret = start_interactive( !args_info.no_colors_given );
+#else
+		fprintf( stderr, "FATAL: No CLI mode implemented for Windows currently!\n" );
+		int ret = -1;
+#endif
 		cfg_free( cfg );
 		cmdline_parser_free( &args_info );
 		return( ( ret == 0 ) ? EXIT_SUCCESS : EXIT_FAILURE );
@@ -581,6 +584,8 @@ int main( int argc, char *argv[] )
 			exit( EXIT_FAILURE );
 		}
 	}
+#else
+	fprintf( stderr, "WARNING: Currently no built-in webserver available for master on Windows!\n" );
 #endif
 
 	if( args_info.foreground_given ) {