Commit Diff

Commit:
c2d3d9a00d9696fa5c68d89ee304f038347d830d
From:
Omar Polo <op@omarpolo.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
gotwebd: refactor gotweb_load_got_path - don't special case ".got": if it's a work-tree gotwebd will just fail soon enough. Suggested by stsp@ - avoid an strdup. - drop `opened' to make it easier to follow what's going on. ok stsp@
Actions:
Patch | Tree
commit - 55e6cffd2185ebe82b0abfbdcd92c49778cc928d
commit + c2d3d9a00d9696fa5c68d89ee304f038347d830d
blob - 4fd134e6d8f50b025fcfcd8ddf9f694ff2e07cc3
blob + 07bf64267469d191992ebd75b8bd4d22fee7a4f6
--- gotwebd/gotweb.c
+++ gotwebd/gotweb.c
@@ -1979,7 +1979,6 @@ gotweb_load_got_path(struct request *c, struct repo_di
 	struct got_repository *repo = NULL;
 	DIR *dt;
 	char *dir_test;
-	int opened = 0;
 
 	if (asprintf(&dir_test, "%s/%s/%s", srv->repos_path, repo_dir->name,
 	    GOTWEB_GIT_DIR) == -1)
@@ -1989,52 +1988,24 @@ gotweb_load_got_path(struct request *c, struct repo_di
 	if (dt == NULL) {
 		free(dir_test);
 	} else {
-		repo_dir->path = strdup(dir_test);
-		if (repo_dir->path == NULL) {
-			opened = 1;
-			error = got_error_from_errno("strdup");
-			goto err;
-		}
-		opened = 1;
-		goto done;
-	}
-
-	if (asprintf(&dir_test, "%s/%s/%s", srv->repos_path, repo_dir->name,
-	    GOTWEB_GOT_DIR) == -1) {
+		repo_dir->path = dir_test;
 		dir_test = NULL;
-		error = got_error_from_errno("asprintf");
-		goto err;
-	}
-
-	dt = opendir(dir_test);
-	if (dt == NULL)
-		free(dir_test);
-	else {
-		opened = 1;
-		error = got_error(GOT_ERR_NOT_GIT_REPO);
-		goto err;
+		goto done;
 	}
 
 	if (asprintf(&dir_test, "%s/%s", srv->repos_path,
-	    repo_dir->name) == -1) {
-		error = got_error_from_errno("asprintf");
-		dir_test = NULL;
-		goto err;
-	}
+	    repo_dir->name) == -1)
+		return got_error_from_errno("asprintf");
 
-	repo_dir->path = strdup(dir_test);
-	if (repo_dir->path == NULL) {
-		opened = 1;
-		error = got_error_from_errno("strdup");
-		goto err;
-	}
-
 	dt = opendir(dir_test);
 	if (dt == NULL) {
 		error = got_error_path(repo_dir->name, GOT_ERR_NOT_GIT_REPO);
 		goto err;
-	} else
-		opened = 1;
+	} else {
+		repo_dir->path = dir_test;
+		dir_test = NULL;
+	}
+
 done:
 	repo = find_cached_repo(srv, repo_dir->path);
 	if (repo == NULL) {
@@ -2057,9 +2028,8 @@ done:
 	error = gotweb_get_clone_url(&repo_dir->url, srv, repo_dir->path);
 err:
 	free(dir_test);
-	if (opened)
-		if (dt != NULL && closedir(dt) == EOF && error == NULL)
-			error = got_error_from_errno("closedir");
+	if (dt != NULL && closedir(dt) == EOF && error == NULL)
+		error = got_error_from_errno("closedir");
 	return error;
 }