Game of Trees Repos

Commit Diff

Commit:: d6e785550aafeec2ec66d26c39b8453268c9d657
From:: Josiah Frentsos <jfrent@tilde.team>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Thu Jun 1 10:18:37 2023 UTC
Message:: consistently use ten Xs in mkstemp(3) templates patch from Josiah Frentsos, thanks!
Actions:: Patch | Tree
commit - 201812127e27ef2aa4827752e229d8f5251f6ff6
commit + d6e785550aafeec2ec66d26c39b8453268c9d657
blob - 46e322483b38fc4e63b2fed41be53cfb4227b6b3
blob + b7e96619c79b13a62eb72554e933c3f7f132bd39
--- lib/diff3.c
+++ lib/diff3.c
@@ -310,15 +310,15 @@ got_merge_diff3(int *overlapcnt, int outfd, FILE *f1, 
 	if (err)
 		goto out;
 
-	if (asprintf(&path1, GOT_TMPDIR_STR "/got-diff1.XXXXXXXX") == -1) {
+	if (asprintf(&path1, GOT_TMPDIR_STR "/got-diff1.XXXXXXXXXX") == -1) {
 		err = got_error_from_errno("asprintf");
 		goto out;
 	}
-	if (asprintf(&path2, GOT_TMPDIR_STR "/got-diff2.XXXXXXXX") == -1) {
+	if (asprintf(&path2, GOT_TMPDIR_STR "/got-diff2.XXXXXXXXXX") == -1) {
 		err = got_error_from_errno("asprintf");
 		goto out;
 	}
-	if (asprintf(&path3, GOT_TMPDIR_STR "/got-diff3.XXXXXXXX") == -1) {
+	if (asprintf(&path3, GOT_TMPDIR_STR "/got-diff3.XXXXXXXXXX") == -1) {
 		err = got_error_from_errno("asprintf");
 		goto out;
 	}
blob - dbeda341626f70c8dcc4069dfe15c2de7219d792
blob + 214927a93b56207296b933bdf3a8b1b2b8e517ca
--- lib/opentemp.c
+++ lib/opentemp.c
@@ -30,7 +30,7 @@ got_opentempfd(void)
 	char name[PATH_MAX];
 	int fd;
 
-	if (strlcpy(name, GOT_TMPDIR_STR "/got.XXXXXXXX", sizeof(name))
+	if (strlcpy(name, GOT_TMPDIR_STR "/got.XXXXXXXXXX", sizeof(name))
 	    >= sizeof(name))
 		return -1;
 
@@ -72,7 +72,7 @@ got_opentemp_named(char **path, FILE **outfile, const 
 
 	*outfile = NULL;
 
-	if (asprintf(path, "%s-XXXXXX%s", basepath, suffix) == -1) {
+	if (asprintf(path, "%s-XXXXXXXXXX%s", basepath, suffix) == -1) {
 		*path = NULL;
 		return got_error_from_errno("asprintf");
 	}
@@ -104,7 +104,7 @@ got_opentemp_named_fd(char **path, int *outfd, const c
 
 	*outfd = -1;
 
-	if (asprintf(path, "%s-XXXXXX%s", basepath, suffix) == -1) {
+	if (asprintf(path, "%s-XXXXXXXXXX%s", basepath, suffix) == -1) {
 		*path = NULL;
 		return got_error_from_errno("asprintf");
 	}
blob - 53c5d1f6202fffc4bed181b63da76e86641ad5e9
blob + 895c13c80ed1183667d0ac4879512c80824f8320
--- regress/cmdline/common.sh
+++ regress/cmdline/common.sh
@@ -245,7 +245,8 @@ test_init()
 		echo "No test name provided" >&2
 		return 1
 	fi
-	local testroot=`mktemp -d "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXX"`
+	local testroot=`mktemp -d \
+	    "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXXXX"`
 	mkdir $testroot/repo
 	git_init $testroot/repo
 	if [ -z "$no_tree" ]; then
blob - c2f3ee46fef581bf98a2713c1d619163cb51f339
blob + 614c0254175714f853d026e00d9c0330ef34b33a
--- regress/cmdline/import.sh
+++ regress/cmdline/import.sh
@@ -18,7 +18,8 @@
 
 test_import_basic() {
 	local testname=import_basic
-	local testroot=`mktemp -d "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXX"`
+	local testroot=`mktemp -d \
+	    "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXXXX"`
 
 	gotadmin init $testroot/repo
 
@@ -142,7 +143,8 @@ test_import_basic() {
 
 test_import_specified_head() {
 	local testname=import_specified_head
-	local testroot=`mktemp -d "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXX"`
+	local testroot=`mktemp -d \
+	    "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXXXX"`
 	local headref=trunk
 
 	gotadmin init -b $headref $testroot/repo
@@ -367,7 +369,8 @@ test_import_requires_new_branch() {
 
 test_import_ignores() {
 	local testname=import_ignores
-	local testroot=`mktemp -d "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXX"`
+	local testroot=`mktemp -d \
+	    "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXXXX"`
 
 	gotadmin init $testroot/repo
 
@@ -400,7 +403,8 @@ test_import_ignores() {
 
 test_import_empty_dir() {
 	local testname=import_empty_dir
-	local testroot=`mktemp -d "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXX"`
+	local testroot=`mktemp -d \
+	    "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXXXX"`
 
 	gotadmin init $testroot/repo
 
@@ -443,7 +447,8 @@ test_import_empty_dir() {
 
 test_import_symlink() {
 	local testname=import_symlink
-	local testroot=`mktemp -d "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXX"`
+	local testroot=`mktemp -d \
+	    "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXXXX"`
 
 	gotadmin init $testroot/repo
 
blob - c0aa7e8388bf26432184a39d3c0257a016975b76
blob + 22184fffc887851e4b8c369a306088ffc4bf4686
--- regress/cmdline/init.sh
+++ regress/cmdline/init.sh
@@ -18,7 +18,8 @@
 
 test_init_basic() {
 	local testname=init_basic
-	local testroot=`mktemp -d "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXX"`
+	local testroot=`mktemp -d \
+	    "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXXXX"`
 	local headref=main
 
 	gotadmin init $testroot/repo
@@ -37,7 +38,8 @@ test_init_basic() {
 
 test_init_specified_head() {
 	local testname=init_specified_head
-	local testroot=`mktemp -d "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXX"`
+	local testroot=`mktemp -d \
+	    "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXXXX"`
 	local headref=trunk
 
 	gotadmin init -b $headref $testroot/repo
blob - 4fef3e998b0e8055a0acac216cc71828bdcea5c5
blob + ddfc0f1e9d1f0c373066bc33b387387e5beeaf0d
--- regress/gotd/Makefile
+++ regress/gotd/Makefile
@@ -13,7 +13,7 @@ CLEANFILES=gotd.conf
 GOTD_TEST_ROOT=/tmp
 GOTD_DEVUSER?=gotdev
 GOTD_DEVUSER_HOME!=userinfo $(GOTD_DEVUSER) | awk '/^dir/ {print $$2}'
-GOTD_TEST_REPO!?=mktemp -d "$(GOTD_TEST_ROOT)/gotd-test-repo-XXXXXXXXX"
+GOTD_TEST_REPO!?=mktemp -d "$(GOTD_TEST_ROOT)/gotd-test-repo-XXXXXXXXXX"
 GOTD_TEST_REPO_URL=ssh://${GOTD_DEVUSER}@127.0.0.1/test-repo
 
 GOTD_TEST_USER?=${DOAS_USER}
blob - 016110f9a8369c7d2288fbc68fa858b04c36f2c4
blob + 3fe3744d90fb5f9a963339227ba308d8236361be
--- regress/gotd/common.sh
+++ regress/gotd/common.sh
@@ -22,7 +22,8 @@ test_init()
 		echo "No test name provided" >&2
 		return 1
 	fi
-	local testroot=`mktemp -d "$GOTD_TEST_ROOT/gotd-test-$testname-XXXXXXXX"`
+	local testroot=`mktemp -d \
+	    "$GOTD_TEST_ROOT/gotd-test-$testname-XXXXXXXXXX"`
 	mkdir $testroot/repo
 	git_init $testroot/repo
 	if [ -z "$no_tree" ]; then
blob - 24bceaedbd0b5f96864aeb98fb8f75684810689b
blob + 8e364cdc52ed8662ae2562398c885d5a21c3061b
--- regress/gotd/prepare_test_repo.sh
+++ regress/gotd/prepare_test_repo.sh
@@ -27,7 +27,7 @@ make_repo()
 		return
 	fi
 
-	test_tree=`mktemp -d "${GOTD_TEST_ROOT}/gotd-test-tree-XXXXXXXXX"`
+	test_tree=`mktemp -d "${GOTD_TEST_ROOT}/gotd-test-tree-XXXXXXXXXX"`
 	make_test_tree "$test_tree"
 	got import -m "import the test tree" -r "${GOTD_TEST_REPO}" "$test_tree" \
 		> /dev/null
blob - 5c67c9b6991543475718b5f280e03afe3d39a724
blob + 6c2f1b6d029a9d9aaf7a02a830665aea07a8b934
--- regress/tog/common.sh
+++ regress/tog/common.sh
@@ -89,7 +89,7 @@ test_init()
 		return 1
 	fi
 
-	testroot=`mktemp -d "$GOT_TEST_ROOT/tog-test-$testname-XXXXXXXX"`
+	testroot=`mktemp -d "$GOT_TEST_ROOT/tog-test-$testname-XXXXXXXXXX"`
 
 	set_test_env $testroot/$testname $testroot/view $columns $lines