Remove libinih from codebase and add it as a dependency instead.
Kevin Backhouse
3 years ago
parent
13ecfbc233
commit
a4164ce866
@ -0,0 +1,43 @@
|
||||
set(inih_LIBRARY_NAMES "inih" "libinih")
|
||||
set(inih_inireader_LIBRARY_NAMES "INIReader" "libINIReader")
|
||||
|
||||
find_path(inih_INCLUDE_DIR
|
||||
NAMES "ini.h"
|
||||
DOC "inih include directory")
|
||||
|
||||
find_path(inih_inireader_INCLUDE_DIR
|
||||
NAMES "INIReader.h"
|
||||
DOC "INIReader include directory")
|
||||
|
||||
find_library(inih_LIBRARY
|
||||
NAMES ${inih_LIBRARY_NAMES}
|
||||
DOC "inih library")
|
||||
|
||||
find_library(inih_inireader_LIBRARY
|
||||
NAMES ${inih_inireader_LIBRARY_NAMES}
|
||||
DOC "inih library")
|
||||
|
||||
mark_as_advanced(inih_INCLUDE_DIR)
|
||||
mark_as_advanced(inih_LIBRARY)
|
||||
mark_as_advanced(inih_inireader_INCLUDE_DIR)
|
||||
mark_as_advanced(inih_inireader_LIBRARY)
|
||||
|
||||
find_package_handle_standard_args(inih REQUIRED_VARS inih_LIBRARY inih_INCLUDE_DIR)
|
||||
|
||||
if(inih_FOUND)
|
||||
set(inih_INCLUDE_DIRS "${inih_INCLUDE_DIR}")
|
||||
set(inih_LIBRARIES "${inih_LIBRARY}")
|
||||
if(NOT TARGET inih::libinih)
|
||||
add_library(inih::libinih INTERFACE IMPORTED)
|
||||
endif()
|
||||
set_property(TARGET inih::libinih PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${inih_INCLUDE_DIRS}")
|
||||
set_property(TARGET inih::libinih PROPERTY INTERFACE_LINK_LIBRARIES "${inih_LIBRARIES}")
|
||||
|
||||
set(inih_inireader_INCLUDE_DIRS "${inih_inireader_INCLUDE_DIR}")
|
||||
set(inih_inireader_LIBRARIES "${inih_inireader_LIBRARY}")
|
||||
if(NOT TARGET inih::inireader)
|
||||
add_library(inih::inireader INTERFACE IMPORTED)
|
||||
endif()
|
||||
set_property(TARGET inih::inireader PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${inih_inireader_INCLUDE_DIRS}")
|
||||
set_property(TARGET inih::inireader PROPERTY INTERFACE_LINK_LIBRARIES "${inih_inireader_LIBRARIES}")
|
||||
endif()
|
||||
@ -1,193 +0,0 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later AND BSD-3-Clause
|
||||
|
||||
// Read an INI file into easy-to-access name/value pairs.
|
||||
// inih and INIReader are released under the New BSD license (see LICENSE.txt).
|
||||
// Go to the project home page for more info:
|
||||
//
|
||||
// https://github.com/benhoyt/inih
|
||||
|
||||
#ifndef __INIREADER_H__
|
||||
#define __INIREADER_H__
|
||||
|
||||
#include "exiv2lib_export.h"
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
namespace Exiv2 {
|
||||
#ifndef __INI_H__
|
||||
#define __INI_H__
|
||||
|
||||
/* Make this header file easier to include in C++ code */
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
//! @brief typedef for prototype of handler function.
|
||||
using ini_handler = int (*)(void* user, const char* section, const char* name, const char* value);
|
||||
|
||||
//! Typedef for prototype of fgets-style reader function.
|
||||
using ini_reader = char* (*)(char* str, int num, void* stream);
|
||||
|
||||
/*!
|
||||
@brief Parse given INI-style file. May have [section]s, name=value pairs
|
||||
(whitespace stripped), and comments starting with ';' (semicolon). Section
|
||||
is "" if name=value pair parsed before any section heading. name:value
|
||||
pairs are also supported as a concession to Python's configparser.
|
||||
|
||||
For each name=value pair parsed, call handler function with given user
|
||||
pointer as well as section, name, and value (data only valid for duration
|
||||
of handler call). Handler should return nonzero on success, zero on error.
|
||||
|
||||
@param filename path to file
|
||||
@param handler user defined handler
|
||||
@param user void pointer passed to user handler
|
||||
|
||||
@return 0 on success, line number of first error on parse error (doesn't
|
||||
stop on first error), -1 on file open error, or -2 on memory allocation
|
||||
error (only when INI_USE_STACK is zero).
|
||||
|
||||
@return 0 on success
|
||||
*/
|
||||
int ini_parse(const char* filename, ini_handler handler, void* user);
|
||||
|
||||
/*! @brief Same as ini_parse(), but takes a FILE* instead of filename. This doesn't
|
||||
close the file when it's finished -- the caller must do that.
|
||||
|
||||
@param file open "C" file
|
||||
@param handler user defined handler
|
||||
@param user void pointer passed to user handler
|
||||
*/
|
||||
int ini_parse_file(FILE* file, ini_handler handler, void* user);
|
||||
|
||||
/*! @brief Same as ini_parse(), but takes an ini_reader function pointer instead of
|
||||
filename. Used for implementing custom or string-based I/O.
|
||||
@param reader magic
|
||||
@param stream more magic
|
||||
@param handler user defined handler
|
||||
@param user void pointer passed to user handler
|
||||
|
||||
@return 0 on success
|
||||
*/
|
||||
int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler, void* user);
|
||||
|
||||
/*! @brief Nonzero to allow multi-line value parsing, in the style of Python's
|
||||
configparser. If allowed, ini_parse() will call the handler with the same
|
||||
name for each subsequent line parsed.
|
||||
*/
|
||||
#ifndef INI_ALLOW_MULTILINE
|
||||
#define INI_ALLOW_MULTILINE 1
|
||||
#endif
|
||||
|
||||
/*! @brief Nonzero to allow a UTF-8 BOM sequence (0xEF 0xBB 0xBF) at the start of
|
||||
the file. See http://code.google.com/p/inih/issues/detail?id=21
|
||||
*/
|
||||
#ifndef INI_ALLOW_BOM
|
||||
#define INI_ALLOW_BOM 1
|
||||
#endif
|
||||
|
||||
/*! @brief Nonzero to allow inline comments (with valid inline comment characters
|
||||
specified by INI_INLINE_COMMENT_PREFIXES). Set to 0 to turn off and match
|
||||
Python 3.2+ configparser behaviour.
|
||||
*/
|
||||
#ifndef INI_ALLOW_INLINE_COMMENTS
|
||||
#define INI_ALLOW_INLINE_COMMENTS 1
|
||||
#endif
|
||||
#ifndef INI_INLINE_COMMENT_PREFIXES
|
||||
#define INI_INLINE_COMMENT_PREFIXES ";"
|
||||
#endif
|
||||
|
||||
//! @brief Nonzero to use stack, zero to use heap (malloc/free).
|
||||
#ifndef INI_USE_STACK
|
||||
#define INI_USE_STACK 1
|
||||
#endif
|
||||
|
||||
//! @brief Stop parsing on first error (default is to keep parsing).
|
||||
#ifndef INI_STOP_ON_FIRST_ERROR
|
||||
#define INI_STOP_ON_FIRST_ERROR 0
|
||||
#endif
|
||||
|
||||
//! @brief Maximum line length for any line in INI file.
|
||||
#ifndef INI_MAX_LINE
|
||||
#define INI_MAX_LINE 200
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __INI_H__ */
|
||||
|
||||
/*! @brief Read an INI file into easy-to-access name/value pairs. (Note that I've gone
|
||||
for simplicity here rather than speed, but it should be pretty decent.)
|
||||
*/
|
||||
class EXIV2API INIReader {
|
||||
public:
|
||||
/*! @brief Construct INIReader and parse given filename. See ini.h for more info
|
||||
about the parsing.
|
||||
*/
|
||||
explicit INIReader(const std::string& filename);
|
||||
|
||||
/*! @brief Return the result of ini_parse(), i.e., 0 on success, line number of
|
||||
first error on parse error, or -1 on file open error.
|
||||
*/
|
||||
[[nodiscard]] int ParseError() const;
|
||||
|
||||
/*! @brief Get a string value from INI file, returning default_value if not found.
|
||||
|
||||
@param section name of section
|
||||
@param name name of key
|
||||
@param default_value default if not found
|
||||
|
||||
@return value
|
||||
*/
|
||||
std::string Get(const std::string& section, const std::string& name, const std::string& default_value);
|
||||
|
||||
/*! @brief Get an integer (long) value from INI file, returning default_value if
|
||||
not found or not a valid integer (decimal "1234", "-1234", or hex "0x4d2").
|
||||
|
||||
@param section name of section
|
||||
@param name name of key
|
||||
@param default_value default if not found
|
||||
|
||||
@return value
|
||||
*/
|
||||
long GetInteger(const std::string& section, const std::string& name, long default_value);
|
||||
|
||||
/*! @brief Get a real (floating point double) value from INI file, returning
|
||||
default_value if not found or not a valid floating point value
|
||||
according to strtod().
|
||||
|
||||
@param section name of section
|
||||
@param name name of key
|
||||
@param default_value default if not found
|
||||
|
||||
@return value
|
||||
*/
|
||||
double GetReal(const std::string& section, const std::string& name, double default_value);
|
||||
|
||||
/*! @brief Get a boolean value from INI file, returning default_value if not found or if
|
||||
not a valid true/false value. Valid true values are "true", "yes", "on", "1",
|
||||
and valid false values are "false", "no", "off", "0" (not case sensitive).
|
||||
|
||||
@param section name of section
|
||||
@param name name of key
|
||||
@param default_value default if not found
|
||||
|
||||
@return value
|
||||
*/
|
||||
bool GetBoolean(const std::string& section, const std::string& name, bool default_value);
|
||||
|
||||
private:
|
||||
int _error; //!< status
|
||||
std::map<std::string, std::string> _values; //!< values from file
|
||||
static std::string MakeKey(const std::string& section,
|
||||
const std::string& name); //!< return key encoded from section/name
|
||||
static int ValueHandler(void* user, const char* section, const char* name,
|
||||
const char* value); //!< value handler
|
||||
};
|
||||
} // namespace Exiv2
|
||||
|
||||
#endif // __INIREADER_H__
|
||||
@ -1,239 +0,0 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later AND BSD-3-Clause
|
||||
|
||||
// Read an INI file into easy-to-access name/value pairs.
|
||||
|
||||
// inih and INIReader are released under the New BSD license (see LICENSE.txt).
|
||||
// Go to the project home page for more info:
|
||||
//
|
||||
// https://github.com/benhoyt/inih
|
||||
|
||||
#include "ini.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
#include <cctype>
|
||||
#include <cstdlib>
|
||||
|
||||
using std::string;
|
||||
using namespace Exiv2;
|
||||
|
||||
#include <cstring>
|
||||
|
||||
#if !INI_USE_STACK
|
||||
#include <cstdlib>
|
||||
#endif
|
||||
|
||||
#define MAX_SECTION 50
|
||||
#define MAX_NAME 50
|
||||
|
||||
/* Strip whitespace chars off end of given string, in place. Return s. */
|
||||
static char* rstrip(char* s) {
|
||||
char* p = s + strlen(s);
|
||||
while (p > s && isspace(static_cast<unsigned char>(*--p)))
|
||||
*p = '\0';
|
||||
return s;
|
||||
}
|
||||
|
||||
/* Return pointer to first non-whitespace char in given string. */
|
||||
static char* lskip(const char* s) {
|
||||
while (*s && isspace(static_cast<unsigned char>(*s)))
|
||||
s++;
|
||||
return const_cast<char*>(s);
|
||||
}
|
||||
|
||||
/* Return pointer to first char (of chars) or inline comment in given string,
|
||||
or pointer to null at end of string if neither found. Inline comment must
|
||||
be prefixed by a whitespace character to register as a comment. */
|
||||
static char* find_chars_or_comment(const char* s, const char* chars) {
|
||||
#if INI_ALLOW_INLINE_COMMENTS
|
||||
int was_space = 0;
|
||||
while (*s && (!chars || !strchr(chars, *s)) && !(was_space && strchr(INI_INLINE_COMMENT_PREFIXES, *s))) {
|
||||
was_space = isspace(static_cast<unsigned char>(*s));
|
||||
s++;
|
||||
}
|
||||
#else
|
||||
while (*s && (!chars || !strchr(chars, *s))) {
|
||||
s++;
|
||||
}
|
||||
#endif
|
||||
return const_cast<char*>(s);
|
||||
}
|
||||
|
||||
/* Version of strncpy that ensures dest (size bytes) is null-terminated. */
|
||||
static char* strncpy0(char* dest, const char* src, size_t size) {
|
||||
memcpy(dest, src, size);
|
||||
dest[size - 1] = '\0';
|
||||
return dest;
|
||||
}
|
||||
|
||||
/* See documentation in header file. */
|
||||
int Exiv2::ini_parse_stream(ini_reader reader, void* stream, ini_handler handler, void* user) {
|
||||
/* Uses a fair bit of stack (use heap instead if you need to) */
|
||||
#if INI_USE_STACK
|
||||
char line[INI_MAX_LINE];
|
||||
#else
|
||||
char* line;
|
||||
#endif
|
||||
char section[MAX_SECTION] = "";
|
||||
char prev_name[MAX_NAME] = "";
|
||||
|
||||
char* start;
|
||||
char* end;
|
||||
char* name;
|
||||
char* value;
|
||||
int lineno = 0;
|
||||
int error = 0;
|
||||
|
||||
#if !INI_USE_STACK
|
||||
line = (char*)malloc(INI_MAX_LINE);
|
||||
if (!line) {
|
||||
return -2;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Scan through stream line by line */
|
||||
while (reader(line, INI_MAX_LINE, stream)) {
|
||||
lineno++;
|
||||
|
||||
start = line;
|
||||
#if INI_ALLOW_BOM
|
||||
if (lineno == 1 && static_cast<unsigned char>(start[0]) == 0xEF && static_cast<unsigned char>(start[1]) == 0xBB &&
|
||||
static_cast<unsigned char>(start[2]) == 0xBF) {
|
||||
start += 3;
|
||||
}
|
||||
#endif
|
||||
start = lskip(rstrip(start));
|
||||
|
||||
if (*start == ';' || *start == '#') {
|
||||
/* Per Python configparser, allow both ; and # comments at the
|
||||
start of a line */
|
||||
}
|
||||
#if INI_ALLOW_MULTILINE
|
||||
else if (*prev_name && *start && start > line) {
|
||||
/* Non-blank line with leading whitespace, treat as continuation
|
||||
of previous name's value (as per Python configparser). */
|
||||
if (!handler(user, section, prev_name, start) && !error)
|
||||
error = lineno;
|
||||
}
|
||||
#endif
|
||||
else if (*start == '[') {
|
||||
/* A "[section]" line */
|
||||
end = find_chars_or_comment(start + 1, "]");
|
||||
if (*end == ']') {
|
||||
*end = '\0';
|
||||
strncpy0(section, start + 1, sizeof(section));
|
||||
*prev_name = '\0';
|
||||
} else if (!error) {
|
||||
/* No ']' found on section line */
|
||||
error = lineno;
|
||||
}
|
||||
} else if (*start) {
|
||||
/* Not a comment, must be a name[=:]value pair */
|
||||
end = find_chars_or_comment(start, "=:");
|
||||
if (*end == '=' || *end == ':') {
|
||||
*end = '\0';
|
||||
name = rstrip(start);
|
||||
value = lskip(end + 1);
|
||||
#if INI_ALLOW_INLINE_COMMENTS
|
||||
end = find_chars_or_comment(value, nullptr);
|
||||
if (*end)
|
||||
*end = '\0';
|
||||
#endif
|
||||
rstrip(value);
|
||||
|
||||
/* Valid name[=:]value pair found, call handler */
|
||||
strncpy0(prev_name, name, sizeof(prev_name));
|
||||
if (!handler(user, section, name, value) && !error)
|
||||
error = lineno;
|
||||
} else if (!error) {
|
||||
/* No '=' or ':' found on name[=:]value line */
|
||||
error = lineno;
|
||||
}
|
||||
}
|
||||
|
||||
#if INI_STOP_ON_FIRST_ERROR
|
||||
if (error)
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
|
||||
#if !INI_USE_STACK
|
||||
free(line);
|
||||
#endif
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
/* See documentation in header file. */
|
||||
int Exiv2::ini_parse_file(FILE* file, ini_handler handler, void* user) {
|
||||
return Exiv2::ini_parse_stream(reinterpret_cast<ini_reader>(fgets), file, handler, user);
|
||||
}
|
||||
|
||||
/* See documentation in header file. */
|
||||
int Exiv2::ini_parse(const char* filename, ini_handler handler, void* user) {
|
||||
FILE* file;
|
||||
int error;
|
||||
|
||||
file = fopen(filename, "r");
|
||||
if (!file)
|
||||
return -1;
|
||||
error = Exiv2::ini_parse_file(file, handler, user);
|
||||
fclose(file);
|
||||
return error;
|
||||
}
|
||||
|
||||
INIReader::INIReader(const std::string& filename) {
|
||||
_error = ini_parse(filename.c_str(), ValueHandler, this);
|
||||
}
|
||||
|
||||
int INIReader::ParseError() const {
|
||||
return _error;
|
||||
}
|
||||
|
||||
string INIReader::Get(const string& section, const string& name, const string& default_value) {
|
||||
string key = MakeKey(section, name);
|
||||
return _values.count(key) ? _values[key] : default_value;
|
||||
}
|
||||
|
||||
long INIReader::GetInteger(const string& section, const string& name, long default_value) {
|
||||
string valstr = Get(section, name, "");
|
||||
const char* value = valstr.c_str();
|
||||
char* end;
|
||||
// This parses "1234" (decimal) and also "0x4D2" (hex)
|
||||
long n = std::strtol(value, &end, 0);
|
||||
return end > value ? n : default_value;
|
||||
}
|
||||
|
||||
double INIReader::GetReal(const string& section, const string& name, double default_value) {
|
||||
string valstr = Get(section, name, "");
|
||||
const char* value = valstr.c_str();
|
||||
char* end;
|
||||
double n = strtod(value, &end);
|
||||
return end > value ? n : default_value;
|
||||
}
|
||||
|
||||
bool INIReader::GetBoolean(const string& section, const string& name, bool default_value) {
|
||||
string valstr = Get(section, name, "");
|
||||
// Convert to lower case to make string comparisons case-insensitive
|
||||
std::transform(valstr.begin(), valstr.end(), valstr.begin(), ::tolower);
|
||||
if (valstr == "true" || valstr == "yes" || valstr == "on" || valstr == "1")
|
||||
return true;
|
||||
if (valstr == "false" || valstr == "no" || valstr == "off" || valstr == "0")
|
||||
return false;
|
||||
return default_value;
|
||||
}
|
||||
|
||||
string INIReader::MakeKey(const string& section, const string& name) {
|
||||
string key = section + "=" + name;
|
||||
// Convert to lower case to make section/name lookups case-insensitive
|
||||
std::transform(key.begin(), key.end(), key.begin(), ::tolower);
|
||||
return key;
|
||||
}
|
||||
|
||||
int INIReader::ValueHandler(void* user, const char* section, const char* name, const char* value) {
|
||||
auto reader = static_cast<INIReader*>(user);
|
||||
string key = MakeKey(section, name);
|
||||
if (!reader->_values[key].empty())
|
||||
reader->_values[key] += "\n";
|
||||
reader->_values[key] += value;
|
||||
return 1;
|
||||
}
|
||||
Loading…
Reference in New Issue