Cleanup whitespace in the monitor

1 files changed, 130 insertions, 122 deletions

diff --git a/eathena-monitor.c b/eathena-monitor.c
index 8e9d985c..d8feaa34 100644
--- a/eathena-monitor.c
+++ b/eathena-monitor.c
@@ -30,11 +30,11 @@ gcc -o eathena-monitor eathena-monitor.c
 #define IS_BLANK(ptr) \
     (((*(ptr)) == ' ') || ((*(ptr)) == '\b') || \
     ((*(ptr)) == '\n') || ((*(ptr)) == '\r'))
-	   
+
 #define SKIP_BLANK(ptr) \
     { while (((*(ptr)) == ' ') || ((*(ptr)) == '\b') || \
     ((*(ptr)) == '\n') || ((*(ptr)) == '\r')) ptr++; }
-			      
+
 #define GOTO_EQL(ptr) \
     { while (((*(ptr)) != '\0') && ((*(ptr)) != '=') && \
     ((*(ptr)) != '\n') && ((*(ptr)) != '\r')) ptr++; }
@@ -56,15 +56,15 @@ void parse_option (char *name, char *value) {
     if (!strcasecmp(name, "login_server")) {
         login_server = strdup(value);
     } else if (!strcasecmp(name, "map_server")) {
-	map_server = strdup(value);
+        map_server = strdup(value);
     } else if (!strcasecmp(name, "char_server")) {
-	char_server = strdup(value);
+        char_server = strdup(value);
     } else if (!strcasecmp(name, "workdir")) {
-	workdir = strdup(value);
+        workdir = strdup(value);
     } else if (!strcasecmp(name, "logfile")) {
-	logfile = strdup(value);
+        logfile = strdup(value);
     } else if (!strcasecmp(name, "interval")) {
-	interval = atoi(strdup(value));
+        interval = atoi(strdup(value));
     } else {
         printf("WARNING: ingnoring invalid options '%s'\n", name);
     }
@@ -78,36 +78,37 @@ int read_config(char *filename) {
     char *value;
     int errors = 0;
 
-    if ( !(input = fopen(filename,"r")) && !(input = fopen (config, "r"))) {
-	fprintf (stderr, "ERROR: Config file doesn't exist (%s and %s), using builtin defaults\n", filename, config);
-	return -1;
+    if (!(input = fopen(filename,"r")) && !(input = fopen (config, "r"))) {
+        fprintf (stderr, "ERROR: Config file doesn't exist (%s and %s), using builtin defaults\n", filename, config);
+        return -1;
     }
-    
+
     while (1) {
-	if (fgets (&string[0], sizeof (string) - 1, input) == NULL)
-	    break;
-	str = &string[0];
-	SKIP_BLANK (str);
-	string[sizeof (string) - 1] = '\0';
-	if (*str == '#')
-	    continue;
-	if (*str == '\0')
-	    continue;
-	name = str;
-	
-	GOTO_EQL (str);
-	
-	if (*str != '=') {
-	    continue;			  
-	}
-				  
-	*str++ = '\0';
-	SKIP_BLANK (str);
-	value = str;
-	GOTO_EOL (str);
-	*str = '\0';
-	parse_option(name, value);
+        if (fgets (&string[0], sizeof (string) - 1, input) == NULL)
+            break;
+        str = &string[0];
+        SKIP_BLANK(str);
+        string[sizeof (string) - 1] = '\0';
+        if (*str == '#')
+            continue;
+        if (*str == '\0')
+            continue;
+        name = str;
+
+        GOTO_EQL (str);
+
+        if (*str != '=') {
+            continue;
+        }
+
+        *str++ = '\0';
+        SKIP_BLANK(str);
+        value = str;
+        GOTO_EOL(str);
+        *str = '\0';
+        parse_option(name, value);
     }
+
     fclose (input);
     return(0);
 }
@@ -116,11 +117,11 @@ void start_process(char *exec) {
     pid_t pid;
     pid = fork();
     if (pid == 0) {
-	if (!fork()) {
-	    execl(exec,exec,NULL);
-	    exit(0);
-	}
-	exit(0);
+    if (!fork()) {
+        execl(exec,exec,NULL);
+        exit(0);
+    }
+    exit(0);
     }
     wait(0);
 }
@@ -128,7 +129,7 @@ void start_process(char *exec) {
 void stop_process(int sig) {
     system("killall map-server");
     system("killall login-server");
-    system("killall char-server");    
+    system("killall char-server");
     exit(0);
 }
 
@@ -152,107 +153,114 @@ int main(int argc, char *argv[]) {
     size_t l_size;
 
     if ( statfs("/proc", &sfs) == -1 ) {
-	fprintf(stderr,"ERROR: /proc filesystem is unaccessible\n");
-	return(255);
+        fprintf(stderr,"ERROR: /proc filesystem is unaccessible\n");
+        return(255);
     }
 
-    signal(SIGTERM,stop_process);
-    signal(SIGINT,stop_process);
+    signal(SIGTERM, stop_process);
+    signal(SIGINT, stop_process);
 
-
-    workdir = (char *) malloc(sizeof(char)*1024);
-    login_server = (char *) malloc(sizeof(char)*1024);
-    char_server = (char *) malloc(sizeof(char)*1024);
-    map_server = (char *) malloc(sizeof(char)*1024);
-    logfile = (char *) malloc(sizeof(char)*1024);
-    config = (char *) malloc(sizeof(char)*1024);
+    workdir = (char *) malloc(sizeof(char) * 1024);
+    login_server = (char *) malloc(sizeof(char) * 1024);
+    char_server = (char *) malloc(sizeof(char) * 1024);
+    map_server = (char *) malloc(sizeof(char) * 1024);
+    logfile = (char *) malloc(sizeof(char) *  1024);
+    config = (char *) malloc(sizeof(char) * 1024);
 
     sprintf(workdir,"%s/tmwserver",HOME);
-    sprintf(login_server,"%s/%s",workdir,LOGIN_SERVER);
-    sprintf(map_server,"%s/%s",workdir,MAP_SERVER);
-    sprintf(char_server,"%s/%s",workdir,CHAR_SERVER);
-    sprintf(logfile,"%s/%s",workdir,LOGFILE);
-    sprintf(config,"%s/%s",workdir,CONFIG);
+    sprintf(login_server,"%s/%s", workdir, LOGIN_SERVER);
+    sprintf(map_server,"%s/%s",  workdir, MAP_SERVER);
+    sprintf(char_server,"%s/%s", workdir, CHAR_SERVER);
+    sprintf(logfile,"%s/%s", workdir,LOGFILE);
+    sprintf(config,"%s/%s", workdir, CONFIG);
 
     read_config(argv[1]);
 
     chdir(workdir);
 
     printf ("Starting:\n");
-    printf ("* interval: %d s\n",interval);
-    printf ("* workdir: %s\n",workdir);
-    printf ("* login_server: %s\n",login_server);
-    printf ("* map_server: %s\n",map_server);
-    printf ("* char_server: %s\n",char_server);
-
-    if (fork()) { 
-	exit(0); 
+    printf ("* interval: %d s\n", interval);
+    printf ("* workdir: %s\n",  workdir);
+    printf ("* login_server: %s\n", login_server);
+    printf ("* map_server: %s\n", map_server);
+    printf ("* char_server: %s\n", char_server);
+
+    if (fork()) {
+        exit(0);
     }
 
     if ((fd = open("/dev/null", O_RDONLY)) != 0) {
-	dup2(fd, 0);
-	close(fd);
+        dup2(fd, 0);
+        close(fd);
     }
+
     if ((fd = open("/dev/null", O_WRONLY)) != 1) {
-	dup2(fd, 1);
-	close(fd);
+        dup2(fd, 1);
+        close(fd);
     }
     dup2(1, 2);
 
     while (1) {
-	proc_login = 0;
-	proc_map = 0;
-	proc_char = 0;
-
-	if ( (procdir = opendir("/proc")) == NULL ) {
-	    fprintf(stderr,"ERROR: Cannot open /proc filesystem\n");
-	    return(255);
-	}
-	while ( (procdirp = readdir(procdir)) != NULL ) {
-	    if ( strtok(procdirp->d_name, "0123456789") == NULL ) {
-		sprintf(pathbuf, "%s%s%s", "/proc/", procdirp->d_name, "/exe");
-		l_size = readlink(pathbuf, link, PATH_MAX);
-		if (l_size != -1) {
-		    link[l_size] = '\0';
-		    if (!strcmp(link,login_server)) {
-			    proc_login = 1;
-			    pid_login = (unsigned int) procdirp->d_name;
-		    }
-		    if (!strcmp(link,char_server)) {
-			    proc_char = 1;
-			    pid_char = (unsigned int) procdirp->d_name;
-		    }
-		    if (!strcmp(link,map_server)) {
-			    proc_map = 1;
-			    pid_map = (unsigned int) procdirp->d_name;
-		    }
-		}
-	    }
-	}
-	closedir(procdir);
-	
-	if (!(log = fopen (logfile,"a"))) {
-	    log = fopen("/tmp/monitor.log","a");
-	}
-	t = time(NULL);
-	tmp = localtime(&t);
-	strftime(timestamp, sizeof(timestamp),"%F %X",tmp);
-	if (proc_login == 0) {
-	    fprintf (log,"[%d][%s] NOTICE: Login server is dead - restarting\n",getpid(),timestamp);
-	    start_process(login_server);
-	    sleep(2);
-	}
-	if (proc_char == 0) {
-	    fprintf (log,"[%d][%s] NOTICE: Char server is dead - restarting\n",getpid(),timestamp);
-	    start_process(char_server);
-	    sleep(2);
-	}
-	if (proc_map == 0) {
-	    fprintf (log,"[%d][%s] NOTICE: Map server is dead - restarting\n",getpid(),timestamp);
-	    start_process(map_server);
-	    sleep(2);
-	}
-	fclose(log);
-	sleep(interval);
+        proc_login = 0;
+        proc_map = 0;
+        proc_char = 0;
+
+        if ((procdir = opendir("/proc")) == NULL) {
+            fprintf(stderr,"ERROR: Cannot open /proc filesystem\n");
+            return(255);
+        }
+
+        while ((procdirp = readdir(procdir)) != NULL) {
+            if (strtok(procdirp->d_name, "0123456789") == NULL) {
+                sprintf(pathbuf, "%s%s%s", "/proc/", procdirp->d_name, "/exe");
+                l_size = readlink(pathbuf, link, PATH_MAX);
+
+                if (l_size != -1) {
+                    link[l_size] = '\0';
+                    if (!strcmp(link,login_server)) {
+                        proc_login = 1;
+                        pid_login = (unsigned int) procdirp->d_name;
+                    }
+
+                    if (!strcmp(link,char_server)) {
+                        proc_char = 1;
+                        pid_char = (unsigned int) procdirp->d_name;
+                    }
+
+                    if (!strcmp(link,map_server)) {
+                        proc_map = 1;
+                        pid_map = (unsigned int) procdirp->d_name;
+                    }
+                }
+            }
+        }
+        closedir(procdir);
+
+        if (!(log = fopen (logfile,"a"))) {
+            log = fopen("/tmp/monitor.log","a");
+        }
+
+        t = time(NULL);
+        tmp = localtime(&t);
+        strftime(timestamp, sizeof(timestamp), "%F %X", tmp);
+
+        if (proc_login == 0) {
+            fprintf (log,"[%d][%s] NOTICE: Login server is dead - restarting\n", getpid(), timestamp);
+            start_process(login_server);
+            sleep(2);
+        }
+        if (proc_char == 0) {
+            fprintf (log,"[%d][%s] NOTICE: Char server is dead - restarting\n", getpid(), timestamp);
+            start_process(char_server);
+            sleep(2);
+        }
+        if (proc_map == 0) {
+            fprintf (log,"[%d][%s] NOTICE: Map server is dead - restarting\n", getpid(), timestamp);
+            start_process(map_server);
+            sleep(2);
+        }
+
+        fclose(log);
+        sleep(interval);
     }
 }