From 405c2498e8985092c89afd521505055bb5ec6c80 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Stelmach?= Date: Tue, 21 Jan 2014 17:17:07 +0100 Subject: [PATCH] Imported Upstream version 3.1 --- AUTHORS | 9 +- INSTALL | 13 +- LICENSE | 2 +- Makefile | 5 +- README | 5 +- doc/Makefile | 16 + doc/iniparser.dox | 81 ++++ doc/iniparser.main | 207 +++++++++ html/bc_s.png | Bin 0 -> 677 bytes html/closed.png | Bin 0 -> 126 bytes html/doxygen.css | 1063 ++++++++++++++++++++++++++++++++------------- html/doxygen.png | Bin 1281 -> 3942 bytes html/globals_func.html | 104 +++-- html/index.html | 234 +++++----- html/iniparser_8h.html | 756 ++++++++++++++++++-------------- html/iniparser_8main.html | 45 +- html/nav_f.png | Bin 0 -> 159 bytes html/nav_h.png | Bin 0 -> 97 bytes html/open.png | Bin 0 -> 118 bytes html/tab_a.png | Bin 0 -> 140 bytes html/tab_b.png | Bin 0 -> 178 bytes html/tab_h.png | Bin 0 -> 192 bytes html/tab_s.png | Bin 0 -> 189 bytes html/tabs.css | 129 ++---- src/dictionary.c | 546 +++++++++-------------- src/dictionary.h | 111 +---- src/iniparser.c | 486 +++++++++++++++------ src/iniparser.h | 67 +-- src/strlib.c | 211 --------- src/strlib.h | 108 ----- test/Makefile | 7 +- test/iniexample.c | 169 ++++--- test/parse.c | 24 + test/twisted-errors.ini | 9 + test/twisted-genhuge.py | 12 + test/twisted-ofkey.ini | 66 +++ test/twisted-ofval.ini | 56 +++ test/twisted.ini | 131 ++++++ 38 files changed, 2757 insertions(+), 1915 deletions(-) create mode 100644 doc/Makefile create mode 100644 doc/iniparser.dox create mode 100644 doc/iniparser.main create mode 100644 html/bc_s.png create mode 100644 html/closed.png create mode 100644 html/nav_f.png create mode 100644 html/nav_h.png create mode 100644 html/open.png create mode 100644 html/tab_a.png create mode 100644 html/tab_b.png create mode 100644 html/tab_h.png create mode 100644 html/tab_s.png delete mode 100644 src/strlib.c delete mode 100644 src/strlib.h create mode 100644 test/parse.c create mode 100644 test/twisted-errors.ini create mode 100644 test/twisted-genhuge.py create mode 100644 test/twisted-ofkey.ini create mode 100644 test/twisted-ofval.ini create mode 100644 test/twisted.ini diff --git a/AUTHORS b/AUTHORS index f3dc876..d5a3f6b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,6 @@ -Author for this package: -Nicolas Devillard +Author: Nicolas Devillard + +This tiny library has received countless contributions and I have +not kept track of all the people who contributed. Let them be thanked +for their ideas, code, suggestions, corrections, enhancements! -Many thanks to the many people who contributed ideas, code, suggestions, -corrections, enhancements. diff --git a/INSTALL b/INSTALL index 0d319b2..a5b05d0 100644 --- a/INSTALL +++ b/INSTALL @@ -2,11 +2,14 @@ iniParser installation instructions ----------------------------------- -1. Modify the Makefile to suit your environment. -2. Type 'make' to make the library. -3. Type 'make check' to make the test program. -4. Type 'test/iniexample' to launch the test program. +- Modify the Makefile to suit your environment. +- Type 'make' to make the library. +- Type 'make check' to make the test program. +- Type 'test/iniexample' to launch the test program. +- Type 'test/parse' to launch torture tests. + + Enjoy! N. Devillard -Tue Jan 14 11:52:03 CET 2003 +Wed Mar 2 21:14:17 CET 2011 diff --git a/LICENSE b/LICENSE index 2eae408..5a3a80b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2000 by Nicolas Devillard. +Copyright (c) 2000-2011 by Nicolas Devillard. MIT License Permission is hereby granted, free of charge, to any person obtaining a diff --git a/Makefile b/Makefile index bc5d612..1405a34 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # Compiler settings CC = gcc -CFLAGS = -O3 -fPIC +CFLAGS = -O2 -fPIC -Wall -ansi -pedantic # Ar settings to build the library AR = ar @@ -32,8 +32,7 @@ COMPILE.c=$(CC) $(CFLAGS) -c SRCS = src/iniparser.c \ - src/dictionary.c \ - src/strlib.c + src/dictionary.c OBJS = $(SRCS:.c=.o) diff --git a/README b/README index 466d079..bc69787 100644 --- a/README +++ b/README @@ -1,5 +1,6 @@ -Welcome to iniParser! +Welcome to iniParser -- version 3.1 +released 08 Apr 2012 This modules offers parsing of ini files from the C level. See a complete documentation in HTML format, from this directory @@ -8,4 +9,4 @@ open the file html/index.html with any HTML-capable browser. Enjoy! N.Devillard -Thu Nov 17 12:31:42 CET 2005 +Sun Apr 8 16:38:09 CEST 2012 diff --git a/doc/Makefile b/doc/Makefile new file mode 100644 index 0000000..db925ec --- /dev/null +++ b/doc/Makefile @@ -0,0 +1,16 @@ +# +# iniparser doc Makefile +# + +all: html + +html: + doxygen iniparser.dox + rm -f ../html/annotated.html + rm -f ../html/classes.html + rm -f ../html/doxygen.gif + rm -f ../html/files.html + rm -f ../html/functions.html + rm -f ../html/globals.html + rm -f ../html/iniparser_main.html + diff --git a/doc/iniparser.dox b/doc/iniparser.dox new file mode 100644 index 0000000..ee59555 --- /dev/null +++ b/doc/iniparser.dox @@ -0,0 +1,81 @@ +PROJECT_NAME = iniparser +PROJECT_NUMBER = 3.1 +OUTPUT_DIRECTORY = .. +OUTPUT_LANGUAGE = English +EXTRACT_ALL = YES +EXTRACT_PRIVATE = NO +EXTRACT_STATIC = NO +HIDE_UNDOC_MEMBERS = NO +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ALWAYS_DETAILED_SEC = NO +FULL_PATH_NAMES = NO +STRIP_FROM_PATH = +INTERNAL_DOCS = NO +SOURCE_BROWSER = NO +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +VERBATIM_HEADERS = NO +SHOW_INCLUDE_FILES = NO +JAVADOC_AUTOBRIEF = NO +INHERIT_DOCS = YES +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +DISTRIBUTE_GROUP_DOC = NO +TAB_SIZE = 4 +ENABLED_SECTIONS = +GENERATE_TODOLIST = NO +GENERATE_TESTLIST = NO +ALIASES = +MAX_INITIALIZER_LINES = 30 +OPTIMIZE_OUTPUT_FOR_C = YES +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = +INPUT = iniparser.main ../src +FILE_PATTERNS = iniparser.h +RECURSIVE = NO +EXCLUDE = +EXCLUDE_PATTERNS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = +IMAGE_PATH = +INPUT_FILTER = +FILTER_SOURCE_FILES = NO +ALPHABETICAL_INDEX = YES +COLS_IN_ALPHA_INDEX = 5 +IGNORE_PREFIX = +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_ALIGN_MEMBERS = YES +GENERATE_HTMLHELP = NO +DISABLE_INDEX = YES +ENUM_VALUES_PER_LINE = 4 +GENERATE_TREEVIEW = NO +TREEVIEW_WIDTH = 250 + +GENERATE_LATEX = NO +GENERATE_RTF = NO +GENERATE_MAN = NO + +ENABLE_PREPROCESSING = NO +MACRO_EXPANSION = NO +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = NO +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +PREDEFINED = +EXPAND_AS_DEFINED = +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +PERL_PATH = /usr/bin/perl +HAVE_DOT = NO +SEARCHENGINE = NO diff --git a/doc/iniparser.main b/doc/iniparser.main new file mode 100644 index 0000000..47747c1 --- /dev/null +++ b/doc/iniparser.main @@ -0,0 +1,207 @@ + +/** + + @mainpage iniparser documentation + + + @section welcome Introduction + + iniParser is a simple C library offering ini file parsing services. + The library is pretty small (less than 1500 lines of C) and robust, and + does not depend on any other external library to compile. It is written + in ANSI C and should compile on most platforms without difficulty. + + + @section inidef What is an ini file? + + An ini file is an ASCII file describing simple parameters + (character strings, integers, floating-point values or booleans) + in an explicit format, easy to use and modify for users. + + An ini file is segmented into Sections, declared by the following + syntax: + + @verbatim + [Section Name] + @endverbatim + + i.e. the section name enclosed in square brackets, alone on a + line. Sections names are allowed to contain any character but + square brackets or linefeeds. + + In any section are zero or more variables, declared with the + following syntax: + + @verbatim + Key = value ; comment + @endverbatim + + The key is any string (possibly containing blanks). The value is + any character on the right side of the equal sign. Values can be + given enclosed with quotes. If no quotes are present, the value is + understood as containing all characters between the first and the + last non-blank characters before the comment. The following + declarations are identical: + + @verbatim + Hello = "this is a long string value" ; comment + Hello = this is a long string value ; comment + @endverbatim + + The semicolon and comment at the end of the line are optional. If + there is a comment, it starts from the first character after the + semicolon up to the end of the line. + + Multi-line values can be provided by ending the line with a + backslash (\). + + @verbatim + Multiple = Line 1 \ + Line 2 \ + Line 3 \ + Line 4 ; comment + @endverbatim + + This would yield: "multiple" <- "Line1 Line2 Line3 Line4" + + Comments in an ini file are: + + - Lines starting with a hash sign + - Blank lines (only blanks or tabs) + - Comments given on value lines after the semicolon (if present) + + + @section install Compiling/installing the library + + Edit the Makefile to indicate the C compiler you want to use, the + options to provide to compile ANSI C, and possibly the options to pass + to the ar program on your machine to build a library (.a) from a set + of object (.o) files. + + Defaults are set for the gcc compiler and the standard ar library + builder. + + Type 'make', that should do it. + + To use the library in your programs, add the following line on top + of your module: + + @code + #include "iniparser.h" + @endcode + + And link your program with the iniparser library by adding + @c -liniparser.a to the compile line. + + See the file test/initest.c for an example. + + iniparser is an ANSI C library. If you want to compile it + with a C++ compiler you will likely run into compatibility + issues. Headers probably have to include the extern "C" + hack and function prototypes will want to add some const + here and there to keep the compiler happy. This job is left + to the reader as there are too many C++ compilers around, each + with its own requirements as to what represents acceptable + C code in a C++ environment. You have been warned. + + + @section reference Library reference + + The library is completely documented in its header file. On-line + documentation has been generated and can be consulted here: + + - iniparser.h + + + @section usage Using the parser + + Comments are discarded by the parser. Then sections are + identified, and in each section a new entry is created for every + keyword found. The keywords are stored with the following syntax: + + @verbatim + [Section] + Keyword = value ; comment + @endverbatim + + is converted to the following key pair: + + @verbatim + ("section:keyword", "value") + @endverbatim + + This means that if you want to retrieve the value that was stored + in the section called @c Pizza, in the keyword @c Cheese, + you would make a request to the dictionary for + @c "pizza:cheese". All section and keyword names are converted + to lowercase before storage in the structure. The value side is + conserved as it has been parsed, though. + + Section names are also stored in the structure. They are stored + using as key the section name, and a NULL associated value. They + can be queried through iniparser_find_entry(). + + To launch the parser, use the function called iniparser_load(), which + takes an input file name and returns a newly allocated @e dictionary + structure. This latter object should remain opaque to the user and only + accessed through the following accessor functions: + + - iniparser_getstring() + - iniparser_getint() + - iniparser_getdouble() + - iniparser_getboolean() + + Finally, discard this structure using iniparser_freedict(). + + All values parsed from the ini file are stored as strings. The + accessors are just converting these strings to the requested type on + the fly, but you could basically perform this conversion by yourself + after having called the string accessor. + + Notice that iniparser_getboolean() will return an integer (0 or 1), + trying to make sense of what was found in the file. Strings starting + with "y", "Y", "t", "T" or "1" are considered true values (return 1), + strings starting with "n", "N", "f", "F", "0" are considered false + (return 0). This allows some flexibility in handling of boolean + answers. + + If you want to add extra information into the structure that was not + present in the ini file, you can use iniparser_set() to insert a + string. + + If you want to add a section to the structure, add a key + with a NULL value. Example: + @verbatim + iniparser_set(ini, "section", NULL); + iniparser_set(ini, "section:key1", NULL); + iniparser_set(ini, "section:key2", NULL); + @endverbatim + + + @section implementation A word about the implementation + + The dictionary structure is a pretty simple dictionary + implementation which might find some uses in other applications. + If you are curious, look into the source. + + + @section defects Known defects + + The dictionary structure is extremely unefficient for searching + as keys are sorted in the same order as they are read from the + ini file, which is convenient when dumping back to a file. The + simplistic first-approach linear search implemented there can + become a bottleneck if you have a very large number of keys. + + People who need to load large amounts of data from an ini file + should definitely turn to more appropriate solutions: sqlite3 or + similar. There are otherwise many other dictionary implementations + available on the net to replace this one. + + + @section authors Authors + + Nicolas Devillard (ndevilla AT free DOT fr). + + +*/ diff --git a/html/bc_s.png b/html/bc_s.png new file mode 100644 index 0000000000000000000000000000000000000000..e4018628b5b45cb4301037485a29d7d74ac22138 GIT binary patch literal 677 zcmV;W0$TlvP)X?0Pv5h+5!wElpi=&YL!gfY!djl#UDdPKy97F|A-deTa@qo3BWh1YQIvzmHR^g zFjV4I6pLB7_*vEZk^%p7c7Bh>0`4r^X#gpJE_Vz9fSHKqclcZaV^k3gX%h+1`u||O zZ+BY?7(R=ayr^kXE=E0Dw=$Ud3VJ?9^Cz@hP?388Cw5>9TloOJ>^KczCgj zns2=|0!a|)Yq3{hjL{xyy7|Tk0N}Pe+g9PUTL!4{#;eUhrNd@!_T<>Vu+35c)h>sq ztgb?(6W3oFLz#%?OMEV@{j#4LuDvjVGZ~6hpQT8li5b0yjvK8c4efl+vSz5)P6 zle78)00_Iv5)&E~hnOdcd}L}i+MU>k+Q8#@KjqJJN`gRj(~)RmNrck9ht@LelPtVO zwp(J;k!T=gC#%o(13-^E+g@aqc()pf{+j|0w)AH*Mq$54UjLv#jV$RYpz3Vjg$$=u z>yjfBQOhL=^@+#4#$l|{~}HZ-?1Yy{lI*$N}*YDC`<{+;>_#gMXZdz4NI00000 LNkvXXu0mjfx86dR literal 0 HcmV?d00001 diff --git a/html/closed.png b/html/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..b7d4bd9fef2272c74b94762c9e2496177017775e GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VuAVNAAr*{o?>h22DDp4|bgj*t z)u^AqcA-V@guRYpb17F<&b?_~8HV>~XqWvB;^$!VVSTy0!eQcJp_yD7TIQA>7dijs YXf6~H5cs^Q6KEiVr>mdKI;Vst0NsWqGynhq literal 0 HcmV?d00001 diff --git a/html/doxygen.css b/html/doxygen.css index c7db1a8..74445fe 100644 --- a/html/doxygen.css +++ b/html/doxygen.css @@ -1,358 +1,835 @@ -BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV { - font-family: Geneva, Arial, Helvetica, sans-serif; +/* The standard CSS for doxygen */ + +body, table, div, p, dl { + font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif; + font-size: 12px; } -BODY,TD { - font-size: 90%; + +/* @group Heading Levels */ + +h1 { + font-size: 150%; } -H1 { - text-align: center; - font-size: 160%; + +.title { + font-size: 150%; + font-weight: bold; + margin: 10px 2px; } -H2 { - font-size: 120%; + +h2 { + font-size: 120%; } -H3 { - font-size: 100%; + +h3 { + font-size: 100%; } -CAPTION { font-weight: bold } -DIV.qindex { - width: 100%; - background-color: #e8eef2; - border: 1px solid #84b0c7; + +dt { + font-weight: bold; +} + +div.multicol { + -moz-column-gap: 1em; + -webkit-column-gap: 1em; + -moz-column-count: 3; + -webkit-column-count: 3; +} + +p.startli, p.startdd, p.starttd { + margin-top: 2px; +} + +p.endli { + margin-bottom: 0px; +} + +p.enddd { + margin-bottom: 4px; +} + +p.endtd { + margin-bottom: 2px; +} + +/* @end */ + +caption { + font-weight: bold; +} + +span.legend { + font-size: 70%; + text-align: center; +} + +h3.version { + font-size: 90%; + text-align: center; +} + +div.qindex, div.navtab{ + background-color: #EBEFF6; + border: 1px solid #A3B4D7; text-align: center; margin: 2px; padding: 2px; - line-height: 140%; } -DIV.nav { + +div.qindex, div.navpath { width: 100%; - background-color: #e8eef2; - border: 1px solid #84b0c7; - text-align: center; - margin: 2px; - padding: 2px; line-height: 140%; } -DIV.navtab { - background-color: #e8eef2; - border: 1px solid #84b0c7; - text-align: center; - margin: 2px; - margin-right: 15px; - padding: 2px; + +div.navtab { + margin-right: 15px; } -TD.navtab { - font-size: 70%; + +/* @group Link Styling */ + +a { + color: #3D578C; + font-weight: normal; + text-decoration: none; } -A.qindex { - text-decoration: none; - font-weight: bold; - color: #1A419D; + +.contents a:visited { + color: #4665A2; } -A.qindex:visited { - text-decoration: none; - font-weight: bold; - color: #1A419D + +a:hover { + text-decoration: underline; } -A.qindex:hover { - text-decoration: none; - background-color: #ddddff; + +a.qindex { + font-weight: bold; } -A.qindexHL { - text-decoration: none; + +a.qindexHL { font-weight: bold; - background-color: #6666cc; + background-color: #9CAFD4; color: #ffffff; - border: 1px double #9295C2; + border: 1px double #869DCA; } -A.qindexHL:hover { - text-decoration: none; - background-color: #6666cc; - color: #ffffff; + +.contents a.qindexHL:visited { + color: #ffffff; +} + +a.el { + font-weight: bold; +} + +a.elRef { +} + +a.code { + color: #4665A2; } -A.qindexHL:visited { text-decoration: none; background-color: #6666cc; color: #ffffff } -A.el { text-decoration: none; font-weight: bold } -A.elRef { font-weight: bold } -A.code:link { text-decoration: none; font-weight: normal; color: #0000FF} -A.code:visited { text-decoration: none; font-weight: normal; color: #0000FF} -A.codeRef:link { font-weight: normal; color: #0000FF} -A.codeRef:visited { font-weight: normal; color: #0000FF} -A:hover { text-decoration: none; background-color: #f2f2ff } -DL.el { margin-left: -1cm } + +a.codeRef { + color: #4665A2; +} + +/* @end */ + +dl.el { + margin-left: -1cm; +} + .fragment { - font-family: monospace, fixed; - font-size: 95%; + font-family: monospace, fixed; + font-size: 105%; } -PRE.fragment { - border: 1px solid #CCCCCC; - background-color: #f5f5f5; - margin-top: 4px; - margin-bottom: 4px; - margin-left: 2px; - margin-right: 8px; - padding-left: 6px; - padding-right: 6px; - padding-top: 4px; - padding-bottom: 4px; + +pre.fragment { + border: 1px solid #C4CFE5; + background-color: #FBFCFD; + padding: 4px 6px; + margin: 4px 8px 4px 2px; + overflow: auto; + word-wrap: break-word; + font-size: 9pt; + line-height: 125%; +} + +div.ah { + background-color: black; + font-weight: bold; + color: #ffffff; + margin-bottom: 3px; + margin-top: 3px; + padding: 0.2em; + border: solid thin #333; + border-radius: 0.5em; + -webkit-border-radius: .5em; + -moz-border-radius: .5em; + box-shadow: 2px 2px 3px #999; + -webkit-box-shadow: 2px 2px 3px #999; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px; + background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444)); + background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000); +} + +div.groupHeader { + margin-left: 16px; + margin-top: 12px; + font-weight: bold; } -DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px } -DIV.groupHeader { - margin-left: 16px; - margin-top: 12px; - margin-bottom: 6px; - font-weight: bold; +div.groupText { + margin-left: 16px; + font-style: italic; } -DIV.groupText { margin-left: 16px; font-style: italic; font-size: 90% } -BODY { + +body { background: white; color: black; - margin-right: 20px; - margin-left: 20px; + margin: 0; } -TD.indexkey { - background-color: #e8eef2; + +div.contents { + margin-top: 10px; + margin-left: 10px; + margin-right: 5px; +} + +td.indexkey { + background-color: #EBEFF6; font-weight: bold; - padding-right : 10px; - padding-top : 2px; - padding-left : 10px; - padding-bottom : 2px; - margin-left : 0px; - margin-right : 0px; - margin-top : 2px; - margin-bottom : 2px; - border: 1px solid #CCCCCC; -} -TD.indexvalue { - background-color: #e8eef2; - font-style: italic; - padding-right : 10px; - padding-top : 2px; - padding-left : 10px; - padding-bottom : 2px; - margin-left : 0px; - margin-right : 0px; - margin-top : 2px; - margin-bottom : 2px; - border: 1px solid #CCCCCC; -} -TR.memlist { - background-color: #f0f0f0; -} -P.formulaDsp { text-align: center; } -IMG.formulaDsp { } -IMG.formulaInl { vertical-align: middle; } -SPAN.keyword { color: #008000 } -SPAN.keywordtype { color: #604020 } -SPAN.keywordflow { color: #e08000 } -SPAN.comment { color: #800000 } -SPAN.preprocessor { color: #806020 } -SPAN.stringliteral { color: #002080 } -SPAN.charliteral { color: #008080 } -.mdescLeft { - padding: 0px 8px 4px 8px; - font-size: 80%; - font-style: italic; - background-color: #FAFAFA; - border-top: 1px none #E0E0E0; - border-right: 1px none #E0E0E0; - border-bottom: 1px none #E0E0E0; - border-left: 1px none #E0E0E0; - margin: 0px; + border: 1px solid #C4CFE5; + margin: 2px 0px 2px 0; + padding: 2px 10px; } -.mdescRight { - padding: 0px 8px 4px 8px; - font-size: 80%; - font-style: italic; - background-color: #FAFAFA; - border-top: 1px none #E0E0E0; - border-right: 1px none #E0E0E0; - border-bottom: 1px none #E0E0E0; - border-left: 1px none #E0E0E0; - margin: 0px; + +td.indexvalue { + background-color: #EBEFF6; + border: 1px solid #C4CFE5; + padding: 2px 10px; + margin: 2px 0px; } -.memItemLeft { - padding: 1px 0px 0px 8px; - margin: 4px; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - border-top-color: #E0E0E0; - border-right-color: #E0E0E0; - border-bottom-color: #E0E0E0; - border-left-color: #E0E0E0; - border-top-style: solid; - border-right-style: none; - border-bottom-style: none; - border-left-style: none; - background-color: #FAFAFA; - font-size: 80%; + +tr.memlist { + background-color: #EEF1F7; } -.memItemRight { - padding: 1px 8px 0px 8px; - margin: 4px; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - border-top-color: #E0E0E0; - border-right-color: #E0E0E0; - border-bottom-color: #E0E0E0; - border-left-color: #E0E0E0; - border-top-style: solid; - border-right-style: none; - border-bottom-style: none; - border-left-style: none; - background-color: #FAFAFA; - font-size: 80%; + +p.formulaDsp { + text-align: center; } -.memTemplItemLeft { - padding: 1px 0px 0px 8px; - margin: 4px; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - border-top-color: #E0E0E0; - border-right-color: #E0E0E0; - border-bottom-color: #E0E0E0; - border-left-color: #E0E0E0; - border-top-style: none; - border-right-style: none; - border-bottom-style: none; - border-left-style: none; - background-color: #FAFAFA; - font-size: 80%; + +img.formulaDsp { + } -.memTemplItemRight { - padding: 1px 8px 0px 8px; - margin: 4px; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - border-top-color: #E0E0E0; - border-right-color: #E0E0E0; - border-bottom-color: #E0E0E0; - border-left-color: #E0E0E0; - border-top-style: none; - border-right-style: none; - border-bottom-style: none; - border-left-style: none; - background-color: #FAFAFA; - font-size: 80%; + +img.formulaInl { + vertical-align: middle; } -.memTemplParams { - padding: 1px 0px 0px 8px; - margin: 4px; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - border-top-color: #E0E0E0; - border-right-color: #E0E0E0; - border-bottom-color: #E0E0E0; - border-left-color: #E0E0E0; - border-top-style: solid; - border-right-style: none; - border-bottom-style: none; - border-left-style: none; - color: #606060; - background-color: #FAFAFA; - font-size: 80%; + +div.center { + text-align: center; + margin-top: 0px; + margin-bottom: 0px; + padding: 0px; } -.search { color: #003399; - font-weight: bold; + +div.center img { + border: 0px; +} + +address.footer { + text-align: right; + padding-right: 12px; +} + +img.footer { + border: 0px; + vertical-align: middle; } -FORM.search { - margin-bottom: 0px; - margin-top: 0px; + +/* @group Code Colorization */ + +span.keyword { + color: #008000 } -INPUT.search { font-size: 75%; - color: #000080; - font-weight: normal; - background-color: #e8eef2; + +span.keywordtype { + color: #604020 } -TD.tiny { font-size: 75%; + +span.keywordflow { + color: #e08000 } -a { - color: #1A41A8; + +span.comment { + color: #800000 +} + +span.preprocessor { + color: #806020 +} + +span.stringliteral { + color: #002080 +} + +span.charliteral { + color: #008080 +} + +span.vhdldigit { + color: #ff00ff +} + +span.vhdlchar { + color: #000000 +} + +span.vhdlkeyword { + color: #700070 +} + +span.vhdllogic { + color: #ff0000 +} + +/* @end */ + +/* +.search { + color: #003399; + font-weight: bold; +} + +form.search { + margin-bottom: 0px; + margin-top: 0px; +} + +input.search { + font-size: 75%; + color: #000080; + font-weight: normal; + background-color: #e8eef2; +} +*/ + +td.tiny { + font-size: 75%; +} + +.dirtab { + padding: 4px; + border-collapse: collapse; + border: 1px solid #A3B4D7; +} + +th.dirtab { + background: #EBEFF6; + font-weight: bold; } -a:visited { - color: #2A3798; + +hr { + height: 0px; + border: none; + border-top: 1px solid #4A6AAA; } -.dirtab { padding: 4px; - border-collapse: collapse; - border: 1px solid #84b0c7; + +hr.footer { + height: 1px; +} + +/* @group Member Descriptions */ + +table.memberdecls { + border-spacing: 0px; + padding: 0px; } -TH.dirtab { background: #e8eef2; - font-weight: bold; + +.mdescLeft, .mdescRight, +.memItemLeft, .memItemRight, +.memTemplItemLeft, .memTemplItemRight, .memTemplParams { + background-color: #F9FAFC; + border: none; + margin: 4px; + padding: 1px 0 0 8px; } -HR { height: 1px; - border: none; - border-top: 1px solid black; + +.mdescLeft, .mdescRight { + padding: 0px 8px 4px 8px; + color: #555; } -/* Style for detailed member documentation */ +.memItemLeft, .memItemRight, .memTemplParams { + border-top: 1px solid #C4CFE5; +} + +.memItemLeft, .memTemplItemLeft { + white-space: nowrap; +} + +.memItemRight { + width: 100%; +} + +.memTemplParams { + color: #4665A2; + white-space: nowrap; +} + +/* @end */ + +/* @group Member Details */ + +/* Styles for detailed member documentation */ + .memtemplate { - font-size: 80%; - color: #606060; - font-weight: normal; -} -.memnav { - background-color: #e8eef2; - border: 1px solid #84b0c7; - text-align: center; - margin: 2px; - margin-right: 15px; - padding: 2px; + font-size: 80%; + color: #4665A2; + font-weight: normal; + margin-left: 9px; +} + +.memnav { + background-color: #EBEFF6; + border: 1px solid #A3B4D7; + text-align: center; + margin: 2px; + margin-right: 15px; + padding: 2px; +} + +.mempage { + width: 100%; } + .memitem { - padding: 4px; - background-color: #eef3f5; - border-width: 1px; - border-style: solid; - border-color: #dedeee; - -moz-border-radius: 8px 8px 8px 8px; + padding: 0; + margin-bottom: 10px; + margin-right: 5px; } + .memname { - white-space: nowrap; - font-weight: bold; -} -.memdoc{ - padding-left: 10px; + white-space: nowrap; + font-weight: bold; + margin-left: 6px; } + .memproto { - background-color: #d5e1e8; - width: 100%; - border-width: 1px; - border-style: solid; - border-color: #84b0c7; - font-weight: bold; - -moz-border-radius: 8px 8px 8px 8px; + border-top: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; + padding: 6px 0px 6px 0px; + color: #253555; + font-weight: bold; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); + /* opera specific markup */ + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + border-top-right-radius: 8px; + border-top-left-radius: 8px; + /* firefox specific markup */ + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + -moz-border-radius-topright: 8px; + -moz-border-radius-topleft: 8px; + /* webkit specific markup */ + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + -webkit-border-top-right-radius: 8px; + -webkit-border-top-left-radius: 8px; + background-image:url('nav_f.png'); + background-repeat:repeat-x; + background-color: #E2E8F2; + } + +.memdoc { + border-bottom: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; + padding: 2px 5px; + background-color: #FBFCFD; + border-top-width: 0; + /* opera specific markup */ + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + /* firefox specific markup */ + -moz-border-radius-bottomleft: 8px; + -moz-border-radius-bottomright: 8px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 60%, #F7F8FB 95%, #EEF1F7); + /* webkit specific markup */ + -webkit-border-bottom-left-radius: 8px; + -webkit-border-bottom-right-radius: 8px; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7F8FB), to(#EEF1F7)); +} + .paramkey { - text-align: right; + text-align: right; } + .paramtype { - white-space: nowrap; + white-space: nowrap; } + .paramname { - color: #602020; - font-style: italic; - white-space: nowrap; + color: #602020; + white-space: nowrap; +} +.paramname em { + font-style: normal; +} + +.params, .retval, .exception, .tparams { + border-spacing: 6px 2px; +} + +.params .paramname, .retval .paramname { + font-weight: bold; + vertical-align: top; +} + +.params .paramtype { + font-style: italic; + vertical-align: top; +} + +.params .paramdir { + font-family: "courier new",courier,monospace; + vertical-align: top; } -/* End Styling for detailed member documentation */ + + + + +/* @end */ + +/* @group Directory (tree) */ /* for the tree view */ + .ftvtree { font-family: sans-serif; - margin:0.5em; -} -.directory { font-size: 9pt; font-weight: bold; } -.directory h3 { margin: 0px; margin-top: 1em; font-size: 11pt; } -.directory > h3 { margin-top: 0; } -.directory p { margin: 0px; white-space: nowrap; } -.directory div { display: none; margin: 0px; } -.directory img { vertical-align: -30%; } + margin: 0px; +} + +/* these are for tree view when used as main index */ + +.directory { + font-size: 9pt; + font-weight: bold; + margin: 5px; +} + +.directory h3 { + margin: 0px; + margin-top: 1em; + font-size: 11pt; +} + +/* +The following two styles can be used to replace the root node title +with an image of your choice. Simply uncomment the next two styles, +specify the name of your image and be sure to set 'height' to the +proper pixel height of your image. +*/ + +/* +.directory h3.swap { + height: 61px; + background-repeat: no-repeat; + background-image: url("yourimage.gif"); +} +.directory h3.swap span { + display: none; +} +*/ + +.directory > h3 { + margin-top: 0; +} + +.directory p { + margin: 0px; + white-space: nowrap; +} + +.directory div { + display: none; + margin: 0px; +} + +.directory img { + vertical-align: -30%; +} + +/* these are for tree view when not used as main index */ + +.directory-alt { + font-size: 100%; + font-weight: bold; +} + +.directory-alt h3 { + margin: 0px; + margin-top: 1em; + font-size: 11pt; +} + +.directory-alt > h3 { + margin-top: 0; +} + +.directory-alt p { + margin: 0px; + white-space: nowrap; +} + +.directory-alt div { + display: none; + margin: 0px; +} + +.directory-alt img { + vertical-align: -30%; +} + +/* @end */ + +div.dynheader { + margin-top: 8px; +} + +address { + font-style: normal; + color: #2A3D61; +} + +table.doxtable { + border-collapse:collapse; +} + +table.doxtable td, table.doxtable th { + border: 1px solid #2D4068; + padding: 3px 7px 2px; +} + +table.doxtable th { + background-color: #374F7F; + color: #FFFFFF; + font-size: 110%; + padding-bottom: 4px; + padding-top: 5px; + text-align:left; +} + +.tabsearch { + top: 0px; + left: 10px; + height: 36px; + background-image: url('tab_b.png'); + z-index: 101; + overflow: hidden; + font-size: 13px; +} + +.navpath ul +{ + font-size: 11px; + background-image:url('tab_b.png'); + background-repeat:repeat-x; + height:30px; + line-height:30px; + color:#8AA0CC; + border:solid 1px #C2CDE4; + overflow:hidden; + margin:0px; + padding:0px; +} + +.navpath li +{ + list-style-type:none; + float:left; + padding-left:10px; + padding-right:15px; + background-image:url('bc_s.png'); + background-repeat:no-repeat; + background-position:right; + color:#364D7C; +} + +.navpath li.navelem a +{ + height:32px; + display:block; + text-decoration: none; + outline: none; +} + +.navpath li.navelem a:hover +{ + color:#6884BD; +} + +.navpath li.footer +{ + list-style-type:none; + float:right; + padding-left:10px; + padding-right:15px; + background-image:none; + background-repeat:no-repeat; + background-position:right; + color:#364D7C; + font-size: 8pt; +} + + +div.summary +{ + float: right; + font-size: 8pt; + padding-right: 5px; + width: 50%; + text-align: right; +} + +div.summary a +{ + white-space: nowrap; +} + +div.ingroups +{ + font-size: 8pt; + padding-left: 5px; + width: 50%; + text-align: left; +} + +div.ingroups a +{ + white-space: nowrap; +} + +div.header +{ + background-image:url('nav_h.png'); + background-repeat:repeat-x; + background-color: #F9FAFC; + margin: 0px; + border-bottom: 1px solid #C4CFE5; +} + +div.headertitle +{ + padding: 5px 5px 5px 10px; +} + +dl +{ + padding: 0 0 0 10px; +} + +dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug +{ + border-left:4px solid; + padding: 0 0 0 6px; +} + +dl.note +{ + border-color: #D0C000; +} + +dl.warning, dl.attention +{ + border-color: #FF0000; +} + +dl.pre, dl.post, dl.invariant +{ + border-color: #00D000; +} + +dl.deprecated +{ + border-color: #505050; +} + +dl.todo +{ + border-color: #00C0E0; +} + +dl.test +{ + border-color: #3030E0; +} + +dl.bug +{ + border-color: #C08050; +} + +#projectlogo +{ + text-align: center; + vertical-align: bottom; + border-collapse: separate; +} + +#projectlogo img +{ + border: 0px none; +} + +#projectname +{ + font: 300% Tahoma, Arial,sans-serif; + margin: 0px; + padding: 2px 0px; +} + +#projectbrief +{ + font: 120% Tahoma, Arial,sans-serif; + margin: 0px; + padding: 0px; +} + +#projectnumber +{ + font: 50% Tahoma, Arial,sans-serif; + margin: 0px; + padding: 0px; +} + +#titlearea +{ + padding: 0px; + margin: 0px; + width: 100%; + border-bottom: 1px solid #5373B4; +} + +.image +{ + text-align: center; +} + +.dotgraph +{ + text-align: center; +} + +.mscgraph +{ + text-align: center; +} + +.caption +{ + font-weight: bold; +} + diff --git a/html/doxygen.png b/html/doxygen.png index f0a274bbaffdd67f6d784c894d9cf28729db0e14..635ed52fce7057ac24df92ec7664088a881fa5d0 100644 GIT binary patch literal 3942 zcmV-s51H_ZP)95ENDh(OT9xpYZC{M(=rqI* z+1erNEr&9zRjUI-4rN=4BBz>P@ys*xOjGRjzVE*Fx_qvyt9d@B@BO*&@8Mq!nM{Tc z_WoM84-~xLreSL9@vgZ{m2dF}`u=^ZF3syQ-s2tnBwCI3ZFvSfI20Wbj236~Urq*8Kfw@RKKfRQTgE>}uUHK^ptamY=o)LU(xy55zNQ(`qZ znZ&$O075mrrInIXQgw4%GCbMD8Vn`3n3$EaRwtP1D{A!Gs=e!L%3;ayv@I{rAw{xw z^x^>EIWQM8ob3m}$(BaupDMV;Ed8w5|i(*e`7rU$TOc&1o7`|!LyN5jHI z7uWAR!v4c2xMp?}QmRYyf>i}tYGU(g=>DW&==J@GbhR z5@BNVY3O$`^D%gk4khm9XpFhuwzxUhi9T=Du4rpVuYRSMPHeDqo+4htnZRU@G9`0& z9~p)CsFl1|t*wjfoTo&%davN^3RfJUhQ{ZZIAcD77X^XsF_iR&ZMQ;p>K5*+*48)x z+=<>nh+6Uq85jOkg>{z>a;+V`s(I;I%*5s+R@9a^wNoZ03(g9-EcH%uHvX&yp7`D#`9Kw>DU3s zjD-VuW_A-K)unlS4O3f>_B%pPONUmI#oyL};Lglp3=04>0eBBEw$D1k-$WTsoi#K* z$7h`NcyRZsZ#w~6I<%~u!^xDofYrzF>zVIj2N>Ijs`mVR(Oy&*9f}<{JtQj8jJT!oEc!NQXBq5y|6ET*N?7ox*E6#{i- z@_DLD^IYTtg|Pg?A~!7@OCd8p^)kxK%VBM84docx$Z{MvO)iiqep@or-N}TEU8$%; zJih?#yJ9)V1s_`}c3XbY9V}nEKwNz8ILmR|v)(w|D@oVG;=i`+$*)!(xH{9#$2Za;pyZ1wgU#)mHl|&8%iwu%yncO z`T32Ib0$D}j`c}}5M@M#7oR&G=QwU!!Ja*P7|NJt1@lo=d{_dY-q_lmDcH7{BHncF zR@^PmcLC6EsN?6N{fV3o8}>?h9X_@;=&-p7%tms7$_{3w(anwek_k&<&)~c$Ar?S> zy9gKavndTmxqAbE?SMgcWhXPENdKdz7ntt55Y3Hs3jjc~uR-#$tR(1a_abv9`-QzG z^J0Fsbd&yruq%xAsxf3rc=T}$Zx|AD%x{Fd=? z{qhl3kG5w-PqVK9-Gru%7UIEw)bt$ZMF|Z6HpmO)F%@GNT8yT|#FuWPxv@@Ic={;6 zU7)e!XG|1dx=kU|&|)+m+$&|Yw92Fa;*MnegXcCf8XsHfqg_F5t)3Jt8)EkXKuY21 zqt%4}@R8hK*(_JO0*H+Pa)6Pp&K49rKNeQEYb*x9WY`!`Vh3|80YF%I`lxv9_!$hD zOh$>zWaRIW!);6`vA$Zp;5lnGyX^^N%YEjCeJMHPolKCE1ttIqK<$0w&LcE8)`_c2 z^H^qf6ACV0t7FLLCsu#mL&Mb8gE@rZE#k+1Nrrxw+{N0^#bN*~!qt2>S4e#jC$a$` ze4@{)$aTEYq_!#2|t@Fj3e?w-XVuG$Z}kAR?_kgJAlZIJ)0{eHw#fybNooA zp02jyYVc&w!}m#BVP>ef2|U^J(A-#O1R#A&><*?Y! zOwml{CnE+aU3JfKE@uzge(qMY{^6siuXFt;+mMbapU;Ppejl=L#>s2#SMBbfP9AFT znEVA=TBtZ6d-GfF>kOxylg>Ek%qTp*h2ze!^^hOsmKOEE6b;maQ>~R>3#z`Zawbik z88OTykU3_!Atg^+vnM=1n}?%<$dHzn)?k&T#RWwb+*y;XNQbYNHKo3wr~&}Qa$id; z6^D*K9RTQZUuQVg)g~P%!BIiv+cXllt)KEP9IN)1udQKf>p|~lXj7K<-9}0Q%i9+K zXaF7qXclE>sf)7)J4_M%V{;(sFT7HN$o0#_qU#Ah1D{ zon=JihPcgG5xHuvQwOXBkt3(iUdx{6Gn|aa>@C9Cqg%rPK(+REZ4>6t3z7m@Aj;0l zSHh&%cKSJ*+WOJGwe?Y7d(9RAy)&NVS6uj}1m@U}jXH3oVQT9E0A)$ZDRdK>;_i;+ z7vbEoI7$1XK6vNxT(_sJ(GM4s92e;gB&Q zDO;(Ve^%gPG&lWW1fUf_=9-Q1%&`s%aD^o`Q2u`WI9V>Qm#D5?SW<)Njmt@aR5@6( zL4cdTo+Jg@>Brm1^_gf%0Z?}1AppR3NdFE5uzdpBZz;{Thd6SI-$gb2}pFAww$*j(2=s{mdz2E;lBvVcrN@}i2bC`Q5Y_;BID^f0J+ACVhyQsLg0@`okIk+i=LJ=3yvI*oASj62 za3C{Pu_fQ+atw!zN{$Shr*_UV=|jp4#CqWeGE?Jb`pq!|5bDES&-Ix=-N>DpydHqW z+-{QS+i)d;uGS)M%Suw9khR}3N82j|S{a#&Tctme0s%mTy<1S|;@M-+S4#o@!qr;r z+w(n=;@43Y_n#dI0Gb(T0{G7k-KY8k`MPM_Bss$?)SK){KJMrwv!vz42_U_Za zX7lDqiU8ZvCAfGpAtfVC5bQrYa4C)M9G$S4D&VqpJ8)lm$t5FAAR%ywf>*~VaivC70RVFXISv4Lx&tk^Cf1)qQ|rxp z*8H>)cgoM;(eKxH14u~~@JopNr9@A z#-yXVG?$es;EPqsn-j?45^L52U=nT#0A^T3JY$&B3EH&%2UHdv3P=_3$!n76!34ks zz^2ii@sXAu8LKYMmG=_^*qtiiOFNlG3?QYtG%wrCZh|)vlj8vq3sw~f1b8;_TMB>z zPSyDQy_9bbXD*#sNRGMzfSAwUD}ASX;ZGQcGdE=9q~ORU{v$}=z2Bc8EOe2S&);jS zCZB8P`hPoV1NBk)TQP2z{q$NL-GLUc7%>&fecE^E{I5gs?8!qTK7VgR7Z?}-`YG|z zVN-NvOlQ+B;~J*69_Xd1n-0MLKTY6&*%rTi*0^HXniz8{bCMsVpSXqs(GGO)*_#Kz z9YBCQ_VRhtwhMfppMh@OdxjCN0mH`5hKZr>UoxMx`W~u^kD&bskplglOiRxQvep*2 z0mk+kMP>J)K`8X3`6Zq|X~5IQ-_rrOn+_WvU{1Gs{ow1-Eb;K(Z?p$@ugXpr^?PM( z(5Hv;$*X=QZaqG_4q)N1v9sO(Dsei!;%IcIztt6YUs{yj z^77e`UYa^%<-Ts+d*b=ihKt?0_sj!ePNO@K*PGmGD*v^;rRAkduikx~UNk=@{XKeV zp_ir(dTaGVWBr{_02Kg2Xmlsn|IvIIRYivbo|L{yx}yX5Bte@P6C>1KyqvYnT{boB#j-07*qoM6N<$f^XQQ A+yDRo literal 1281 zcmaJ>ZA?>F7(Vx-ms?uoS`b@hdRtpo6o^%HU>M$hfGrBvQnk$LE?p^P!kn&ikhyq! zX~V@&tPF5Qt@V?oTL96Bi%aRiwbe1)9DWQI#?)=HxS7QSw`J`5fAJ*eJbB;uNuKA& zdERDo*{Y<(If(#(B$Lr#;nB(8Y#ia=ZCeW?JfPLuQY`=@cW$k}Rivq|vbxGrRq1Tl9;+(gNt?}UtVKM2`T5t1jLzuL@0UIs`S#vlhl4)^ zLgSYrPj@$+`|j?eSbXTmiHGkWxV8V}BzNR?pl9k_s4pDu9vd5a_UzZEPk)}Ad{AV_ zzddrjrh4=Imr`E06;LY{)YYt?o}L~H@7C}F^WB!Ra=v`Q0bj{>5&$66CWF>mf6vjP z2N>RRY6ZYa=K`76>+|_)Xdwko+7wv}7cN|btOhWb(*{sta~6b?S8Omrxw}!4`NhGr zZVpNqpu1@BE`QGWNTpEpcJVW5izu~2B^GlM?1(OPg)zwW;QcP@Ltcclm>XbJL9C|j z=9!2?ua=uIlf0%AndzHsRC}IyTL$EhAee(fdKB`?27KeS^2M8M_7b~PiCFO&r5LC7 z7gl1*a<8;SjNaw#h=843_AV9iZbWQOAp5YOC^&_F*9K0> zB|6%IDb?aM#3viTxkLU4aXg&@+CkNTOnQ1iMP*^?b|^lJy$4C)Zk4isV!|RZ*XhXh zw8q3$=*0LeGC!XI_Wc?dkT~3+*Gu%%yIqP+Wr3H$=&ROMQU6q}Ag^P~>c5vAEO;a- z_dK-3PPeKar%)6$j~vI2#*-YH!1h6HYVtwCX5_wM`iF#UKz&&@9Oo5w3%XGYrX zW>dY~)SG-((Yim%`InwgTvyRC?e=Wh^8KCao!R6Eg&TpVWUY1sN~4G}V?nFnEGo-; zHZ_$eW9-GnC%^WS9b z@p;-$oH#MtC0v>Q$HX%4^JdFdO$0cbv-W)Q TtK}Eh@>>I#ipmV1>S*>q-hkC} diff --git a/html/globals_func.html b/html/globals_func.html index dc5c712..d8ecfa9 100644 --- a/html/globals_func.html +++ b/html/globals_func.html @@ -1,54 +1,86 @@ - + + - - - -iniparser 2.x + +iniparser: Globals + + - - - - - - -
- + + +
+
+ + + + + + +
+
iniparser 3.1
+
-  -

