Changeset 5445

Timestamp:

03/20/08 14:56:41 (4 months ago)

Author:

morris

Message:

Add a concept of default settings

Handle config writes better

Files:

• libwired/trunk/libwired/misc/wi-config.c (modified) (12 diffs)
• libwired/trunk/libwired/misc/wi-config.h (modified) (2 diffs)

libwired/trunk/libwired/misc/wi-config.c

@@ -50 +50 @@
-        wi_string_t                                             *path;
-        wi_hash_t                                               *types;
+        wi_hash_t                                               *defaults;
-        wi_uinteger_t                                   line;
-        
@@ -104 +105 @@
-
-
-
+, wi_hash_t *defaults
-        config->lock            = wi_lock_init(wi_lock_alloc());
-        config->path            = wi_retain(path);
-        config->types           = wi_retain(types);
-        config->changes         = wi_set_init(wi_set_alloc());
+        config->defaults        = wi_retain(defaults);
-        
-        return config;
@@ -155 +157 @@
-        
-        config->values = wi_hash_init(wi_hash_alloc());
+        
+        if(config->defaults)
+                wi_hash_add_entries_from_hash(config->values, config->defaults);
-        
-        while((string = wi_file_read_line(file))) {
@@ -181 +186 @@
-                                        _wi_config_log_error(config, name);
-                                }
+                        } else {
+                                wi_error_set_libwired_error(WI_ERROR_SETTINGS_SYNTAXERROR);
+                                
+                                _wi_config_log_error(config, string);
-                        }
-                }
@@ -193 +202 @@
-
-wi_boolean_t wi_config_write_file(wi_config_t *config) {
+        wi_enumerator_t         *enumerator;
-        wi_file_t                       *file, *tmpfile;
-        wi_string_t                     *string, *name, *value;
+        wi_set_t                        *keys;
+        wi_boolean_t            write;
-        
-        file = wi_file_for_updating(config->path);
@@ -208 +220 @@
-        
-        wi_lock_lock(config->lock);
+        
+        keys = wi_autorelease(wi_copy(config->changes));
-
-        while((string = wi_file_read_line(file))) {
-
+
+
+
+
+
+
+
-                        if(_wi_config_parse_string(config, string, &name, &value)) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                wi_file_write_format(tmpfile, WI_STR("%@\n"), string);
-                        }
-                } else {
-                        wi_file_write_format(tmpfile, WI_STR("%@\n"), string);
-                }
-        }
+        
+        enumerator = wi_set_data_enumerator(keys);
+        
+        while((name = wi_enumerator_next_data(enumerator)))
+                _wi_config_write_setting_to_file(config, name, tmpfile);
-        
-        wi_set_remove_all_data(config->changes);
@@ -241 +286 @@
-void wi_config_note_change(wi_config_t *config, wi_string_t *name) {
-        wi_set_add_data(config->changes, name);
+}
+
+
+
+void wi_config_clear_changes(wi_config_t *config) {
+        wi_set_remove_all_data(config->changes);
-}
-
@@ -265 +316 @@
-        array = wi_string_components_separated_by_string(string, WI_STR("="));
-        
-
-
-
-
-
+
-                return false;
-        }
-        
-        *name = wi_string_by_deleting_surrounding_whitespace(WI_ARRAY(array, 0));
@@ -392 +438 @@
-        struct passwd                           *user;
-        struct group                            *group;
+        wi_uinteger_t                           i, count;
-        
-        if(!wi_hash_contains_key(config->types, name)) {
@@ -419 +466 @@
-                        
-                case WI_CONFIG_STRINGLIST:
-
-
-
-
-
-
+
+
+
+
-                        break;
-                        
@@ -470 +515 @@
-
-void wi_config_set_instance_for_name(wi_config_t *config, wi_runtime_instance_t *instance, wi_string_t *name) {
+        wi_runtime_instance_t           *copy;
+        
-        wi_lock_lock(config->lock);
-        
@@ -475 +522 @@
-                wi_set_add_data(config->changes, name);
-        
-
+
+
+
-        
-        wi_lock_unlock(config->lock);

libwired/trunk/libwired/misc/wi-config.h

@@ -56 +56 @@
-
-WI_EXPORT wi_config_t *                         wi_config_alloc(void);
-
+, wi_hash_t *
-
-WI_EXPORT wi_boolean_t                          wi_config_read_file(wi_config_t *);
@@ -62 +62 @@
-
-WI_EXPORT void                                          wi_config_note_change(wi_config_t *, wi_string_t *);
+WI_EXPORT void                                          wi_config_clear_changes(wi_config_t *);
-WI_EXPORT wi_set_t *                            wi_config_changes(wi_config_t *);
-