Attachment 77342 Details for Bug 63046 – Uses different path separators depending on the platform

[patch] Uses different path separators depending on the platform

0006-path_separator.all.patch (text/plain), 2.18 KB, created by LRN on 2013-04-02 21:36:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: LRN

Created: 2013-04-02 21:36:21 UTC

Size: 2.18 KB

patch

obsolete

>--- p11-kit-0.17.5/trust/tests/test-module.c.orig	2013-04-03 00:23:21 +0400
>+++ p11-kit-0.17.5/trust/tests/test-module.c	2013-04-03 01:24:23 +0400
>@@ -81,7 +81,9 @@
> 	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 @@
> 	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);
>--- p11-kit-0.17.5/tools/tool.c.orig	2013-04-03 00:23:21 +0400
>+++ p11-kit-0.17.5/tools/tool.c	2013-04-03 01:22:59 +0400
>@@ -201,7 +201,7 @@
> 
> 	/* 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);
> 
>--- p11-kit-0.17.5/common/compat.h.orig	2013-04-03 01:05:26 +0400
>+++ p11-kit-0.17.5/common/compat.h	2013-04-03 01:25:59 +0400
>@@ -68,6 +68,14 @@
> #define O_BINARY 0
> #endif
> 
>+#if defined (_WIN32) && !defined (__CYGWIN__)
>+#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
>--- p11-kit-0.17.5/trust/module.c.orig	2013-04-03 00:23:21 +0400
>+++ p11-kit-0.17.5/trust/module.c	2013-04-03 01:29:49 +0400
>@@ -202,7 +202,7 @@
> 
> 	while (remaining) {
> 		path = remaining;
>-		pos = strchr (remaining, ':');
>+		pos = strchr (remaining, PATH_SEPARATOR_C);
> 		if (pos == NULL) {
> 			remaining = NULL;
> 		} else {

Actions: View | Splinter Review

Attachments on bug 63046: 77341 | 77342 | 77363 | 77364 | 77365 | 77366

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.