commit - 223a6550c748d4197032951c1eacf87694482f411a6d39bc1d9bbc2afe477792
commit + 3363f42b92e1cfb43e378c65e8f7d5f9f3f8f92e68e2102e6549ad848b9e03c8
blob - 52daa873c21da576d336ced7d1ef7a2e7a4daf332d7765c49df856873fadf0eb
blob + c4b7314dfc88c88bab267816ed105c2096fdd29699a2dea7e4e13e73efc4c49c
--- tog/tog.c
+++ tog/tog.c
FILE *f = NULL;
char buf[BUFSIZ], pathbase[PATH_MAX];
char *idstr1, *idstr2 = NULL, *path = NULL;
+ char *repo_name = NULL;
size_t r;
off_t pos;
int rc;
if (err != NULL)
goto done;
- rc = snprintf(pathbase, sizeof(pathbase), "%s/tog-%.8s-%.8s",
- GOT_TMPDIR_STR, idstr1 != NULL ? idstr1 : "empty", idstr2);
+ err = got_path_basename(&repo_name, got_repo_get_path(s->repo));
+ if (err)
+ goto done;
+
+ rc = snprintf(pathbase, sizeof(pathbase), "%s/tog-%s-%.8s-%.8s",
+ GOT_TMPDIR_STR, repo_name,
+ idstr1 != NULL ? idstr1 : "empty", idstr2);
if (rc < 0 || (size_t)rc >= sizeof(pathbase)) {
err = got_error(rc < 0 ? GOT_ERR_IO : GOT_ERR_NO_SPACE);
goto done;
free(path);
free(idstr1);
free(idstr2);
+ free(repo_name);
return err;
}