| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
All config file processing functions start with "ini_config".
The only function that does not comply is
ini_print_errors. We can't rename it since
it is a part of the current active interface.
I marked that function needs to be removed when we
remove old interface and created a copy with
the correct name. I also updated unit test accordingly.
|
|
|
|
|
| |
Patch adds two functions. One tests permissions,
another validates if the file has changed or not.
|
|
|
|
| |
Added function to detect changes to the configuration file.
|
|
|
|
|
|
| |
Added check access constants and the check access function.
The function is effectively copied from ini_metadata.c
The flags are copied from ini_config.h
|
|
|
|
|
|
|
|
|
|
|
|
| |
After some more thinking I decided not to use
metadata collection. It seems to be an overhead.
Patch does following:
* Replaces metadata collection in file context structure
with standard file stats
* Removes all operations against old metadata collection
* Defines new flags for data to collect
* Creates a function that consolidates common operations
between open and reopen functions.
|
|
|
|
|
| |
This patch would allow to reopen file
and create a new context based on the old one.
|
|
|
|
| |
Allow closing file without destroying the context.
|
|
|
|
| |
Spotted style violation.
|
|
|
|
|
|
| |
New test reads smerge.conf in all possible
modes and compares the combined result with
the sexpect.conf function.
|
|
|
|
|
|
| |
Patch adds smerge.conf file to the list
of files to test and adds test for the DETECT
mode for inidividual values.
|
|
|
|
|
|
|
| |
smerge.conf - test file
sexpect.conf - file contains output of the smerge.conf
processed in different merge modes
for sections and values
|
|
|
|
|
| |
If in merge DETECT mode and there were no parsing errors
return error if there were merge collisions.
|
|
|
|
|
|
| |
This patch adds functionality to respect
merge section flags and to process section
collisions differently dpending on these flags.
|
|
|
|
|
| |
Use section line number for error reporting
about the section collisions.
|
|
|
|
|
|
|
|
|
| |
This patch refactores the value processing
function so that it can be used both in
normal mode when velues need to be constrcuted and
saved into the current section (po->sec) and in the
merge mode when values are already constructed
and need to be saved into a po->merge_sec.
|
|
|
|
|
|
|
|
| |
Patch implements three functions:
* Function to detect a collision between two section names.
* Function to empty section from all its keys
* Function to add values one by one from one section to
another.
|
|
|
|
|
|
| |
* Changed parse_error to use save_error function
created in previous commit.
* Fixed comment to be more clear.
|
|
|
|
| |
Create a function to add error into error list.
|
|
|
|
|
| |
Adding new varibles to the internal parsing structure
and initializing them.
|
|
|
|
|
|
|
| |
Adding "DETECT" merge modes.
These modes would be useable for dry run cases to detect
if there are any potential merge conflicts.
Patch just defines new constans and adds input checks.
|
|
|
|
|
|
|
|
| |
Patch consists of two parts:
* Adding new constants for error messages to ini_configobj.h file
* Making ini_print.c use this header file instead of the old one.
Converting this to enums is tracked as a separate ticket.
|
|
|
|
|
| |
The fact that the other_test could return EOK on error
was the actual problem.
|
|
|
|
|
| |
* Do not set ext_data parameter to NULL
* include a private header to avoid implicit declarations
|
|
|
|
|
| |
Previous fix was not complete.
Secondary scan revealed other issues.
|
|
|
|
|
|
| |
Previous fix was not complete. New scan revealed
potential memory leak in case of coding error.
Low severity but still a bug...
|
|
|
|
| |
One liner to eliminate compilation warning.
|
|
|
|
|
|
|
|
| |
I decided not to redo the whole test.
It would have been too much work.
Just cleaned the code a bit and freed
allocated memory.
It is Coverity issue 10075.
|
|
|
|
|
|
| |
The newly created value object was not freed
in case of an error.
Coverity issue 10076.
|
|
|
|
|
|
|
|
|
| |
Allocating simple buffer is not enough.
It needs to be initialized with something.
The patch does exactly this for the case when
the empty comment string is represented by a NULL
value in the function input variable.
Coverity issue 10073.
|
|
|
|
| |
One liner to fix Coverity isssue 10044.
|
|
|
|
|
| |
Noticed under valgrind then checked
and saw that this is a coverity issue 10077.
|
|
|
|
|
|
| |
The 'len' varible was not initialized properly.
The ref_array_get function does not return error so
the error check is removed.
|
|
|
|
|
|
|
|
| |
I investigated the coverity issue 10043.
Reading code did not reveal the issue.
I added the test just to be sure and ran
valgrind again. It does not seem to leak
despite the Coverity concerns.
|
|
|
|
|
|
|
|
| |
The paths to test files did not work in
parallel build or 'make diskcheck' cases.
Now they are corrected. All temp files are
created in the build directory and read
from there.
|
|
|
|
|
|
| |
This patch addresses the crashes with the file object
when the file is not there and the file context
needs to be destroyed during the open operation.
|
|
|
|
|
|
|
| |
* Rearranged code in parser module and
created a skeleton of the function that will
be responcible for merging sections.
* Added missing static declarations to some functions.
|
|
|
|
|
| |
Added validation of the collision flags
at the interface boundary.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch is the first pass at merging functionality.
It implements merging of values that belong to the same
section. Patch includes:
* Definition of merge flags in doxy format
* Definition of the masks in internal header
* Changes to parser to handle the merging of values.
* Also swithed parser to not use ini_config.h as
I want to switch implementation of the current
interface to new interface at some point.
* New unit test was created.
* New config file for this unit test was added to ini.d
Main code changes are in ini_parse.c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Added method to copy configuration.
* Added unit test for it.
* Added method to reset boandary for the
whole configuration.
* Added unit test for it.
* Unit test now can read a file
save it read again and save.
Both saves produce same files!
* Reworked the way the parser was dealing
with empty lines. It was sutting
off the value in the middle
if the folded line consisted of
just spaces.
|
|
|
|
|
|
| |
* Fixed different issues with folding
and serialization
* Added more unit testing.
|
|
|
|
| |
Minor cleanup in the error reporting.
|
|
|
|
|
|
|
| |
* Added capability to copy value.
* Added function to set alternative wrapping boundary
of the value.
* Created a unit test for both new functions.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Added copy coment functionality
* Changed the internal implementation to
use array simple buffer instead of
the two arrays one for lines and one for lengths
* Realigned comments in the header file
* Changed the trace macros to use
simplified entry and exit macros.
* Corrected unit test to return error codes.
* Refactored unit test to use array
of test functions intead of the direct calls
* Added unit test for copy functionality.
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
The patch contains two major pieces of work:
* The beginning of the new INI interface
significantly re-thought and reworked.
* The implementation of the file object.
Parsing was adjusted to use this object.
|
|
|
|
|
|
|
|
|
|
| |
I realized that the new high level interface should be
defined in one file instead of being scattered in many headers.
I would have to eventuallu eliminate ini_configobj.h too
and move everything to the new interface in ini_config.h.
This patch renames couple functions to be consistent
with the naming convention and removes ini_parse.h header.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The parser is added to the existing module.
The old parsing functuion will be removed when we
switch to the new interface.
Parser logic:
* There is one high level function that wraps the
parser interface. It is at the bottom of the module.
ini_parse_config();
* Internally it creates a perser object
and then runs parser on it.
* At the end parser object is destroyed.
* This object stores the state of the parser.
* The parser has an action queue
* There are several actions that parser can perform
- read line
- inspect read line
- record an error
- process last comment in the file (POST)
* Each action handler determines what to do next
depending upon what has happened.
* Read handler reads lines and enqueues inspection action
in case of success or error action in case of failure.
* Inspection action parses last read line and
treats it either is a:
* Comment
* Section
* New key + value
* Continuation of the value
In case of error the error action is enqueued.
* Error can be fatal or non fatal. It depend on the error_level
flag passed in. If the error is non fatal the read action is
enqueued otherwise parser stops.
* The POST action is a special action to handle comment at
the bottom of the file. The comment is stored with the
value it preceeds so in case there is a comment at
the bottom of the file a special value needs to be created
to hold just the comment.
|
|
|
|
|
|
|
|
| |
* ini_config_priv.h - private header
* ini_configobj.h - future public header for the new interface
* ini_configobj.c - just constructor/decructor for now
* ini_serialize.c - code to serialize the configuration
into a buffer so it can be written somewhere.
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Removed the annoyong type casting in the serialization
since there is a new function in the simplebuffer to
addstring.
* Changed the serialization code to not create simple
buffer object but rather add to the passed in one.
* Added serialization of the value that stores section
* Started cleaning constants but then stopped since
this effor should be done a bit later when the new
high level ini config interface is better baked.
|