iniparser 2.x

    [Section Name]
++    [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:

-
    Key = value ; comment
++    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:

-
    Hello = "this is a long string value" ; comment
++    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.

@@ -46,7 +49,7 @@ 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.

+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.

 

 
@@ -59,22 +62,24 @@ The library is completely documented in its header file. On-line documentation 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]
++    [Section]
     Keyword = value ; comment
 	

 is converted to the following key pair:

-
    ("section:keyword", "value")
++    ("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:

+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:

 

-iniparser_getstr()
iniparser_getint()
iniparser_getdouble()
iniparser_getboolean()
+iniparser_getstr()
iniparser_getint()
iniparser_getdouble()
iniparser_getboolean()
 
-Finally, discard this structure using iniparser_freedict().

+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.

+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
@@ -84,7 +89,8 @@ The dictionary structure is a pretty simple dictionary implementation which migh
 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
@@ -93,7 +99,8 @@ A section depends on another section if it contains its name as a prefix, separa
          +--- Grape
 	

 In an ini file, that would be converted to:

-
    [Pizza]
++    [Pizza]
 
     [Pizza/Cheese]
     Name   = Gorgonzola ;
@@ -116,15 +123,16 @@ This proposal is actually more related to the way people write ini files, more t
 Accessing the above tree would give something like (error checking removed for clarity sake):
 
    dictionary * d ;
 
-    d = iniparser_load("example.ini");
+    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"));
+    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);
+    iniparser_freedict(d);
 

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

-
    key                             value
++    key                             value
 
     "pizza"                         NULL
     "pizza/cheese"                  NULL
diff --git a/source3/iniparser/html/iniparser_8h.html b/source3/iniparser/html/iniparser_8h.html
index 3f0534f31e..9a7d5ecbc3 100644
--- a/source3/iniparser/html/iniparser_8h.html
+++ b/source3/iniparser/html/iniparser_8h.html
@@ -10,97 +10,87 @@
 
 
 
-
-
-src
+
 iniparser.h File Reference
Parser for ini files. More...
 
 
-
+
 
-
-
+
+
 
-
-
+
+
 
-
-
+
+
 
-
-
+
+
 
-
-
+
+
 
-
-
+
+
 
-
-
+
+
 
-
-
+
+
 
-
-
+
+
 
-
-
+
+
 
-
-
+
+
 
-
-
+
+
 
-
-
+
+
 
-
+
 
 
Functions
int  iniparser_getnsec (dictionary *d)
int  iniparser_getnsec (dictionary *d)
  Get number of sections in a dictionary.  
char *  iniparser_getsecname (dictionary *d, int n)
  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)
  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)
  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, char *key)
  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, char *key, char *def)
  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, char *key, int notfound)
  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 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, char *key, int 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)
  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)
  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)
  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 (char *ininame)
  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)
  Parse an ini file and return an allocated dictionary object.  
void  iniparser_freedict (dictionary *d)
  Free all memory associated to an ini dictionary.  
  Free all memory associated to an ini dictionary.  

 
 
Detailed Description
 Parser for ini files. 
 
-
Author:
N. Devillard 
-Date:
Mar 2000 
-Version:
Revision
1.20 
+Author:
N. Devillard 
+Date:
Mar 2000 
+Version:
Revision
1.23 
 
 
Function Documentation
-
-
-  
-    
-  
-
-      
+
+
+
+      

-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
+          
+          
+          
         void iniparser_dump           (  dictionary *   d, void iniparser_dump           ( dictionary *   d, 
         
         FILE *   f FILE *   f  
         
         )  ) 
         
       
-    
-
-  
-    
-    
-       
-    
+
+
 
 
 Dump a dictionary to an opened file pointer. 
@@ -111,42 +101,34 @@ Dump a dictionary to an opened file pointer.
     
f  Opened 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 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. 
+
+
+
+

+
+      

-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
+          
+          
+          
         void iniparser_dump_ini           (  dictionary *   d, void iniparser_dump_ini           ( dictionary *   d, 
         
         FILE *   f FILE *   f  
         
         )  ) 
         
       
-    
-
-  
-    
-    
-       
-    
+
+
 
 
 Save a dictionary to a loadable ini file. 
@@ -157,42 +139,34 @@ Save a dictionary to a loadable ini file.
     
f  Opened 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 dictionary into a loadable ini file. It is Ok to specify stderr or stdout as output files. 
+
+
+
+

+
+      

-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
+          
+          
+          
         int iniparser_find_entry           (  dictionary *   ini, int iniparser_find_entry           ( dictionary *   ini, 
         
         char *   entry char *   entry  
         
         )  ) 
         
       
