#include <string.h>
#include <ctype.h>
#include <errno.h>
+#include <rte_string_fns.h>
#include <rte_common.h>
+#include <rte_log.h>
#include "rte_cfgfile.h"
struct rte_cfgfile_section *sections;
};
+RTE_LOG_REGISTER(cfgfile_logtype, lib.cfgfile, INFO);
+
+#define CFG_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, cfgfile_logtype, "%s(): " fmt "\n", \
+ __func__, ## args)
+
/** when we resize a file structure, how many extra entries
* for new sections do we add in */
#define CFG_ALLOC_SECTION_BATCH 8
struct rte_cfgfile_entry *curr_entry =
§ion->entries[section->num_entries];
- snprintf(curr_entry->name, sizeof(curr_entry->name), "%s", entryname);
- snprintf(curr_entry->value,
- sizeof(curr_entry->value), "%s", entryvalue);
+ strlcpy(curr_entry->name, entryname, sizeof(curr_entry->name));
+ strlcpy(curr_entry->value, entryvalue, sizeof(curr_entry->value));
section->num_entries++;
return 0;
unsigned int i;
if (!params) {
- printf("Error - missing cfgfile parameters\n");
+ CFG_LOG(ERR, "missing cfgfile parameters\n");
return -EINVAL;
}
}
if (valid_comment == 0) {
- printf("Error - invalid comment characters %c\n",
+ CFG_LOG(ERR, "invalid comment characters %c\n",
params->comment_character);
return -ENOTSUP;
}
rte_cfgfile_load_with_params(const char *filename, int flags,
const struct rte_cfgfile_parameters *params)
{
- char buffer[CFG_NAME_LEN + CFG_VALUE_LEN + 4] = {0};
+ char buffer[CFG_NAME_LEN + CFG_VALUE_LEN + 4];
int lineno = 0;
- struct rte_cfgfile *cfg = NULL;
+ struct rte_cfgfile *cfg;
if (rte_cfgfile_check_params(params))
return NULL;
cfg = rte_cfgfile_create(flags);
while (fgets(buffer, sizeof(buffer), f) != NULL) {
- char *pos = NULL;
+ char *pos;
size_t len = strnlen(buffer, sizeof(buffer));
lineno++;
if ((len >= sizeof(buffer) - 1) && (buffer[len-1] != '\n')) {
- printf("Error line %d - no \\n found on string. "
+ CFG_LOG(ERR, " line %d - no \\n found on string. "
"Check if line too long\n", lineno);
goto error1;
}
/* section heading line */
char *end = memchr(buffer, ']', len);
if (end == NULL) {
- printf("Error line %d - no terminating ']'"
- "character found\n", lineno);
+ CFG_LOG(ERR,
+ "line %d - no terminating ']' character found\n",
+ lineno);
goto error1;
}
*end = '\0';
split[0] = buffer;
split[1] = memchr(buffer, '=', len);
if (split[1] == NULL) {
- printf("Error line %d - no '='"
- "character found\n", lineno);
+ CFG_LOG(ERR,
+ "line %d - no '=' character found\n",
+ lineno);
goto error1;
}
*split[1] = '\0';
_strip(split[1], strlen(split[1]));
char *end = memchr(split[1], '\\', strlen(split[1]));
+ size_t split_len = strlen(split[1]) + 1;
while (end != NULL) {
if (*(end+1) == params->comment_character) {
*end = '\0';
- strcat(split[1], end+1);
+ strlcat(split[1], end+1, split_len);
} else
end++;
end = memchr(end, '\\', strlen(end));
if (!(flags & CFG_FLAG_EMPTY_VALUES) &&
(*split[1] == '\0')) {
- printf("Error at line %d - cannot use empty "
- "values\n", lineno);
+ CFG_LOG(ERR,
+ "line %d - cannot use empty values\n",
+ lineno);
goto error1;
}
rte_cfgfile_create(int flags)
{
int i;
- struct rte_cfgfile *cfg = NULL;
+ struct rte_cfgfile *cfg;
+
+ /* future proof flags usage */
+ if (flags & ~(CFG_FLAG_GLOBAL_SECTION | CFG_FLAG_EMPTY_VALUES))
+ return NULL;
cfg = malloc(sizeof(*cfg));
cfg->num_sections = 0;
/* allocate first batch of sections and entries */
- cfg->sections = malloc(sizeof(struct rte_cfgfile_section) *
- CFG_ALLOC_SECTION_BATCH);
-
+ cfg->sections = calloc(CFG_ALLOC_SECTION_BATCH,
+ sizeof(struct rte_cfgfile_section));
if (cfg->sections == NULL)
goto error1;
cfg->allocated_sections = CFG_ALLOC_SECTION_BATCH;
for (i = 0; i < CFG_ALLOC_SECTION_BATCH; i++) {
- cfg->sections[i].entries = malloc(sizeof(
- struct rte_cfgfile_entry) * CFG_ALLOC_ENTRY_BATCH);
+ cfg->sections[i].entries = calloc(CFG_ALLOC_ENTRY_BATCH,
+ sizeof(struct rte_cfgfile_entry));
if (cfg->sections[i].entries == NULL)
goto error1;
cfg->allocated_sections += CFG_ALLOC_SECTION_BATCH;
}
- snprintf(cfg->sections[cfg->num_sections].name,
- sizeof(cfg->sections[0].name), "%s", sectionname);
+ strlcpy(cfg->sections[cfg->num_sections].name, sectionname,
+ sizeof(cfg->sections[0].name));
cfg->sections[cfg->num_sections].num_entries = 0;
cfg->num_sections++;
for (i = 0; i < curr_section->num_entries; i++)
if (!strcmp(curr_section->entries[i].name, entryname)) {
- snprintf(curr_section->entries[i].value,
- sizeof(curr_section->entries[i].value),
- "%s", entryvalue);
+ strlcpy(curr_section->entries[i].value, entryvalue,
+ sizeof(curr_section->entries[i].value));
return 0;
}
- printf("Error - entry name doesn't exist\n");
+
+ CFG_LOG(ERR, "entry name doesn't exist\n");
return -EINVAL;
}
int i;
for (i = 0; i < cfg->num_sections && i < max_sections; i++)
- snprintf(sections[i], CFG_NAME_LEN, "%s",
- cfg->sections[i].name);
+ strlcpy(sections[i], cfg->sections[i].name, CFG_NAME_LEN);
return i;
}
const struct rte_cfgfile_section *sect = &(cfg->sections[index]);
- snprintf(sectionname, CFG_NAME_LEN, "%s", sect->name);
+ strlcpy(sectionname, sect->name, CFG_NAME_LEN);
return sect->num_entries;
}
int
if (index < 0 || index >= cfg->num_sections)
return -1;
sect = &cfg->sections[index];
- snprintf(sectionname, CFG_NAME_LEN, "%s", sect->name);
+ strlcpy(sectionname, sect->name, CFG_NAME_LEN);
for (i = 0; i < max_entries && i < sect->num_entries; i++)
entries[i] = sect->entries[i];
return i;
git.droids-corp.org / dpdk.git / blobdiff