[BACK]Return to aitcfg.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libaitcfg / src

Diff for /libaitcfg/src/aitcfg.c between versions 1.2 and 1.7

version 1.2, 2009/09/09 09:07:31 version 1.7, 2012/07/25 15:24:20
Line 5 Line 5
 * $Author$  * $Author$
 * $Id$  * $Id$
 *  *
*************************************************************************/**************************************************************************
 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 <info@elwix.org>
 
 Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
         by Michael Pounov <misho@elwix.org>.  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 <misho@elwix.org>
 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 "global.h"
 #include "aitcfg.h"  #include "aitcfg.h"
   
   
 #pragma GCC visibility push(hidden)  #pragma GCC visibility push(hidden)
   
int cfgErrno;int cfg_Errno;
char cfgError[MAX_STR + 1];char cfg_Error[STRSIZ];
   
   inline int
   cfg_tree_cmp(struct tagCfg *a, struct tagCfg *b)
   {
           int ret;
   
           assert(a && b);
   
           ret = ((AIT_KEY(&a->cfg_sec) << 16) | AIT_KEY(&a->cfg_attr)) - 
                   ((AIT_KEY(&b->cfg_sec) << 16) | AIT_KEY(&b->cfg_attr));
   
           if (ret < 0)
                   return -1;
           else if (ret > 0)
                   return 1;
   
           return ret;
   }
   
   RB_GENERATE(tagRC, tagCfg, cfg_node, cfg_tree_cmp);
   
 #pragma GCC visibility pop  #pragma GCC visibility pop
   
   
   // cfg_GetErrno() Get error code of last operation
   inline int
   cfg_GetErrno()
   {
           return cfg_Errno;
   }
   
   // cfg_GetError() Get error text of last operation
   inline const char *
   cfg_GetError()
   {
           return cfg_Error;
   }
   
   // cfg_SetErr() Set error to variables for internal use!!!
   inline void
   cfg_SetErr(int eno, char *estr, ...)
   {
           va_list lst;
   
           cfg_Errno = eno;
           memset(cfg_Error, 0, sizeof cfg_Error);
           va_start(lst, estr);
           vsnprintf(cfg_Error, sizeof cfg_Error, estr, lst);
           va_end(lst);
   }
   
   
 /*  /*
 * InitConfig() Head initializing function for config * cfgInitConfig() - Init config root
 * @cfg = New head element for init *
 * return: 0 ok; -1 error:: new head element is null * @cfg = Config root
*/ * return: -1 error or 0 ok
inline int InitConfig(sl_config * __restrict cfg) */
 int
 cfgInitConfig(cfg_root_t * __restrict cfg)
 {  {
         if (!cfg)          if (!cfg)
                 return -1;                  return -1;
   
        cfg->slh_first = NULL;        pthread_mutex_init(&cfg->rc_mtx, NULL);
 
         SLIST_INIT(cfg);
         RB_INIT(cfg);
         return 0;          return 0;
 }  }
   
 /*  /*
 * LoadConfig() Load config from file * cfgLoadConfig() - Load config from file
 * @csConfigName = Filename of config *
 * @cfg = Head list element * @cfgName = Config filename
 * return: 0 ok; -1 error:: can`t load config * @cfg = Config root
*/ * return: -1 error or 0 ok
int LoadConfig(const char *csConfigName, sl_config * __restrict cfg) */
 int
 cfgLoadConfig(const char *cfgName, cfg_root_t * __restrict cfg)
 {  {
         FILE *f;          FILE *f;
         int ret;          int ret;
   
        if (!csConfigName || !cfg)        if (!cfgName || !cfg) {
                 cfg_SetErr(EINVAL, "Invalid parameter(s)");
                 return -1;                  return -1;
           } else
                   cfgInitConfig(cfg);
   
        InitConfig(cfg);        f = fopen(cfgName, "r");
        if (access(csConfigName, R_OK)) { 
                LOGERR; 
                return -1; 
        } 
 
        f = fopen(csConfigName, "rt"); 
         if (!f) {          if (!f) {
                 LOGERR;                  LOGERR;
                 return -1;                  return -1;
         }          }
           
         ret ^= ret;  
         ret = ReadConfig(f, cfg);  
   
           ret = cfgReadConfig(f, cfg);
   
         fclose(f);          fclose(f);
         return ret;          return ret;
 }  }
   
 /*  /*
 * UnloadConfig() Unload config from memory and free resources * cfgClearConfig() - Clear config and free resources
 * @cfg = Head list element *
*/ * @cfg = Config root
void UnloadConfig(sl_config * __restrict cfg) * return: none
  */
 void
 cfgClearConfig(cfg_root_t * __restrict cfg)
 {  {
        struct tagPair *av;        struct tagCfg *av;
   
        if (!cfg->slh_first)        if (!cfg)
                 return;                  return;
   
        while ((av = cfg->slh_first)) {        CFG_RC_LOCK(cfg);
                cfg->slh_first = cfg->slh_first->sle_next;        while ((av = SLIST_FIRST(cfg))) {
                 SLIST_REMOVE_HEAD(cfg, cfg_next);
   
                if (av->psValue)                AIT_FREE_VAL(&av->cfg_val);
                        free(av->psValue);                AIT_FREE_VAL(&av->cfg_attr);
                if (av->psAttribute)                AIT_FREE_VAL(&av->cfg_sec);
                        free(av->psAttribute);                io_free(av);
                if (av->psSection) 
                        free(av->psSection); 
                free(av); 
         }          }
           cfg->rbh_root = NULL;
           CFG_RC_UNLOCK(cfg);
 }  }
   
 /*  /*
 * CreateConfig() Create config file from memory * cfgUnloadConfig() - Unload config from memory and destroy resources
  *
  * @cfg = Config root
  * return: none
  */
 void
 cfgUnloadConfig(cfg_root_t * __restrict cfg)
 {
         if (!cfg)
                 return;
 
         cfgClearConfig(cfg);
         pthread_mutex_destroy(&cfg->rc_mtx);
 }
 
 /*
  * cfgCreateConfig() - Create config file from memory
  *
  * @csConfigName = New config filename   * @csConfigName = New config filename
 * @cfg = Head list element * @cfg = Config root
 * return: 0 ok; -1 error:: can`t save new config * @whitespace = Additional whitespace characters to file
*/ * return: -1 error or 0 ok
int CreateConfig(const char *csConfigName, sl_config * __restrict cfg) */
 int
 cfgCreateConfig(const char *csConfigName, cfg_root_t * __restrict cfg, int whitespace)
 {  {
         FILE *f;          FILE *f;
         int ret;          int ret;
Line 103  int CreateConfig(const char *csConfigName, sl_config * Line 213  int CreateConfig(const char *csConfigName, sl_config *
         if (!csConfigName || !cfg)          if (!csConfigName || !cfg)
                 return -1;                  return -1;
   
        f = fopen(csConfigName, "wt");        f = fopen(csConfigName, "w");
         if (!f) {          if (!f) {
                 LOGERR;                  LOGERR;
                 return -1;                  return -1;
         }          }
                   
        ret ^= ret;        ret = cfgWriteConfig(f, cfg, whitespace);
        ret = WriteConfig(f, cfg); 
   
         fclose(f);          fclose(f);
         return ret;          return ret;
 }  
   
 // -----------------------------------------------------------  
   
 //  
 // Error maintenance functions ...  
 //  
   
 // cfg_GetErrno() Get error code of last operation  
 inline int cfg_GetErrno()  
 {  
         return cfgErrno;  
 }  
   
 // cfg_GetError() Get error text of last operation  
 inline const char *cfg_GetError()  
 {  
         return cfgError;  
 }  }
Removed from v.1.2  
changed lines
  Added in v.1.7

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>