[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.3.2.1 and 1.6.2.1

version 1.3.2.1, 2009/11/11 14:46:36 version 1.6.2.1, 2011/05/10 20:52:36
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
static inline int cfgDbg(FILE *f, char *fmt, ...)static inline int
 cfgDbg(FILE *f, char *fmt, ...)
 {  {
         int ret = 0;          int ret = 0;
         va_list lst;          va_list lst;
Line 28  static inline int cfgDbg(FILE *f, char *fmt, ...) Line 65  static inline int cfgDbg(FILE *f, char *fmt, ...)
  * InvertQueue() InvertQueue order //{cfg} list of elements for revert   * InvertQueue() InvertQueue order //{cfg} list of elements for revert
  * @cfg = Head list element for revert    * @cfg = Head list element for revert 
 */  */
static inline void InvertQueue(sl_config * __restrict cfg)static inline void
 InvertQueue(sl_config * __restrict cfg)
 {  {
         struct tagPair *item, *next, *prev = NULL;          struct tagPair *item, *next, *prev = NULL;
   
Line 41  static inline void InvertQueue(sl_config * __restrict  Line 79  static inline void InvertQueue(sl_config * __restrict 
 }  }
   
 // 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)
 {  {
         struct tagPair *av;          struct tagPair *av;
         time_t tim;          time_t tim;
Line 108  static inline int cfgWrite(FILE *f, sl_config * __rest Line 147  static inline int cfgWrite(FILE *f, sl_config * __rest
  * @cfg = Head list element   * @cfg = Head list element
  * return: 0 ok; -1 error:: can`t allocate memory   * return: 0 ok; -1 error:: can`t allocate memory
 */  */
int ReadConfig(FILE *f, sl_config * __restrict cfg)int
 ReadConfig(FILE *f, sl_config * __restrict cfg)
 {  {
         u_char szLine[MAX_STR + 1];          u_char szLine[MAX_STR + 1];
         u_char szSection[MAX_STR + 1], *psAttr, *psVal;          u_char szSection[MAX_STR + 1], *psAttr, *psVal;
Line 119  int ReadConfig(FILE *f, sl_config * __restrict cfg) Line 159  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 185  int ReadConfig(FILE *f, sl_config * __restrict cfg) Line 225  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);
                        unquot(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 223  int ReadConfig(FILE *f, sl_config * __restrict cfg) Line 263  int ReadConfig(FILE *f, sl_config * __restrict cfg)
  * @cfg = Head list element   * @cfg = Head list element
  * return: 0 ok; -1 error:: can`t write to file   * return: 0 ok; -1 error:: can`t write to file
 */  */
int WriteConfig(FILE *f, sl_config * __restrict cfg)int
 WriteConfig(FILE *f, sl_config * __restrict cfg)
 {  {
         return cfgWrite(f, cfg, 1);          return cfgWrite(f, cfg, 1);
 }  }
Line 234  int WriteConfig(FILE *f, sl_config * __restrict cfg) Line 275  int WriteConfig(FILE *f, sl_config * __restrict cfg)
  * @cfg = Head list element   * @cfg = Head list element
  * return: 0 ok; -1 error:: can`t write to file   * return: 0 ok; -1 error:: can`t write to file
 */  */
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);
 }  }
Line 245  int cfg_WriteConfig(FILE *f, sl_config * __restrict cf Line 287  int cfg_WriteConfig(FILE *f, sl_config * __restrict cf
  * @add_cfg = Head list element of added list   * @add_cfg = Head list element of added list
  * return: 0 ok; -1 error:: can`t concat lists   * return: 0 ok; -1 error:: can`t concat lists
 */  */
int ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg)int
 ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg)
 {  {
         struct tagPair *item;          struct tagPair *item;
         int ret = 0;          int ret = 0;
Line 267  int ConcatConfig(sl_config * __restrict cfg, sl_config Line 310  int ConcatConfig(sl_config * __restrict cfg, sl_config
  * @add_cfg = Head list element of merged list (destroy after all!)   * @add_cfg = Head list element of merged list (destroy after all!)
  * return: 0 ok; -1 error:: can`t merge lists   * return: 0 ok; -1 error:: can`t merge lists
 */  */
int MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg)int
 MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg)
 {  {
         struct tagPair *item, *merge, *add_next, *next = NULL;          struct tagPair *item, *merge, *add_next, *next = NULL;
         int flg;          int flg;
Removed from v.1.3.2.1  
changed lines
  Added in v.1.6.2.1

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