discover: Use device_handler_status_dev_* for device-specific status

[petitboot] / discover / parser-conf.c

diff --git a/discover/parser-conf.c b/discover/parser-conf.c
index a21efc4aced845e10fec38469e9abcc72bc85ed9..5f2b9787303d3102033662f08cf2477c23a78b60 100644 (file)
--- a/discover/parser-conf.c
+++ b/discover/parser-conf.c
@@ -16,7 +16,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 

-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif

 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>


@@ -46,6 +48,9 @@ char *conf_strip_str(char *s)
        if (!s)
                return NULL;
 
        if (!s)
                return NULL;
 

+       if (!strlen(s))
+               return NULL;
+

        while (*s == '"' || *s == '\'' || isspace(*s))
                s++;
 
        while (*s == '"' || *s == '\'' || isspace(*s))
                s++;
 


@@ -124,8 +129,6 @@ char *conf_get_pair(struct conf_context __attribute__((unused)) *conf, char *str
        }
 
 exit:
        }
 
 exit:

-       pb_log("%s: @%s@%s@\n", __func__, *name_out, *value_out);
-

        return end ? end + 1 : NULL;
 }
 
        return end ? end + 1 : NULL;
 }
 


@@ -155,6 +158,9 @@ void conf_init_global_options(struct conf_context *conf)
 {
        int i;
 
 {
        int i;
 

+       if (!conf->global_options)
+               return;
+

        for (i = 0; conf->global_options[i].name; i++)
                conf->global_options[i].value = NULL;
 }
        for (i = 0; conf->global_options[i].name; i++)
                conf->global_options[i].value = NULL;
 }


@@ -171,11 +177,13 @@ int conf_set_global_option(struct conf_context *conf, const char *name,
 {
        int i;
 
 {
        int i;
 

+       assert(conf->global_options);
+

        for (i = 0; conf->global_options[i].name; i++) {
                if (streq(name, conf->global_options[i].name)) {
                        conf->global_options[i].value
                                = talloc_strdup(conf, value);
        for (i = 0; conf->global_options[i].name; i++) {
                if (streq(name, conf->global_options[i].name)) {
                        conf->global_options[i].value
                                = talloc_strdup(conf, value);

-                       pb_log("%s: @%s@%s@\n", __func__, name, value);
+                       pb_debug("%s: %s = '%s'\n", __func__, name, value);

                        return 1;
                }
        }
                        return 1;
                }
        }


@@ -196,12 +204,11 @@ const char *conf_get_global_option(struct conf_context *conf,
 {
        int i;
 
 {
        int i;
 

+       assert(conf->global_options);
+

        for (i = 0; conf->global_options[i].name ;i++)
        for (i = 0; conf->global_options[i].name ;i++)

-               if (streq(name, conf->global_options[i].name)) {
-                       pb_log("%s: @%s@%s@\n", __func__, name,
-                               conf->global_options[i].value);
+               if (streq(name, conf->global_options[i].name))

                        return conf->global_options[i].value;
                        return conf->global_options[i].value;

-               }

 
        assert(0 && "unknown global name");
        return NULL;
 
        assert(0 && "unknown global name");
        return NULL;


@@ -213,12 +220,16 @@ const char *conf_get_global_option(struct conf_context *conf,
  * Called from conf_parse() with data read from a conf file.
  */
 
  * Called from conf_parse() with data read from a conf file.
  */
 

-static void conf_parse_buf(struct conf_context *conf)
+void conf_parse_buf(struct conf_context *conf, char *buf,
+               int len __attribute__((unused)))

 {
        char *pos, *name, *value;
 
 {
        char *pos, *name, *value;
 

-       for (pos = conf->buf; pos;) {
-               pos = conf_get_pair_equal(conf, pos, &name, &value, '\n');
+       assert(conf->get_pair);
+       assert(conf->process_pair);
+
+       for (pos = buf; pos;) {
+               pos = conf->get_pair(conf, pos, &name, &value, '\n');

 
                if (!value)
                        continue;
 
                if (!value)
                        continue;


@@ -235,80 +246,3 @@ static void conf_parse_buf(struct conf_context *conf)
        if (conf->finish)
                conf->finish(conf);
 }
        if (conf->finish)
                conf->finish(conf);
 }

-
-/**
- * conf_parse - The common parser entry.
- *
- * Called from the parser specific setup routines.  Searches for .conf
- * files, reads data into buffers, and calls conf_parse_buf().
- */
-
-int conf_parse(struct conf_context *conf)
-{
-       int fd, rc;
-       unsigned int i;
-       struct stat stat;
-       ssize_t len;
-
-       rc = 0;
-       fd = -1;
-       len = 0;
-
-       /* The parser is only run on the first file found. */
-       /* FIXME: Could try others on error, etc. */
-
-       for (i = 0; conf->conf_files[i]; i++) {
-               char *filepath = resolve_path(conf->dc,
-                       conf->conf_files[i], conf->dc->device_path);
-
-               pb_log("%s: try: %s\n", __func__, filepath);
-
-               fd = open(filepath, O_RDONLY);
-
-               talloc_free(filepath);
-
-               if (fd < 0) {
-                       pb_log("%s: open failed: %s\n", __func__,
-                               strerror(errno));
-                       continue;
-               }
-
-               if (fstat(fd, &stat)) {
-                       pb_log("%s: fstat failed: %s\n", __func__,
-                               strerror(errno));
-                       continue;
-               }
-
-               conf->buf = talloc_array(conf, char, stat.st_size + 1);
-
-               len = read(fd, conf->buf, stat.st_size);
-
-               if (len < 0) {
-                       pb_log("%s: read failed: %s\n", __func__,
-                               strerror(errno));
-                       continue;
-               }
-               conf->buf[len] = 0;
-
-               break;
-       }
-
-       if (fd >= 0)
-               close(fd);
-
-       if (len <= 0)
-               goto out;
-
-       if (!conf->dc->device->icon_file)
-               conf->dc->device->icon_file = talloc_strdup(conf->dc,
-                       generic_icon_file(guess_device_type(conf->dc)));
-
-       conf_parse_buf(conf);
-
-       rc = 1;
-
-out:
-       pb_log("%s: %s\n", __func__, (rc ? "ok" : "failed"));
-       return rc;
-}
-