-

+
+  - +
+
Generated on Sun Apr 8 2012 17:05:08 for iniparser by  + +doxygen 1.7.4
diff --git a/html/index.html b/html/index.html index a095755..794a4ff 100644 --- a/html/index.html +++ b/html/index.html @@ -1,156 +1,118 @@ - + + - - - -iniparser 2.x + +iniparser: iniparser documentation + + - - - - - - -

iniparser documentation

-

-

2.x

-

-Introduction

-iniParser is a simple C library offering ini file parsing services. The library is pretty small (less than 1500 lines of C) and robust, and does not depend on any other external library to compile. It is written in ANSI C and should compile anywhere without difficulty.

-

-

-What is an ini file?

-An ini file is an ASCII file describing simple parameters (character strings, integers, floating-point values or booleans) in an explicit format, easy to use and modify for users.

-An ini file is segmented into Sections, declared by the following syntax:

+ + +

+
+ + + + + + +
+
iniparser 3.1
+
+
+
+
+
+
iniparser documentation
+
+
+

+Introduction

+

iniParser is a simple C library offering ini file parsing services. The library is pretty small (less than 1500 lines of C) and robust, and does not depend on any other external library to compile. It is written in ANSI C and should compile on most platforms without difficulty.

+

+What is an ini file?

+

