Attachment 77367 Details for Bug 63062 – Use a semi-colon as the path separator on Windows

[patch] Use a semi-colon as the path separator on Windows

Use-a-semi-colon-as-the-path-separator-on-Windows.patch (text/plain), 2.72 KB, created by Stef Walter on 2013-04-03 08:52:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stef Walter

Created: 2013-04-03 08:52:05 UTC

Size: 2.72 KB

patch

obsolete

>From 8f88d3588ec641e68de99a341d700b2cc776b3d0 Mon Sep 17 00:00:00 2001
>From: LRN <lrn1986@gmail.com>
>Date: Wed, 3 Apr 2013 10:50:59 +0200
>Subject: [PATCH] Use a semi-colon as the path separator on Windows
>
>https://bugs.freedesktop.org/show_bug.cgi?id=63062
>---
> common/compat.h           | 8 ++++++++
> tools/tool.c              | 2 +-
> trust/module.c            | 2 +-
> trust/tests/test-module.c | 9 +++++++--
> 4 files changed, 17 insertions(+), 4 deletions(-)
>
>diff --git a/common/compat.h b/common/compat.h
>index bd933cb..555fd8c 100644
>--- a/common/compat.h
>+++ b/common/compat.h
>@@ -68,6 +68,14 @@
> #define O_BINARY 0
> #endif
> 
>+#ifdef OS_WIN32
>+#define PATH_SEPARATOR_S ";"
>+#define PATH_SEPARATOR_C ';'
>+#else
>+#define PATH_SEPARATOR_S ":"
>+#define PATH_SEPARATOR_C ':'
>+#endif
>+
> #ifndef HAVE_GETPROGNAME
> const char * getprogname (void);
> #endif
>diff --git a/tools/tool.c b/tools/tool.c
>index 9ec41a4..bc5eb13 100644
>--- a/tools/tool.c
>+++ b/tools/tool.c
>@@ -201,7 +201,7 @@ exec_external (const char *command,
> 
> 	/* Add our libexec directory to the path */
> 	path = getenv ("PATH");
>-	if (!asprintf (&env, "PATH=%s%s%s", path ? path : "", path ? ":" : "", PKGDATADIR))
>+	if (!asprintf (&env, "PATH=%s%s%s", path ? path : "", path ? PATH_SEPARATOR_S : "", PKGDATADIR))
> 		return_if_reached ();
> 	putenv (env);
> 
>diff --git a/trust/module.c b/trust/module.c
>index 46ebeb6..aa16b1d 100644
>--- a/trust/module.c
>+++ b/trust/module.c
>@@ -202,7 +202,7 @@ create_tokens_inlock (p11_array *tokens,
> 
> 	while (remaining) {
> 		path = remaining;
>-		pos = strchr (remaining, ':');
>+		pos = strchr (remaining, PATH_SEPARATOR_C);
> 		if (pos == NULL) {
> 			remaining = NULL;
> 		} else {
>diff --git a/trust/tests/test-module.c b/trust/tests/test-module.c
>index 525a68e..cba9b7a 100644
>--- a/trust/tests/test-module.c
>+++ b/trust/tests/test-module.c
>@@ -81,7 +81,9 @@ setup (CuTest *cu)
> 	CuAssertTrue (cu, rv == CKR_OK);
> 
> 	memset (&args, 0, sizeof (args));
>-	paths = SRCDIR "/input:" SRCDIR "/files/self-signed-with-ku.der:" SRCDIR "/files/thawte.pem";
>+	paths = SRCDIR "/input" PATH_SEPARATOR_S \
>+		SRCDIR "/files/self-signed-with-ku.der" PATH_SEPARATOR_S \
>+		SRCDIR "/files/thawte.pem";
> 	if (asprintf (&arguments, "paths='%s'", paths) < 0)
> 		CuAssertTrue (cu, false && "not reached");
> 	args.pReserved = arguments;
>@@ -204,7 +206,10 @@ test_get_token_info (CuTest *cu)
> 	CuAssertTrue (cu, rv == CKR_OK);
> 
> 	memset (&args, 0, sizeof (args));
>-	args.pReserved = "paths='" SYSCONFDIR "/input:" DATADIR "/files/blah:" "/some/other/path/the-basename'";
>+	args.pReserved = "paths='" \
>+		SYSCONFDIR "/input" PATH_SEPARATOR_S \
>+		DATADIR "/files/blah" PATH_SEPARATOR_S \
>+		"/some/other/path/the-basename'";
> 	args.flags = CKF_OS_LOCKING_OK;
> 
> 	rv = module->C_Initialize (&args);
>-- 
>1.8.2

Actions: View | Splinter Review

Attachments on bug 63062: 77367 | 77374

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.