ui-shared: rename parameter to cgit_print_snapshot_links()

[cgit.git] / configfile.c

diff --git a/configfile.c b/configfile.c
index d98989c4312aed59e9a6a45aee3b603c8ac1c48f..e0391091e147891ca2639142a7b29180030db125 100644 (file)
--- a/configfile.c
+++ b/configfile.c
@@ -1,13 +1,12 @@
 /* configfile.c: parsing of config files
  *
 /* configfile.c: parsing of config files
  *

- * Copyright (C) 2008 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 

-#include <ctype.h>
-#include <stdio.h>
+#include <git-compat-util.h>

 #include "configfile.h"
 
 static int next_char(FILE *f)
 #include "configfile.h"
 
 static int next_char(FILE *f)


@@ -31,45 +30,47 @@ static void skip_line(FILE *f)
                ;
 }
 
                ;
 }
 

-static int read_config_line(FILE *f, char *line, const char **value, int bufsize)
+static int read_config_line(FILE *f, struct strbuf *name, struct strbuf *value)

 {
 {

-       int i = 0, isname = 0;
+       int c = next_char(f);

 
 

-       *value = NULL;
-       while (i < bufsize - 1) {
-               int c = next_char(f);
-               if (!isname && (c == '#' || c == ';')) {
-                       skip_line(f);
-                       continue;
-               }
-               if (!isname && isspace(c))
-                       continue;
+       strbuf_reset(name);
+       strbuf_reset(value);

 
 

-               if (c == '=' && !*value) {
-                       line[i] = 0;
-                       *value = &line[i + 1];
-               } else if (c == '\n' && !isname) {
-                       i = 0;
-                       continue;
-               } else if (c == '\n' || c == EOF) {
-                       line[i] = 0;
+       /* Skip comments and preceding spaces. */
+       for(;;) {
+               if (c == EOF)
+                       return 0;
+               else if (c == '#' || c == ';')
+                       skip_line(f);
+               else if (!isspace(c))

                        break;
                        break;

-               } else {
-                       line[i] = c;
-               }
-               isname = 1;
-               i++;
+               c = next_char(f);

        }
        }

-       line[i + 1] = 0;
-       return i;
+
+       /* Read variable name. */
+       while (c != '=') {
+               if (c == '\n' || c == EOF)
+                       return 0;
+               strbuf_addch(name, c);
+               c = next_char(f);
+       }
+
+       /* Read variable value. */
+       c = next_char(f);
+       while (c != '\n' && c != EOF) {
+               strbuf_addch(value, c);
+               c = next_char(f);
+       }
+
+       return 1;

 }
 
 int parse_configfile(const char *filename, configfile_value_fn fn)
 {
        static int nesting;
 }
 
 int parse_configfile(const char *filename, configfile_value_fn fn)
 {
        static int nesting;

-       int len;
-       char line[256];
-       const char *value;
+       struct strbuf name = STRBUF_INIT;
+       struct strbuf value = STRBUF_INIT;

        FILE *f;
 
        /* cancel deeply nested include-commands */
        FILE *f;
 
        /* cancel deeply nested include-commands */


@@ -78,10 +79,12 @@ int parse_configfile(const char *filename, configfile_value_fn fn)
        if (!(f = fopen(filename, "r")))
                return -1;
        nesting++;
        if (!(f = fopen(filename, "r")))
                return -1;
        nesting++;

-       while ((len = read_config_line(f, line, &value, sizeof(line))) > 0)
-               fn(line, value);
+       while (read_config_line(f, &name, &value))
+               fn(name.buf, value.buf);

        nesting--;
        fclose(f);
        nesting--;
        fclose(f);

+       strbuf_release(&name);
+       strbuf_release(&value);

        return 0;
 }
 
        return 0;
 }