Changeset 1566

Timestamp:

01/25/10 10:25:47 (6 months ago)

Author:

marek

Message:

batctl: extend bat-hosts parser to ignore empty lines and comments

Files:

• branches/batctl-0.2.x/bat-hosts.c (modified) (8 diffs)

branches/batctl-0.2.x/bat-hosts.c

@@ -1 @@
-/* 
+/*
  * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors:
  *
@@ -64 +64 @@
 {
         FILE *fd;
+        char *line_ptr = NULL;
         char name[HOST_NAME_MAX_LEN], mac_str[18];
         struct ether_addr *mac_addr;
         struct bat_host *bat_host;
         struct hashtable_t *swaphash;
+        size_t len = 0;
 
         name[0] = mac_str[0] = '\0';
@@ -75 +77 @@
                 return;
 
-        while (fscanf(fd,"%[^ \t]%s\n", mac_str, name) != EOF) {
+        while (getline(&line_ptr, &len, fd) != -1) {
+                /* ignore empty lines and comments */
+                if ((line_ptr[0] == '\n') || (line_ptr[0] == '#'))
+                        continue;
+
+                if (sscanf(line_ptr, "%[^ \t]%s\n", mac_str, name) != 2) {
+                        fprintf(stderr, "Warning - unrecognized bat-host definition: %s", line_ptr);
+                        continue;
+                }
 
                 mac_addr = ether_aton(mac_str);
                 if (!mac_addr) {
-                        printf("Warning - invalid mac address in '%s' detected: %s\n", path, mac_str);
+                        fprintf(stderr, "Warning - invalid mac address in '%s' detected: %s\n", path, mac_str);
                         continue;
                 }
@@ -87 +97 @@
                 /* mac entry already exists - we found a new name for it */
                 if (bat_host) {
-                        printf("Warning - mac already known (changing name from '%s' to '%s'): %s\n",
+                        fprintf(stderr, "Warning - mac already known (changing name from '%s' to '%s'): %s\n",
                                         bat_host->name, name, mac_str);
                         strncpy(bat_host->name, name, HOST_NAME_MAX_LEN - 1);
@@ -97 +107 @@
                 /* name entry already exists - we found a new mac address for it */
                 if (bat_host) {
-                        printf("Warning - name already known (changing mac from '%s' to '%s'): %s\n",
+                        fprintf(stderr, "Warning - name already known (changing mac from '%s' to '%s'): %s\n",
                                         ether_ntoa(&bat_host->mac_addr), mac_str, name);
                         hash_remove(*hash, bat_host);
@@ -106 +116 @@
 
                 if (!bat_host) {
-                        printf("Error - could not allocate memory: %s\n", strerror(errno));
+                        fprintf(stderr, "Error - could not allocate memory: %s\n", strerror(errno));
                         goto out;
                 }
@@ -119 +129 @@
 
                         if (swaphash == NULL)
-                                printf("Warning - couldn't resize bat hosts hash table\n");
+                                fprintf(stderr, "Warning - couldn't resize bat hosts hash table\n");
                         else
                                 *hash = swaphash;
                 }
-
         }
 
@@ -129 +138 @@
         if (fd)
                 fclose(fd);
+        if (line_ptr)
+                free(line_ptr);
         return;
 }