summaryrefslogtreecommitdiff
path: root/test/utility
diff options
context:
space:
mode:
Diffstat (limited to 'test/utility')
-rw-r--r--test/utility/test_util.i23
1 files changed, 7 insertions, 16 deletions
diff --git a/test/utility/test_util.i b/test/utility/test_util.i
index 73141bc9be7..3b88d375381 100644
--- a/test/utility/test_util.i
+++ b/test/utility/test_util.i
@@ -66,26 +66,17 @@ testutil_die(int e, const char *fmt, ...)
* Creates the full intended work directory in buffer.
*/
static inline void
-testutil_work_dir_from_path(char *buffer, size_t inputSize, char *dir)
+testutil_work_dir_from_path(char *buffer, size_t inputSize, const char *dir)
{
/* If no directory is provided, use the default. */
- if (dir == NULL) {
- if (inputSize < sizeof(DEFAULT_DIR))
- testutil_die(ENOMEM,
- "Not enough memory in buffer for directory %s%c%s",
- dir, DIR_DELIM, DEFAULT_DIR);
-
- snprintf(buffer, inputSize, DEFAULT_DIR);
- return;
- }
-
- /* Additional bytes for the directory and WT_TEST. */
- if (inputSize < strlen(dir) + sizeof(DEFAULT_DIR) + sizeof(DIR_DELIM))
+ if (dir == NULL)
+ dir = DEFAULT_DIR;
+
+ if (inputSize < strlen(dir) + 1)
testutil_die(ENOMEM,
- "Not enough memory in buffer for directory %s%c%s",
- dir, DIR_DELIM, DEFAULT_DIR);
+ "Not enough memory in buffer for directory %s", dir);
- snprintf(buffer, inputSize, "%s%c%s", dir, DIR_DELIM, DEFAULT_DIR);
+ strcpy(buffer, dir);
}
/*