-    
-
-  
-    
-    
-       
-    
+
+
 
 
 Finds out if a given entry exists in a dictionary. 
@@ -203,33 +177,25 @@ Finds out if a given entry exists in a dictionary.
     
entry  Name 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           (  dictionary *   d           )  
+        
+          
+          
+          
+          
+          
+          void iniparser_freedict           ( dictionary *   d           )  
         
       
-    
-
-  
-    
-    
-       
-    
+
+
 
 
 Free all memory associated to an ini dictionary. 
@@ -239,48 +205,40 @@ Free all memory associated to an ini dictionary.
     
d  Dictionary 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           (  dictionary *   d, int iniparser_getboolean           ( dictionary *   d, 
         
         char *   key, const char *   key, 
         
         int   notfound int   notfound  
         
         )  ) 
         
       
-    
-
-  
-    
-    
-       
-    
+
+
 
 
 Get the string associated to a key, convert to a boolean. 
@@ -292,7 +250,7 @@ Get the string associated to a key, convert to a boolean.
     
notfound  Value to return in case of error 
   
 
-
Returns:
integer
+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:

 

@@ -302,47 +260,39 @@ 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.    
-  
-
-

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

+
+      

-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
+          
+          
+          
         double iniparser_getdouble           (  dictionary *   d, double iniparser_getdouble           ( dictionary *   d, 
         
         char *   key, char *   key, 
         
         double   notfound double   notfound  
         
         )  ) 
         
       
-    
-
-  
-    
-    
-       
-    
+
+
 
 
 Get the string associated to a key, convert to a double. 
@@ -354,48 +304,40 @@ Get the string associated to a key, convert to a double.
     
notfound  Value 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           (  dictionary *   d, int iniparser_getint           ( dictionary *   d, 
         
         char *   key, const char *   key, 
         
         int   notfound int   notfound  
         
         )  ) 
         
       
-    
-
-  
-    
-    
-       
-    
+
+
 
 
 Get the string associated to a key, convert to an int. 
@@ -407,33 +349,31 @@ Get the string associated to a key, convert to an int.
     
notfound  Value 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.    
-  
-
-
-
-  
-    
-  
-
-      
-        
-          
-          
-          
-          
-          
-          
+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() 
+
+

+
+

+
+      
int iniparser_getnsec           (  dictionary *   d           )  
+        
+          
+          
+          
+          
+          
+          int iniparser_getnsec           ( dictionary *   d           )  
         
       
-    
-
-  
-    
-    
-       
-    
+
+
 
 
 Get number of sections in a dictionary. 
@@ -443,44 +383,36 @@ Get number of sections in a dictionary.
     
d  Dictionary to examine 
   
 
-
Returns:
int Number of sections found in dictionary
+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.    
-  
-
-

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

+
+      

-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
+          
+          
+          
         char* iniparser_getsecname           (  dictionary *   d, char* iniparser_getsecname           ( dictionary *   d, 
         
         int   n int   n  
         
         )  ) 
         
       
-    
-
-  
-    
-    
-       
-    
+
+
 
 
 Get name for section n in a dictionary. 
@@ -491,43 +423,35 @@ Get name for section n in a dictionary.
     
n  Section number (from 0 to nsec-1). 
   
 
-
Returns:
Pointer to char string
+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.    
-  
-
-

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

+
+      

-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
+          
+          
+          
         char* iniparser_getstr           (  dictionary *   d, char* iniparser_getstr           ( dictionary *   d, 
         
         char *   key const char *   key  
         
         )  ) 
         
       
-    
-
-  
-    
-    
-       
-    
+
+
 
 
 Get the string associated to a key, return NULL if not found. 
@@ -538,49 +462,41 @@ Get the string associated to a key, return NULL if not found.
     
key  Key string to look for 
   
 
-
Returns:
pointer to statically allocated character string, or NULL.
+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.    
-  
-
-

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

+
+      

-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
+          
+          
+          
         char* iniparser_getstring           (  dictionary *   d, char* iniparser_getstring           ( dictionary *   d, 
         
         char *   key, const char *   key, 
         
         char *   def char *   def  
         
         )  ) 
         
       
-    
-
-  
-    
-    
-       
-    
+
+
 
 
 Get the string associated to a key. 
@@ -592,33 +508,25 @@ Get the string associated to a key.
     
def  Default 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           (  char *   ininame           )  
+        
+          
+          
+          
+          
+          
+          dictionary* iniparser_load           ( const char *   ininame           )  
         
       
-    
-
-  
-    
-    
-       
-    
+
+
 
 
 Parse an ini file and return an allocated dictionary object. 
