version 1.20, 2022/12/05 22:31:12
|
version 1.20.2.1, 2023/01/23 21:03:50
|
Line 12 terms:
|
Line 12 terms:
|
All of the documentation and software included in the ELWIX and AITNET |
All of the documentation and software included in the ELWIX and AITNET |
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org> |
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org> |
|
|
Copyright 2004 - 2021 | Copyright 2004 - 2023 |
by Michael Pounov <misho@elwix.org>. All rights reserved. |
by Michael Pounov <misho@elwix.org>. All rights reserved. |
|
|
Redistribution and use in source and binary forms, with or without |
Redistribution and use in source and binary forms, with or without |
Line 98 cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
|
Line 98 cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
|
/* concat line to value */ |
/* concat line to value */ |
AIT_SET_STRCAT(&av->cfg_val, line); |
AIT_SET_STRCAT(&av->cfg_val, line); |
if (!flg && AIT_ADDR(&av->cfg_val)) |
if (!flg && AIT_ADDR(&av->cfg_val)) |
str_Unquot((char*) AIT_GET_STR(&av->cfg_val)); | av->cfg_quoted += str_Unquot((char*) AIT_GET_STR(&av->cfg_val)); |
|
|
/* read include file */ |
/* read include file */ |
if (!flg && AIT_ADDR(&av->cfg_val) && |
if (!flg && AIT_ADDR(&av->cfg_val) && |
Line 109 cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
|
Line 109 cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
|
cfgReadConfig(ff, cfg); |
cfgReadConfig(ff, cfg); |
fclose(ff); |
fclose(ff); |
} else |
} else |
EDEBUG(7, "Error:: Can't open %s file", | EDEBUG(ELWIX_DEBUG_LOG, "Error:: Can't open %s file", |
AIT_GET_STR(&av->cfg_val)); |
AIT_GET_STR(&av->cfg_val)); |
} |
} |
continue; |
continue; |
Line 149 cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
|
Line 149 cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
|
strlcpy(szSection, line + 1, sizeof szSection); |
strlcpy(szSection, line + 1, sizeof szSection); |
AIT_SET_STR(&av->cfg_sec, line); |
AIT_SET_STR(&av->cfg_sec, line); |
} else |
} else |
EDEBUG(7, "Ignore section '%s' ... not found ']'", line); | EDEBUG(ELWIX_DEBUG_LOG, "Ignore section '%s' ... not found ']'", line); |
continue; |
continue; |
} |
} |
/* parse pair */ |
/* parse pair */ |
if (!(psAttr = strchr(line, '='))) { |
if (!(psAttr = strchr(line, '='))) { |
AIT_SET_STR(&av->cfg_val, origin); |
AIT_SET_STR(&av->cfg_val, origin); |
EDEBUG(7, "Ignore a/v '%s' ... not found '='", line); | EDEBUG(ELWIX_DEBUG_LOG, "Ignore a/v '%s' ... not found '='", line); |
continue; |
continue; |
} else { |
} else { |
*psAttr = 0; |
*psAttr = 0; |
Line 173 cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
|
Line 173 cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
|
str_RTrim(psAttr); |
str_RTrim(psAttr); |
str_LTrim(psVal); |
str_LTrim(psVal); |
if (!flg) |
if (!flg) |
str_Unquot(psVal); | av->cfg_quoted += str_Unquot(psVal); |
AIT_SET_STR(&av->cfg_val, psVal); |
AIT_SET_STR(&av->cfg_val, psVal); |
AIT_SET_STR(&av->cfg_attr, psAttr); |
AIT_SET_STR(&av->cfg_attr, psAttr); |
AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), |
AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), |
Line 191 cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
|
Line 191 cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
|
cfgReadConfig(ff, cfg); |
cfgReadConfig(ff, cfg); |
fclose(ff); |
fclose(ff); |
} else |
} else |
EDEBUG(7, "Error:: Can't open %s file", | EDEBUG(ELWIX_DEBUG_LOG, "Error:: Can't open %s file", |
AIT_GET_STR(&av->cfg_val)); |
AIT_GET_STR(&av->cfg_val)); |
} |
} |
} |
} |
Line 232 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
Line 232 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
if (!AIT_ISEMPTY(&av->cfg_sec) && AIT_ADDR(&av->cfg_sec) && |
if (!AIT_ISEMPTY(&av->cfg_sec) && AIT_ADDR(&av->cfg_sec) && |
strcmp(AIT_GET_STRZ(&av->cfg_sec), szSection)) { |
strcmp(AIT_GET_STRZ(&av->cfg_sec), szSection)) { |
strlcpy(szSection, AIT_GET_STR(&av->cfg_sec), sizeof szSection); |
strlcpy(szSection, AIT_GET_STR(&av->cfg_sec), sizeof szSection); |
if (!cfg_Write(f, "\n[%s]\n", AIT_GET_STR(&av->cfg_sec))) { | if (!cfg_Write(f, "[%s]\n", AIT_GET_STR(&av->cfg_sec))) { |
LOGERR; |
LOGERR; |
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
return -1; |
return -1; |
} |
} |
} else if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) { |
} else if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) { |
memset(szSection, 0, sizeof szSection); |
memset(szSection, 0, sizeof szSection); |
if (!cfg_Write(f, "\n[]\n")) { | if (!cfg_Write(f, "[]\n")) { |
LOGERR; |
LOGERR; |
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
return -1; |
return -1; |
Line 255 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
Line 255 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
else |
else |
strlcat(line, "=", sizeof line); |
strlcat(line, "=", sizeof line); |
} |
} |
if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string) | if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string) { |
| if (av->cfg_quoted) |
| strlcat(line, "\"", sizeof line); |
strlcat(line, AIT_GET_STRZ(&av->cfg_val), sizeof line); |
strlcat(line, AIT_GET_STRZ(&av->cfg_val), sizeof line); |
|
if (av->cfg_quoted) |
|
strlcat(line, "\"", sizeof line); |
|
} |
skip_sec: |
skip_sec: |
/* write */ |
/* write */ |
if (!cfg_Write(f, "%s\n", line)) { |
if (!cfg_Write(f, "%s\n", line)) { |
Line 303 cfgWriteConfigRaw(FILE *f, cfg_root_t * __restrict cfg
|
Line 308 cfgWriteConfigRaw(FILE *f, cfg_root_t * __restrict cfg
|
if (!AIT_ISEMPTY(&av->cfg_sec) && AIT_ADDR(&av->cfg_sec) && |
if (!AIT_ISEMPTY(&av->cfg_sec) && AIT_ADDR(&av->cfg_sec) && |
strcmp(AIT_GET_STRZ(&av->cfg_sec), szSection)) { |
strcmp(AIT_GET_STRZ(&av->cfg_sec), szSection)) { |
strlcpy(szSection, AIT_GET_STR(&av->cfg_sec), sizeof szSection); |
strlcpy(szSection, AIT_GET_STR(&av->cfg_sec), sizeof szSection); |
if (!cfg_Write(f, "\n[%s]\n", AIT_GET_STR(&av->cfg_sec))) { | if (!cfg_Write(f, "[%s]\n", AIT_GET_STR(&av->cfg_sec))) { |
LOGERR; |
LOGERR; |
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
return -1; |
return -1; |
} |
} |
} else if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) { |
} else if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) { |
memset(szSection, 0, sizeof szSection); |
memset(szSection, 0, sizeof szSection); |
if (!cfg_Write(f, "\n[]\n")) { | if (!cfg_Write(f, "[]\n")) { |
LOGERR; |
LOGERR; |
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
return -1; |
return -1; |
Line 326 cfgWriteConfigRaw(FILE *f, cfg_root_t * __restrict cfg
|
Line 331 cfgWriteConfigRaw(FILE *f, cfg_root_t * __restrict cfg
|
else |
else |
strlcat(line, "=", sizeof line); |
strlcat(line, "=", sizeof line); |
} |
} |
if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string) | if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string) { |
| if (av->cfg_quoted) |
| strlcat(line, "\"", sizeof line); |
strlcat(line, AIT_GET_STRZ(&av->cfg_val), sizeof line); |
strlcat(line, AIT_GET_STRZ(&av->cfg_val), sizeof line); |
|
if (av->cfg_quoted) |
|
strlcat(line, "\"", sizeof line); |
|
} |
skip_sec: |
skip_sec: |
/* write */ |
/* write */ |
if (!cfg_Write(f, "%s\n", line)) { |
if (!cfg_Write(f, "%s\n", line)) { |
Line 486 cfgReadLines(FILE *f, const char *delim, const char *e
|
Line 496 cfgReadLines(FILE *f, const char *delim, const char *e
|
AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), |
AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), |
E_ALIGN(AIT_LEN(&av->cfg_sec) - 1, 2) / 2); |
E_ALIGN(AIT_LEN(&av->cfg_sec) - 1, 2) / 2); |
} |
} |
if (psVal) | if (psVal) { |
| av->cfg_quoted = str_Unquot(psVal); |
AIT_SET_STR(&av->cfg_val, psVal); |
AIT_SET_STR(&av->cfg_val, psVal); |
|
} |
AIT_SET_STR(&av->cfg_attr, psAttr); |
AIT_SET_STR(&av->cfg_attr, psAttr); |
AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), |
AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), |
E_ALIGN(AIT_LEN(&av->cfg_attr) - 1, 2) / 2); |
E_ALIGN(AIT_LEN(&av->cfg_attr) - 1, 2) / 2); |
Line 556 cfgWriteLines(FILE *f, const char *delim, const char *
|
Line 568 cfgWriteLines(FILE *f, const char *delim, const char *
|
AIT_SET_STRCAT(v, AIT_GET_STR(&av->cfg_attr)); |
AIT_SET_STRCAT(v, AIT_GET_STR(&av->cfg_attr)); |
AIT_SET_STRCAT(v, delim); |
AIT_SET_STRCAT(v, delim); |
} |
} |
if (!AIT_ISEMPTY(&av->cfg_val)) | if (!AIT_ISEMPTY(&av->cfg_val)) { |
| if (av->cfg_quoted) |
| AIT_SET_STRCAT(v, "\""); |
AIT_SET_STRCAT(v, AIT_GET_STR(&av->cfg_val)); |
AIT_SET_STRCAT(v, AIT_GET_STR(&av->cfg_val)); |
|
if (av->cfg_quoted) |
|
AIT_SET_STRCAT(v, "\""); |
|
} |
AIT_SET_STRCAT(v, eol); |
AIT_SET_STRCAT(v, eol); |
} |
} |
|
|