commit - 1ae0a34120856e195295615ab4aa5493dfa95b2a
commit + 4e8d6e3e9aecbb3dd1fdac64d2e194ccc83524f9
blob - 20da7cd5ef34fa20793f95ffe8187bb7911a6f46
blob + 76d5fa47854f50c74c3bc8001a2b84b8371f27d6
--- gotweb/gotweb.c
+++ gotweb/gotweb.c
TAILQ_ENTRY(gw_header) entry;
struct got_repository *repo;
struct got_reflist_head refs;
- struct got_commit_object *commit;
struct got_object_id *id;
char *path;
char *commit_id; /* id_str1 */
char *parent_id; /* id_str2 */
char *tree_id;
- const char *author;
- const char *committer;
+ char *author;
+ char *committer;
char *commit_msg;
time_t committer_time;
};
static const struct got_error *gw_get_commits(struct gw_trans *,
struct gw_header *, int);
static const struct got_error *gw_get_commit(struct gw_trans *,
- struct gw_header *);
+ struct gw_header *,
+ struct got_commit_object *,
+ struct got_object_id *id);
static const struct got_error *gw_apply_unveil(const char *);
static const struct got_error *gw_blame_cb(void *, int, int,
struct got_object_id *);
goto done;
kerr = khtml_closeelem(gw_trans->gw_html_req, 2);
done:
- got_ref_list_free(&header->refs);
gw_free_header(header);
if (error == NULL && kerr != KCGI_OK)
error = gw_kcgi_error(kerr);
error = gw_output_blob_buf(gw_trans);
done:
- got_ref_list_free(&header->refs);
gw_free_header(header);
return error;
}
kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
done:
- got_ref_list_free(&header->refs);
gw_free_header(header);
free(age);
if (error == NULL && kerr != KCGI_OK)
age = NULL;
}
done:
- got_ref_list_free(&header->refs);
gw_free_header(header);
TAILQ_FOREACH(n_header, &gw_trans->gw_headers, entry)
gw_free_header(n_header);
href_blob = NULL;
}
done:
- got_ref_list_free(&header->refs);
gw_free_header(header);
TAILQ_FOREACH(n_header, &gw_trans->gw_headers, entry)
gw_free_header(n_header);
kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
done:
- got_ref_list_free(&header->refs);
gw_free_header(header);
free(tree_html_disp);
free(tree_html);
kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
done:
- got_ref_list_free(&header->refs);
gw_free_header(header);
if (error == NULL && kerr != KCGI_OK)
error = gw_kcgi_error(kerr);
if (refname && strcmp(got_ref_get_name(re->ref), refname) != 0)
continue;
-
+
error = got_ref_resolve(&id, repo, re->ref);
if (error)
goto done;
static void
gw_free_header(struct gw_header *header)
{
- free(header->id);
free(header->path);
- if (header->commit != NULL)
- got_object_commit_close(header->commit);
if (header->repo)
got_repo_close(header->repo);
+ free(header->author);
+ free(header->committer);
free(header->refs_str);
free(header->commit_id);
free(header->parent_id);
return NULL;
header->repo = NULL;
- header->commit = NULL;
header->id = NULL;
header->path = NULL;
SIMPLEQ_INIT(&header->refs);
{
const struct got_error *error = NULL;
struct got_commit_graph *graph = NULL;
+ struct got_commit_object *commit = NULL;
error = got_commit_graph_open(&graph, header->path, 0);
if (error)
goto done;
for (;;) {
- /*
- * XXX This is gross; Some fields of 'header' change during every
- * loop iteration, some remain constant (e.g. header->repo).
- * We should refactor this to be able to call gw_free_header()
- * during every loop iteration. Or perhaps do away with the
- * appraoch of passing a struct around which contains data
- * of various lifetimes, and instead pass globals like 'repo'
- * around separately as done in e.g. tog(1). Any state which
- * keeps changing with every iteration (e.g. header->id) would
- * better stored in local variables of this function instead.
- */
- /* Clear fields that will be filled again by gw_get_commit. */
- free(header->refs_str);
- header->refs_str = NULL;
- free(header->commit_id);
- header->commit_id = NULL;
- free(header->parent_id);
- header->parent_id = NULL;
- free(header->tree_id);
- header->tree_id = NULL;
- free(header->commit_msg);
- header->commit_msg = NULL;
-
- free(header->id); /* XXX see above comment */
error = got_commit_graph_iter_next(&header->id, graph,
header->repo, NULL, NULL);
if (error) {
if (header->id == NULL)
goto done;
- if (header->commit != NULL) /* XXX see above comment */
- got_object_commit_close(header->commit);
- error = got_object_open_as_commit(&header->commit, header->repo,
+ error = got_object_open_as_commit(&commit, header->repo,
header->id);
- if (error)
- goto done;
-
- error = gw_get_commit(gw_trans, header);
- if (limit > 1) {
+ if (error)
+ goto done;
+ if (limit == 1) {
+ error = gw_get_commit(gw_trans, header, commit,
+ header->id);
+ if (error)
+ goto done;
+ } else {
struct gw_header *n_header = NULL;
if ((n_header = gw_init_header()) == NULL) {
error = got_error_from_errno("malloc");
- goto done;
- }
-
- if (header->refs_str != NULL) {
- n_header->refs_str = strdup(header->refs_str);
- if (n_header->refs_str == NULL) {
- error = got_error_from_errno("strdup");
- goto done;
- }
- }
- n_header->commit_id = strdup(header->commit_id);
- if (n_header->commit_id == NULL) {
- error = got_error_from_errno("strdup");
- goto done;
- }
- if (header->parent_id != NULL) {
- n_header->parent_id = strdup(header->parent_id);
- if (n_header->parent_id == NULL) {
- error = got_error_from_errno("strdup");
- goto done;
- }
- }
- n_header->tree_id = strdup(header->tree_id);
- if (n_header->tree_id == NULL) {
- error = got_error_from_errno("strdup");
goto done;
}
- n_header->author = header->author;
- n_header->committer = header->committer;
- n_header->commit_msg = strdup(header->commit_msg);
- if (n_header->commit_msg == NULL) {
- error = got_error_from_errno("strdup");
+ error = gw_get_commit(gw_trans, n_header, commit,
+ header->id);
+ if (error)
goto done;
- }
- n_header->committer_time = header->committer_time;
TAILQ_INSERT_TAIL(&gw_trans->gw_headers, n_header,
entry);
}
break;
}
done:
+ if (commit != NULL)
+ got_object_commit_close(commit);
if (graph)
got_commit_graph_close(graph);
return error;
}
static const struct got_error *
-gw_get_commit(struct gw_trans *gw_trans, struct gw_header *header)
+gw_get_commit(struct gw_trans *gw_trans, struct gw_header *header,
+ struct got_commit_object *commit, struct got_object_id *id)
{
const struct got_error *error = NULL;
struct got_reflist_entry *re;
}
}
cmp = got_object_id_cmp(tag ?
- got_object_tag_get_object_id(tag) : re->id, header->id);
+ got_object_tag_get_object_id(tag) : re->id, id);
if (tag)
got_object_tag_close(tag);
if (cmp != 0)
free(s);
}
- error = got_object_id_str(&header->commit_id, header->id);
+ error = got_object_id_str(&header->commit_id, id);
if (error)
return error;
error = got_object_id_str(&header->tree_id,
- got_object_commit_get_tree_id(header->commit));
+ got_object_commit_get_tree_id(commit));
if (error)
return error;
if (gw_trans->action == GW_DIFF) {
parent_id = SIMPLEQ_FIRST(
- got_object_commit_get_parent_ids(header->commit));
+ got_object_commit_get_parent_ids(commit));
if (parent_id != NULL) {
id2 = got_object_id_dup(parent_id->id);
free (parent_id);
}
header->committer_time =
- got_object_commit_get_committer_time(header->commit);
+ got_object_commit_get_committer_time(commit);
header->author =
- got_object_commit_get_author(header->commit);
+ strdup(got_object_commit_get_author(commit));
+ if (header->author == NULL) {
+ error = got_error_from_errno("strdup");
+ return error;
+ }
header->committer =
- got_object_commit_get_committer(header->commit);
- if (error)
+ strdup(got_object_commit_get_committer(commit));
+ if (header->committer == NULL) {
+ error = got_error_from_errno("strdup");
return error;
- error = got_object_commit_get_logmsg(&commit_msg0, header->commit);
+ }
+ error = got_object_commit_get_logmsg(&commit_msg0, commit);
if (error)
return error;
got_ref_close(head_ref);
if (error)
return error;
-
- error = got_object_open_as_commit(&header->commit,
- header->repo, header->id);
- if (error)
- return error;
} else {
struct got_reference *ref;
error = got_ref_open(&ref, header->repo, gw_trans->commit, 0);
error = got_object_get_type(&obj_type, header->repo,
header->id);
if (error)
- return error;
+ goto done;
if (obj_type == GOT_OBJ_TYPE_TAG) {
struct got_tag_object *tag;
error = got_object_open_as_tag(&tag,
header->repo, header->id);
if (error)
- return error;
+ goto done;
if (got_object_tag_get_object_type(tag) !=
GOT_OBJ_TYPE_COMMIT) {
got_object_tag_close(tag);
error = got_error(GOT_ERR_OBJ_TYPE);
- return error;
+ goto done;
}
free(header->id);
header->id = got_object_id_dup(
"got_object_id_dup");
got_object_tag_close(tag);
if (error)
- return error;
+ goto done;
} else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
error = got_error(GOT_ERR_OBJ_TYPE);
- return error;
+ goto done;
}
- error = got_object_open_as_commit(&header->commit,
- header->repo, header->id);
- if (error)
- return error;
- }
- if (header->commit == NULL) {
- error = got_repo_match_object_id_prefix(&header->id,
- gw_trans->commit, GOT_OBJ_TYPE_COMMIT,
- header->repo);
- if (error)
- return error;
}
error = got_repo_match_object_id_prefix(&header->id,
gw_trans->commit, GOT_OBJ_TYPE_COMMIT,
header->repo);
if (error)
- return error;
+ goto done;
}
error = got_repo_map_path(&in_repo_path, header->repo,
gw_trans->repo_path, 1);
if (error)
- return error;
+ goto done;
if (in_repo_path) {
header->path = strdup(in_repo_path);
if (header->path == NULL) {
error = got_error_from_errno("strdup");
- free(in_repo_path);
- return error;
+ goto done;
}
}
- free(in_repo_path);
error = got_ref_list(&header->refs, header->repo, NULL,
got_ref_cmp_by_name, NULL);
if (error)
- return error;
+ goto done;
error = gw_get_commits(gw_trans, header, limit);
+done:
+ got_ref_list_free(&header->refs);
+ free(header->id);
+ free(in_repo_path);
return error;
}