@@ -628,49 +536,41 @@ Parse an ini file and return an allocated dictionary object.
     
ininame  Name of the ini file to read. 
   
 
-
Returns:
Pointer to newly allocated dictionary
+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().    
-  
-
-

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

+
+      

-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
-          
+          
+          
+          
+          
-          
-          
-          
+          
+          
+          
         int iniparser_setstr           (  dictionary *   ini, int iniparser_setstr           ( dictionary *   ini, 
         
         char *   entry, char *   entry, 
         
         char *   val char *   val  
         
         )  ) 
         
       
-    
-
-  
-    
-    
-       
-    
+
+
 
 
 Set an entry in a dictionary. 
@@ -682,42 +582,34 @@ Set an entry in a dictionary.
     
val  New 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           (  dictionary *   ini, void iniparser_unset           ( dictionary *   ini, 
         
         char *   entry char *   entry  
         
         )  ) 
         
       
-    
-
-  
-    
-    
-       
-    
+
+
 
 
 Delete an entry in a dictionary. 
@@ -728,10 +620,10 @@ Delete an entry in a dictionary.
     
entry  Entry 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. 
+
+

 
 
 
diff --git a/source3/iniparser/html/iniparser_8main.html b/source3/iniparser/html/iniparser_8main.html
index 38a963bbc7..a00eed2f9e 100644
--- a/source3/iniparser/html/iniparser_8main.html
+++ b/source3/iniparser/html/iniparser_8main.html
@@ -10,7 +10,7 @@
 
 
 
-
+
 
iniparser.main File Reference

 
 
diff --git a/source3/iniparser/html/tab_b.gif b/source3/iniparser/html/tab_b.gif
new file mode 100644
index 0000000000..0d623483ff
Binary files /dev/null and b/source3/iniparser/html/tab_b.gif differ
diff --git a/source3/iniparser/html/tab_l.gif b/source3/iniparser/html/tab_l.gif
new file mode 100644
index 0000000000..9b1e6337c9
Binary files /dev/null and b/source3/iniparser/html/tab_l.gif differ
diff --git a/source3/iniparser/html/tab_r.gif b/source3/iniparser/html/tab_r.gif
new file mode 100644
index 0000000000..ce9dd9f533
Binary files /dev/null and b/source3/iniparser/html/tab_r.gif differ
diff --git a/source3/iniparser/html/tabs.css b/source3/iniparser/html/tabs.css
new file mode 100644
index 0000000000..a61552a67a
--- /dev/null
+++ b/source3/iniparser/html/tabs.css
@@ -0,0 +1,102 @@
+/* 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;
+}
+
+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;
+}
+
+DIV.tabs A:hover
+{
+   background-position: 100% -150px;
+}
+
+DIV.tabs A:link, DIV.tabs A:visited,
+DIV.tabs A:active, DIV.tabs A:hover
+{
+       color: #1A419D;
+}
+
+DIV.tabs SPAN
+{
+   float            : left;
+   display          : block;
+   background       : url("tab_l.gif") no-repeat left top;
+   padding          : 5px 9px;
+   white-space      : nowrap;
+}
+
+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;
+}
+
+DIV.tabs LI#current A
+{
+   background-position: 100% -150px;
+   border-width     : 0px;
+}
+
+DIV.tabs LI#current SPAN
+{
+   background-position: 0% -150px;
+   padding-bottom   : 6px;
+}
+
+DIV.nav
+{
+   background       : none;
+   border           : none;
+   border-bottom    : 1px solid #84B0C7;
+}
diff --git a/source3/iniparser/src/dictionary.c b/source3/iniparser/src/dictionary.c
index edbd6f9a35..b9d426dc7e 100644
--- a/source3/iniparser/src/dictionary.c
+++ b/source3/iniparser/src/dictionary.c
@@ -4,7 +4,7 @@
    @file	dictionary.c
    @author	N. Devillard
    @date	Aug 2000
-   @version	$Revision: 1.23 $
+   @version	$Revision: 1.25 $
    @brief	Implements a dictionary for string variables.
 
    This module implements a simple dictionary object, i.e. a list
@@ -14,10 +14,10 @@
 /*--------------------------------------------------------------------------*/
 
 /*
-	$Id: dictionary.c,v 1.23 2002/06/17 09:30:46 ndevilla Exp $
+	$Id: dictionary.c,v 1.25 2007-05-27 13:03:43 ndevilla Exp $
 	$Author: ndevilla $
-	$Date: 2002/06/17 09:30:46 $
-	$Revision: 1.23 $
+	$Date: 2007-05-27 13:03:43 $
+	$Revision: 1.25 $
 */
 
 /*---------------------------------------------------------------------------
diff --git a/source3/iniparser/src/dictionary.h b/source3/iniparser/src/dictionary.h
index dcab6e7511..b332680b04 100644
--- a/source3/iniparser/src/dictionary.h
+++ b/source3/iniparser/src/dictionary.h
@@ -14,9 +14,9 @@
 /*--------------------------------------------------------------------------*/
 
 /*
-	$Id: dictionary.h,v 1.11 2002/06/17 09:30:46 ndevilla Exp $
+	$Id: dictionary.h,v 1.11 2002-06-17 09:30:46 ndevilla Exp $
 	$Author: ndevilla $
-	$Date: 2002/06/17 09:30:46 $
+	$Date: 2002-06-17 09:30:46 $
 	$Revision: 1.11 $
 */
 
