Changeset 489f996 for lib

Timestamp:

2008-12-25T11:05:11Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9e768da

Parents:

72b6783e

Message:

Simplified ini parser code a bit more. Not using strtok() after all since
I can't find a guarantee that it's okay with me further mutilating the
strings. :-)

File:

• lib/ini.c (modified) (7 diffs)

lib/ini.c

@@ -53 +53 @@
 }
 
+/* Strips leading and trailing whitespace and returns a pointer to the first
+   non-ws character of the given string. */
+static char *ini_strip_whitespace( char *in )
+{
+        char *e;
+
+        while( isspace( *in ) )
+                in++;
+
+        e = in + strlen( in ) - 1;
+        while( e > in && isspace( *e ) )
+                e--;
+        e[1] = 0;
+        
+        return in;
+}
+
 int ini_read( ini_t *file )
 {
@@ -62 +79 @@
                 
                 file->line++;
-                
-                /* Leading whitespace */
-                while( *file->cur == ' ' || *file->cur == '\t' )
-                        file->cur++;
 
                 /* Find the end of line */
                 if( ( e = strchr( file->cur, '\n' ) ) != NULL )
                 {
+                        *e = 0;
                         next = e + 1;
                 }
@@ -75 +89 @@
                 {
                         /* No more lines. */
-                        e = file->cur + strlen( file->cur ) - 1;
+                        e = file->cur + strlen( file->cur );
                         next = NULL;
                 }
@@ -81 +95 @@
                 /* Comment? */
                 if( ( s = strchr( file->cur, '#' ) ) != NULL )
-                        e = s - 1;
+                        *s = 0;
                 
-                /* And kill trailing whitespace. */
-                while( isspace( *e ) && e > file->cur )
-                        e--;
-                e[1] = 0;
-                
-                printf( "Stripped line: '%s'\n", file->cur );
+                file->cur = ini_strip_whitespace( file->cur );
                 
                 if( *file->cur == '[' )
@@ -97 +106 @@
                                 *s = 0;
                                 file->c_section = file->cur;
-                                
-                                printf( "Section started: %s\n", file->c_section );
                         }
                 }
@@ -104 +111 @@
                 {
                         *s = 0;
-                        file->value = s + 1;
-                        while( isspace( *file->value ) )
-                                file->value++;
-                        
-                        s--;
-                        while( isspace( *s ) && s > file->cur )
-                                s--;
-                        s[1] = 0;
-                        file->key = file->cur;
+                        file->key = ini_strip_whitespace( file->cur );
+                        file->value = ini_strip_whitespace( s + 1 );
                         
                         if( ( s = strchr( file->key, '.' ) ) != NULL )
@@ -126 +126 @@
                         
                         file->cur = next;
-                        
-                        printf( "%s.%s = '%s'\n", file->section, file->key, file->value );
-                        
                         return 1;
                 }
-                /* else: noise, but let's just ignore it. */
+                /* else: noise/comment/etc, let's just ignore it. */
 
                 file->cur = next;