An ini file is an ASCII file describing simple parameters (character strings, integers, floating-point values or booleans) in an explicit format, easy to use and modify for users.

+

An ini file is segmented into Sections, declared by the following syntax:

     [Section Name]
-

-i.e. the section name enclosed in square brackets, alone on a line. Sections names are allowed to contain any character but square brackets or linefeeds. Slashes (/) are also reserved for hierarchical sections (see below).

-In any section are zero or more variables, declared with the following syntax:

+

i.e. the section name enclosed in square brackets, alone on a line. Sections names are allowed to contain any character but square brackets or linefeeds.

+

In any section are zero or more variables, declared with the following syntax:

     Key = value ; comment
-

-The key is any string (possibly containing blanks). The value is any character on the right side of the equal sign. Values can be given enclosed with quotes. If no quotes are present, the value is understood as containing all characters between the first and the last non-blank characters. The following declarations are identical:

+

The key is any string (possibly containing blanks). The value is any character on the right side of the equal sign. Values can be given enclosed with quotes. If no quotes are present, the value is understood as containing all characters between the first and the last non-blank characters before the comment. The following declarations are identical:

     Hello = "this is a long string value" ; comment
     Hello = this is a long string value ; comment
-

-The semicolon and comment at the end of the line are optional. If there is a comment, it starts from the first character after the semicolon up to the end of the line.

-Comments in an ini file are:

+

The semicolon and comment at the end of the line are optional. If there is a comment, it starts from the first character after the semicolon up to the end of the line.

+

Multi-line values can be provided by ending the line with a backslash (\).

+
+    Multiple = Line 1 \
+    Line 2 \
+    Line 3 \
+    Line 4 ; comment
+

This would yield: "multiple" <- "Line1 Line2 Line3 Line4"

+

Comments in an ini file are:

    -
  • Lines starting with a hash sign
  • Blank lines (only blanks or tabs)
  • Comments given on value lines after the semicolon (if present)
-

-

-

-Compiling/installing the library

-Edit the Makefile to indicate the C compiler you want to use, the options to provide to compile ANSI C, and possibly the options to pass to the ar program on your machine to build a library (.a) from a set of object (.o) files.

-Defaults are set for the gcc compiler and the standard ar library builder.

-Type 'make', that should do it.

-To use the library in your programs, add the following line on top of your module:

-

    #include "iniparser.h"
-

-And link your program with the iniparser library by adding -liniparser.a to the compile line.

-See the file test/initest.c for an example.

-

-

-Library reference

-The library is completely documented in its header file. On-line documentation has been generated and can be consulted here:

+

  • Lines starting with a hash sign
    • +
  • Blank lines (only blanks or tabs)
    • +
  • Comments given on value lines after the semicolon (if present)
    • + +

    +Compiling/installing the library

    +

    Edit the Makefile to indicate the C compiler you want to use, the options to provide to compile ANSI C, and possibly the options to pass to the ar program on your machine to build a library (.a) from a set of object (.o) files.

    +

    Defaults are set for the gcc compiler and the standard ar library builder.

    +

    Type 'make', that should do it.

    +

    To use the library in your programs, add the following line on top of your module:

    +
        #include "iniparser.h"
+

    And link your program with the iniparser library by adding -liniparser.a to the compile line.

    +

    See the file test/initest.c for an example.

    +

    iniparser is an ANSI C library. If you want to compile it with a C++ compiler you will likely run into compatibility issues. Headers probably have to include the extern "C" hack and function prototypes will want to add some const here and there to keep the compiler happy. This job is left to the reader as there are too many C++ compilers around, each with its own requirements as to what represents acceptable C code in a C++ environment. You have been warned.

    +

    +Library reference

    +

    The library is completely documented in its header file. On-line documentation has been generated and can be consulted here:

    -

    -

    -

    -Using the parser

    -Comments are discarded by the parser. Then sections are identified, and in each section a new entry is created for every keyword found. The keywords are stored with the following syntax:

    +

  • iniparser.h
    • + +

    +Using the parser

    +

    Comments are discarded by the parser. Then sections are identified, and in each section a new entry is created for every keyword found. The keywords are stored with the following syntax:

         [Section]
     Keyword = value ; comment
-

    -is converted to the following key pair:

    +

    is converted to the following key pair:

         ("section:keyword", "value")
-

    -This means that if you want to retrieve the value that was stored in the section called Pizza, in the keyword Cheese, you would make a request to the dictionary for "pizza:cheese". All section and keyword names are converted to lowercase before storage in the structure. The value side is conserved as it has been parsed, though.

    -Section names are also stored in the structure. They are stored using as key the section name, and a NULL associated value. They can be queried through iniparser_find_entry().

    -To launch the parser, simply use the function called iniparser_load(), which takes an input file name and returns a newly allocated dictionary structure. This latter object should remain opaque to the user and only accessed through the following accessor functions:

    +

    This means that if you want to retrieve the value that was stored in the section called Pizza, in the keyword Cheese, you would make a request to the dictionary for "pizza:cheese". All section and keyword names are converted to lowercase before storage in the structure. The value side is conserved as it has been parsed, though.

    +

    Section names are also stored in the structure. They are stored using as key the section name, and a NULL associated value. They can be queried through iniparser_find_entry().

    +

    To launch the parser, use the function called iniparser_load(), which takes an input file name and returns a newly allocated dictionary structure. This latter object should remain opaque to the user and only accessed through the following accessor functions:

    -

    -Finally, discard this structure using iniparser_freedict().

    -All values parsed from the ini file are stored as strings. The getint, getdouble and getboolean accessors are just converting these strings to the requested type on the fly, but you could basically perform this conversion by yourself after having called the getstr accessor.

    -Notice that the iniparser_getboolean() function will return an integer (0 or 1), trying to make sense of what was found in the file. Strings starting with "y", "Y", "t", "T" or "1" are considered true values (return 1), strings starting with "n", "N", "f", "F", "0" are considered false (return 0). This allows flexible handling of boolean answers.

    -If you want to add extra information into the structure that was not present in the ini file, you can use iniparser_setstr() to insert a string.

    -

    -

    -A word about the implementation

    -The dictionary structure is a pretty simple dictionary implementation which might find some uses in other applications. If you are curious, look into the source.

    -

    -

    -Hierarchical ini files

    -ini files are nice to present informations to the user in a readable format, but lack a very useful feature: the possibility of organizing data in a hierarchical (tree-like) fashion. The following convention can be used to make ini files obtain this second dimension:

    -A section depends on another section if it contains its name as a prefix, separated by slashes (/). For example: we have 2 main sections in the ini file. The first one is called Pizza and has two child subsections called Cheese and Ham. The second main section in the ini file is called Wine and has two child subsections called Year and Grape. As a tree, this could appear as:

    -

    -    |
