Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch for v2.18.3 #4

Open
wants to merge 20 commits into
base: origin-v2.18.3
Choose a base branch
from
Open

Patch for v2.18.3 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
279b394
commit patch 12370683
jiongle1 Mar 28, 2024
463cba4
commit patch 12786072
jiongle1 Mar 28, 2024
684b2b2
commit patch 15149186
jiongle1 Mar 28, 2024
98b926d
commit patch 14889044
jiongle1 Mar 28, 2024
3a8eae2
commit patch 15176726
jiongle1 Mar 28, 2024
30b7b5d
commit patch 15176729
jiongle1 Mar 28, 2024
30ff41f
commit patch 15176740
jiongle1 Mar 28, 2024
f677bfa
commit patch 15176728
jiongle1 Mar 28, 2024
e40569b
commit patch 15176738
jiongle1 Mar 28, 2024
db9cc8f
commit patch 15176744
jiongle1 Mar 28, 2024
8468992
commit patch 15176742
jiongle1 Mar 28, 2024
99dfe2b
commit patch 15176743
jiongle1 Mar 28, 2024
92957bc
commit patch 15149185
jiongle1 Mar 28, 2024
fecd7d0
commit patch 15149187
jiongle1 Mar 28, 2024
c816867
commit patch 15149219
jiongle1 Mar 28, 2024
1d9bca5
commit patch 15149192
jiongle1 Mar 28, 2024
22b7809
commit patch 15149191
jiongle1 Mar 28, 2024
db455e8
commit patch 15149189
jiongle1 Mar 28, 2024
6f02e9e
commit patch 15149188
jiongle1 Mar 28, 2024
8756a31
commit patch 15149218
jiongle1 Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 34 additions & 34 deletions attr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ static const char git_attr__unknown[] = "(builtin)unknown";
#endif

struct git_attr {
int attr_nr; /* unique attribute number */
unsigned int attr_nr; /* unique attribute number */
char name[FLEX_ARRAY]; /* attribute name */
};

Expand Down Expand Up @@ -226,7 +226,7 @@ static void report_invalid_attr(const char *name, size_t len,
* dictionary. If no entry is found, create a new attribute and store it in
* the dictionary.
*/
static const struct git_attr *git_attr_internal(const char *name, int namelen)
static const struct git_attr *git_attr_internal(const char *name, size_t namelen)
{
struct git_attr *a;

Expand All @@ -242,8 +242,8 @@ static const struct git_attr *git_attr_internal(const char *name, int namelen)
a->attr_nr = hashmap_get_size(&g_attr_hashmap.map);

attr_hashmap_add(&g_attr_hashmap, a->name, namelen, a);
assert(a->attr_nr ==
(hashmap_get_size(&g_attr_hashmap.map) - 1));
if (a->attr_nr != hashmap_get_size(&g_attr_hashmap.map) - 1)
die(_("unable to add additional attribute"));
}

hashmap_unlock(&g_attr_hashmap);
Expand Down Expand Up @@ -288,7 +288,7 @@ struct match_attr {
const struct git_attr *attr;
} u;
char is_macro;
unsigned num_attr;
size_t num_attr;
struct attr_state state[FLEX_ARRAY];
};

