Commit 6421c49a3726b4132aafcc780016f5a984832caf
2011-05-17T18:55:52
Fix variable name normalization When I changed it over to use different strings for the variable and the name, cvar_name_normalize was left behind. Fix this and rename to cvar_normalize_name to reflect the incompatible change. Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84
diff --git a/src/config_file.c b/src/config_file.c
index 37bb279..74a7b58 100644
--- a/src/config_file.c
+++ b/src/config_file.c
@@ -197,36 +197,49 @@ static cvar_t *cvar_list_find(cvar_t_list *list, const char *name)
return NULL;
}
-static int cvar_name_normalize(const char *input, char **output)
+static int cvar_normalize_name(cvar_t *var, char **output)
{
- char *input_sp = strchr(input, ' ');
- char *quote, *str;
- int i;
+ char *section_sp = strchr(var->section, ' ');
+ char *quote, *name;
+ int len, ret;
- /* We need to make a copy anyway */
- str = git__strdup(input);
- if (str == NULL)
+ /*
+ * The final string is going to be at most one char longer than
+ * the input
+ */
+ len = strlen(var->section) + strlen(var->name) + 1;
+ name = git__malloc(len + 1);
+ if (name == NULL)
return GIT_ENOMEM;
- *output = str;
+ /* If there aren't any spaces in the section, it's easy */
+ if (section_sp == NULL) {
+ ret = snprintf(name, len + 1, "%s.%s", var->section, var->name);
+ if (ret < 0)
+ return git__throw(GIT_EOSERR, "Failed to normalize name. OS err: %s", strerror(errno));
- /* If there aren't any spaces, we don't need to do anything */
- if (input_sp == NULL)
+ *output = name;
return GIT_SUCCESS;
+ }
/*
- * If there are spaces, we replace the space by a dot, move the
- * variable name so that the dot before it replaces the last
- * quotation mark and repeat so that the first quotation mark
- * disappears.
+ * If there are spaces, we replace the space by a dot, move
+ * section name so it overwrites the first quotation mark and
+ * replace the last quotation mark by a dot. We then append the
+ * variable name.
*/
- str[input_sp - input] = '.';
-
- for (i = 0; i < 2; ++i) {
- quote = strrchr(str, '"');
- memmove(quote, quote + 1, strlen(quote));
- }
-
+ strcpy(name, var->section);
+ section_sp = strchr(name, ' ');
+ *section_sp = '.';
+ /* Remove first quote */
+ quote = strchr(name, '"');
+ memmove(quote, quote+1, strlen(quote+1));
+ /* Remove second quote */
+ quote = strchr(name, '"');
+ *quote = '.';
+ strcpy(quote+1, var->name);
+
+ *output = name;
return GIT_SUCCESS;
}
@@ -276,7 +289,7 @@ static int file_foreach(git_config_backend *backend, int (*fn)(const char *, voi
file_backend *b = (file_backend *)backend;
CVAR_LIST_FOREACH(&b->var_list, var) {
- ret = cvar_name_normalize(var->name, &normalized);
+ ret = cvar_normalize_name(var, &normalized);
if (ret < GIT_SUCCESS)
return ret;