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

Diff for /libaitcfg/src/parse.c between versions 1.2.2.1 and 1.5.2.3

version 1.2.2.1, 2009/09/09 09:29:37 version 1.5.2.3, 2011/05/01 17:23:29
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
         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"
 #include "tools.h"  
   
   
 // cfgDbg() Debug/Log operation  // cfgDbg() Debug/Log operation
Line 24  static inline int cfgDbg(FILE *f, char *fmt, ...) Line 60  static inline int cfgDbg(FILE *f, char *fmt, ...)
         return ret;          return ret;
 }  }
   
   /*
    * InvertQueue() InvertQueue order //{cfg} list of elements for revert
    * @cfg = Head list element for revert 
   */
   static inline void InvertQueue(sl_config * __restrict cfg)
   {
           struct tagPair *item, *next, *prev = NULL;
   
           for (item = cfg->slh_first; item; item = next) {
                   next = item->sle_next;
                   item->sle_next = prev;
                   prev = item;
           }
           cfg->slh_first = prev;
   }
   
 // cfgWrite() Write to file from config list  // cfgWrite() Write to file from config list
 static inline int cfgWrite(FILE *f, sl_config * __restrict cfg, int whitespace)  static inline int cfgWrite(FILE *f, sl_config * __restrict cfg, int whitespace)
 {  {
Line 42  static inline int cfgWrite(FILE *f, sl_config * __rest Line 94  static inline int cfgWrite(FILE *f, sl_config * __rest
                 return -1;                  return -1;
         }          }
   
           InvertQueue(cfg);
         for (av = cfg->slh_first; av; av = av->sle_next) {          for (av = cfg->slh_first; av; av = av->sle_next) {
                 if (av->psSection && strcmp((char*) av->psSection, (char*) szSection)) {                  if (av->psSection && strcmp((char*) av->psSection, (char*) szSection)) {
                         strlcpy((char*) szSection, (char*) av->psSection, MAX_STR + 1);                          strlcpy((char*) szSection, (char*) av->psSection, MAX_STR + 1);
Line 70  static inline int cfgWrite(FILE *f, sl_config * __rest Line 123  static inline int cfgWrite(FILE *f, sl_config * __rest
                         }                          }
                 }                  }
         }          }
           InvertQueue(cfg);
   
         bzero(szTime, MAX_STR + 1);          bzero(szTime, MAX_STR + 1);
         time(&tim);          time(&tim);
Line 82  static inline int cfgWrite(FILE *f, sl_config * __rest Line 136  static inline int cfgWrite(FILE *f, sl_config * __rest
         return 0;          return 0;
 }  }
   
// -----------------------------------------// ---------------------------------------------------
   
 /*  /*
  * ReadConfig() Read from file and add new item to config list   * ReadConfig() Read from file and add new item to config list
Line 101  int ReadConfig(FILE *f, sl_config * __restrict cfg) Line 155  int ReadConfig(FILE *f, sl_config * __restrict cfg)
         while (!feof(f)) {          while (!feof(f)) {
                 memset(szLine, 0, MAX_STR + 1);                  memset(szLine, 0, MAX_STR + 1);
                 fgets((char*) szLine, MAX_STR, f);                  fgets((char*) szLine, MAX_STR, f);
                trim(szLine);                io_TrimStr(szLine);
 #ifdef __DEBUG  #ifdef __DEBUG
                 cfgDbg(stdout, "DEBUG:: RAW |%s|\n", szLine);                  cfgDbg(stdout, "DEBUG:: RAW |%s|\n", szLine);
 #endif  #endif
Line 167  int ReadConfig(FILE *f, sl_config * __restrict cfg) Line 221  int ReadConfig(FILE *f, sl_config * __restrict cfg)
                         psAttr = szLine;                          psAttr = szLine;
                         psVal = (szLine + pos + 1);                          psVal = (szLine + pos + 1);
                         szLine[pos] = 0;                          szLine[pos] = 0;
                        rtrim(psAttr);                        io_RTrimStr(psAttr);
                        ltrim(psVal);                        io_LTrimStr(psVal);
                         io_UnquotStr(psVal);
 #ifdef __DEBUG  #ifdef __DEBUG
                         cfgDbg(stdout, "DEBUG:: Attr(%p) ->%s size=%d Value(%p) ->%s size=%d\n",                           cfgDbg(stdout, "DEBUG:: Attr(%p) ->%s size=%d Value(%p) ->%s size=%d\n", 
                                         psAttr, psAttr, strlen((char*) psAttr), psVal, psVal, strlen((char*) psVal));                                          psAttr, psAttr, strlen((char*) psAttr), psVal, psVal, strlen((char*) psVal));
Line 218  int WriteConfig(FILE *f, sl_config * __restrict cfg) Line 273  int WriteConfig(FILE *f, sl_config * __restrict cfg)
 int cfg_WriteConfig(FILE *f, sl_config * __restrict cfg)  int cfg_WriteConfig(FILE *f, sl_config * __restrict cfg)
 {  {
         return cfgWrite(f, cfg, 0);          return cfgWrite(f, cfg, 0);
   }
   
   /*
    * ConcatConfig() Concat two list in one
    * @cfg = Head list element of main list
    * @add_cfg = Head list element of added list
    * return: 0 ok; -1 error:: can`t concat lists
   */
   int ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg)
   {
           struct tagPair *item;
           int ret = 0;
   
           if (!cfg || !add_cfg)
                   return -1;
   
           for (item = cfg->slh_first; item->sle_next; item = item->sle_next);
           item->sle_next = add_cfg->slh_first;
   
           add_cfg->slh_first = NULL;
   
           return ret;
   }
   
   /*
    * MergeConfig() Marge two list in one cfg and destroy add_cfg
    * @cfg = Head list element of main list
    * @add_cfg = Head list element of merged list (destroy after all!)
    * return: 0 ok; -1 error:: can`t merge lists
   */
   int MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg)
   {
           struct tagPair *item, *merge, *add_next, *next = NULL;
           int flg;
   
           if (!cfg || !add_cfg)
                   return -1;
   
           item = add_cfg->slh_first;
           while (item) {
                   add_next = item->sle_next;
   
                   for (flg = 0, merge = cfg->slh_first, next = merge->sle_next; next; 
                                   merge = merge->sle_next, next = merge->sle_next) {
                           if (!merge->psSection && !item->psSection) {
                                   flg = 1;
                                   merge->sle_next = item;
                                   item->sle_next = next;
                                   break;
                           }
                           if (merge->psSection && item->psSection && 
                                           !strcmp((char*) merge->psSection, (char*) item->psSection)) {
                                   flg = 1;
                                   merge->sle_next = item;
                                   item->sle_next = next;
                                   break;
                           }
                   }
   
                   if (!flg) {
                           if (!merge->sle_next) {
                                   merge->sle_next = item;
                                   item->sle_next = NULL;
                           } else
                                   return -1;
                   }
   
                   item = add_next;
           }
   
           add_cfg->slh_first = NULL;
   
           return 0;
 }  }
Removed from v.1.2.2.1  
changed lines
  Added in v.1.5.2.3

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