Cleaned up ifdefs

1 files changed, 98 insertions, 454 deletions

diff --git a/read_cfg.c b/read_cfg.c
index 5f479c4..8a4f902 100644
--- a/read_cfg.c
+++ b/read_cfg.c
@@ -1,44 +1,37 @@
+#if defined _WIN32 || defined _WIN64
+#include "windows/read_cfg.h"
+#else
+#include "unix/read_cfg.h"
+#endif
+
 #include <assert.h>
-#include <ctype.h>
-#include <dirent.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 #include "entry.h"
 #include "group.h"
-#define BUF_LEN 1024 //maybe move this line to the header file
+#define BUF_LEN 1024
 #define MAX_ARGS 5
 #define OPTION_CNT 14
 
 //public
-#if defined _WIN32 || defined _WIN64
-char *find_config_win();
-#else
-char *find_config();
-#endif
 void cfg_interp(char *path);
-int get_compmode();
 bool get_sort();
 bool get_case_sensitivity();
 void refer_to_doc();
-
-//private
-void mkconfig_wizard(char *path);
-void check_line(char *buffer, char **options, int ln);
-int check_option(char *arg, char **options);
-void handle_fname(char *path, char *group, bool recurs, bool force, char *name, int ln);
 void addme(char *path, char *group, bool force, char *name);
-char *autoAlias(char *path);
 int search_ch(char *str, char c);
 int search_last_ch(char *str, char c);
 int wild_cmp(char *wild, char *literal);
 char *strip_quotes(char *str);
 void error_mes(int ln, char *message);
 
+//private
+void check_line(char *buffer, char **options, int ln);
+int check_option(char *arg, char **options);
+char *autoAlias(char *path);
+
 //turn on or off sorting (A-Z); On by default
 bool sort = true;
 
@@ -48,67 +41,6 @@ bool hr = false;
 //turn foldCase (insensitive case searching) on or off; On by default
 bool fold_case = true;
 