-    +-- Pizza
-    |     +-- Cheese
-    |     +-- Ham
-    +-- Wine
-         +--- Year
-         +--- Grape
-

    -In an ini file, that would be converted to:

    -

    -    [Pizza]
-
-    [Pizza/Cheese]
-    Name   = Gorgonzola ;
-    Origin = Italy ;
-
-    [Pizza/Ham]
-    Name   = Parma ;
-    Origin = Italy ;
-
-    [Wine]
-
-    [Wine/Year]
-    Value = 1998 ;
-
-    [Wine/Grape]
-    Name   = Cabernet Sauvignon ;
-    Origin = Chile ;
-

    -This proposal is actually more related to the way people write ini files, more than the parser presented here. But it is certainly a useful way of making tree-like data declarations without going through painful formats like XML.

    -Accessing the above tree would give something like (error checking removed for clarity sake):

    -

        dictionary * d ;
-
-    d = iniparser_load("example.ini");
-
-    printf("cheese name is %s\n", iniparser_getstr(d, "pizza/cheese:name"));
-    printf("grape name is %s\n",  iniparser_getstr(d, "wine/grape:name"));
-
-    iniparser_freedict(d);
-

    -The whole ini file above is represented in the dictionary as the following list of pairs:

    +

  • iniparser_getstring()
    • +
  • iniparser_getint()
    • +
  • iniparser_getdouble()
    • +
  • iniparser_getboolean()
    • + +

    Finally, discard this structure using iniparser_freedict().

    +

    All values parsed from the ini file are stored as strings. The accessors are just converting these strings to the requested type on the fly, but you could basically perform this conversion by yourself after having called the string accessor.

    +

    Notice that iniparser_getboolean() will return an integer (0 or 1), trying to make sense of what was found in the file. Strings starting with "y", "Y", "t", "T" or "1" are considered true values (return 1), strings starting with "n", "N", "f", "F", "0" are considered false (return 0). This allows some flexibility in handling of boolean answers.

    +

    If you want to add extra information into the structure that was not present in the ini file, you can use iniparser_set() to insert a string.

    +

    If you want to add a section to the structure, add a key with a NULL value. Example: 

    -    key                             value
