[PATCH v2 4/6] tmp-objdir: preserve errno when directory creation fails
- From
Justin Tobler <jltobler@gmail.com>
- Date
- Nov 19, 2026, 00:20 UTC
- Message-ID
- <20261119002043.2108654-5-jltobler@gmail.com>
- In-Reply-To
- <20261119002043.2108654-1-jltobler@gmail.com>
When `tmp_objdir_create()` fails to create the temporary object directory, it cleans up after itself before returning NULL. Depending on where the failure occurred, this cleanup may clobber `errno`, leaving callers without a way to reliably tell why creating the directory failed.
In a subsequent commit, ODB transactions create their temporary object directory eagerly and report a more specific error regarding creation failure. Preserve `errno` across the cleanup so that callers can inspect it accordingly.
Signed-off-by: Justin Tobler <jltobler@gmail.com> --- tmp-objdir.c | 11 +++++++++-- tmp-objdir.h | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/tmp-objdir.c b/tmp-objdir.c index c78fc0e6b6..c3549c2e8d 100644 --- a/tmp-objdir.c +++ b/tmp-objdir.c @@ -151,6 +151,7 @@ struct tmp_objdir *tmp_objdir_create(struct repository *r, struct odb_source_files *files = odb_source_files_downcast(r->objects->source); static int installed_handlers; struct tmp_objdir *t; + int saved_errno; char *path; int ret; @@ -175,9 +176,10 @@ struct tmp_objdir *tmp_objdir_create(struct repository *r, chdir_notify_register(tmp_objdir_reparent, t); if (!mkdtemp(t->path.buf)) { + saved_errno = errno; /* free, not destroy, as we never touched the filesystem */ tmp_objdir_free(t); - return NULL; + goto error; } the_tmp_objdir = t; @@ -188,10 +190,11 @@ struct tmp_objdir *tmp_objdir_create(struct repository *r, path = xstrfmt("%s/pack", t->path.buf); ret = mkdir(path, 0777); + saved_errno = errno; free(path); if (ret) { tmp_objdir_destroy(t); - return NULL; + goto error; } env_append(&t->env, ALTERNATE_DB_ENVIRONMENT, @@ -214,6 +217,10 @@ struct tmp_objdir *tmp_objdir_create(struct repository *r, t->repo->disable_ref_updates = true; return t; + +error: + errno = saved_errno; + return NULL; } /* diff --git a/tmp-objdir.h b/tmp-objdir.h index a301b01d84..4ef6750a01 100644 --- a/tmp-objdir.h +++ b/tmp-objdir.h @@ -26,7 +26,8 @@ struct tmp_objdir; /* * Create a new temporary object directory with the specified prefix and - * install the directory as the primary write target; returns NULL on failure. + * install the directory as the primary write target; returns NULL and sets + * errno on failure. */ struct tmp_objdir *tmp_objdir_create(struct repository *r, const char *prefix, int will_destroy);
-- 2.56.0.173.gf57c9a7388