Changeset 1582

Timestamp:

03/04/10 16:33:24 (6 months ago)

Author:

marek

Message:

batctl: avoid parsing bat-hosts multiple times

Currently, running batctl from the home directory leads to warnings
("Warning - mac already known") if ~/bat-hosts exists. This is caused by
batctl parsing both "~/bat-hosts" and "bat-hosts" which happen to be the
same file when the working directory is ~

This patch adds duplicate file name detection to bat_hosts_init() to
avoid these warnings.

Signed-off-by: Daniel Seither <post@…>

Files:

• trunk/batctl/bat-hosts.c (modified) (4 diffs)

trunk/batctl/bat-hosts.c

@@ -24 +24 @@
 #include <stdio.h>
 #include <stdint.h>
+#include <limits.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -145 +146 @@
 void bat_hosts_init(void)
 {
-        unsigned int i;
+        unsigned int i, j, parse;
         char confdir[CONF_DIR_LEN];
         char *homedir;
+        size_t locations = sizeof(bat_hosts_path) / sizeof(char *);
+        char *normalized[locations];
 
         host_hash = hash_new(64, compare_mac, choose_mac);
@@ -158 +161 @@
         homedir = getenv("HOME");
 
-        for (i = 0; i < sizeof(bat_hosts_path) / sizeof(char *); i++) {
+        for (i = 0; i < locations; i++) {
                 strcpy(confdir, "");
 
@@ -171 +174 @@
                 }
 
-                parse_hosts_file(&host_hash, confdir);
+                normalized[i] = realpath(confdir, NULL);
+                if (normalized[i] == NULL)
+                        continue;
+
+                /* check for duplicates: don't parse the same file twice */
+                parse = 1;
+                for (j = 0; j < i; j++) {
+                        if (normalized[j] == NULL)
+                                continue;
+
+                        if (strncmp(normalized[i], normalized[j], CONF_DIR_LEN) == 0) {
+                                parse = 0;
+                                break;
+                        }
+                }
+
+                if (parse && (normalized[i] != NULL))
+                        parse_hosts_file(&host_hash, normalized[i]);
+        }
+
+        for (i = 0; i < locations; i++) {
+                if (normalized[i])
+                        free(normalized[i]);
         }
 }