-
-    "pizza"                         NULL
-    "pizza/cheese"                  NULL
-    "pizza/cheese:name"             "Gorgonzola"
-    "pizza/cheese:origin"           "Italy"
-    "pizza/ham"                     NULL
-    "pizza/ham:name"                "Parma"
-    "pizza/ham:origin"              "Italy"
-    "wine"                          NULL
-    "wine/year"                     NULL
-    "wine/year:value"               "1998"
-    "wine/grape"                    NULL
-    "wine/grape:name"               "Cabernet Sauvignon"
-    "wine/grape:origin"             "Chile"
-

    -

    -

    -Authors

    -Nicolas Devillard (ndevilla AT free DOT fr). + iniparser_set(ini, "section", NULL); + iniparser_set(ini, "section:key1", NULL); + iniparser_set(ini, "section:key2", NULL); +

    +A word about the implementation

    +

    The dictionary structure is a pretty simple dictionary implementation which might find some uses in other applications. If you are curious, look into the source.

    +

    +Known defects

    +

    The dictionary structure is extremely unefficient for searching as keys are sorted in the same order as they are read from the ini file, which is convenient when dumping back to a file. The simplistic first-approach linear search implemented there can become a bottleneck if you have a very large number of keys.

    +

    People who need to load large amounts of data from an ini file should definitely turn to more appropriate solutions: sqlite3 or similar. There are otherwise many other dictionary implementations available on the net to replace this one.

    +

    +Authors

    +

    Nicolas Devillard (ndevilla AT free DOT fr).

    + +
    Generated on Sun Apr 8 2012 17:05:08 for iniparser by  + +doxygen 1.7.4
    diff --git a/html/iniparser_8h.html b/html/iniparser_8h.html index 9a7d5ec..c27f012 100644 --- a/html/iniparser_8h.html +++ b/html/iniparser_8h.html @@ -1,629 +1,725 @@ - + + - - - -iniparser 2.x + +iniparser: iniparser.h File Reference + + + + +
    +
    + + + + + + +
    +
    iniparser 3.1
    +
    +
    +
    +
    +
    +Functions
    +
    +
    iniparser.h File Reference
    +
    +
    + +

    Parser for ini files. +More...

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    +Functions

    int iniparser_getnsec (dictionary *d)
     Get number of sections in a dictionary.
    char * iniparser_getsecname (dictionary *d, int n)
     Get name for section n in a dictionary.
    void iniparser_dump_ini (dictionary *d, FILE *f)
     Save a dictionary to a loadable ini file.
    void iniparser_dumpsection_ini (dictionary *d, char *s, FILE *f)
     Save a dictionary section to a loadable ini file.
    void iniparser_dump (dictionary *d, FILE *f)
     Dump a dictionary to an opened file pointer.
    int iniparser_getsecnkeys (dictionary *d, char *s)
     Get the number of keys in a section of a dictionary.
    char ** iniparser_getseckeys (dictionary *d, char *s)
     Get the number of keys in a section of a dictionary.
    char * iniparser_getstring (dictionary *d, const char *key, char *def)
     Get the string associated to a key.
    int iniparser_getint (dictionary *d, const char *key, int notfound)
     Get the string associated to a key, convert to an int.
    double iniparser_getdouble (dictionary *d, const char *key, double notfound)
     Get the string associated to a key, convert to a double.
    int iniparser_getboolean (dictionary *d, const char *key, int notfound)
     Get the string associated to a key, convert to a boolean.
    int iniparser_set (dictionary *ini, const char *entry, const char *val)
     Set an entry in a dictionary.
    void iniparser_unset (dictionary *ini, const char *entry)
     Delete an entry in a dictionary.
    int iniparser_find_entry (dictionary *ini, const char *entry)
     Finds out if a given entry exists in a dictionary.
    dictionary * iniparser_load (const char *ininame)
     Parse an ini file and return an allocated dictionary object.
    void iniparser_freedict (dictionary *d)
     Free all memory associated to an ini dictionary.
    +

    Detailed Description

    +

    Parser for ini files.

    +
    Author:
    N. Devillard
    +

    Function Documentation

    + +
    +
    + + + + + + + + + + + + + + + + + + +
    void iniparser_dump (dictionary * d,
    FILE * f 
    )
    +
    +
    - - - - - -

    iniparser.h File Reference

    Parser for ini files. More... -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +

    Dump a dictionary to an opened file pointer.

    +
    Parameters:
    +

    Functions

    int iniparser_getnsec (dictionary *d)
     Get number of sections in a dictionary.
    char * iniparser_getsecname (dictionary *d, int n)
     Get name for section n in a dictionary.
    void iniparser_dump_ini (dictionary *d, FILE *f)
     Save a dictionary to a loadable ini file.
    void iniparser_dump (dictionary *d, FILE *f)
     Dump a dictionary to an opened file pointer.
    char * iniparser_getstr (dictionary *d, const char *key)
     Get the string associated to a key, return NULL if not found.
    char * iniparser_getstring (dictionary *d, const char *key, char *def)
     Get the string associated to a key.
    int iniparser_getint (dictionary *d, const char *key, int notfound)
     Get the string associated to a key, convert to an int.
    double iniparser_getdouble (dictionary *d, char *key, double notfound)
     Get the string associated to a key, convert to a double.
    int iniparser_getboolean (dictionary *d, const char *key, int notfound)
     Get the string associated to a key, convert to a boolean.
    int iniparser_setstr (dictionary *ini, char *entry, char *val)
     Set an entry in a dictionary.
    void iniparser_unset (dictionary *ini, char *entry)
     Delete an entry in a dictionary.
    int iniparser_find_entry (dictionary *ini, char *entry)
     Finds out if a given entry exists in a dictionary.
    dictionary * iniparser_load (const char *ininame)
     Parse an ini file and return an allocated dictionary object.
    void iniparser_freedict (dictionary *d)
    + + +
    dDictionary to dump.
    fOpened file pointer to dump to.
    + + +

    Returns:
    void
    +

    This function prints out the contents of a dictionary, one element by line, onto the provided file pointer. It is OK to specify stderr or stdout as output files. This function is meant for debugging purposes mostly.

    - Free all memory associated to an ini dictionary.
    - -

    Detailed Description

    -Parser for ini files. -

    -

    Author:
    N. Devillard
    -
    Date:
    Mar 2000
    -
    Version:
    Revision
    1.23
    -
    -

    Function Documentation

    - +
    +
    +
    - + - - + + - - + + - +
    void iniparser_dump void iniparser_dump_ini (dictionary *  d, dictionary * d,
    FILE *  f FILE * f 
    )
    -

    -Dump a dictionary to an opened file pointer. -

    -

    Parameters:
    - - - +

    Save a dictionary to a loadable ini file.

    +
    Parameters:
    +
    d Dictionary to dump.
    f Opened file pointer to dump to.
    + +
    dDictionary to dump
    fOpened file pointer to dump to
    +
    -
    Returns:
    void
    -This function prints out the contents of a dictionary, one element by line, onto the provided file pointer. It is OK to specify stderr or stdout as output files. This function is meant for debugging purposes mostly. +
    Returns:
    void
    +

    This function dumps a given dictionary into a loadable ini file. It is Ok to specify stderr or stdout as output files.

    + +
    -

    - +

    - + - - + + - - + + + + + + + + - +
    void iniparser_dump_ini void iniparser_dumpsection_ini (dictionary *  d, dictionary * d,
    FILE *  f char * s,
    FILE * f 
    )
    -

    -Save a dictionary to a loadable ini file. -

    -

    Parameters:
    - - - +

    Save a dictionary section to a loadable ini file.

    +
    Parameters:
    +
    d Dictionary to dump
    f Opened file pointer to dump to
    + + +
    dDictionary to dump
    sSection name of dictionary to dump
    fOpened file pointer to dump to
    +
    -
    Returns:
    void
    -This function dumps a given dictionary into a loadable ini file. It is Ok to specify stderr or stdout as output files. +
    Returns:
    void
    +

    This function dumps a given section of a given dictionary into a loadable ini file. It is Ok to specify stderr or stdout as output files.

    + +
    -

    - +

    - + - - + + - - + + - +
    int iniparser_find_entry int iniparser_find_entry (dictionary *  ini, dictionary * ini,
    char *  entry const char * entry 
    )
    -

    -Finds out if a given entry exists in a dictionary. -

    -

    Parameters:
    - - - +

    Finds out if a given entry exists in a dictionary.

    +
    Parameters:
    +
    ini Dictionary to search
    entry Name of the entry to look for
    + +
    iniDictionary to search
    entryName of the entry to look for
    +
    -
    Returns:
    integer 1 if entry exists, 0 otherwise
    -Finds out if a given entry exists in the dictionary. Since sections are stored as keys with NULL associated values, this is the only way of querying for the presence of sections in a dictionary. +
    Returns:
    integer 1 if entry exists, 0 otherwise
    +

    Finds out if a given entry exists in the dictionary. Since sections are stored as keys with NULL associated values, this is the only way of querying for the presence of sections in a dictionary.

    +
    -

    - + +

    - + - - - - + + +
    void iniparser_freedict void iniparser_freedict (dictionary *  d  ) dictionary * d)
    -

    -Free all memory associated to an ini dictionary. -

    -

    Parameters:
    - - +

    Free all memory associated to an ini dictionary.

    +
    Parameters:
    +
    d Dictionary to free
    +
    dDictionary to free
    +
    -
    Returns:
    void
    -Free all memory associated to an ini dictionary. It is mandatory to call this function before the dictionary object gets out of the current context. +
    Returns:
    void
    +

    Free all memory associated to an ini dictionary. It is mandatory to call this function before the dictionary object gets out of the current context.

    + +
    -

    - +

    - + - - + + - - + + - - + + - +
    int iniparser_getboolean int iniparser_getboolean (dictionary *  d, dictionary * d,
    const char *  key, const char * key,
    int  notfound int notfound 
    )
    -

    -Get the string associated to a key, convert to a boolean. -

    -

    Parameters:
    - - - - +

    Get the string associated to a key, convert to a boolean.

    +
    Parameters:
    +
    d Dictionary to search
    key Key string to look for
    notfound Value to return in case of error
    + + +
    dDictionary to search
    keyKey string to look for
    notfoundValue to return in case of error
    +
    -
    Returns:
    integer
    -This function queries a dictionary for a key. A key as read from an ini file is given as "section:key". If the key cannot be found, the notfound value is returned.

    -A true boolean is found if one of the following is matched:

    +

    Returns:
    integer
    +

    This function queries a dictionary for a key. A key as read from an ini file is given as "section:key". If the key cannot be found, the notfound value is returned.

    +

    A true boolean is found if one of the following is matched:

      -
    • A string starting with 'y'
    • A string starting with 'Y'
    • A string starting with 't'
    • A string starting with 'T'
    • A string starting with '1'
    -

    -A false boolean is found if one of the following is matched:

    +

  • A string starting with 'y'
    • +
  • A string starting with 'Y'
    • +
  • A string starting with 't'
    • +
  • A string starting with 'T'
    • +
  • A string starting with '1'
    • + +

    A false boolean is found if one of the following is matched:

      -
    • A string starting with 'n'
    • A string starting with 'N'
    • A string starting with 'f'
    • A string starting with 'F'
    • A string starting with '0'
    -

    -The notfound value returned if no boolean is identified, does not necessarily have to be 0 or 1. +

  • A string starting with 'n'
    • +
  • A string starting with 'N'
    • +
  • A string starting with 'f'
    • +
  • A string starting with 'F'
    • +
  • A string starting with '0'
    • + +

    The notfound value returned if no boolean is identified, does not necessarily have to be 0 or 1.

    + +
    -

    - +

    - + - - + + - - + + - - + + - +
    double iniparser_getdouble double iniparser_getdouble (dictionary *  d, dictionary * d,
    char *  key, const char * key,
    double  notfound double notfound 
    )
    -

    -Get the string associated to a key, convert to a double. -

    -

    Parameters:
    - - - - +

    Get the string associated to a key, convert to a double.

    +
    Parameters:
    +
    d Dictionary to search
    key Key string to look for
    notfound Value to return in case of error
    + + +
    dDictionary to search
    keyKey string to look for
    notfoundValue to return in case of error
    +
    -
    Returns:
    double
    -This function queries a dictionary for a key. A key as read from an ini file is given as "section:key". If the key cannot be found, the notfound value is returned. +
    Returns:
    double
    +

    This function queries a dictionary for a key. A key as read from an ini file is given as "section:key". If the key cannot be found, the notfound value is returned.

    +
    -

    - + +

    - + - - + + - - + + - - + + - +
    int iniparser_getint int iniparser_getint (dictionary *  d, dictionary * d,
    const char *  key, const char * key,
    int  notfound int notfound 
    )
    -

    -Get the string associated to a key, convert to an int. -

    -

    Parameters:
    - - - - +

    Get the string associated to a key, convert to an int.

    +
    Parameters:
    +
    d Dictionary to search
    key Key string to look for
    notfound Value to return in case of error
    + + +
    dDictionary to search
    keyKey string to look for
    notfoundValue to return in case of error
    +
    -
    Returns:
    integer
    -This function queries a dictionary for a key. A key as read from an ini file is given as "section:key". If the key cannot be found, the notfound value is returned.

    -Supported values for integers include the usual C notation so decimal, octal (starting with 0) and hexadecimal (starting with 0x) are supported. Examples:

    +

    Returns:
    integer
    +

    This function queries a dictionary for a key. A key as read from an ini file is given as "section:key". If the key cannot be found, the notfound value is returned.

    +

    Supported values for integers include the usual C notation so decimal, octal (starting with 0) and hexadecimal (starting with 0x) are supported. Examples:

      -
    • "42" -> 42
    • "042" -> 34 (octal -> decimal)
    • "0x42" -> 66 (hexa -> decimal)
    -

    -Warning: the conversion may overflow in various ways. Conversion is totally outsourced to strtol(), see the associated man page for overflow handling.

    -Credits: Thanks to A. Becker for suggesting strtol() +

  • "42" -> 42
    • +
  • "042" -> 34 (octal -> decimal)
    • +
  • "0x42" -> 66 (hexa -> decimal)
    • + +

    Warning: the conversion may overflow in various ways. Conversion is totally outsourced to strtol(), see the associated man page for overflow handling.

    +

    Credits: Thanks to A. Becker for suggesting strtol()

    + +
    -

    - +

    - + - - - - + + +
    int iniparser_getnsec int iniparser_getnsec (dictionary *  d  ) dictionary * d)
    -

    -Get number of sections in a dictionary. -

    -

    Parameters:
    - - +

    Get number of sections in a dictionary.

    +
    Parameters:
    +
    d Dictionary to examine
    +
    dDictionary to examine
    +
    -
    Returns:
    int Number of sections found in dictionary
    -This function returns the number of sections found in a dictionary. The test to recognize sections is done on the string stored in the dictionary: a section name is given as "section" whereas a key is stored as "section:key", thus the test looks for entries that do not contain a colon.

    -This clearly fails in the case a section name contains a colon, but this should simply be avoided.

    -This function returns -1 in case of error. +

    Returns:
    int Number of sections found in dictionary
    +

    This function returns the number of sections found in a dictionary. The test to recognize sections is done on the string stored in the dictionary: a section name is given as "section" whereas a key is stored as "section:key", thus the test looks for entries that do not contain a colon.

    +

    This clearly fails in the case a section name contains a colon, but this should simply be avoided.

    +

    This function returns -1 in case of error.

    + +
    -

    - +

    - + - - + + - - + + - +
    char* iniparser_getsecname char** iniparser_getseckeys (dictionary *  d, dictionary * d,
    int  n char * s 
    )
    -

    -Get name for section n in a dictionary. -

    -

    Parameters:
    - - - +

    Get the number of keys in a section of a dictionary.

    +
    Parameters:
    +
    d Dictionary to examine
    n Section number (from 0 to nsec-1).
    + +
    dDictionary to examine
    sSection name of dictionary to examine
    +
    -
    Returns:
    Pointer to char string
    -This function locates the n-th section in a dictionary and returns its name as a pointer to a string statically allocated inside the dictionary. Do not free or modify the returned string!

    -This function returns NULL in case of error. +

    Returns:
    pointer to statically allocated character strings
    +

    This function queries a dictionary and finds all keys in a given section. Each pointer in the returned char pointer-to-pointer is pointing to a string allocated in the dictionary; do not free or modify them.

    +

    This function returns NULL in case of error.

    + +
    -

    - +

    - + - - + + - - + + - +
    char* iniparser_getstr char* iniparser_getsecname (dictionary *  d, dictionary * d,
    const char *  key int n 
    )
    -

    -Get the string associated to a key, return NULL if not found. -

    -

    Parameters:
    - - - +

    Get name for section n in a dictionary.

    +
    Parameters:
    +
    d Dictionary to search
    key Key string to look for
    + +
    dDictionary to examine
    nSection number (from 0 to nsec-1).
    +
    -
    Returns:
    pointer to statically allocated character string, or NULL.
    -This function queries a dictionary for a key. A key as read from an ini file is given as "section:key". If the key cannot be found, NULL is returned. The returned char pointer is pointing to a string allocated in the dictionary, do not free or modify it.

    -This function is only provided for backwards compatibility with previous versions of iniparser. It is recommended to use iniparser_getstring() instead. +

    Returns:
    Pointer to char string
    +

    This function locates the n-th section in a dictionary and returns its name as a pointer to a string statically allocated inside the dictionary. Do not free or modify the returned string!

    +

    This function returns NULL in case of error.

    + +
    -

    - +

    - + - - + + - - + + + + + + + + +
    char* iniparser_getstring int iniparser_getsecnkeys (dictionary *  d, dictionary * d,
    const char *  key, char * s 
    )
    +
    +
    + +

    Get the number of keys in a section of a dictionary.

    +
    Parameters:
    + + + +
    dDictionary to examine
    sSection name of dictionary to examine
    +
    +
    +
    Returns:
    Number of keys in section
    + +
    +
    + +
    +
    + + + + + + - - + + + + + + + + - +
    char* iniparser_getstring (dictionary * d,
    char *  def const char * key,
    char * def 
    )
    -

    -Get the string associated to a key. -

    -

    Parameters:
    - - - - +

    Get the string associated to a key.

    +
    Parameters:
    +
    d Dictionary to search
    key Key string to look for
    def Default value to return if key not found.
    + + +
    dDictionary to search
    keyKey string to look for
    defDefault value to return if key not found.
    +
    -
    Returns:
    pointer to statically allocated character string
    -This function queries a dictionary for a key. A key as read from an ini file is given as "section:key". If the key cannot be found, the pointer passed as 'def' is returned. The returned char pointer is pointing to a string allocated in the dictionary, do not free or modify it. +
    Returns:
    pointer to statically allocated character string
    +

    This function queries a dictionary for a key. A key as read from an ini file is given as "section:key". If the key cannot be found, the pointer passed as 'def' is returned. The returned char pointer is pointing to a string allocated in the dictionary, do not free or modify it.

    + +
    -

    - +

    - + - - - - + + +
    dictionary* iniparser_load dictionary* iniparser_load (const char *  ininame  ) const char * ininame)
    -

    -Parse an ini file and return an allocated dictionary object. -

    -

    Parameters:
    - - +

    Parse an ini file and return an allocated dictionary object.

    +
    Parameters:
    +
    ininame Name of the ini file to read.
    +
    ininameName of the ini file to read.
    +
    -
    Returns:
    Pointer to newly allocated dictionary
    -This is the parser for ini files. This function is called, providing the name of the file to be read. It returns a dictionary object that should not be accessed directly, but through accessor functions instead.

    -The returned dictionary must be freed using iniparser_freedict(). +

    Returns:
    Pointer to newly allocated dictionary
    +

    This is the parser for ini files. This function is called, providing the name of the file to be read. It returns a dictionary object that should not be accessed directly, but through accessor functions instead.

    +

    The returned dictionary must be freed using iniparser_freedict().

    + +
    -

    - +

    - + - - + + - - + + - - + + - +
    int iniparser_setstr int iniparser_set (dictionary *  ini, dictionary * ini,
    char *  entry, const char * entry,
    char *  val const char * val 
    )
    -

    -Set an entry in a dictionary. -

    -

    Parameters:
    - - - - +

    Set an entry in a dictionary.

    +
    Parameters:
    +
    ini Dictionary to modify.
    entry Entry to modify (entry name)
    val New value to associate to the entry.
    + + +
    iniDictionary to modify.
    entryEntry to modify (entry name)
    valNew value to associate to the entry.
    +
    -
    Returns:
    int 0 if Ok, -1 otherwise.
    -If the given entry can be found in the dictionary, it is modified to contain the provided value. If it cannot be found, -1 is returned. It is Ok to set val to NULL. +
    Returns:
    int 0 if Ok, -1 otherwise.
    +

    If the given entry can be found in the dictionary, it is modified to contain the provided value. If it cannot be found, -1 is returned. It is Ok to set val to NULL.

    + +
    -

    - +

    - + - - + + - - + + - +
    void iniparser_unset void iniparser_unset (dictionary *  ini, dictionary * ini,
    char *  entry const char * entry 
    )
    -

    -Delete an entry in a dictionary. -

    -

    Parameters:
    - - - +

    Delete an entry in a dictionary.

    +
    Parameters:
    +
    ini Dictionary to modify
    entry Entry to delete (entry name)
    + +
    iniDictionary to modify
    entryEntry to delete (entry name)
    +
    -
    Returns:
    void
    -If the given entry can be found, it is deleted from the dictionary. -
    -

    +

    Returns:
    void
    +

    If the given entry can be found, it is deleted from the dictionary.

    + + + +
    Generated on Sun Apr 8 2012 17:05:08 for iniparser by  + +doxygen 1.7.4
    diff --git a/html/iniparser_8main.html b/html/iniparser_8main.html index a00eed2..b16f143 100644 --- a/html/iniparser_8main.html +++ b/html/iniparser_8main.html @@ -1,19 +1,36 @@ - + + - - - -iniparser 2.x + +iniparser: iniparser.main File Reference + + - - - - - - -

    iniparser.main File Reference

    - + + +
    +
    +
    + + + + +
    +
    iniparser 3.1
    +
    - + + +
    +
    +
    iniparser.main File Reference
    +
    +
    + +
    +
    +
    Generated on Sun Apr 8 2012 17:05:08 for iniparser by  + +doxygen 1.7.4
    diff --git a/html/nav_f.png b/html/nav_f.png new file mode 100644 index 0000000000000000000000000000000000000000..1b07a16207e67c95fe2ee17e7016e6d08ac7ac99 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^j6iI`!2~2XGqLUlQfZzpjv*C{Z|{2YIT`Y>1X`Eg z-tTbne1`SITM8Q!Pb(<)UFZ(m>wMzvKZQqKM~~GcZ=A7j<~E6K62>ozFS=cD3)mf8 z9WX0+R&m(l9KUsLdTx4?9~({T__KA%`}olPJ^N;y|F^pHgs_K%!rj~{8>RwnWbkzL Kb6Mw<&;$VTdq1fF literal 0 HcmV?d00001 diff --git a/html/nav_h.png b/html/nav_h.png new file mode 100644 index 0000000000000000000000000000000000000000..01f5fa6a596e36bd12c2d6ceff1b0169fda7e699 GIT binary patch literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^j6lr8!2~3AUOE6t1`SUa$B+ufw|6&kG8phMJMJ~w va4>Y+bZ&9QY?(VEUPY_cGd9nQ`um^ZSUyYpAAuKhL7F^W{an^LB{Ts5DmojT literal 0 HcmV?d00001 diff --git a/html/open.png b/html/open.png new file mode 100644 index 0000000000000000000000000000000000000000..7b35d2c2c389743089632fe24c3104f2173d97af GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{Vww^AIAr*{o=Nbw!DDW^(zOibV zl!F8B0?t?i!vld4k#$~0_AX3zElaoknau9@iXhZTrl-TjWj9jM#?{xt`6uU{<)jb9Suc^QnbhJ(o{ib8=j9u0_mE8M7kgF7f<7W7IEf=8(L_qx|g0H;V7iPxm&Q@G7p8W2Kx&iT|YUM=ITC zY<0Qbr;u&AtXD{o@41wH=7&d8=2Z_{M9Tsa=g*t*@A3H$UOlxZk7?f6RUWpx>Fc_L s#LQ{edY3MpIXkMeV^&YV=9fR%8Jv|Kya=#u06K}m)78&qol`;+0RKEt)&Kwi literal 0 HcmV?d00001 diff --git a/html/tab_s.png b/html/tab_s.png new file mode 100644 index 0000000000000000000000000000000000000000..978943ac807718de0e69e5a585a8f0a1e5999285 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^j6kfy!2~3aiye;!QZ1e?jv*C{Z|}b5Yzkm-c<7z3 zq^cq0=~}Z;b(!Zvb5Z%sTRFKGlz1=qOFg;myyu?$r`wZb^irPsN1a)6)TwB0r+)wb zPL25;=adu89?fTK`qDR>$D*)b_WOmdKI;Vst02j(hg8%>k literal 0 HcmV?d00001 diff --git a/html/tabs.css b/html/tabs.css index a61552a..2192056 100644 --- a/html/tabs.css +++ b/html/tabs.css @@ -1,102 +1,59 @@ -/* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */ - -DIV.tabs -{ - float : left; - width : 100%; - background : url("tab_b.gif") repeat-x bottom; - margin-bottom : 4px; -} - -DIV.tabs UL -{ - margin : 0px; - padding-left : 10px; - list-style : none; -} - -DIV.tabs LI, DIV.tabs FORM -{ - display : inline; - margin : 0px; - padding : 0px; -} - -DIV.tabs FORM -{ - float : right; +.tabs, .tabs2, .tabs3 { + background-image: url('tab_b.png'); + width: 100%; + z-index: 101; + font-size: 13px; } -DIV.tabs A -{ - float : left; - background : url("tab_r.gif") no-repeat right top; - border-bottom : 1px solid #84B0C7; - font-size : x-small; - font-weight : bold; - text-decoration : none; +.tabs2 { + font-size: 10px; } - -DIV.tabs A:hover -{ - background-position: 100% -150px; +.tabs3 { + font-size: 9px; } -DIV.tabs A:link, DIV.tabs A:visited, -DIV.tabs A:active, DIV.tabs A:hover -{ - color: #1A419D; +.tablist { + margin: 0; + padding: 0; + display: table; } -DIV.tabs SPAN -{ - float : left; - display : block; - background : url("tab_l.gif") no-repeat left top; - padding : 5px 9px; - white-space : nowrap; +.tablist li { + float: left; + display: table-cell; + background-image: url('tab_b.png'); + line-height: 36px; + list-style: none; } -DIV.tabs INPUT -{ - float : right; - display : inline; - font-size : 1em; -} - -DIV.tabs TD -{ - font-size : x-small; - font-weight : bold; - text-decoration : none; -} - - - -/* Commented Backslash Hack hides rule from IE5-Mac \*/ -DIV.tabs SPAN {float : none;} -/* End IE5-Mac hack */ - -DIV.tabs A:hover SPAN -{ - background-position: 0% -150px; +.tablist a { + display: block; + padding: 0 20px; + font-weight: bold; + background-image:url('tab_s.png'); + background-repeat:no-repeat; + background-position:right; + color: #283A5D; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); + text-decoration: none; + outline: none; } -DIV.tabs LI#current A -{ - background-position: 100% -150px; - border-width : 0px; +.tabs3 .tablist a { + padding: 0 10px; } -DIV.tabs LI#current SPAN -{ - background-position: 0% -150px; - padding-bottom : 6px; +.tablist a:hover { + background-image: url('tab_h.png'); + background-repeat:repeat-x; + color: #fff; + text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0); + text-decoration: none; } -DIV.nav -{ - background : none; - border : none; - border-bottom : 1px solid #84B0C7; +.tablist li.current a { + background-image: url('tab_a.png'); + background-repeat:repeat-x; + color: #fff; + text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0); } diff --git a/src/dictionary.c b/src/dictionary.c index b9d426d..3f0f5cf 100644 --- a/src/dictionary.c +++ b/src/dictionary.c @@ -1,11 +1,8 @@ - /*-------------------------------------------------------------------------*/ /** - @file dictionary.c - @author N. Devillard - @date Aug 2000 - @version $Revision: 1.25 $ - @brief Implements a dictionary for string variables. + @file dictionary.c + @author N. Devillard + @brief Implements a dictionary for string variables. This module implements a simple dictionary object, i.e. a list of string/string associations. This object is useful to store e.g. @@ -13,17 +10,9 @@ */ /*--------------------------------------------------------------------------*/ -/* - $Id: dictionary.c,v 1.25 2007-05-27 13:03:43 ndevilla Exp $ - $Author: ndevilla $ - $Date: 2007-05-27 13:03:43 $ - $Revision: 1.25 $ -*/ - /*--------------------------------------------------------------------------- - Includes + Includes ---------------------------------------------------------------------------*/ - #include "dictionary.h" #include @@ -31,43 +20,64 @@ #include #include - /** Maximum value size for integers and doubles. */ -#define MAXVALSZ 1024 +#define MAXVALSZ 1024 /** Minimal allocated number of entries in a dictionary */ -#define DICTMINSZ 128 +#define DICTMINSZ 128 /** Invalid key token */ #define DICT_INVALID_KEY ((char*)-1) - /*--------------------------------------------------------------------------- - Private functions + Private functions ---------------------------------------------------------------------------*/ /* Doubles the allocated size associated to a pointer */ /* 'size' is the current allocated size. */ static void * mem_double(void * ptr, int size) { - void * newptr ; + void * newptr ; newptr = calloc(2*size, 1); + if (newptr==NULL) { + return NULL ; + } memcpy(newptr, ptr, size); free(ptr); return newptr ; } +/*-------------------------------------------------------------------------*/ +/** + @brief Duplicate a string + @param s String to duplicate + @return Pointer to a newly allocated string, to be freed with free() + + This is a replacement for strdup(). This implementation is provided + for systems that do not have it. + */ +/*--------------------------------------------------------------------------*/ +static char * xstrdup(const char * s) +{ + char * t ; + if (!s) + return NULL ; + t = (char*)malloc(strlen(s)+1) ; + if (t) { + strcpy(t,s); + } + return t ; +} /*--------------------------------------------------------------------------- - Function codes + Function codes ---------------------------------------------------------------------------*/ - /*-------------------------------------------------------------------------*/ /** - @brief Compute the hash key for a string. - @param key Character string to use for key. - @return 1 unsigned int on at least 32 bits. + @brief Compute the hash key for a string. + @param key Character string to use for key. + @return 1 unsigned int on at least 32 bits. This hash function has been taken from an Article in Dr Dobbs Journal. This is normally a collision-free function, distributing keys evenly. @@ -75,93 +85,86 @@ static void * mem_double(void * ptr, int size) by comparing the key itself in last resort. */ /*--------------------------------------------------------------------------*/ - -unsigned dictionary_hash(char * key) +unsigned dictionary_hash(const char * key) { - int len ; - unsigned hash ; - int i ; - - len = strlen(key); - for (hash=0, i=0 ; i>6) ; - } - hash += (hash <<3); - hash ^= (hash >>11); - hash += (hash <<15); - return hash ; + int len ; + unsigned hash ; + int i ; + + len = strlen(key); + for (hash=0, i=0 ; i>6) ; + } + hash += (hash <<3); + hash ^= (hash >>11); + hash += (hash <<15); + return hash ; } - /*-------------------------------------------------------------------------*/ /** - @brief Create a new dictionary object. - @param size Optional initial size of the dictionary. - @return 1 newly allocated dictionary objet. + @brief Create a new dictionary object. + @param size Optional initial size of the dictionary. + @return 1 newly allocated dictionary objet. This function allocates a new dictionary object of given size and returns it. If you do not know in advance (roughly) the number of entries in the dictionary, give size=0. */ /*--------------------------------------------------------------------------*/ - dictionary * dictionary_new(int size) { - dictionary * d ; - - /* If no size was specified, allocate space for DICTMINSZ */ - if (sizesize = size ; - d->val = (char **)calloc(size, sizeof(char*)); - d->key = (char **)calloc(size, sizeof(char*)); - d->hash = (unsigned int *)calloc(size, sizeof(unsigned)); - return d ; -} + dictionary * d ; + /* If no size was specified, allocate space for DICTMINSZ */ + if (sizesize = size ; + d->val = (char **)calloc(size, sizeof(char*)); + d->key = (char **)calloc(size, sizeof(char*)); + d->hash = (unsigned int *)calloc(size, sizeof(unsigned)); + return d ; +} /*-------------------------------------------------------------------------*/ /** - @brief Delete a dictionary object - @param d dictionary object to deallocate. - @return void + @brief Delete a dictionary object + @param d dictionary object to deallocate. + @return void Deallocate a dictionary object and all memory associated to it. */ /*--------------------------------------------------------------------------*/ - void dictionary_del(dictionary * d) { - int i ; - - if (d==NULL) return ; - for (i=0 ; isize ; i++) { - if (d->key[i]!=NULL) - free(d->key[i]); - if (d->val[i]!=NULL) - free(d->val[i]); - } - free(d->val); - free(d->key); - free(d->hash); - free(d); - return ; -} - + int i ; + if (d==NULL) return ; + for (i=0 ; isize ; i++) { + if (d->key[i]!=NULL) + free(d->key[i]); + if (d->val[i]!=NULL) + free(d->val[i]); + } + free(d->val); + free(d->key); + free(d->hash); + free(d); + return ; +} /*-------------------------------------------------------------------------*/ /** - @brief Get a value from a dictionary. - @param d dictionary object to search. - @param key Key to look for in the dictionary. + @brief Get a value from a dictionary. + @param d dictionary object to search. + @param key Key to look for in the dictionary. @param def Default value to return if key not found. - @return 1 pointer to internally allocated character string. + @return 1 pointer to internally allocated character string. This function locates a key in a dictionary and returns a pointer to its value, or the passed 'def' pointer if no such key can be found in @@ -169,106 +172,33 @@ void dictionary_del(dictionary * d) dictionary object, you should not try to free it or modify it. */ /*--------------------------------------------------------------------------*/ -char * dictionary_get(dictionary * d, char * key, char * def) +char * dictionary_get(dictionary * d, const char * key, char * def) { - unsigned hash ; - int i ; + unsigned hash ; + int i ; - hash = dictionary_hash(key); - for (i=0 ; isize ; i++) { - if (d->key==NULL) + hash = dictionary_hash(key); + for (i=0 ; isize ; i++) { + if (d->key[i]==NULL) continue ; /* Compare hash */ - if (hash==d->hash[i]) { + if (hash==d->hash[i]) { /* Compare string, to avoid hash collisions */ if (!strcmp(key, d->key[i])) { - return d->val[i] ; - } - } - } - return def ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Get a value from a dictionary, as a char. - @param d dictionary object to search. - @param key Key to look for in the dictionary. - @param def Default value for the key if not found. - @return char - - This function locates a key in a dictionary using dictionary_get, - and returns the first char of the found string. - */ -/*--------------------------------------------------------------------------*/ -char dictionary_getchar(dictionary * d, char * key, char def) -{ - char * v ; - - if ((v=dictionary_get(d,key,DICT_INVALID_KEY))==DICT_INVALID_KEY) { - return def ; - } else { - return v[0] ; - } -} - - -/*-------------------------------------------------------------------------*/ -/** - @brief Get a value from a dictionary, as an int. - @param d dictionary object to search. - @param key Key to look for in the dictionary. - @param def Default value for the key if not found. - @return int - - This function locates a key in a dictionary using dictionary_get, - and applies atoi on it to return an int. If the value cannot be found - in the dictionary, the default is returned. - */ -/*--------------------------------------------------------------------------*/ -int dictionary_getint(dictionary * d, char * key, int def) -{ - char * v ; - - if ((v=dictionary_get(d,key,DICT_INVALID_KEY))==DICT_INVALID_KEY) { - return def ; - } else { - return atoi(v); - } -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Get a value from a dictionary, as a double. - @param d dictionary object to search. - @param key Key to look for in the dictionary. - @param def Default value for the key if not found. - @return double - - This function locates a key in a dictionary using dictionary_get, - and applies atof on it to return a double. If the value cannot be found - in the dictionary, the default is returned. - */ -/*--------------------------------------------------------------------------*/ -double dictionary_getdouble(dictionary * d, char * key, double def) -{ - char * v ; - - if ((v=dictionary_get(d,key,DICT_INVALID_KEY))==DICT_INVALID_KEY) { - return def ; - } else { - return atof(v); - } + return d->val[i] ; + } + } + } + return def ; } - /*-------------------------------------------------------------------------*/ /** - @brief Set a value in a dictionary. - @param d dictionary object to modify. - @param key Key to modify or add. - @param val Value to add. - @return void + @brief Set a value in a dictionary. + @param d dictionary object to modify. + @param key Key to modify or add. + @param val Value to add. + @return int 0 if Ok, anything else otherwise If the given key is found in the dictionary, the associated value is replaced by the provided one. If the key cannot be found in the @@ -284,96 +214,99 @@ double dictionary_getdouble(dictionary * d, char * key, double def) content to NULL is equivalent to deleting the variable from the dictionary. It is not possible (in this implementation) to have a key in the dictionary without value. + + This function returns non-zero in case of failure. */ /*--------------------------------------------------------------------------*/ - -void dictionary_set(dictionary * d, char * key, char * val) +int dictionary_set(dictionary * d, const char * key, const char * val) { - int i ; - unsigned hash ; - - if (d==NULL || key==NULL) return ; - - /* Compute hash for this key */ - hash = dictionary_hash(key) ; - /* Find if value is already in blackboard */ - if (d->n>0) { - for (i=0 ; isize ; i++) { + int i ; + unsigned hash ; + + if (d==NULL || key==NULL) return -1 ; + + /* Compute hash for this key */ + hash = dictionary_hash(key) ; + /* Find if value is already in dictionary */ + if (d->n>0) { + for (i=0 ; isize ; i++) { if (d->key[i]==NULL) continue ; - if (hash==d->hash[i]) { /* Same hash value */ - if (!strcmp(key, d->key[i])) { /* Same key */ - /* Found a value: modify and return */ - if (d->val[i]!=NULL) - free(d->val[i]); - d->val[i] = val ? strdup(val) : NULL ; + if (hash==d->hash[i]) { /* Same hash value */ + if (!strcmp(key, d->key[i])) { /* Same key */ + /* Found a value: modify and return */ + if (d->val[i]!=NULL) + free(d->val[i]); + d->val[i] = val ? xstrdup(val) : NULL ; /* Value has been modified: return */ - return ; - } - } - } - } - /* Add a new value */ - /* See if dictionary needs to grow */ - if (d->n==d->size) { - - /* Reached maximum size: reallocate blackboard */ - d->val = (char **)mem_double(d->val, d->size * sizeof(char*)) ; - d->key = (char **)mem_double(d->key, d->size * sizeof(char*)) ; - d->hash = (unsigned int *)mem_double(d->hash, d->size * sizeof(unsigned)) ; - - /* Double size */ - d->size *= 2 ; - } - - /* Insert key in the first empty slot */ - for (i=0 ; isize ; i++) { - if (d->key[i]==NULL) { - /* Add key here */ - break ; + return 0 ; + } + } } } - /* Copy key */ - d->key[i] = strdup(key); - d->val[i] = val ? strdup(val) : NULL ; - d->hash[i] = hash; - d->n ++ ; - return ; + /* Add a new value */ + /* See if dictionary needs to grow */ + if (d->n==d->size) { + + /* Reached maximum size: reallocate dictionary */ + d->val = (char **)mem_double(d->val, d->size * sizeof(char*)) ; + d->key = (char **)mem_double(d->key, d->size * sizeof(char*)) ; + d->hash = (unsigned int *)mem_double(d->hash, d->size * sizeof(unsigned)) ; + if ((d->val==NULL) || (d->key==NULL) || (d->hash==NULL)) { + /* Cannot grow dictionary */ + return -1 ; + } + /* Double size */ + d->size *= 2 ; + } + + /* Insert key in the first empty slot. Start at d->n and wrap at + d->size. Because d->n < d->size this will necessarily + terminate. */ + for (i=d->n ; d->key[i] ; ) { + if(++i == d->size) i = 0; + } + /* Copy key */ + d->key[i] = xstrdup(key); + d->val[i] = val ? xstrdup(val) : NULL ; + d->hash[i] = hash; + d->n ++ ; + return 0 ; } /*-------------------------------------------------------------------------*/ /** - @brief Delete a key in a dictionary - @param d dictionary object to modify. - @param key Key to remove. + @brief Delete a key in a dictionary + @param d dictionary object to modify. + @param key Key to remove. @return void This function deletes a key in a dictionary. Nothing is done if the key cannot be found. */ /*--------------------------------------------------------------------------*/ -void dictionary_unset(dictionary * d, char * key) +void dictionary_unset(dictionary * d, const char * key) { - unsigned hash ; - int i ; + unsigned hash ; + int i ; - if (key == NULL) { - return; - } + if (key == NULL) { + return; + } - hash = dictionary_hash(key); - for (i=0 ; isize ; i++) { + hash = dictionary_hash(key); + for (i=0 ; isize ; i++) { if (d->key[i]==NULL) continue ; /* Compare hash */ - if (hash==d->hash[i]) { + if (hash==d->hash[i]) { /* Compare string, to avoid hash collisions */ if (!strcmp(key, d->key[i])) { /* Found key */ break ; - } - } - } + } + } + } if (i>=d->size) /* Key not found */ return ; @@ -389,126 +322,77 @@ void dictionary_unset(dictionary * d, char * key) return ; } - -/*-------------------------------------------------------------------------*/ -/** - @brief Set a key in a dictionary, providing an int. - @param d Dictionary to update. - @param key Key to modify or add - @param val Integer value to store (will be stored as a string). - @return void - - This helper function calls dictionary_set() with the provided integer - converted to a string using %d. - */ -/*--------------------------------------------------------------------------*/ - - -void dictionary_setint(dictionary * d, char * key, int val) -{ - char sval[MAXVALSZ]; - sprintf(sval, "%d", val); - dictionary_set(d, key, sval); -} - - -/*-------------------------------------------------------------------------*/ -/** - @brief Set a key in a dictionary, providing a double. - @param d Dictionary to update. - @param key Key to modify or add - @param val Double value to store (will be stored as a string). - @return void - - This helper function calls dictionary_set() with the provided double - converted to a string using %g. - */ -/*--------------------------------------------------------------------------*/ - - -void dictionary_setdouble(dictionary * d, char * key, double val) -{ - char sval[MAXVALSZ]; - sprintf(sval, "%g", val); - dictionary_set(d, key, sval); -} - - - /*-------------------------------------------------------------------------*/ /** - @brief Dump a dictionary to an opened file pointer. - @param d Dictionary to dump - @param f Opened file pointer. - @return void + @brief Dump a dictionary to an opened file pointer. + @param d Dictionary to dump + @param f Opened file pointer. + @return void Dumps a dictionary onto an opened file pointer. Key pairs are printed out as @c [Key]=[Value], one per line. It is Ok to provide stdout or stderr as output file pointers. */ /*--------------------------------------------------------------------------*/ - void dictionary_dump(dictionary * d, FILE * out) { - int i ; - - if (d==NULL || out==NULL) return ; - if (d->n<1) { - fprintf(out, "empty dictionary\n"); - return ; - } - for (i=0 ; isize ; i++) { + int i ; + + if (d==NULL || out==NULL) return ; + if (d->n<1) { + fprintf(out, "empty dictionary\n"); + return ; + } + for (i=0 ; isize ; i++) { if (d->key[i]) { fprintf(out, "%20s\t[%s]\n", d->key[i], d->val[i] ? d->val[i] : "UNDEF"); } - } - return ; + } + return ; } - -/* Example code */ +/* Test code */ #ifdef TESTDIC #define NVALS 20000 int main(int argc, char *argv[]) { - dictionary * d ; - char * val ; - int i ; - char cval[90] ; - - /* allocate blackboard */ - printf("allocating...\n"); - d = dictionary_new(0); - - /* Set values in blackboard */ - printf("setting %d values...\n", NVALS); - for (i=0 ; in != 0) { printf("error deleting values\n"); } - - printf("deallocating...\n"); - dictionary_del(d); - return 0 ; + printf("deallocating...\n"); + dictionary_del(d); + return 0 ; } #endif /* vim: set ts=4 et sw=4 tw=75 */ diff --git a/src/dictionary.h b/src/dictionary.h index b332680..34c4b82 100644 --- a/src/dictionary.h +++ b/src/dictionary.h @@ -3,8 +3,6 @@ /** @file dictionary.h @author N. Devillard - @date Aug 2000 - @version $Revision: 1.11 $ @brief Implements a dictionary for string variables. This module implements a simple dictionary object, i.e. a list @@ -13,18 +11,11 @@ */ /*--------------------------------------------------------------------------*/ -/* - $Id: dictionary.h,v 1.11 2002-06-17 09:30:46 ndevilla Exp $ - $Author: ndevilla $ - $Date: 2002-06-17 09:30:46 $ - $Revision: 1.11 $ -*/ - #ifndef _DICTIONARY_H_ #define _DICTIONARY_H_ /*--------------------------------------------------------------------------- - Includes + Includes ---------------------------------------------------------------------------*/ #include @@ -33,13 +24,13 @@ #include /*--------------------------------------------------------------------------- - New types + New types ---------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/ /** - @brief Dictionary object + @brief Dictionary object This object contains a list of string/string associations. Each association is identified by a unique string key. Looking up values @@ -48,16 +39,16 @@ */ /*-------------------------------------------------------------------------*/ typedef struct _dictionary_ { - int n ; /** Number of entries in dictionary */ - int size ; /** Storage size */ - char ** val ; /** List of string values */ - char ** key ; /** List of string keys */ - unsigned * hash ; /** List of hash values for keys */ + int n ; /** Number of entries in dictionary */ + int size ; /** Storage size */ + char ** val ; /** List of string values */ + char ** key ; /** List of string keys */ + unsigned * hash ; /** List of hash values for keys */ } dictionary ; /*--------------------------------------------------------------------------- - Function prototypes + Function prototypes ---------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/ @@ -72,7 +63,7 @@ typedef struct _dictionary_ { by comparing the key itself in last resort. */ /*--------------------------------------------------------------------------*/ -unsigned dictionary_hash(char * key); +unsigned dictionary_hash(const char * key); /*-------------------------------------------------------------------------*/ /** @@ -112,52 +103,8 @@ void dictionary_del(dictionary * vd); dictionary object, you should not try to free it or modify it. */ /*--------------------------------------------------------------------------*/ -char * dictionary_get(dictionary * d, char * key, char * def); - - -/*-------------------------------------------------------------------------*/ -/** - @brief Get a value from a dictionary, as a char. - @param d dictionary object to search. - @param key Key to look for in the dictionary. - @param def Default value for the key if not found. - @return char - - This function locates a key in a dictionary using dictionary_get, - and returns the first char of the found string. - */ -/*--------------------------------------------------------------------------*/ -char dictionary_getchar(dictionary * d, char * key, char def) ; - -/*-------------------------------------------------------------------------*/ -/** - @brief Get a value from a dictionary, as an int. - @param d dictionary object to search. - @param key Key to look for in the dictionary. - @param def Default value for the key if not found. - @return int - - This function locates a key in a dictionary using dictionary_get, - and applies atoi on it to return an int. If the value cannot be found - in the dictionary, the default is returned. - */ -/*--------------------------------------------------------------------------*/ -int dictionary_getint(dictionary * d, char * key, int def); - -/*-------------------------------------------------------------------------*/ -/** - @brief Get a value from a dictionary, as a double. - @param d dictionary object to search. - @param key Key to look for in the dictionary. - @param def Default value for the key if not found. - @return double +char * dictionary_get(dictionary * d, const char * key, char * def); - This function locates a key in a dictionary using dictionary_get, - and applies atof on it to return a double. If the value cannot be found - in the dictionary, the default is returned. - */ -/*--------------------------------------------------------------------------*/ -double dictionary_getdouble(dictionary * d, char * key, double def); /*-------------------------------------------------------------------------*/ /** @@ -165,7 +112,7 @@ double dictionary_getdouble(dictionary * d, char * key, double def); @param d dictionary object to modify. @param key Key to modify or add. @param val Value to add. - @return void + @return int 0 if Ok, anything else otherwise If the given key is found in the dictionary, the associated value is replaced by the provided one. If the key cannot be found in the @@ -181,9 +128,11 @@ double dictionary_getdouble(dictionary * d, char * key, double def); content to NULL is equivalent to deleting the variable from the dictionary. It is not possible (in this implementation) to have a key in the dictionary without value. + + This function returns non-zero in case of failure. */ /*--------------------------------------------------------------------------*/ -void dictionary_set(dictionary * vd, char * key, char * val); +int dictionary_set(dictionary * vd, const char * key, const char * val); /*-------------------------------------------------------------------------*/ /** @@ -196,36 +145,8 @@ void dictionary_set(dictionary * vd, char * key, char * val); key cannot be found. */ /*--------------------------------------------------------------------------*/ -void dictionary_unset(dictionary * d, char * key); - +void dictionary_unset(dictionary * d, const char * key); -/*-------------------------------------------------------------------------*/ -/** - @brief Set a key in a dictionary, providing an int. - @param d Dictionary to update. - @param key Key to modify or add - @param val Integer value to store (will be stored as a string). - @return void - - This helper function calls dictionary_set() with the provided integer - converted to a string using %d. - */ -/*--------------------------------------------------------------------------*/ -void dictionary_setint(dictionary * d, char * key, int val); - -/*-------------------------------------------------------------------------*/ -/** - @brief Set a key in a dictionary, providing a double. - @param d Dictionary to update. - @param key Key to modify or add - @param val Double value to store (will be stored as a string). - @return void - - This helper function calls dictionary_set() with the provided double - converted to a string using %g. - */ -/*--------------------------------------------------------------------------*/ -void dictionary_setdouble(dictionary * d, char * key, double val); /*-------------------------------------------------------------------------*/ /** diff --git a/src/iniparser.c b/src/iniparser.c index 0934087..d557955 100644 --- a/src/iniparser.c +++ b/src/iniparser.c @@ -3,54 +3,93 @@ /** @file iniparser.c @author N. Devillard - @date Mar 2000 - @version $Revision: 2.17 $ @brief Parser for ini files. */ /*--------------------------------------------------------------------------*/ - -/* - $Id: iniparser.c,v 2.17 2007-05-27 13:03:43 ndevilla Exp $ - $Author: ndevilla $ - $Date: 2007-05-27 13:03:43 $ - $Revision: 2.17 $ -*/ - -/*--------------------------------------------------------------------------- - Includes - ---------------------------------------------------------------------------*/ - +/*---------------------------- Includes ------------------------------------*/ +#include #include "iniparser.h" -#include "strlib.h" -#define ASCIILINESZ 1024 +/*---------------------------- Defines -------------------------------------*/ +#define ASCIILINESZ (1024) #define INI_INVALID_KEY ((char*)-1) /*--------------------------------------------------------------------------- Private to this module ---------------------------------------------------------------------------*/ +/** + * This enum stores the status for each parsed line (internal use only). + */ +typedef enum _line_status_ { + LINE_UNPROCESSED, + LINE_ERROR, + LINE_EMPTY, + LINE_COMMENT, + LINE_SECTION, + LINE_VALUE +} line_status ; -/* Private: add an entry to the dictionary */ -static void iniparser_add_entry( - dictionary * d, - char * sec, - char * key, - char * val) +/*-------------------------------------------------------------------------*/ +/** + @brief Convert a string to lowercase. + @param s String to convert. + @return ptr to statically allocated string. + + This function returns a pointer to a statically allocated string + containing a lowercased version of the input string. Do not free + or modify the returned string! Since the returned string is statically + allocated, it will be modified at each function call (not re-entrant). + */ +/*--------------------------------------------------------------------------*/ +static char * strlwc(const char * s) { - char longkey[2*ASCIILINESZ+1]; + static char l[ASCIILINESZ+1]; + int i ; - /* Make a key as section:keyword */ - if (key!=NULL) { - sprintf(longkey, "%s:%s", sec, key); - } else { - strcpy(longkey, sec); + if (s==NULL) return NULL ; + memset(l, 0, ASCIILINESZ+1); + i=0 ; + while (s[i] && i l) { + if (!isspace((int)*(last-1))) + break ; + last -- ; + } + *last = (char)0; + return (char*)l ; +} /*-------------------------------------------------------------------------*/ /** @@ -70,7 +109,6 @@ static void iniparser_add_entry( This function returns -1 in case of error. */ /*--------------------------------------------------------------------------*/ - int iniparser_getnsec(dictionary * d) { int i ; @@ -88,7 +126,6 @@ int iniparser_getnsec(dictionary * d) return nsec ; } - /*-------------------------------------------------------------------------*/ /** @brief Get name for section n in a dictionary. @@ -103,7 +140,6 @@ int iniparser_getnsec(dictionary * d) This function returns NULL in case of error. */ /*--------------------------------------------------------------------------*/ - char * iniparser_getsecname(dictionary * d, int n) { int i ; @@ -126,7 +162,6 @@ char * iniparser_getsecname(dictionary * d, int n) return d->key[i] ; } - /*-------------------------------------------------------------------------*/ /** @brief Dump a dictionary to an opened file pointer. @@ -168,14 +203,11 @@ void iniparser_dump(dictionary * d, FILE * f) It is Ok to specify @c stderr or @c stdout as output files. */ /*--------------------------------------------------------------------------*/ - void iniparser_dump_ini(dictionary * d, FILE * f) { - int i, j ; - char keym[ASCIILINESZ+1]; + int i ; int nsec ; char * secname ; - int seclen ; if (d==NULL || f==NULL) return ; @@ -191,50 +223,132 @@ void iniparser_dump_ini(dictionary * d, FILE * f) } for (i=0 ; isize ; j++) { - if (d->key[j]==NULL) - continue ; - if (!strncmp(d->key[j], keym, seclen+1)) { - fprintf(f, - "%-30s = %s\n", - d->key[j]+seclen+1, - d->val[j] ? d->val[j] : ""); - } - } + iniparser_dumpsection_ini(d, secname, f) ; } fprintf(f, "\n"); return ; } +/*-------------------------------------------------------------------------*/ +/** + @brief Save a dictionary section to a loadable ini file + @param d Dictionary to dump + @param s Section name of dictionary to dump + @param f Opened file pointer to dump to + @return void + + This function dumps a given section of a given dictionary into a loadable ini + file. It is Ok to specify @c stderr or @c stdout as output files. + */ +/*--------------------------------------------------------------------------*/ +void iniparser_dumpsection_ini(dictionary * d, char * s, FILE * f) +{ + int j ; + char keym[ASCIILINESZ+1]; + int seclen ; + if (d==NULL || f==NULL) return ; + if (! iniparser_find_entry(d, s)) return ; + seclen = (int)strlen(s); + fprintf(f, "\n[%s]\n", s); + sprintf(keym, "%s:", s); + for (j=0 ; jsize ; j++) { + if (d->key[j]==NULL) + continue ; + if (!strncmp(d->key[j], keym, seclen+1)) { + fprintf(f, + "%-30s = %s\n", + d->key[j]+seclen+1, + d->val[j] ? d->val[j] : ""); + } + } + fprintf(f, "\n"); + return ; +} /*-------------------------------------------------------------------------*/ /** - @brief Get the string associated to a key, return NULL if not found - @param d Dictionary to search - @param key Key string to look for - @return pointer to statically allocated character string, or NULL. + @brief Get the number of keys in a section of a dictionary. + @param d Dictionary to examine + @param s Section name of dictionary to examine + @return Number of keys in section + */ +/*--------------------------------------------------------------------------*/ +int iniparser_getsecnkeys(dictionary * d, char * s) +{ + int seclen, nkeys ; + char keym[ASCIILINESZ+1]; + int j ; - This function queries a dictionary for a key. A key as read from an - ini file is given as "section:key". If the key cannot be found, - NULL is returned. - The returned char pointer is pointing to a string allocated in - the dictionary, do not free or modify it. + nkeys = 0; + + if (d==NULL) return nkeys; + if (! iniparser_find_entry(d, s)) return nkeys; - This function is only provided for backwards compatibility with - previous versions of iniparser. It is recommended to use - iniparser_getstring() instead. + seclen = (int)strlen(s); + sprintf(keym, "%s:", s); + + for (j=0 ; jsize ; j++) { + if (d->key[j]==NULL) + continue ; + if (!strncmp(d->key[j], keym, seclen+1)) + nkeys++; + } + + return nkeys; + +} + +/*-------------------------------------------------------------------------*/ +/** + @brief Get the number of keys in a section of a dictionary. + @param d Dictionary to examine + @param s Section name of dictionary to examine + @return pointer to statically allocated character strings + + This function queries a dictionary and finds all keys in a given section. + Each pointer in the returned char pointer-to-pointer is pointing to + a string allocated in the dictionary; do not free or modify them. + + This function returns NULL in case of error. */ /*--------------------------------------------------------------------------*/ -char * iniparser_getstr(dictionary * d, const char * key) +char ** iniparser_getseckeys(dictionary * d, char * s) { - return iniparser_getstring(d, key, NULL); -} + char **keys; + + int i, j ; + char keym[ASCIILINESZ+1]; + int seclen, nkeys ; + + keys = NULL; + + if (d==NULL) return keys; + if (! iniparser_find_entry(d, s)) return keys; + + nkeys = iniparser_getsecnkeys(d, s); + + keys = (char**) malloc(nkeys*sizeof(char*)); + + seclen = (int)strlen(s); + sprintf(keym, "%s:", s); + + i = 0; + + for (j=0 ; jsize ; j++) { + if (d->key[j]==NULL) + continue ; + if (!strncmp(d->key[j], keym, seclen+1)) { + keys[i] = d->key[j]; + i++; + } + } + + return keys; + +} /*-------------------------------------------------------------------------*/ /** @@ -259,16 +373,11 @@ char * iniparser_getstring(dictionary * d, const char * key, char * def) if (d==NULL || key==NULL) return def ; - if (!(lc_key = strdup(strlwc(key)))) { - return NULL; - } + lc_key = strlwc(key); sval = dictionary_get(d, lc_key, def); - free(lc_key); return sval ; } - - /*-------------------------------------------------------------------------*/ /** @brief Get the string associated to a key, convert to an int @@ -305,7 +414,6 @@ int iniparser_getint(dictionary * d, const char * key, int notfound) return (int)strtol(str, NULL, 0); } - /*-------------------------------------------------------------------------*/ /** @brief Get the string associated to a key, convert to a double @@ -319,7 +427,7 @@ int iniparser_getint(dictionary * d, const char * key, int notfound) the notfound value is returned. */ /*--------------------------------------------------------------------------*/ -double iniparser_getdouble(dictionary * d, char * key, double notfound) +double iniparser_getdouble(dictionary * d, const char * key, double notfound) { char * str ; @@ -328,8 +436,6 @@ double iniparser_getdouble(dictionary * d, char * key, double notfound) return atof(str); } - - /*-------------------------------------------------------------------------*/ /** @brief Get the string associated to a key, convert to a boolean @@ -379,7 +485,6 @@ int iniparser_getboolean(dictionary * d, const char * key, int notfound) return ret; } - /*-------------------------------------------------------------------------*/ /** @brief Finds out if a given entry exists in a dictionary @@ -392,10 +497,9 @@ int iniparser_getboolean(dictionary * d, const char * key, int notfound) of querying for the presence of sections in a dictionary. */ /*--------------------------------------------------------------------------*/ - int iniparser_find_entry( dictionary * ini, - char * entry + const char * entry ) { int found=0 ; @@ -405,8 +509,6 @@ int iniparser_find_entry( return found ; } - - /*-------------------------------------------------------------------------*/ /** @brief Set an entry in a dictionary. @@ -420,11 +522,9 @@ int iniparser_find_entry( It is Ok to set val to NULL. */ /*--------------------------------------------------------------------------*/ - -int iniparser_setstr(dictionary * ini, char * entry, char * val) +int iniparser_set(dictionary * ini, const char * entry, const char * val) { - dictionary_set(ini, strlwc(entry), val); - return 0 ; + return dictionary_set(ini, strlwc(entry), val) ; } /*-------------------------------------------------------------------------*/ @@ -437,11 +537,80 @@ int iniparser_setstr(dictionary * ini, char * entry, char * val) If the given entry can be found, it is deleted from the dictionary. */ /*--------------------------------------------------------------------------*/ -void iniparser_unset(dictionary * ini, char * entry) +void iniparser_unset(dictionary * ini, const char * entry) { dictionary_unset(ini, strlwc(entry)); } +/*-------------------------------------------------------------------------*/ +/** + @brief Load a single line from an INI file + @param input_line Input line, may be concatenated multi-line input + @param section Output space to store section + @param key Output space to store key + @param value Output space to store value + @return line_status value + */ +/*--------------------------------------------------------------------------*/ +static line_status iniparser_line( + const char * input_line, + char * section, + char * key, + char * value) +{ + line_status sta ; + char line[ASCIILINESZ+1]; + int len ; + + strcpy(line, strstrip(input_line)); + len = (int)strlen(line); + + sta = LINE_UNPROCESSED ; + if (len<1) { + /* Empty line */ + sta = LINE_EMPTY ; + } else if (line[0]=='#' || line[0]==';') { + /* Comment line */ + sta = LINE_COMMENT ; + } else if (line[0]=='[' && line[len-1]==']') { + /* Section name */ + sscanf(line, "[%[^]]", section); + strcpy(section, strstrip(section)); + strcpy(section, strlwc(section)); + sta = LINE_SECTION ; + } else if (sscanf (line, "%[^=] = \"%[^\"]\"", key, value) == 2 + || sscanf (line, "%[^=] = '%[^\']'", key, value) == 2 + || sscanf (line, "%[^=] = %[^;#]", key, value) == 2) { + /* Usual key=value, with or without comments */ + strcpy(key, strstrip(key)); + strcpy(key, strlwc(key)); + strcpy(value, strstrip(value)); + /* + * sscanf cannot handle '' or "" as empty values + * this is done here + */ + if (!strcmp(value, "\"\"") || (!strcmp(value, "''"))) { + value[0]=0 ; + } + sta = LINE_VALUE ; + } else if (sscanf(line, "%[^=] = %[;#]", key, value)==2 + || sscanf(line, "%[^=] %[=]", key, value) == 2) { + /* + * Special cases: + * key= + * key=; + * key=# + */ + strcpy(key, strstrip(key)); + strcpy(key, strlwc(key)); + value[0]=0 ; + sta = LINE_VALUE ; + } else { + /* Generate syntax error */ + sta = LINE_ERROR ; + } + return sta ; +} /*-------------------------------------------------------------------------*/ /** @@ -457,65 +626,109 @@ void iniparser_unset(dictionary * ini, char * entry) The returned dictionary must be freed using iniparser_freedict(). */ /*--------------------------------------------------------------------------*/ - dictionary * iniparser_load(const char * ininame) { - dictionary * d ; - char lin[ASCIILINESZ+1]; - char sec[ASCIILINESZ+1]; - char key[ASCIILINESZ+1]; - char val[ASCIILINESZ+1]; - char * where ; - FILE * ini ; - int lineno ; - - if ((ini=fopen(ininame, "r"))==NULL) { + FILE * in ; + + char line [ASCIILINESZ+1] ; + char section [ASCIILINESZ+1] ; + char key [ASCIILINESZ+1] ; + char tmp [ASCIILINESZ+1] ; + char val [ASCIILINESZ+1] ; + + int last=0 ; + int len ; + int lineno=0 ; + int errs=0; + + dictionary * dict ; + + if ((in=fopen(ininame, "r"))==NULL) { + fprintf(stderr, "iniparser: cannot open %s\n", ininame); return NULL ; } - sec[0]=0; - - /* - * Initialize a new dictionary entry - */ - if (!(d = dictionary_new(0))) { - fclose(ini); - return NULL; + dict = dictionary_new(0) ; + if (!dict) { + fclose(in); + return NULL ; } - lineno = 0 ; - while (fgets(lin, ASCIILINESZ, ini)!=NULL) { + + memset(line, 0, ASCIILINESZ); + memset(section, 0, ASCIILINESZ); + memset(key, 0, ASCIILINESZ); + memset(val, 0, ASCIILINESZ); + last=0 ; + + while (fgets(line+last, ASCIILINESZ-last, in)!=NULL) { lineno++ ; - where = strskp(lin); /* Skip leading spaces */ - if (*where==';' || *where=='#' || *where==0) - continue ; /* Comment lines */ - else { - if (sscanf(where, "[%[^]]", sec)==1) { - /* Valid section name */ - strcpy(sec, strlwc(sec)); - iniparser_add_entry(d, sec, NULL, NULL); - } else if (sscanf (where, "%[^=] = \"%[^\"]\"", key, val) == 2 - || sscanf (where, "%[^=] = '%[^\']'", key, val) == 2 - || sscanf (where, "%[^=] = %[^;#]", key, val) == 2) { - strcpy(key, strlwc(strcrop(key))); - /* - * sscanf cannot handle "" or '' as empty value, - * this is done here - */ - if (!strcmp(val, "\"\"") || !strcmp(val, "''")) { - val[0] = (char)0; - } else { - strcpy(val, strcrop(val)); - } - iniparser_add_entry(d, sec, key, val); - } + len = (int)strlen(line)-1; + if (len==0) + continue; + /* Safety check against buffer overflows */ + if (line[len]!='\n') { + fprintf(stderr, + "iniparser: input line too long in %s (%d)\n", + ininame, + lineno); + dictionary_del(dict); + fclose(in); + return NULL ; + } + /* Get rid of \n and spaces at end of line */ + while ((len>=0) && + ((line[len]=='\n') || (isspace(line[len])))) { + line[len]=0 ; + len-- ; + } + /* Detect multi-line */ + if (line[len]=='\\') { + /* Multi-line value */ + last=len ; + continue ; + } else { + last=0 ; + } + switch (iniparser_line(line, section, key, val)) { + case LINE_EMPTY: + case LINE_COMMENT: + break ; + + case LINE_SECTION: + errs = dictionary_set(dict, section, NULL); + break ; + + case LINE_VALUE: + sprintf(tmp, "%s:%s", section, key); + errs = dictionary_set(dict, tmp, val) ; + break ; + + case LINE_ERROR: + fprintf(stderr, "iniparser: syntax error in %s (%d):\n", + ininame, + lineno); + fprintf(stderr, "-> %s\n", line); + errs++ ; + break; + + default: + break ; + } + memset(line, 0, ASCIILINESZ); + last=0; + if (errs<0) { + fprintf(stderr, "iniparser: memory allocation failure\n"); + break ; } } - fclose(ini); - return d ; + if (errs) { + dictionary_del(dict); + dict = NULL ; + } + fclose(in); + return dict ; } - - /*-------------------------------------------------------------------------*/ /** @brief Free all memory associated to an ini dictionary @@ -527,7 +740,6 @@ dictionary * iniparser_load(const char * ininame) gets out of the current context. */ /*--------------------------------------------------------------------------*/ - void iniparser_freedict(dictionary * d) { dictionary_del(d); diff --git a/src/iniparser.h b/src/iniparser.h index 5bbd904..ecd73bf 100644 --- a/src/iniparser.h +++ b/src/iniparser.h @@ -3,24 +3,15 @@ /** @file iniparser.h @author N. Devillard - @date Mar 2000 - @version $Revision: 1.23 $ @brief Parser for ini files. */ /*--------------------------------------------------------------------------*/ -/* - $Id: iniparser.h,v 1.23 2006-09-27 11:03:35 ndevilla Exp $ - $Author: ndevilla $ - $Date: 2006-09-27 11:03:35 $ - $Revision: 1.23 $ -*/ - #ifndef _INIPARSER_H_ #define _INIPARSER_H_ /*--------------------------------------------------------------------------- - Includes + Includes ---------------------------------------------------------------------------*/ #include @@ -92,6 +83,21 @@ void iniparser_dump_ini(dictionary * d, FILE * f); /*-------------------------------------------------------------------------*/ /** + @brief Save a dictionary section to a loadable ini file + @param d Dictionary to dump + @param s Section name of dictionary to dump + @param f Opened file pointer to dump to + @return void + + This function dumps a given section of a given dictionary into a loadable ini + file. It is Ok to specify @c stderr or @c stdout as output files. + */ +/*--------------------------------------------------------------------------*/ + +void iniparser_dumpsection_ini(dictionary * d, char * s, FILE * f); + +/*-------------------------------------------------------------------------*/ +/** @brief Dump a dictionary to an opened file pointer. @param d Dictionary to dump. @param f Opened file pointer to dump to. @@ -107,24 +113,29 @@ void iniparser_dump(dictionary * d, FILE * f); /*-------------------------------------------------------------------------*/ /** - @brief Get the string associated to a key, return NULL if not found - @param d Dictionary to search - @param key Key string to look for - @return pointer to statically allocated character string, or NULL. + @brief Get the number of keys in a section of a dictionary. + @param d Dictionary to examine + @param s Section name of dictionary to examine + @return Number of keys in section + */ +/*--------------------------------------------------------------------------*/ +int iniparser_getsecnkeys(dictionary * d, char * s); - This function queries a dictionary for a key. A key as read from an - ini file is given as "section:key". If the key cannot be found, - NULL is returned. - The returned char pointer is pointing to a string allocated in - the dictionary, do not free or modify it. +/*-------------------------------------------------------------------------*/ +/** + @brief Get the number of keys in a section of a dictionary. + @param d Dictionary to examine + @param s Section name of dictionary to examine + @return pointer to statically allocated character strings - This function is only provided for backwards compatibility with - previous versions of iniparser. It is recommended to use - iniparser_getstring() instead. + This function queries a dictionary and finds all keys in a given section. + Each pointer in the returned char pointer-to-pointer is pointing to + a string allocated in the dictionary; do not free or modify them. + + This function returns NULL in case of error. */ /*--------------------------------------------------------------------------*/ -char * iniparser_getstr(dictionary * d, const char * key); - +char ** iniparser_getseckeys(dictionary * d, char * s); /*-------------------------------------------------------------------------*/ /** @@ -185,7 +196,7 @@ int iniparser_getint(dictionary * d, const char * key, int notfound); the notfound value is returned. */ /*--------------------------------------------------------------------------*/ -double iniparser_getdouble(dictionary * d, char * key, double notfound); +double iniparser_getdouble(dictionary * d, const char * key, double notfound); /*-------------------------------------------------------------------------*/ /** @@ -235,8 +246,8 @@ int iniparser_getboolean(dictionary * d, const char * key, int notfound); It is Ok to set val to NULL. */ /*--------------------------------------------------------------------------*/ +int iniparser_set(dictionary * ini, const char * entry, const char * val); -int iniparser_setstr(dictionary * ini, char * entry, char * val); /*-------------------------------------------------------------------------*/ /** @@ -248,7 +259,7 @@ int iniparser_setstr(dictionary * ini, char * entry, char * val); If the given entry can be found, it is deleted from the dictionary. */ /*--------------------------------------------------------------------------*/ -void iniparser_unset(dictionary * ini, char * entry); +void iniparser_unset(dictionary * ini, const char * entry); /*-------------------------------------------------------------------------*/ /** @@ -262,7 +273,7 @@ void iniparser_unset(dictionary * ini, char * entry); of querying for the presence of sections in a dictionary. */ /*--------------------------------------------------------------------------*/ -int iniparser_find_entry(dictionary * ini, char * entry) ; +int iniparser_find_entry(dictionary * ini, const char * entry) ; /*-------------------------------------------------------------------------*/ /** diff --git a/src/strlib.c b/src/strlib.c deleted file mode 100644 index f0d85ae..0000000 --- a/src/strlib.c +++ /dev/null @@ -1,211 +0,0 @@ - -/*-------------------------------------------------------------------------*/ -/** - @file strlib.c - @author N. Devillard - @date Jan 2001 - @version $Revision: 1.9 $ - @brief Various string handling routines to complement the C lib. - - This modules adds a few complementary string routines usually missing - in the standard C library. -*/ -/*--------------------------------------------------------------------------*/ - -/* - $Id: strlib.c,v 1.9 2006-09-27 11:04:11 ndevilla Exp $ - $Author: ndevilla $ - $Date: 2006-09-27 11:04:11 $ - $Revision: 1.9 $ -*/ - -/*--------------------------------------------------------------------------- - Includes - ---------------------------------------------------------------------------*/ - -#include -#include - -#include "strlib.h" - -/*--------------------------------------------------------------------------- - Defines - ---------------------------------------------------------------------------*/ -#define ASCIILINESZ 1024 - -/*--------------------------------------------------------------------------- - Function codes - ---------------------------------------------------------------------------*/ - - -/*-------------------------------------------------------------------------*/ -/** - @brief Convert a string to lowercase. - @param s String to convert. - @return ptr to statically allocated string. - - This function returns a pointer to a statically allocated string - containing a lowercased version of the input string. Do not free - or modify the returned string! Since the returned string is statically - allocated, it will be modified at each function call (not re-entrant). - */ -/*--------------------------------------------------------------------------*/ - -char * strlwc(const char * s) -{ - static char l[ASCIILINESZ+1]; - int i ; - - if (s==NULL) return NULL ; - memset(l, 0, ASCIILINESZ+1); - i=0 ; - while (s[i] && i l) { - if (!isspace((int)*(last-1))) - break ; - last -- ; - } - *last = (char)0; - return l ; -} - - - -/*-------------------------------------------------------------------------*/ -/** - @brief Remove blanks at the beginning and the end of a string. - @param s String to parse. - @return ptr to statically allocated string. - - This function returns a pointer to a statically allocated string, - which is identical to the input string, except that all blank - characters at the end and the beg. of the string have been removed. - Do not free or modify the returned string! Since the returned string - is statically allocated, it will be modified at each function call - (not re-entrant). - */ -/*--------------------------------------------------------------------------*/ -char * strstrip(char * s) -{ - static char l[ASCIILINESZ+1]; - char * last ; - - if (s==NULL) return NULL ; - - while (isspace((int)*s) && *s) s++; - - memset(l, 0, ASCIILINESZ+1); - strcpy(l, s); - last = l + strlen(l); - while (last > l) { - if (!isspace((int)*(last-1))) - break ; - last -- ; - } - *last = (char)0; - - return (char*)l ; -} - -/* Test code */ -#ifdef TEST -int main(int argc, char * argv[]) -{ - char * str ; - - str = "\t\tI'm a lumberkack and I'm OK " ; - printf("lowercase: [%s]\n", strlwc(str)); - printf("uppercase: [%s]\n", strupc(str)); - printf("skipped : [%s]\n", strskp(str)); - printf("cropped : [%s]\n", strcrop(str)); - printf("stripped : [%s]\n", strstrip(str)); - - return 0 ; -} -#endif -/* vim: set ts=4 et sw=4 tw=75 */ diff --git a/src/strlib.h b/src/strlib.h deleted file mode 100644 index cd70a62..0000000 --- a/src/strlib.h +++ /dev/null @@ -1,108 +0,0 @@ - -/*-------------------------------------------------------------------------*/ -/** - @file strlib.h - @author N. Devillard - @date Jan 2001 - @version $Revision: 1.4 $ - @brief Various string handling routines to complement the C lib. - - This modules adds a few complementary string routines usually missing - in the standard C library. -*/ -/*--------------------------------------------------------------------------*/ - -/* - $Id: strlib.h,v 1.4 2006-09-27 11:04:11 ndevilla Exp $ - $Author: ndevilla $ - $Date: 2006-09-27 11:04:11 $ - $Revision: 1.4 $ -*/ - -#ifndef _STRLIB_H_ -#define _STRLIB_H_ - -/*--------------------------------------------------------------------------- - Includes - ---------------------------------------------------------------------------*/ - -#include -#include - -/*--------------------------------------------------------------------------- - Function codes - ---------------------------------------------------------------------------*/ - -/*-------------------------------------------------------------------------*/ -/** - @brief Convert a string to lowercase. - @param s String to convert. - @return ptr to statically allocated string. - - This function returns a pointer to a statically allocated string - containing a lowercased version of the input string. Do not free - or modify the returned string! Since the returned string is statically - allocated, it will be modified at each function call (not re-entrant). - */ -/*--------------------------------------------------------------------------*/ -char * strlwc(const char * s); - -/*-------------------------------------------------------------------------*/ -/** - @brief Convert a string to uppercase. - @param s String to convert. - @return ptr to statically allocated string. - - This function returns a pointer to a statically allocated string - containing an uppercased version of the input string. Do not free - or modify the returned string! Since the returned string is statically - allocated, it will be modified at each function call (not re-entrant). - */ -/*--------------------------------------------------------------------------*/ -char * strupc(char * s); - -/*-------------------------------------------------------------------------*/ -/** - @brief Skip blanks until the first non-blank character. - @param s String to parse. - @return Pointer to char inside given string. - - This function returns a pointer to the first non-blank character in the - given string. - */ -/*--------------------------------------------------------------------------*/ -char * strskp(char * s); - -/*-------------------------------------------------------------------------*/ -/** - @brief Remove blanks at the end of a string. - @param s String to parse. - @return ptr to statically allocated string. - - This function returns a pointer to a statically allocated string, - which is identical to the input string, except that all blank - characters at the end of the string have been removed. - Do not free or modify the returned string! Since the returned string - is statically allocated, it will be modified at each function call - (not re-entrant). - */ -/*--------------------------------------------------------------------------*/ -char * strcrop(char * s); - -/*-------------------------------------------------------------------------*/ -/** - @brief Remove blanks at the beginning and the end of a string. - @param s String to parse. - @return ptr to statically allocated string. - - This function returns a pointer to a statically allocated string, - which is identical to the input string, except that all blank - characters at the end and the beg. of the string have been removed. - Do not free or modify the returned string! Since the returned string - is statically allocated, it will be modified at each function call - (not re-entrant). - */ -/*--------------------------------------------------------------------------*/ -char * strstrip(char * s) ; - -#endif diff --git a/test/Makefile b/test/Makefile index aa8fcb2..c18b19a 100644 --- a/test/Makefile +++ b/test/Makefile @@ -12,13 +12,16 @@ RM = rm -f default: all -all: iniexample +all: iniexample parse iniexample: iniexample.c $(CC) $(CFLAGS) -o iniexample iniexample.c -I../src -L.. -liniparser +parse: parse.c + $(CC) $(CFLAGS) -o parse parse.c -I../src -L.. -liniparser + clean veryclean: - $(RM) iniexample example.ini + $(RM) iniexample example.ini parse diff --git a/test/iniexample.c b/test/iniexample.c index 5e8e71c..833e9a8 100644 --- a/test/iniexample.c +++ b/test/iniexample.c @@ -10,108 +10,91 @@ int parse_ini_file(char * ini_name); int main(int argc, char * argv[]) { - int status ; - - if (argc<2) { - create_example_ini_file(); - status = parse_ini_file("example.ini"); - } else { - status = parse_ini_file(argv[1]); - } - return status ; + int status ; + + if (argc<2) { + create_example_ini_file(); + status = parse_ini_file("example.ini"); + } else { + status = parse_ini_file(argv[1]); + } + return status ; } void create_example_ini_file(void) { - FILE * ini ; - - ini = fopen("example.ini", "w"); - fprintf(ini, "\n\ -#\n\ -# This is an example of ini file\n\ -#\n\ -\n\ -[Pizza]\n\ -\n\ -Ham = yes ;\n\ -Mushrooms = TRUE ;\n\ -Capres = 0 ;\n\ -Cheese = NO ;\n\ -\n\ -\n\ -[Wine]\n\ -\n\ -Grape = Cabernet Sauvignon ;\n\ -Year = 1989 ;\n\ -Country = Spain ;\n\ -Alcohol = 12.5 ;\n\ -\n\ -#\n\ -# end of file\n\ -#\n"); - - fclose(ini); + FILE * ini ; + + ini = fopen("example.ini", "w"); + fprintf(ini, + "#\n" + "# This is an example of ini file\n" + "#\n" + "\n" + "[Pizza]\n" + "\n" + "Ham = yes ;\n" + "Mushrooms = TRUE ;\n" + "Capres = 0 ;\n" + "Cheese = Non ;\n" + "\n" + "\n" + "[Wine]\n" + "\n" + "Grape = Cabernet Sauvignon ;\n" + "Year = 1989 ;\n" + "Country = Spain ;\n" + "Alcohol = 12.5 ;\n" + "\n"); + fclose(ini); } int parse_ini_file(char * ini_name) { - dictionary * ini ; - - /* Some temporary variables to hold query results */ - int b ; - int i ; - double d ; - char * s ; - - ini = iniparser_load(ini_name); - if (ini==NULL) { - fprintf(stderr, "cannot parse file [%s]", ini_name); - return -1 ; - } - iniparser_dump(ini, stderr); - - /* Get pizza attributes */ - printf("Pizza:\n"); - - b = iniparser_getboolean(ini, "pizza:ham", -1); - printf("Ham: [%d]\n", b); - b = iniparser_getboolean(ini, "pizza:mushrooms", -1); - printf("Mushrooms: [%d]\n", b); - b = iniparser_getboolean(ini, "pizza:capres", -1); - printf("Capres: [%d]\n", b); - b = iniparser_getboolean(ini, "pizza:cheese", -1); - printf("Cheese: [%d]\n", b); - - /* Get wine attributes */ - printf("Wine:\n"); - s = iniparser_getstr(ini, "wine:grape"); - if (s) { - printf("grape: [%s]\n", s); - } else { - printf("grape: not found\n"); - } - i = iniparser_getint(ini, "wine:year", -1); - if (i>0) { - printf("year: [%d]\n", i); - } else { - printf("year: not found\n"); - } - s = iniparser_getstr(ini, "wine:country"); - if (s) { - printf("country: [%s]\n", s); - } else { - printf("country: not found\n"); - } - d = iniparser_getdouble(ini, "wine:alcohol", -1.0); - if (d>0.0) { - printf("alcohol: [%g]\n", d); - } else { - printf("alcohol: not found\n"); - } - - iniparser_freedict(ini); - return 0 ; + dictionary * ini ; + + /* Some temporary variables to hold query results */ + int b ; + int i ; + double d ; + char * s ; + + ini = iniparser_load(ini_name); + if (ini==NULL) { + fprintf(stderr, "cannot parse file: %s\n", ini_name); + return -1 ; + } + iniparser_dump(ini, stderr); + + /* Get pizza attributes */ + printf("Pizza:\n"); + + b = iniparser_getboolean(ini, "pizza:ham", -1); + printf("Ham: [%d]\n", b); + b = iniparser_getboolean(ini, "pizza:mushrooms", -1); + printf("Mushrooms: [%d]\n", b); + b = iniparser_getboolean(ini, "pizza:capres", -1); + printf("Capres: [%d]\n", b); + b = iniparser_getboolean(ini, "pizza:cheese", -1); + printf("Cheese: [%d]\n", b); + + /* Get wine attributes */ + printf("Wine:\n"); + s = iniparser_getstring(ini, "wine:grape", NULL); + printf("Grape: [%s]\n", s ? s : "UNDEF"); + + i = iniparser_getint(ini, "wine:year", -1); + printf("Year: [%d]\n", i); + + s = iniparser_getstring(ini, "wine:country", NULL); + printf("Country: [%s]\n", s ? s : "UNDEF"); + + d = iniparser_getdouble(ini, "wine:alcohol", -1.0); + printf("Alcohol: [%g]\n", d); + + iniparser_freedict(ini); + return 0 ; } diff --git a/test/parse.c b/test/parse.c new file mode 100644 index 0000000..37d07aa --- /dev/null +++ b/test/parse.c @@ -0,0 +1,24 @@ +#include +#include +#include +#include + +#include "iniparser.h" + +int main(int argc, char * argv[]) +{ + dictionary * ini ; + char * ini_name ; + + if (argc<2) { + ini_name = "twisted.ini"; + } else { + ini_name = argv[1] ; + } + + ini = iniparser_load(ini_name); + iniparser_dump(ini, stdout); + iniparser_freedict(ini); + + return 0 ; +} diff --git a/test/twisted-errors.ini b/test/twisted-errors.ini new file mode 100644 index 0000000..4dc3bbe --- /dev/null +++ b/test/twisted-errors.ini @@ -0,0 +1,9 @@ +# +# All of these should trigger syntax errors +# +[section] +hello +world +hello \ +world +a + b ; diff --git a/test/twisted-genhuge.py b/test/twisted-genhuge.py new file mode 100644 index 0000000..570973c --- /dev/null +++ b/test/twisted-genhuge.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +import os +import sys + +if __name__=="__main__": + f=open('twisted-massive.ini', 'w') + for i in range(100): + f.write('[%03d]\n' % i) + for j in range(100): + f.write('key-%03d=1;\n' % j) + f.close() + diff --git a/test/twisted-ofkey.ini b/test/twisted-ofkey.ini new file mode 100644 index 0000000..4f2e72e --- /dev/null +++ b/test/twisted-ofkey.ini @@ -0,0 +1,66 @@ +# Stress testing buffers for overflows +[long] +# Shitload key size +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=1 + diff --git a/test/twisted-ofval.ini b/test/twisted-ofval.ini new file mode 100644 index 0000000..2a3cedf --- /dev/null +++ b/test/twisted-ofval.ini @@ -0,0 +1,56 @@ +# Shitload data size +[long] +a=\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\ +1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890; + diff --git a/test/twisted.ini b/test/twisted.ini new file mode 100644 index 0000000..86e549f --- /dev/null +++ b/test/twisted.ini @@ -0,0 +1,131 @@ +# +# Twisted.ini +# This file is meant for regression tests + +# Different blank settings around the equal sign +[blanks] +a=1 +b=1; +c=1; comment +d=1# comment + +e =1 +f =1; +g =1; comment +h =1# comment + +i= 1 +j= 1; +k= 1; comment +l= 1# comment + +m = 1 +n = 1; +o = 1; comment +p = 1# comment + +q=1 ; +r=1 ; comment +s=1 ;comment +t=1 #comment + +# Empty values +[empty] +a = '' +b = "" + +c = '' ; +d = "" ; + +e = '' ; comment +f = "" ; comment + +g = +h = ; +i = ; comment +j = # comment + +k= +l=; +m=;comment +n=# + +# Peculiar values +[peculiar] +a=';'; +b='#'# +c=';';comment +d='#'#comment +e=\; +f=\# +g=\;comment +h=\#comment +i=;; +j=## +k=;;;;;;;;;; +l=########## + +# Quotes +[quotes] +s1=' +s2='' +s3=''' +s4='''' + +d1=" +d2="" +d3=""" +d4="""" + +m1='"' +m2="'" + +h1=hello'world +h2='hello'world +h3='hello'world' + +h4=hello"world +h5="hello"world +h6="hello"world" + +# Section names +[a] +[ b] +[c ] +[ d ] +[ begin end ] +[ open[ ] + +# Multi-line inputs +[multi] +a = begin\ +end +b = begin \ +end +c = begin \ + end +d = 1\ +2\ +3\ +4 +e = 1 \ + 2 \ + 3 \ + 4 +f = 1 ; \ +hidden = because of the preceding backslash multi-lining the comment ; +visible = 1 +g = 1 #\ +and now this comment is hidden too \ +and this one too +h = 1 +multi \ +line \ +key = 1 +multi \ +line \ +key = \ +multi \ +line \ +value ; +# end of file -- 2.7.4