diff --git a/source3/iniparser/src/iniparser.c b/source3/iniparser/src/iniparser.c
index 0cb452b265..09340876d8 100644
--- a/source3/iniparser/src/iniparser.c
+++ b/source3/iniparser/src/iniparser.c
@@ -4,16 +4,16 @@
    @file    iniparser.c
    @author  N. Devillard
    @date    Mar 2000
-   @version $Revision: 2.14 $
+   @version $Revision: 2.17 $
    @brief   Parser for ini files.
 */
 /*--------------------------------------------------------------------------*/
 
 /*
-    $Id: iniparser.c,v 2.14 2002/12/12 10:49:01 ndevilla Exp $
+    $Id: iniparser.c,v 2.17 2007-05-27 13:03:43 ndevilla Exp $
     $Author: ndevilla $
-    $Date: 2002/12/12 10:49:01 $
-    $Revision: 2.14 $
+    $Date: 2007-05-27 13:03:43 $
+    $Revision: 2.17 $
 */
 
 /*---------------------------------------------------------------------------
@@ -280,6 +280,20 @@ char * iniparser_getstring(dictionary * d, const char * key, char * def)
   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()
  */
 /*--------------------------------------------------------------------------*/
 int iniparser_getint(dictionary * d, const char * key, int notfound)
@@ -288,7 +302,7 @@ int iniparser_getint(dictionary * d, const char * key, int notfound)
 
     str = iniparser_getstring(d, key, INI_INVALID_KEY);
     if (str==INI_INVALID_KEY) return notfound ;
-    return atoi(str);
+    return (int)strtol(str, NULL, 0);
 }
 
 
diff --git a/source3/iniparser/src/iniparser.h b/source3/iniparser/src/iniparser.h
index 2df8ffe837..5bbd9045cf 100644
--- a/source3/iniparser/src/iniparser.h
+++ b/source3/iniparser/src/iniparser.h
@@ -4,16 +4,16 @@
    @file    iniparser.h
    @author  N. Devillard
    @date    Mar 2000
-   @version $Revision: 1.20 $
+   @version $Revision: 1.23 $
    @brief   Parser for ini files.
 */
 /*--------------------------------------------------------------------------*/
 
 /*
-	$Id: iniparser.h,v 1.20 2005/08/19 17:23:21 ndevilla Exp $
+	$Id: iniparser.h,v 1.23 2006-09-27 11:03:35 ndevilla Exp $
 	$Author: ndevilla $
-	$Date: 2005/08/19 17:23:21 $
-	$Revision: 1.20 $
+	$Date: 2006-09-27 11:03:35 $
+	$Revision: 1.23 $
 */
 
 #ifndef _INIPARSER_H_
@@ -154,6 +154,20 @@ char * iniparser_getstring(dictionary * d, const char * key, char * def);
   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()
  */
 /*--------------------------------------------------------------------------*/
 int iniparser_getint(dictionary * d, const char * key, int notfound);
diff --git a/source3/iniparser/src/strlib.c b/source3/iniparser/src/strlib.c
index b954a36cf7..f0d85aea58 100644
--- a/source3/iniparser/src/strlib.c
+++ b/source3/iniparser/src/strlib.c
@@ -4,7 +4,7 @@
   @file		strlib.c
   @author	N. Devillard
   @date		Jan 2001
-  @version	$Revision: 1.8 $
+  @version	$Revision: 1.9 $
   @brief	Various string handling routines to complement the C lib.
 
   This modules adds a few complementary string routines usually missing
