security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-08 12:44:23 +01:00
Code Activity

gpgscm,w32: Fix testing for absolute paths.

Browse Source 
* tests/gpgscm/main.c (path_absolute_p): New function.
(load): Use new function.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2017-07-18 16:15:45 +02:00
parent b231959728
commit 2e1342b78b
No known key found for this signature in database
GPG Key ID: DD1A52F9DA8C9020
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/gpgscm/main.c
View File

@ -124,6 +124,19 @@ my_strusage( int level )
} }
static int
path_absolute_p (const char *p)
{
#if _WIN32
return ((strlen (p) > 2 && p[1] == ':' && (p[2] == '\\' || p[2] == '/'))
|| p[0] == '\\' || p[0] == '/');
#else
return p[0] == '/';
#endif
}
/* Load the Scheme program from FILE_NAME. If FILE_NAME is not an /* Load the Scheme program from FILE_NAME. If FILE_NAME is not an
absolute path, and LOOKUP_IN_PATH is given, then it is qualified absolute path, and LOOKUP_IN_PATH is given, then it is qualified
with the values in scmpath until the file is found. */ with the values in scmpath until the file is found. */
@ -139,9 +152,9 @@ load (scheme *sc, char *file_name,
FILE *h = NULL; FILE *h = NULL;
use_path = use_path =
lookup_in_path && ! (file_name[0] == '/' || scmpath_len == 0); lookup_in_path && ! (path_absolute_p (file_name) || scmpath_len == 0);
if (file_name[0] == '/' || lookup_in_cwd || scmpath_len == 0) if (path_absolute_p (file_name) || lookup_in_cwd || scmpath_len == 0)
{ {
h = fopen (file_name, "r"); h = fopen (file_name, "r");
if (! h) if (! h)