-#if defined _WIN32 || defined _WIN64
-//for Windows Compatability, this will be '\\' (otherwise '/')
-char sep = '\\';
-#else
-char sep = '/';
-#endif
-
-#if defined _WIN32 || defined _WIN64
-char *find_config_win(){
-	char *appdata = getenv("APPDATA");
-	char *path = malloc(sizeof(char) * BUF_LEN);
-	int check_count = 1;
-	char choices[check_count][BUF_LEN];
-	int i;
-
-	sprintf(choices[0], "%s%ctml%cconfig", appdata, sep, sep);
-
-	for(i = 0; i < check_count; i++){
-		path = choices[i];
-		printf("Checking for config at %s: ", choices[i]);
-		if(access(path, R_OK) == 0){
-			printf("Using config \"%s\"\n\n", path);
-			return path;
-		}
-		else printf("File does not exist\n");
-	}
-
-	//TODO no config exists, ask user if they want to autogenerate one
-	mkconfig_wizard(choices[0]);
-	path = choices[0];
-	return path;
-}
-
-#else
-char *find_config(){
-	char *home = getenv("HOME");
-	char *path = malloc(sizeof(char) * BUF_LEN);
-	char choices[2][BUF_LEN];
-	int check_count = 2;
-	int i;
-
-	sprintf(choices[0], "%s%c.config%ctml%cconfig", home, sep, sep, sep);
-	sprintf(choices[1], "%s%c.tml%cconfig", home, sep, sep);
-
-	for(i = 0; i < check_count; i++){
-		path = choices[i];
-		printf("Checking for config at %s: ", choices[i]);
-		if(access(path, R_OK) == 0){
-			printf("Using config \"%s\"\n\n", path);
-			return path;
-		}
-		else printf("File does not exist\n");
-	}
-
-	//TODO no config exists, ask user if they want to autogenerate one
-	mkconfig_wizard(choices[0]);
-	path = choices[0];
-	return path;
-}
-#endif
-
 void cfg_interp(char *path){
 	FILE *fp;
 	char buffer[BUF_LEN];
@@ -180,174 +112,109 @@ void refer_to_doc(){
 	return;
 }
 
-void mkconfig_wizard(char *path){
-	char input;
-	FILE *fp;
-
-#if defined _WIN32 || defined _WIN64
-	char *home = getenv("USERPROFILE");
-	char *appdata = getenv("APPDATA");
-#else
-	char *home = getenv("HOME");
-#endif
+void addme(char *path, char *group, bool force, char *name){
+	ENTRY *new;
+	char auto_name[BUF_LEN];
 
-	printf("\nNo configuration file found. Auto-generate one now at \"%s\"? [Y/n] ", path);
-	fflush(stdout);
-	scanf(" %c", &input);
+	//check if a name was given as argument
+	if(name != NULL){
+		//strip quotes from the name
+		name = strip_quotes(name);
+		new = create_entry(name, path, force);
+	}
 
-	if(input == 'n'){
-		printf("Configuration will not be auto-generated\n");
-		refer_to_doc();
-		exit(0);
-		
+	//check if autoAlias is on. If it is, go to the autoAlias function
+	else if(hr){
+		strcpy(auto_name, autoAlias(path));
+		new = create_entry(auto_name, path, force);
 	}
 
-	printf("Generating configuration file at \"%s\"...\n", path);
+	else new = create_entry(path, path, force);
+	if(new != NULL) group_add(group, new);
 
-	//ensure directories have been created
-#if defined _WIN32 || defined _WIN64
-	if(appdata == NULL){
-		printf("Failed: \%APPDATA\% is NULL\n");
-		exit(1);
-	}
+	return;
+}
 
-	if(home == NULL){
-		printf("Failed: \%USERPROFILE\% is NULL\n");
-		exit(1);
+int search_ch(char *str, char c){
+	int i = 0;
+
+	while(str[i] != '\0'){
+		if(str[i] == c) return i;
+		i++;
 	}
 
-	sprintf(path, "%s%ctml%c", appdata, sep, sep);
-	mkdir(path);
+	return -1;
+}
+
+int search_last_ch(char *str, char c){
+	int i = 0;
+	int last_i = -1;
 
-	sprintf(path, "%s%ctml%cconfig", appdata, sep, sep);
-#else
-	if(home == NULL){
-		printf("Failed: HOME is NULL\n");
-		exit(1);
+	while(str[i] != '\0'){
+		if(str[i] == c) last_i = i;
+		i++;
 	}
 
-	sprintf(path, "%s%c.config%c", home, sep, sep);
-	mkdir(path, 0755);
+	return last_i;
+}
+
+//return 0 if match, 1 if not
+//TODO only supports one wildcard per entry
+int wild_cmp(char *wild, char *literal){
+	int i;
+	
+	while(*wild != '\0'){
+		//traverse until wildcard
+		if(*wild != '*'){
+			if(*wild != *literal) return 1;
+			wild++;
+			literal++;
+		}
 
-	sprintf(path, "%s%c.config%ctml%c", home, sep, sep, sep);
-	mkdir(path, 0755);
+		//found wildcard, find the end of both names and comapre from the back
+		else{
+			i = 0;
+			wild++;
+			while(*wild != '\0'){
+				i++;
+				wild++;
+			}
+			while(*literal != '\0'){
+				literal++;
+			}
 
-	sprintf(path, "%s%c.config%ctml%cconfig", home, sep, sep, sep);
-#endif
+			while(i > 0){
+				wild--;
+				literal--;
+				if(*wild != *literal) return 1;
+				i--;
+			}
 
-	//open file for writing, make sure non-NULL
-	fp = fopen(path, "w");
-	if(fp == NULL){
-		printf("Failed: \"%s\" could not be open for writing\n", path);
-		exit(1);
+			return 0;
+		}
 	}
 
-	//write to file (in Windows, executing a file will open it in its default application)
-#if defined _WIN32 || defined _WIN64
-	fprintf(fp, "# This file was auto-generated by tml. See docs\\tml-config.md or tml-config(5) for documentation\n"
-	"# By default, no launcher is specified for any group. When no launcher is specified on the Windows build of tml, media files will be opened with their default application.\n"
-	"# It is generally recommended to specify a launcher for groups containing media files using the \"setLauncher\" command\n\n"
-	"# Recursively add files from %s%cMusic%c to Music group\n"
-	"addGroup Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.aac Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.aiff Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.alac Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.au Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.flac Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.m4a Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.mp3 Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.ogg Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.pcm Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.wav Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.wma Music\n\n", home, sep, sep);
-	fprintf(fp, "# Recursively add files from %s%cPictures%c to Pictures group\n"
-	"addGroup Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.epi Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.eps Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.eps2 Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.eps3 Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.epsf Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.epsi Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.ept Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.gif Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.gfa Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.giff Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.jpeg Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.jpg Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.png Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.svg Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.svgz Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.tif Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.tiff Pictures\n\n", home, sep, sep);
-	fprintf(fp, "# Recursively add files from %s%cVideos%c to Videos group\n"
-	"addGroup Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.asf Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.avi Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.flv Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.mk3d Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.mkv Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.mov Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.mp4 Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.qt Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.webm Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.wmv Videos\n", home, sep, sep);
-#else
-	fprintf(fp, "# This file was auto-generated by tml. See docs/tml-config.md or tml-config(5) for documentation\n"
-	"# The default launcher is set to \"xdg-open\" which will open files based on the relevant default application set through xdg\n\n"
-	"# Recursively add files from %s%cMusic%c to Music group\n"
-	"addGroup Music\n"
-	"setLauncher Music xdg-open\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.aac Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.aiff Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.alac Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.au Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.flac Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.m4a Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.mp3 Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.ogg Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.pcm Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.wav Music\n", home, sep, sep);
-	fprintf(fp, "addR %s%cMusic%c*.wma Music\n\n", home, sep, sep);
-	fprintf(fp, "# Recursively add files from %s%cPictures%c to Pictures group\n"
-	"addGroup Pictures\n"
-	"setLauncher Pictures xdg-open\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.epi Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.eps Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.eps2 Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.eps3 Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.epsf Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.epsi Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.ept Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.gif Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.gfa Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.giff Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.jpeg Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.jpg Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.png Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.svg Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.svgz Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.tif Pictures\n", home, sep, sep);
-	fprintf(fp, "addR %s%cPictures%c*.tiff Pictures\n\n", home, sep, sep);
-	fprintf(fp, "# Recursively add files from %s%cVideos%c to Videos group\n"
-	"addGroup Videos\n"
-	"setLauncher Videos xdg-open\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.asf Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.avi Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.flv Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.mk3d Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.mkv Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.mov Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.mp4 Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.qt Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.webm Videos\n", home, sep, sep);
-	fprintf(fp, "addR %s%cVideos%c*.wmv Videos\n", home, sep, sep);
-#endif
+	return 0;
+}
 
-	fclose(fp);
-	printf("done\nIt is highly recommended to further tweak the configuration file! [press any key to continue]");
-	fflush(stdout);
-	getchar();
-	getchar();
+
+char *strip_quotes(char *str){
+	char *stripped_str = malloc(sizeof(char) * BUF_LEN);
+	
+	if(str[0] == '"'){
+		stripped_str = &str[1];
+		stripped_str[strlen(stripped_str) - 1] = '\0';
+		return stripped_str;
+	}
+
+	return str;
+}
+
+void error_mes(int ln, char *message){
+
+	assert(message != NULL);
+
+	printf("Configuration File Error:\nOn line %d: %s\n\n", ln, message);
 
 	return;
 }
@@ -591,149 +458,6 @@ int check_option(char *arg, char **options){
 	return -1;
 }
 
-//TODO augment to involve recurs
-//TODO could use some cleanup...
-void handle_fname(char *path, char *group, bool recurs, bool force, char *name, int ln){
-	ENTRY *new;
-	char *search; //pointer for traversing path
-	char full_path_cpy[BUF_LEN];
-	char relative_path_cpy[BUF_LEN];
-	char arg_cpy[BUF_LEN];
-	char auto_name[BUF_LEN];
-	int plen = strlen(path);
-	char *dirname;
-	char *local_arg; //for use in addR
-	DIR *dp;
-	struct dirent *fname;
-	int i;
-	char *error_p; //helper for complex error messages
-
-	assert(path != NULL && group != NULL);
-
-	if(path[0] == '\0' || group[0] == '\0'){
-		error_mes(ln, "Too few arguments for \"add\"");
-		return;
-	}
-
-	//address potential quotes
-	strcpy(full_path_cpy, strip_quotes(path));
-
-	//don't check that the path arg is valid when forced
-	if(force) addme(full_path_cpy, group, force, name);
-
-	//file is not recognized, perhaps it has a wildcard?
-	//TODO finish rewriting a more robust wildcard thingy
-	else if(access(full_path_cpy, F_OK) == -1){
-		i = search_ch(full_path_cpy, '*');
-		if(i > -1){
-			//look for a directory
-			while(full_path_cpy[i] != sep && (i >= 0)){
-				i--;
-			}
-			dirname = full_path_cpy;
-			strcpy(arg_cpy, full_path_cpy);
-			dirname[i+1] = '\0';
-			dp = opendir(dirname);
-
-			//the directory is real
-			if(dp != NULL){ 
-				while(fname = readdir(dp)){
-					relative_path_cpy[0] = '\0';
-					strcat(relative_path_cpy, dirname);
-					strcat(relative_path_cpy, fname->d_name);
-
-#if defined _WIN32 || defined _WIN64
-					//Windows cannot tell file types (TODO), so just add relatively indiscriminantly
-					if(!(wild_cmp(&arg_cpy[i+1], fname->d_name))) addme(relative_path_cpy, group, force, name);
-
-					//if the recursive option was specified, run handle_fname on this directory, but for security reasons, do not consider directories that start with a '.'
-					else if(recurs && fname->d_name[0] != '.'){
-						i = search_last_ch(arg_cpy, sep);
-						local_arg = &arg_cpy[i+1];
-						strcat(relative_path_cpy, &sep);
-						strcat(relative_path_cpy, local_arg);
-						handle_fname(relative_path_cpy, group, 1, 0, NULL, ln);
-					}
-#else
-					//check if path is a file (and not a directory/symlink/etc.) and regex matches
-					if(fname->d_type == DT_REG && !(wild_cmp(&arg_cpy[i+1], fname->d_name))) addme(relative_path_cpy, group, force, name);
-
-					//if the recursive option was specified and the path is a directory, run handle_fname on this directory, but for security reasons, do not consider directories that start with a '.'
-					else if(recurs && fname->d_type == DT_DIR && fname->d_name[0] != '.'){
-						i = search_last_ch(arg_cpy, sep);
-						local_arg = &arg_cpy[i+1];
-						strcat(relative_path_cpy, &sep);
-						strcat(relative_path_cpy, local_arg);
-						handle_fname(relative_path_cpy, group, 1, 0, NULL, ln);
-					}
-#endif
-
-				}
-
-				closedir(dp);
-			}
-
-#if defined _WIN32 || defined _WIN64
-			//directory is not real, report error to the user
-			else if(!recurs){
-				error_p = malloc(sizeof(char) * 1024);
-				sprintf(error_p, "\"%s\" bad path", dirname);
-				error_mes(ln, error_p);
-				free(error_p);
-				//printf("Error: \"%s\" bad path\n", dirname);
-			}
-		}
-#else
-			//directory is not real, report error to the user
-			else{
-				error_p = malloc(sizeof(char) * 1024);
-				sprintf(error_p, "\"%s\" bad path", dirname);
-				error_mes(ln, error_p);
-				free(error_p);
-				//printf("Error: \"%s\" bad path\n", dirname);
-			}
-		}
-#endif
-
-		//path is not real, report error to the user
-		else{
-			error_p = malloc(sizeof(char) * 1024);
-			sprintf(error_p, "\"%s\" bad path", full_path_cpy);
-			error_mes(ln, error_p);
-			free(error_p);
-		}
-	}
-
-	//file name is okay
-	//FIXME does not take into account whether the argument is a file (could be a directory, symlink, etc.)
-	else addme(full_path_cpy, group, force, name);
-
-	return;
-}
-
-void addme(char *path, char *group, bool force, char *name){
-	ENTRY *new;
-	char auto_name[BUF_LEN];
-
-	//check if a name was given as argument
-	if(name != NULL){
-		//strip quotes from the name
-		name = strip_quotes(name);
-		new = create_entry(name, path, force);
-	}
-
-	//check if autoAlias is on. If it is, go to the autoAlias function
-	else if(hr){
-		strcpy(auto_name, autoAlias(path));
-		new = create_entry(auto_name, path, force);
-	}
-
-	else new = create_entry(path, path, force);
-	if(new != NULL) group_add(group, new);
-
-	return;
-}
-
 
 char *autoAlias(char *path){
 	char *hr_name = malloc(sizeof(char) * BUF_LEN);
@@ -792,85 +516,5 @@ char *autoAlias(char *path){
 	return hr_name;
 }
 
-int search_ch(char *str, char c){
-	int i = 0;
 
-	while(str[i] != '\0'){
-		if(str[i] == c) return i;
-		i++;
-	}
-
-	return -1;
-}
 
-int search_last_ch(char *str, char c){
-	int i = 0;
-	int last_i = -1;
-
-	while(str[i] != '\0'){
-		if(str[i] == c) last_i = i;
-		i++;
-	}
-
-	return last_i;
-}
-
-//return 0 if match, 1 if not
-//TODO only supports one wildcard per entry
-int wild_cmp(char *wild, char *literal){
-	int i;
-	
-	while(*wild != '\0'){
-		//traverse until wildcard
-		if(*wild != '*'){
-			if(*wild != *literal) return 1;
-			wild++;
-			literal++;
-		}
-
-		//found wildcard, find the end of both names and comapre from the back
-		else{
-			i = 0;
-			wild++;
-			while(*wild != '\0'){
-				i++;
-				wild++;
-			}
-			while(*literal != '\0'){
-				literal++;
-			}
-
-			while(i > 0){
-				wild--;
-				literal--;
-				if(*wild != *literal) return 1;
-				i--;
-			}
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-char *strip_quotes(char *str){
-	char *stripped_str = malloc(sizeof(char) * BUF_LEN);
-	
-	if(str[0] == '"'){
-		stripped_str = &str[1];
-		stripped_str[strlen(stripped_str) - 1] = '\0';
-		return stripped_str;
-	}
-
-	return str;
-}
-
-void error_mes(int ln, char *message){
-
-	assert(message != NULL);
-
-	printf("Configuration File Error:\nOn line %d: %s\n\n", ln, message);
-
-	return;
-}