@@ -13,10 +13,10 @@
 /*--------------------------------------------------------------------------*/
 
 /*
-	$Id: strlib.c,v 1.8 2002/12/12 10:29:16 ndevilla Exp $
+	$Id: strlib.c,v 1.9 2006-09-27 11:04:11 ndevilla Exp $
 	$Author: ndevilla $
-	$Date: 2002/12/12 10:29:16 $
-	$Revision: 1.8 $
+	$Date: 2006-09-27 11:04:11 $
+	$Revision: 1.9 $
 */
 
 /*---------------------------------------------------------------------------
diff --git a/source3/iniparser/src/strlib.h b/source3/iniparser/src/strlib.h
index 39ca26f1df..cd70a6287d 100644
--- a/source3/iniparser/src/strlib.h
+++ b/source3/iniparser/src/strlib.h
@@ -4,7 +4,7 @@
   @file     strlib.h
   @author   N. Devillard
   @date     Jan 2001
-  @version  $Revision: 1.3 $
+  @version  $Revision: 1.4 $
   @brief    Various string handling routines to complement the C lib.
 
   This modules adds a few complementary string routines usually missing
@@ -13,10 +13,10 @@
 /*--------------------------------------------------------------------------*/
 
 /*
-	$Id: strlib.h,v 1.3 2001/10/19 08:31:41 ndevilla Exp $
+	$Id: strlib.h,v 1.4 2006-09-27 11:04:11 ndevilla Exp $
 	$Author: ndevilla $
-	$Date: 2001/10/19 08:31:41 $
-	$Revision: 1.3 $
+	$Date: 2006-09-27 11:04:11 $
+	$Revision: 1.4 $
 */
 
 #ifndef _STRLIB_H_
-- 
cgit

src Directory Reference

Files

iniparser Directories

iniparser documentation

iniparser documentation

2.x

@@ -22,14 +22,17 @@ iniParser is a simple C library offering ini file parsing services. The library What is an ini file?

Using the parser

A word about the implementation

iniparser.h File Reference

Functions

Detailed Description

Function Documentation

iniparser.main File Reference


Functions
int	iniparser_getnsec (dictionary *d)
int	iniparser_getnsec (dictionary *d)
	Get number of sections in a dictionary.
char *	iniparser_getsecname (dictionary *d, int n)
	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)
	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)
	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, char key)
	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, char key, char *def)
	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, char key, int notfound)
	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 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, char key, int 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)
	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)
	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)
	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 (char *ininame)
	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)
	Parse an ini file and return an allocated dictionary object.
void	iniparser_freedict (dictionary *d)
	Free all memory associated to an ini dictionary.
	Free all memory associated to an ini dictionary.

- -	+ + Dump a dictionary to an opened file pointer. @@ -111,42 +101,34 @@ Dump a dictionary to an opened file pointer.
	f	Opened file pointer to dump to.

- -	+ + Save a dictionary to a loadable ini file. @@ -157,42 +139,34 @@ Save a dictionary to a loadable ini file.
	f	Opened file pointer to dump to

- -	+ + Finds out if a given entry exists in a dictionary. @@ -203,33 +177,25 @@ Finds out if a given entry exists in a dictionary.
	entry	Name of the entry to look for

- -	+ + Free all memory associated to an ini dictionary. @@ -239,48 +205,40 @@ Free all memory associated to an ini dictionary.
	d	Dictionary to free

- -	+ + Get the string associated to a key, convert to a boolean. @@ -292,7 +250,7 @@ Get the string associated to a key, convert to a boolean.
	notfound	Value to return in case of error

- -	+ + Get number of sections in a dictionary. @@ -443,44 +383,36 @@ Get number of sections in a dictionary.
	d	Dictionary to examine

- -	+ + Get name for section n in a dictionary. @@ -491,43 +423,35 @@ Get name for section n in a dictionary.
	n	Section number (from 0 to nsec-1).

- -	+ + Get the string associated to a key, return NULL if not found. @@ -538,49 +462,41 @@ Get the string associated to a key, return NULL if not found.
	key	Key string to look for

- -	+ + Get the string associated to a key. @@ -592,33 +508,25 @@ Get the string associated to a key.
	def	Default value to return if key not found.

- -	+ + Parse an ini file and return an allocated dictionary object. @@ -628,49 +536,41 @@ Parse an ini file and return an allocated dictionary object.
	ininame	Name of the ini file to read.

- -	+ + Set an entry in a dictionary. @@ -682,42 +582,34 @@ Set an entry in a dictionary.
	val	New value to associate to the entry.

- -	+ + Delete an entry in a dictionary. @@ -728,10 +620,10 @@ Delete an entry in a dictionary.
	entry	Entry to delete (entry name)