--- libaitcfg/src/aitcfg.c 2008/08/28 13:17:41 1.1.1.1 +++ libaitcfg/src/aitcfg.c 2011/05/10 20:52:36 1.4.2.1 @@ -1,3 +1,48 @@ +/************************************************************************* +* (C) 2008 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: aitcfg.c,v 1.4.2.1 2011/05/10 20:52:36 misho Exp $ +* +************************************************************************** +The ELWIX and AITNET software is distributed under the following +terms: + +All of the documentation and software included in the ELWIX and AITNET +Releases is copyrighted by ELWIX - Sofia/Bulgaria + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + by Michael Pounov . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by Michael Pounov +ELWIX - Embedded LightWeight unIX and its contributors. +4. Neither the name of AITNET nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ #include "global.h" #include "aitcfg.h" @@ -15,12 +60,14 @@ char cfgError[MAX_STR + 1]; * @cfg = New head element for init * return: 0 ok; -1 error:: new head element is null */ -inline int InitConfig(sl_config * __restrict cfg) +inline int +InitConfig(sl_config * __restrict cfg) { if (!cfg) return -1; - return (int) (cfg->slh_first = NULL); + cfg->slh_first = NULL; + return 0; } /* @@ -29,7 +76,8 @@ inline int InitConfig(sl_config * __restrict cfg) * @cfg = Head list element * return: 0 ok; -1 error:: can`t load config */ -int LoadConfig(const char *csConfigName, sl_config * __restrict cfg) +int +LoadConfig(const char *csConfigName, sl_config * __restrict cfg) { FILE *f; int ret; @@ -60,14 +108,15 @@ int LoadConfig(const char *csConfigName, sl_config * _ * UnloadConfig() Unload config from memory and free resources * @cfg = Head list element */ -void UnloadConfig(sl_config * __restrict cfg) +void +UnloadConfig(sl_config * __restrict cfg) { struct tagPair *av; if (!cfg->slh_first) return; - for (av = cfg->slh_first; av; av = av->sle_next) { + while ((av = cfg->slh_first)) { cfg->slh_first = cfg->slh_first->sle_next; if (av->psValue) @@ -86,7 +135,8 @@ void UnloadConfig(sl_config * __restrict cfg) * @cfg = Head list element * return: 0 ok; -1 error:: can`t save new config */ -int CreateConfig(const char *csConfigName, sl_config * __restrict cfg) +int +CreateConfig(const char *csConfigName, sl_config * __restrict cfg) { FILE *f; int ret; @@ -107,6 +157,34 @@ int CreateConfig(const char *csConfigName, sl_config * return ret; } +/* + * cfg_CreateConfig() Create config file from memory without whitespaces! + * @csConfigName = New config filename + * @cfg = Head list element + * return: 0 ok; -1 error:: can`t save new config +*/ +int +cfg_CreateConfig(const char *csConfigName, sl_config * __restrict cfg) +{ + FILE *f; + int ret; + + if (!csConfigName || !cfg) + return -1; + + f = fopen(csConfigName, "wt"); + if (!f) { + LOGERR; + return -1; + } + + ret ^= ret; + ret = cfg_WriteConfig(f, cfg); + + fclose(f); + return ret; +} + // ----------------------------------------------------------- // @@ -114,13 +192,15 @@ int CreateConfig(const char *csConfigName, sl_config * // // cfg_GetErrno() Get error code of last operation -inline int cfg_GetErrno() +inline int +cfg_GetErrno() { return cfgErrno; } // cfg_GetError() Get error text of last operation -inline const char *cfg_GetError() +inline const char * +cfg_GetError() { return cfgError; }