From: Stefan Sperling <stsp@stsp.name>
Subject: Re: got-build-regress.sh regress failure
To: Omar Polo <op@omarpolo.com>
Cc: gameoftrees@openbsd.org
Date: Tue, 8 Mar 2022 13:02:58 +0100

On Tue, Mar 08, 2022 at 10:33:21AM +0100, Omar Polo wrote:
> right.  we unveil /tmp and the regress suite uses that for the tests,

Indeed. This regress builder is using /ramdisk instead of /tmp in
order to catch mistakes we make due to this.
 
> this is better?

Yes, OK. Looks good.
 
> diff 63868eefd7fce8dc07000a925bb6405100a596bb f69a1b4827a2ffcff36a4f54310ea5bd714951fb
> blob - 84226a57dca7da7a69187a76d804e8ceda7558ba
> blob + 672f8dac069d4fdcde1088037bbf462287cd0264
> --- lib/patch.c
> +++ lib/patch.c
> @@ -383,7 +383,7 @@ apply_patch(struct got_worktree *worktree, struct got_
>  	const struct got_error *err = NULL;
>  	struct got_pathlist_head paths;
>  	struct got_pathlist_entry *pe;
> -	char *path = NULL, *tmppath = NULL;
> +	char *path = NULL, *tmppath = NULL, *template = NULL;
>  	FILE *orig = NULL, *tmp = NULL;
>  	struct got_patch_hunk *h;
>  	size_t i;
> @@ -419,8 +419,13 @@ apply_patch(struct got_worktree *worktree, struct got_
>  		goto done;
>  	}
>  
> -	err = got_opentemp_named(&tmppath, &tmp,
> -	    got_worktree_get_root_path(worktree));
> +	if (asprintf(&template, "%s/got-patch",
> +	    got_worktree_get_root_path(worktree)) == -1) {
> +		err = got_error_from_errno(template);
> +		goto done;
> +	}
> +
> +	err = got_opentemp_named(&tmppath, &tmp, template);
>  	if (err)
>  		goto done;
>  
> @@ -509,6 +514,7 @@ rename:
>  	else
>  		printf("M  %s\n", path); /* XXX */
>  done:
> +	free(template);
>  	if (err != NULL && p->old == NULL && path != NULL)
>  		unlink(path);
>  	if (tmp != NULL)
> 
>