Commit Diff

Commit:
2959f41846dadc2d7826083bfc86d41a49b37420
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
gotwebd: add the magic ".git" handling like gotd, assume an implicit ".git" if the repo doesn't exist. Merge gotweb_init_repo_dir() and gotweb_load_got_path() since the former only sets repo_dir->name, and we don't realistically know the name until we've opened the directory. While here, unbreak the git worktree handling too. Realistically, moving forward, we should issue a redirect to the canonical URL or at least set the correct metadata in the document to avoid having multiple URLs for the same content. ok stsp; tiny change to repo_dir->name handling done after the ok.
Actions:
Patch | Tree
commit - 99ed25deb726bbb5294a88152cb1ab8a2049f537
commit + 2959f41846dadc2d7826083bfc86d41a49b37420
blob - 84f26236147f048cca67613f9b3a2dfbf061ed03
blob + 629ddbf12941ad82fb3f24aba94fc8ddb599969f
--- gotwebd/gotweb.c
+++ gotwebd/gotweb.c
@@ -85,10 +85,8 @@ static const struct got_error *gotweb_parse_querystrin
 static const struct got_error *gotweb_assign_querystring(struct querystring **,
     char *, char *);
 static int gotweb_render_index(struct template *);
-static const struct got_error *gotweb_init_repo_dir(struct repo_dir **,
-    const char *);
-static const struct got_error *gotweb_load_got_path(struct request *c,
-    struct repo_dir *);
+static const struct got_error *gotweb_load_got_path(struct repo_dir **,
+    const char *, struct request *);
 static const struct got_error *gotweb_get_repo_description(char **,
     struct server *, const char *, int);
 static const struct got_error *gotweb_get_clone_url(char **, struct server *,
@@ -196,10 +194,7 @@ gotweb_process_request(struct request *c)
 	}
 
 	if (qs->action != INDEX) {
-		error = gotweb_init_repo_dir(&repo_dir, qs->path);
-		if (error)
-			goto err;
-		error = gotweb_load_got_path(c, repo_dir);
+		error = gotweb_load_got_path(&repo_dir, qs->path, c);
 		c->t->repo_dir = repo_dir;
 		if (error && error->code != GOT_ERR_LONELY_PACKIDX)
 			goto err;
@@ -822,11 +817,8 @@ gotweb_render_index(struct template *tp)
 			continue;
 		}
 
-		error = gotweb_init_repo_dir(&repo_dir, sd_dent[d_i]->d_name);
-		if (error)
-			continue;
-
-		error = gotweb_load_got_path(c, repo_dir);
+		error = gotweb_load_got_path(&repo_dir, sd_dent[d_i]->d_name,
+		    c);
 		if (error && error->code != GOT_ERR_LONELY_PACKIDX) {
 			if (error->code != GOT_ERR_NOT_GIT_REPO)
 				log_warnx("%s: %s: %s", __func__,
@@ -1073,36 +1065,55 @@ gotweb_render_absolute_url(struct request *c, struct g
 }
 
 static const struct got_error *
-gotweb_load_got_path(struct request *c, struct repo_dir *repo_dir)
+gotweb_load_got_path(struct repo_dir **rp, const char *dir,
+    struct request *c)
 {
 	const struct got_error *error = NULL;
 	struct socket *sock = c->sock;
 	struct server *srv = c->srv;
 	struct transport *t = c->t;
+	struct repo_dir *repo_dir;
 	DIR *dt;
 	char *dir_test;
 
-	if (asprintf(&dir_test, "%s/%s/%s", srv->repos_path, repo_dir->name,
+	*rp = calloc(1, sizeof(**rp));
+	if (*rp == NULL)
+		return got_error_from_errno("calloc");
+	repo_dir = *rp;
+
+	if (asprintf(&dir_test, "%s/%s/%s", srv->repos_path, dir,
 	    GOTWEB_GIT_DIR) == -1)
 		return got_error_from_errno("asprintf");
 
 	dt = opendir(dir_test);
 	if (dt == NULL) {
 		free(dir_test);
-		if (asprintf(&dir_test, "%s/%s", srv->repos_path,
-		    repo_dir->name) == -1)
+		if (asprintf(&dir_test, "%s/%s", srv->repos_path, dir) == -1)
 			return got_error_from_errno("asprintf");
 		dt = opendir(dir_test);
 		if (dt == NULL) {
 			free(dir_test);
-			return got_error_path(repo_dir->name,
-			    GOT_ERR_NOT_GIT_REPO);
+			if (asprintf(&dir_test, "%s/%s%s", srv->repos_path,
+			    dir, GOTWEB_GIT_DIR) == -1)
+				return got_error_from_errno("asprintf");
+			dt = opendir(dir_test);
+			if (dt == NULL) {
+				free(dir_test);
+				return got_error_path(dir,
+				    GOT_ERR_NOT_GIT_REPO);
+			}
 		}
 	}
 
 	repo_dir->path = dir_test;
 	dir_test = NULL;
 
+	repo_dir->name = strdup(repo_dir->path + strlen(srv->repos_path) + 1);
+	if (repo_dir->name == NULL) {
+		error = got_error_from_errno("strdup");
+		goto err;
+	}
+
 	if (srv->respect_exportok &&
 	    faccessat(dirfd(dt), "git-daemon-export-ok", F_OK, 0) == -1) {
 		error = got_error_path(repo_dir->name, GOT_ERR_NOT_GIT_REPO);
@@ -1138,29 +1149,6 @@ err:
 }
 
 static const struct got_error *
-gotweb_init_repo_dir(struct repo_dir **repo_dir, const char *dir)
-{
-	const struct got_error *error;
-
-	*repo_dir = calloc(1, sizeof(**repo_dir));
-	if (*repo_dir == NULL)
-		return got_error_from_errno("calloc");
-
-	if (asprintf(&(*repo_dir)->name, "%s", dir) == -1) {
-		error = got_error_from_errno("asprintf");
-		free(*repo_dir);
-		*repo_dir = NULL;
-		return error;
-	}
-	(*repo_dir)->owner = NULL;
-	(*repo_dir)->description = NULL;
-	(*repo_dir)->url = NULL;
-	(*repo_dir)->path = NULL;
-
-	return NULL;
-}
-
-static const struct got_error *
 gotweb_get_repo_description(char **description, struct server *srv,
     const char *dirpath, int dir)
 {