Expand All @@ -305,7 +305,7 @@ static const char *parse_attr(const char *src, int lineno, const char *cp,
struct attr_state *e)
{
const char *ep, *equals;
int len;
size_t len;

ep = cp + strcspn(cp, blank);
equals = strchr(cp, '=');
Expand Down Expand Up @@ -349,8 +349,7 @@ static const char *parse_attr(const char *src, int lineno, const char *cp,
static struct match_attr *parse_attr_line(const char *line, const char *src,
int lineno, int macro_ok)
{
int namelen;
int num_attr, i;
size_t namelen, num_attr, i;
const char *cp, *name, *states;
struct match_attr *res = NULL;
int is_macro;
Expand Down Expand Up @@ -397,10 +396,9 @@ static struct match_attr *parse_attr_line(const char *line, const char *src,
goto fail_return;
}

res = xcalloc(1,
sizeof(*res) +
sizeof(struct attr_state) * num_attr +
(is_macro ? 0 : namelen + 1));
res = xcalloc(1, st_add3(sizeof(*res),
st_mult(sizeof(struct attr_state), num_attr),
is_macro ? 0 : namelen + 1));
if (is_macro) {
res->u.attr = git_attr_internal(name, namelen);
} else {
Expand Down Expand Up @@ -463,11 +461,12 @@ struct attr_stack {

static void attr_stack_free(struct attr_stack *e)
{
int i;
unsigned i;
free(e->origin);
for (i = 0; i < e->num_matches; i++) {
struct match_attr *a = e->attrs[i];
int j;
size_t j;

for (j = 0; j < a->num_attr; j++) {
const char *setto = a->state[j].setto;
if (setto == ATTR__TRUE ||
Expand Down Expand Up @@ -682,8 +681,8 @@ static void handle_attr_line(struct attr_stack *res,
a = parse_attr_line(line, src, lineno, macro_ok);
if (!a)
return;
ALLOC_GROW(res->attrs, res->num_matches + 1, res->alloc);
res->attrs[res->num_matches++] = a;
ALLOC_GROW_BY(res->attrs, res->num_matches, 1, res->alloc);
res->attrs[res->num_matches - 1] = a;
}

static struct attr_stack *read_attr_from_array(const char **list)
Expand Down Expand Up @@ -725,21 +724,22 @@ void git_attr_set_direction(enum git_attr_direction new_direction,

static struct attr_stack *read_attr_from_file(const char *path, int macro_ok)
{
struct strbuf buf = STRBUF_INIT;
FILE *fp = fopen_or_warn(path, "r");
struct attr_stack *res;
char buf[2048];
int lineno = 0;

if (!fp)
return NULL;
res = xcalloc(1, sizeof(*res));
while (fgets(buf, sizeof(buf), fp)) {
char *bufp = buf;
if (!lineno)
skip_utf8_bom(&bufp, strlen(bufp));
handle_attr_line(res, bufp, path, ++lineno, macro_ok);
while (strbuf_getline(&buf, fp) != EOF) {
if (!lineno && starts_with(buf.buf, utf8_bom))
strbuf_remove(&buf, 0, strlen(utf8_bom));
handle_attr_line(res, buf.buf, path, ++lineno, macro_ok);
}

fclose(fp);
strbuf_release(&buf);
return res;
}

Expand Down Expand Up @@ -1018,12 +1018,12 @@ static int macroexpand_one(struct all_attrs_item *all_attrs, int nr, int rem);
static int fill_one(const char *what, struct all_attrs_item *all_attrs,
const struct match_attr *a, int rem)
{
int i;
size_t i;

for (i = a->num_attr - 1; rem > 0 && i >= 0; i--) {
const struct git_attr *attr = a->state[i].attr;
for (i = a->num_attr; rem > 0 && i > 0; i--) {
const struct git_attr *attr = a->state[i - 1].attr;
const char **n = &(all_attrs[attr->attr_nr].value);
const char *v = a->state[i].setto;
const char *v = a->state[i - 1].setto;

if (*n == ATTR__UNKNOWN) {
debug_set(what,
Expand All @@ -1042,11 +1042,11 @@ static int fill(const char *path, int pathlen, int basename_offset,
struct all_attrs_item *all_attrs, int rem)
{
for (; rem > 0 && stack; stack = stack->prev) {
int i;
unsigned i;
const char *base = stack->origin ? stack->origin : "";

for (i = stack->num_matches - 1; 0 < rem && 0 <= i; i--) {
const struct match_attr *a = stack->attrs[i];
for (i = stack->num_matches; 0 < rem && 0 < i; i--) {
const struct match_attr *a = stack->attrs[i - 1];
if (a->is_macro)
continue;
if (path_matches(path, pathlen, basename_offset,
Expand Down Expand Up @@ -1077,11 +1077,11 @@ static void determine_macros(struct all_attrs_item *all_attrs,
const struct attr_stack *stack)
{
for (; stack; stack = stack->prev) {
int i;
for (i = stack->num_matches - 1; i >= 0; i--) {
const struct match_attr *ma = stack->attrs[i];
unsigned i;
for (i = stack->num_matches; i > 0; i--) {
const struct match_attr *ma = stack->attrs[i - 1];
if (ma->is_macro) {
int n = ma->u.attr->attr_nr;
unsigned int n = ma->u.attr->attr_nr;
if (!all_attrs[n].macro) {
all_attrs[n].macro = ma;
}
Expand Down Expand Up @@ -1143,7 +1143,7 @@ int git_check_attr(const char *path, struct attr_check *check)
collect_some_attrs(path, check);

for (i = 0; i < check->nr; i++) {
size_t n = check->items[i].attr->attr_nr;
unsigned int n = check->items[i].attr->attr_nr;
const char *value = check->all_attrs[n].value;
if (value == ATTR__UNKNOWN)
value = ATTR__UNSET;
Expand Down
Loading