Use strbufs instead of open-coded string manipulation
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alex Riesen committed
Mar 26, 2010 at 23:56 UTC
572e4f6a0c14f650d4cd71876e4249be4c3ad019
1 file changed
+19
-32
config.c
+19
-32
@@ -7,6 +7,7 @@
7
*/
8
#include "cache.h"
9
#include "exec_cmd.h"
10
+#include "strbuf.h"
11
12
#define MAXNAME (256)
13
@@ -21,8 +22,8 @@ const char *config_exclusive_filename = NULL;
22
struct config_item
23
{
24
struct config_item *next;
25
+ char *name;
26
char *value;
25
- char name[1 /* NUL */];
27
};
28
static struct config_item *config_parameters;
29
static struct config_item **config_parameters_tail = &config_parameters;
@@ -32,43 +33,29 @@ static void lowercase(char *p)
33
for (; *p; p++)
34
*p = tolower(*p);
35
}
35
-static char *skip_space(const char *p)
36
-{
37
- for (; *p; p++)
38
- if (!isspace(*p))
39
- break;
40
- return (char *)p;
41
-}
42
-static char *trailing_space(const char *begin, const char *p)
43
-{
44
- while (p-- > begin)
45
- if (!isspace(*p))
46
- break;
47
- return (char *)p + 1;
48
-}
36
37
int git_config_parse_parameter(const char *text)
38
{
39
struct config_item *ct;
53
- const char *name;
54
- const char *val;
55
- name = skip_space(text);
56
- text = val = strchr(name, '=');
57
- if (!text)
58
- text = name + strlen(name);
59
- text = trailing_space(name, text);
60
- if (text <= name)
40
+ struct strbuf tmp = STRBUF_INIT;
41
+ struct strbuf **pair;
42
+ strbuf_addstr(&tmp, text);
43
+ pair = strbuf_split(&tmp, '=');
44
+ if (pair[0]->len && pair[0]->buf[pair[0]->len - 1] == '=')
45
+ strbuf_setlen(pair[0], pair[0]->len - 1);
46
+ strbuf_trim(pair[0]);
47
+ if (!pair[0]->len) {
48
+ strbuf_list_free(pair);
49
return -1;
62
- ct = xcalloc(1, sizeof(struct config_item) + (text - name));
63
- memcpy(ct->name, name, text - name);
64
- lowercase(ct->name);
65
- if (!val)
66
- ct->value = NULL;
67
- else {
68
- val = skip_space(++val /* skip "=" */);
69
- text = trailing_space(val, val + strlen(val));
70
- ct->value = xstrndup(val, text - val);
50
}
51
+ ct = xcalloc(1, sizeof(struct config_item));
52
+ ct->name = strbuf_detach(pair[0], NULL);
53
+ if (pair[1]) {
54
+ strbuf_trim(pair[1]);
55
+ ct->value = strbuf_detach(pair[1], NULL);
56
+ }
57
+ strbuf_list_free(pair);
58
+ lowercase(ct->name);
59
*config_parameters_tail = ct;
60
config_parameters_tail = &ct->next;
61
return 0;