thodg/libgit2/src/config_file.c

---

src/config_file.c

---

Log

Author	Commit	Date	CI	Message
	a9f51e43	2013-09-11T22:00:36		Merge git_buf and git_buffer This makes the git_buf struct that was used internally into an externally available structure and eliminates the git_buffer. As part of that, some of the special cases that arose with the externally used git_buffer were blended into the git_buf, such as being careful about git_buf objects that may have a NULL ptr and allowing for bufs with a valid ptr and size but zero asize as a way of referring to externally owned data.
	19be0692	2013-09-06T20:34:02		config: keep a list of included files When refreshing we need to refresh if any of the files have been touched, so we need to keep the list.
	d8d25acb	2013-09-05T19:24:20		config: add support for include directives Relative, absolute and home-relative paths are supported. The recursion limit it set at 10, just like in git.
	53ea0513	2013-09-07T19:07:39		config: handle realloc issues from larger depths As the include depth increases, the chance of a realloc increases. This means that whenever we run git_array_alloc() or call config_parse(), we need to remember what our reader's index is so we can look it up again.
	69789922	2013-09-07T18:50:35		config: return an error when reaching the maximum include depth
	73fc5e01	2013-09-06T21:12:26		config: fix variable overriding When two or more variables of the same name exist and the user asks for a scalar, we must return the latest value assign to it.
	a9fb7989	2013-09-06T20:51:35		config: refresh included files We need to refresh the variables from the included files if they are changed, so loop over all included files and re-parse the files if any of them has changed.
	d209cc47	2013-09-05T18:06:12		config: decouple the backend from the reader at the low level In order to support config includes, we must differentiate between the backend's main file and the file we are currently parsing. This lays the groundwork for includes, keeping the current behaviours.
	b8b22d77	2013-08-28T06:04:51		Merge pull request #1772 from libgit2/config-iter Configuration iterators redux
	f4be8209	2013-08-14T00:45:05		config: don't special-case the multivar iterator Build it on top of the normal iterator instead, which lets use re-use a lot of code.
	43e5dda7	2013-08-12T11:21:57		config: get rid of a useless asignment
	5880962d	2013-08-09T09:05:19		config: introduce _iterator_new() As the name suggests, it iterates over all the entries
	7f7ebe13	2013-08-08T12:57:13		Merge pull request #1771 from nvloff/write_empty_config_value config: allow setting empty string as value
	c57f6682	2013-08-08T21:17:32		config: allow empty string as value `git_config_set_string(config, "config.section", "")` fails when escaping the value. The buffer in `escape_value` is allocated without NULL-termination. And in case of empty string 0 is passed for buffer size in `git_buf_grow`. `git_buf_detach` returns NULL when the allocated size is 0 and that leads to an error return in `GITERR_CHECK_ALLOC` called after `escape_value` The change in `config_file.c` was suggested by Russell Belfer <rb@github.com>
	99dfb538	2013-08-08T17:57:59		config: working multivar iterator Implement the foreach version as a wrapper around the iterator.
	cca5df63	2013-08-08T16:59:39		config: hopefully get the iterator to work on multivars
	3a7ffc29	2013-08-08T16:18:07		config: initial multivar iterator
	eba73992	2013-08-08T14:39:32		config: move next() and free() into the iterator Like we have in the references iterator, next and free belong in the iterator itself.
	4efa3290	2013-08-08T13:41:18		config: get_multivar -> get_multivar_foreach The plain function will return an iterator, so move this one out of the way.
	84fec6f6	2013-08-08T13:14:35		config: saner iterator errors Really report an error in foreach if we fail to allocate the iterator, and don't fail if the config is emtpy.
	82ae6fcd	2013-08-08T11:55:47		config: compilation fixes
	4d588d97	2013-08-08T11:24:47		Don't typedef a pointer Make the iterator structure opaque and make sure it compiles.
	a603c191	2013-03-18T21:02:36		replaced foreach() with non callback based iterations in git_config_backend new functions in struct git_config_backend: * iterator_new(...) * iterator_free(...) * next(...) The old callback based foreach style can still be used with `git_config_backend_foreach_match`
	6385fc5f	2013-03-17T20:39:01		added new type and several functions to git_strmap This step is needed to easily add iterators to git_config_backend As well use these new git_strmap functions to implement foreach * git_strmap_iter * git_strmap_has_data(...) * git_strmap_begin(...) * git_strmap_end(...) * git_strmap_next(...)
	2d9f5b9f	2013-08-07T11:11:55		Parse config headers with quoted quotes Parse config headers that have the last quote on the line quoted instead of walking off the end.
	278ce746	2013-07-01T10:20:38		Add helpful buffer shorten function
	16adc9fa	2013-05-24T10:35:58		Typedef git_config_level_t and use it everywhere The GIT_CONFIG_LEVEL constants actually work well as an enum because they are mutually exclusive, so this adds a typedef to the enum and uses that everywhere that one of these constants are expected, instead of the old code that typically used an unsigned int.
	e583334c	2013-05-10T21:42:22		Fix broken build when MSVC SDL checks is enabled
	a472f887	2013-04-22T07:44:32		Merge pull request #1493 from carlosmn/remotes Revamp the refspec handling
	83041c71	2013-04-19T11:52:04		Move git_config_backend to include/git2/sys Moving backend implementor objects into include/git2/sys so the APIs can be isolated from the ones that normal libgit2 users would be likely to use.
	e5a27f03	2013-04-20T15:25:39		config: allow setting multivars when none exist yet Adding a multivar when there are no variables with that name set should set the variable instead of failing.
	1e7799e8	2013-01-29T12:15:18		Implement config key validation rules This is a new implementation of core git's config key checking rules that prevents non-alphanumeric characters (and '-') for the top-level section and key names inside of config files. This also validates the target section name when renaming sections.
	9f35754a	2013-01-25T13:29:28		config: support trailing backslashes Check whether the backslash at the end of the line is being escaped or not so as not to consider it a continuation marker when it's e.g. a Windows-style path.
	359fc2d2	2013-01-08T17:07:25		update copyrights
	69177621	2012-11-29T14:07:50		Deploy git_config_backend version
	7bf87ab6	2012-11-28T09:58:48		Consolidate text buffer functions There are many scattered functions that look into the contents of buffers to do various text manipulations (such as escaping or unescaping data, calculating text stats, guessing if content is binary, etc). This groups all those functions together into a new file and converts the code to use that. This has two enhancements to existing functionality. The old text stats function is significantly rewritten and the BOM detection code was extended (although largely we can't deal with anything other than a UTF8 BOM).
	54b2a37a	2012-11-20T16:02:25		Clean up config.h
	f2696fa4	2012-11-26T12:12:41		Fix invalid read reported by valgrind
	826bc4a8	2012-11-23T13:31:22		Remove use of English expletives Remove words such as fuck, crap, shit etc. Remove other potentially offensive words from comments. Tidy up other geopolicital terms in comments.
	47db054d	2012-11-13T13:41:01		config: distinguish between a lone variable name and one without rhs '[section] variable' and '[section] variable =' behave differently when parsed as booleans, so we need to store that distinction internally.
	bcad677b	2012-11-08T12:28:21		- Update 'tests-clar/resources/config/config11' in order to reproduce the invalidread with the unittest (just added some \n at the end of the file) - Fix config_file.c
	744cc03e	2012-10-30T12:10:36		Add git_config_refresh() API to reload config This adds a new API that allows users to reload the config if the file has changed on disk. A new config callback function to refresh the config was added. The modified time and file size are used to test if the file needs to be reloaded (and are now stored in the disk backend object). In writing tests, just using mtime was a problem / race, so I wanted to check file size as well. To support that, I extended `git_futils_readbuffer_updated` to optionally check file size in addition to mtime, and I added a new function `git_filebuf_stats` to fetch the mtime and size for an open filebuf (so that the config could be easily refreshed after a write). Lastly, I moved some similar file checking code for attributes into filebuf. It is still only being used for attrs, but it seems potentially reusable, so I thought I'd move it over.
	a1abe66a	2012-09-10T12:11:02		Add config level support in the config API Added `struct git_config_entry`: a git_config_entry contains the key, the value, and the config file level from which a config element was found. Added `git_config_open_level`: build a single-level focused config object from a multi-level one. We are now storing `git_config_entry`s in the khash of the config_file
	f8ede948	2012-09-18T14:10:40		Fix adding variable to config file with no trailing newline This can occur after a manual modification of a config file.
	b200a813	2012-09-14T20:43:47		config: fix Unicode BOM detection Defining the BOM as a string makes the array include the NUL-terminator, which means that the memcpy is going to check for that as well and thus never match for a nonempty file. Define the array as three chars, which makes the size correct.
	f335ecd6	2012-08-30T14:24:16		Diff iterators This refactors the diff output code so that an iterator object can be used to traverse and generate the diffs, instead of just the `foreach()` style with callbacks. The code has been rearranged so that the two styles can still share most functions. This also replaces `GIT_REVWALKOVER` with `GIT_ITEROVER` and uses that as a common error code for marking the end of iteration when using a iterator style of object.
	0c8858de	2012-08-03T14:28:07		Fix valgrind issues and leaks This fixes up a number of problems flagged by valgrind and also cleans up the internal `git_submodule` allocation handling overall with a simpler model.
	aa13bf05	2012-08-02T13:00:58		Major submodule rewrite This replaces the old submodule API with a new extended API that supports most of the things that can be done with `git submodule`.
	616c1433	2012-08-12T11:53:58		Clean up code Okay, this is probably cleaner and it is also less net change from the original version
	a1ecddf0	2012-08-12T07:59:30		Fix config parser boundary logic The config file parser was not working right if there was no whitespace between the value name and the equals sign. This fixes that.
	5dca2010	2012-08-03T17:08:01		Update iterators for consistency across library This updates all the `foreach()` type functions across the library that take callbacks from the user to have a consistent behavior. The rules are: * A callback terminates the loop by returning any non-zero value * Once the callback returns non-zero, it will not be called again (i.e. the loop stops all iteration regardless of state) * If the callback returns non-zero, the parent fn returns GIT_EUSER * Although the parent returns GIT_EUSER, no error will be set in the library and `giterr_last()` will return NULL if called. This commit makes those changes across the library and adds tests for most of the iteration APIs to make sure that they follow the above rules.
	5d9cfa07	2012-07-20T17:52:53		config: escape subsection names when creating them This allows us to set options like "some.foo\\ish.var". This closes #830
	b3ff1dab	2012-07-10T15:22:39		Adding git_config_foreach_match() iteration fn Adding a new config iteration function that let's you iterate over just the config entries that match a particular regular expression. The old foreach becomes a simple use of this with an empty pattern. This also fixes an apparent bug in the existing `git_config_foreach` where returning a non-zero value from the iteration callback was not correctly aborting the iteration and the returned value was not being propogated back to the caller of foreach. Added to tests to cover all these changes.
	49938cad	2012-06-11T16:28:51		config: correctly escape quotes in the value When a configuration option is set, we didn't check to see whether there was any escaping needed. Escape the available characters so we can unescape them correctly when we read them.
	1d4dcc4b	2012-06-01T11:48:58		config: set an error message when asked to delete a non-existent key
	904b67e6	2012-05-18T01:48:50		errors: Rename error codes
	e172cf08	2012-05-18T01:21:06		errors: Rename the generic return codes
	0f49200c	2012-05-09T04:37:02		msvc: Do not use `isspace` Locale-aware bullshit bitting my ass again yo
	3df9cc59	2012-05-03T16:07:22		config: don't use freed memory on error Change the order and set a NULL so we don't try to access freed memory in case of an error.
	b709e951	2012-05-04T11:06:12		Fix memory leaks and use after free
	40879fac	2012-05-02T15:59:02		Merge branch 'new-error-handling' into development Conflicts: .travis.yml include/git2/diff.h src/config_file.c src/diff.c src/diff_output.c src/mwindow.c src/path.c tests-clar/clar_helpers.c tests-clar/object/tree/frompath.c tests/t00-core.c tests/t03-objwrite.c tests/t08-tag.c tests/t10-refs.c tests/t12-repo.c tests/t18-status.c tests/test_helpers.c tests/test_main.c
	fa6420f7	2012-04-29T21:46:33		buf: deploy git_buf_len()
	c2b67043	2012-04-25T15:20:28		Rename git_khash_str to git_strmap, etc. This renamed `git_khash_str` to `git_strmap`, `git_hash_oid` to `git_oidmap`, and deletes `git_hashtable` from the tree, plus adds unit tests for `git_strmap`.
	01fed0a8	2012-04-25T10:36:01		Convert hashtable usage over to khash This updates khash.h with some extra features (like error checking on allocations, ability to use wrapped malloc, foreach calls, etc), creates two high-level wrappers around khash: `git_khash_str` and `git_khash_oid` for string-to-void-ptr and oid-to-void-ptr tables, then converts all of the old usage of `git_hashtable` over to use these new hashtables. For `git_khash_str`, I've tried to create a set of macros that yield an API not too unlike the old `git_hashtable` API. Since the oid hashtable is only used in one file, I haven't bother to set up all those macros and just use the khash APIs directly for now.
	2bc8fa02	2012-04-17T10:14:24		Implement git_pool paged memory allocator This adds a `git_pool` object that can do simple paged memory allocation with free for the entire pool at once. Using this, you can replace many small allocations with large blocks that can then cheaply be doled out in small pieces. This is best used when you plan to free the small blocks all at once - for example, if they represent the parsed state from a file or data stream that are either all kept or all discarded. There are two real patterns of usage for `git_pools`: either for "string" allocation, where the item size is a single byte and you end up just packing the allocations in together, or for "fixed size" allocation where you are allocating a large object (e.g. a `git_oid`) and you generally just allocation single objects that can be tightly packed. Of course, you can use it for other things, but those two cases are the easiest.
	a7d19b97	2012-04-25T15:47:53		config: also allow escaping outside of a quoted string This limitation was a misparsing of the documentation.
	2c1075d6	2012-03-16T12:52:49		config: parse quoted values Variable values may be quoted to include newlines, literal quotes and other characters. Add support for these and test it.
	8e8b6b01	2012-04-04T13:13:43		Clean up valgrind warnings
	bfc9ca59	2012-03-28T16:45:36		Added submodule API and use in status When processing status for a newly checked out repo, it is possible that there will be submodules that have not yet been initialized. The only way to distinguish these from untracked directories is to have some knowledge of submodules. This commit adds a new submodule API which, given a name or path, can determine if it appears to be a submodule and can give information about the submodule.
	54fef6eb	2012-03-09T20:38:32		config: write out section headers with subsections correctly write_section() mistakenly treated is input as the whole variable name instead of simply the section (and possibly subsection) and would confuse "section.subsection" as a section plus variable name and produce a wrong section header. Fix this and include a test for writing "section.subsection.var" and reading it from the file.
	dda708e7	2012-03-09T19:55:50		error-handling: On-disk config file backend Includes: - Proper error reporting when encountering syntax errors in a config file (file, line number, column). - Rewritten `config_write`, now with 99% less goto-spaghetti - Error state in `git_filebuf`: filebuf write functions no longer need to be checked for error returns. If any of the writes performed on a buffer fail, the last call to `git_filebuf_commit` or `git_filebuf_hash` will fail accordingly and set the appropiate error message. Baller!
	854eccbb	2012-02-29T12:04:59		Clean up GIT_UNUSED macros on all platforms It turns out that commit 31e9cfc4cbcaf1b38cdd3dbe3282a8f57e5366a5 did not fix the GIT_USUSED behavior on all platforms. This commit walks through and really cleans things up more thoroughly, getting rid of the unnecessary stuff. To remove the use of some GIT_UNUSED, I ended up adding a couple of new iterators for hashtables that allow you to iterator just over keys or just over values. In making this change, I found a bug in the clar tests (where we were doing *count++ but meant to do (*count)++ to increment the value). I fixed that but then found the test failing because it was not really using an empty repo. So, I took some of the code that I wrote for iterator testing and moved it to clar_helpers.c, then made use of that to make it easier to open fixtures on a per test basis even within a single test file.
	13224ea4	2012-02-27T04:28:31		buffer: Unify `git_fbuffer` and `git_buf` This makes so much sense that I can't believe it hasn't been done before. Kill the old `git_fbuffer` and read files straight into `git_buf` objects. Also: In order to fully support 4GB files in 32-bit systems, the `git_buf` implementation has been changed from using `ssize_t` for storage and storing negative values on allocation failure, to using `size_t` and changing the buffer pointer to a magical pointer on allocation failure. Hopefully this won't break anything.
	0a43d7cb	2012-02-25T18:52:28		config: correctly deal with setting a multivar with regex where there are no matches We used to erroneously consider "^$" as a special case for appending a value to a multivar. This was a misunderstanding and we should always append a value if there are no existing values that match. While we're in the area, replace all the variables in-memory in one swoop and then replace them on disk so as to avoid matching a value we've just introduced.
	3005855f	2012-02-05T00:29:26		Implement setting multivars
	5e0dc4af	2012-02-04T23:18:30		Support getting multivars
	0774d94d	2012-02-01T17:21:28		Store multivars in the multimap
	fefd4551	2012-01-23T04:26:49		First round of config multimap changes Move the configuration to use a multimap instead of a list. This commit doesn't provide any functional changes but changes the support structures.
	5e0de328	2012-02-13T17:10:24		Update Copyright header Signed-off-by: schu <schu-github@schulog.org>
	15f52ae1	2011-12-19T15:59:13		config_file: fix clang sizeof-pointer-memaccess
	a9fe8ae0	2012-01-23T22:14:04		config: don't use 'section "subsection"' internal form on config_set This had been left over from a time when I believed what the git documentation had to say about case-sensitivity. The rest of the code doesn't recognize this form and we hadn't noticed because most tests don't try to get a recently-set variable but free and reload the configuration, causing the right format to be used.
	c1c399cf	2012-01-13T19:33:54		config: handle EOF properly In the main loop we peek to see what kind of line the next one is. If there are multiple newlines before the end of the file, the eof marker won't be set after we read the last line with data and we'll try to peek again. This peek will return LF (as it pretends that we have a newline at EOF so other function don't need any special handling). Fix cfg_getchar so it doesn't try to read past the last character in the file and config_parse so it considers LF as EOF on peek (as we're ignoring spaces) and sets the reader's EOF flag to exit the parsing loop.
	9dd4c3e8	2011-12-31T05:56:39		config: Rename the `delete` callback name `delete` is a reserved keyword in C++.
	e95849c1	2011-12-16T11:39:21		config_file: honor error Return an error if we can't write an updated version of the config file after config_delete. Along with that, fix an uninitialized warning. Signed-off-by: schu <schu-github@schulog.org>
	80a665aa	2011-12-16T02:28:39		config: really delete variables Instead of just setting the value to NULL, which gives unwanted results when asking for that variable after deleting it, delete the variable from the list and re-write the file.
	7b2b4adf	2011-12-16T01:39:28		Revert "config: Return ENOTFOUND when a variable was deleted" This would make us think that config variables like [core] something is missing.
	2ea14da6	2011-12-15T18:14:41		config: Return ENOTFOUND when a variable was deleted
	9462c471	2011-11-25T08:16:26		repository: Change ownership semantics The ownership semantics have been changed all over the library to be consistent. There are no more "borrowed" or duplicated references. Main changes: - `git_repository_open2` and `3` have been dropped. - Added setters and getters to hotswap all the repository owned objects: `git_repository_index` `git_repository_set_index` `git_repository_odb` `git_repository_set_odb` `git_repository_config` `git_repository_set_config` `git_repository_workdir` `git_repository_set_workdir` Now working directories/index files/ODBs and so on can be hot-swapped after creating a repository and between operations. - All these objects now have proper ownership semantics with refcounting: they all require freeing after they are no longer needed (the repository always keeps its internal reference). - Repository open and initialization has been updated to keep in mind the configuration files. Bare repositories are now always detected, and a default config file is created on init. - All the tests affected by these changes have been dropped from the old test suite and ported to the new one.
	4e90a0a4	2011-11-26T01:54:12		config: allow to open and write to a new file
	b762e576	2011-11-17T15:10:27		filebuf: add GIT_FILEBUF_INIT and protect multiple opens and cleanups Update all stack allocations of git_filebuf to use GIT_FILEBUF_INIT and make git_filebuf_open and git_filebuf_cleanup safe to be called multiple times on the same buffer. Signed-off-by: Vicent Marti <tanoku@gmail.com>
	89fb8f02	2011-10-28T19:04:23		Merge pull request #456 from brodie/perm-fixes Create objects, indexes, and directories with the right file permissions
	3286c408	2011-10-28T14:51:13		global: Properly use `git__` memory wrappers Ensure that all memory related functions (malloc, calloc, strdup, free, etc) are using their respective `git__` wrappers.
	9f861826	2011-10-27T16:45:44		Fixed crash in config parser when empty value is encountered. Example: key1 = value1 key2 = In this config the value will be a bad pointer which config object will attempt to free() causing a crash.
	01ad7b3a	2011-09-06T15:48:45		*: correct and codify various file permissions The following files now have 0444 permissions: - loose objects - pack indexes - pack files - packs downloaded by fetch - packs downloaded by the HTTP transport And the following files now have 0666 permissions: - config files - repository indexes - reflogs - refs This brings libgit2 more in line with Git. Note that git_filebuf_commit() and git_filebuf_commit_at() have both gained a new mode parameter. The latter change fixes an important issue where filebufs created with GIT_FILEBUF_TEMPORARY received 0600 permissions (due to mkstemp(3) usage). Now we chmod() the file before renaming it into place. Tests have been added to confirm that new commit, tag, and tree objects are created with the right permissions. I don't have access to Windows, so for now I've guarded the tests with "#ifndef GIT_WIN32".
	cd19ca95	2011-10-01T20:16:13		Squelch a couple of warnings Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>
	9ac581bf	2011-10-01T19:56:04		config: behave like git with [section.subsection] The documentation is a bit misleading. The subsection name is always case-sensitive, but with a [section.subsection] header, the subsection is transformed to lowercase when the configuration is parsed. Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>
	71a4c1f1	2011-09-18T20:07:59		Merge pull request #384 from kiryl/warnings Add more -W flags to CFLAGS
	b6ed727a	2011-09-18T19:52:40		Merge pull request #392 from sschuberth/development Fix a bug and GCC warning introduced in 932669b
	87d9869f	2011-09-19T03:34:49		Tabify everything There were quite a few places were spaces were being used instead of tabs. Try to catch them all. This should hopefully not break anything. Except for `git blame`. Oh well.
	bb742ede	2011-09-19T01:54:32		Cleanup legal data 1. The license header is technically not valid if it doesn't have a copyright signature. 2. The COPYING file has been updated with the different licenses used in the project. 3. The full GPLv2 header in each file annoys me.