Re: [PATCH 3/4] tmp-objdir: preserve errno when directory creation fails
- From
Karthik Nayak <karthik.188@gmail.com>
- Date
- Nov 11, 2026, 16:44 UTC
- Message-ID
- <CAOLa=ZSonhP78j2sJdTwctp2h101jWZbvU_jcg1_TR41cRK7dA@mail.gmail.com>
- In-Reply-To
- <20261110002251.2007617-4-jltobler@gmail.com>
Justin Tobler <jltobler@gmail.com> writes:
Show 33 quoted lines
> 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 | 8 ++++++++
> tmp-objdir.h | 3 ++-
> 2 files changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/tmp-objdir.c b/tmp-objdir.c
> index 5307717354..4b91d86787 100644
> --- a/tmp-objdir.c
> +++ b/tmp-objdir.c
> @@ -148,10 +148,13 @@ static int setup_tmp_objdir(const char *root)
> {
> char *path;
> int ret = 0;
> + int saved_errno;
>
> path = xstrfmt("%s/pack", root);
> ret = mkdir(path, 0777);
> + saved_errno = errno;
> free(path);
> + errno = saved_errno;
>This and the below pattern of save+restore seems a bit finicky to me. Could we instead do:
1. Move this function inline
modified tmp-objdir.c
@@ -144,18 +144,6 @@ static void env_replace(struct strvec *env, const char *key, const char *val) strvec_pushf(env, "%s=%s", key, val); } -static int setup_tmp_objdir(const char *root) -{ - char *path; - int ret = 0; - - path = xstrfmt("%s/pack", root); - ret = mkdir(path, 0777); - free(path); - - return ret; -} - struct tmp_objdir *tmp_objdir_create(struct repository *r, const char *prefix, int will_destroy) @@ -163,6 +151,8 @@ 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; + char *path; + int ret; if (the_tmp_objdir) BUG("only one tmp_objdir can be used at a time"); @@ -196,7 +186,11 @@ struct tmp_objdir *tmp_objdir_create(struct repository *r, installed_handlers++; } - if (setup_tmp_objdir(t->path.buf)) { + path = xstrfmt("%s/pack", t->path.buf); + ret = mkdir(path, 0777); + free(path); + + if (ret) { tmp_objdir_destroy(t); return NULL; } --8<--- 2. Then we can only set the errno we actually care about and jump to exit modified 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 fail; } the_tmp_objdir = t; @@ -191,8 +193,9 @@ struct tmp_objdir *tmp_objdir_create(struct repository *r, free(path); if (ret) { + saved_errno = errno; tmp_objdir_destroy(t); - return NULL; + goto fail; } env_append(&t->env, ALTERNATE_DB_ENVIRONMENT, @@ -215,6 +218,10 @@ struct tmp_objdir *tmp_objdir_create(struct repository *r, t->repo->disable_ref_updates = true; return t; + +fail: + errno = saved_errno; + return NULL; } --8<--- This avoids having to care about other syscalls which may be added in the future and breaking our setup as done in the patch here. [snip]