security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

gpg,w32: Fix empty homedir when only a drive letter is used.

Browse Source 
* common/homedir.c (copy_dir_with_fixup): New.
(default_homedir): Use here.
(gnupg_set_homedir): And here .
--

This actually fixes a couple of cases for Windows.  Both --home-dir
and GNUPGHOME.  The interpretation of "c:" -> "c:/" might not be the
correct one but because we need an absolute dir anyway it is the less
surprising one.  Note that this does not include a full syntax check
and fixup and thus it is very well possible that the result is not an
absolute directory.

GnuPG-bug-id: 3720
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2018-04-09 14:44:21 +02:00
parent 519e4560e8
commit 6da7aa1e7c
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 63 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
common/homedir.c
View File

@ -171,6 +171,62 @@ is_gnupg_default_homedir (const char *dir)
}
/* Helper to remove trailing slashes from NEWDIR. Return a new
* allocated string if that has been done or NULL if there are no
* slashes to remove. Also inserts a missing slash after a Windows
* drive letter. */
static char *
copy_dir_with_fixup (const char *newdir)
{
char *result = NULL;
char *p;
if (!*newdir)
return NULL;
#ifdef HAVE_W32_SYSTEM
if (newdir[0] && newdir[1] == ':'
&& !(newdir[2] == '/' || newdir[2] == '\\'))
{
/* Drive letter with missing leading slash. */
p = result = xmalloc (strlen (newdir) + 1 + 1);
*p++ = newdir[0];
*p++ = newdir[1];
*p++ = '\\';
strcpy (p, newdir+2);
/* Remove trailing slashes. */
p = result + strlen (result) - 1;
while (p > result+2 && (*p == '/' || *p == '\\'))
*p-- = 0;
}
else if (newdir[strlen (newdir)-1] == '/'
|| newdir[strlen (newdir)-1] == '\\' )
{
result = xstrdup (newdir);
p = result + strlen (result) - 1;
while (p > result
&& (*p == '/' || *p == '\\')
&& (p-1 > result && p[-1] != ':')) /* We keep "c:/". */
*p-- = 0;
}
#else /*!HAVE_W32_SYSTEM*/
if (newdir[strlen (newdir)-1] == '/')
{
result = xstrdup (newdir);
p = result + strlen (result) - 1;
while (p > result && *p == '/')
*p-- = 0;
}
#endif /*!HAVE_W32_SYSTEM*/
return result;
}
/* Get the standard home directory. In general this function should
not be used as it does not consider a registry value (under W32) or
the GNUPGHOME environment variable. It is better to use
@ -278,18 +334,11 @@ default_homedir (void)
dir = GNUPG_DEFAULT_HOMEDIR;
else
{
/* Strip trailing slashes if any. */
if (dir[strlen (dir)-1] == '/')
{
char *tmp, *p;
char *p;
tmp = xstrdup (dir);
p = tmp + strlen (tmp) - 1;
while (p > tmp && *p == '/')
*p-- = 0;
dir = tmp;
}
p = copy_dir_with_fixup (dir);
if (p)
dir = p;
if (!is_gnupg_default_homedir (dir))
non_default_homedir = 1;
@ -432,28 +481,10 @@ gnupg_set_homedir (const char *newdir)
newdir = default_homedir ();
else
{
/* Remove trailing slashes from NEWSDIR. */
if (newdir[strlen (newdir)-1] == '/'
#ifdef HAVE_W32_SYSTEM
|| newdir[strlen (newdir)-1] == '\\'
#endif
)
{
char *p;
tmp = copy_dir_with_fixup (newdir);
if (tmp)
newdir = tmp;
tmp = xstrdup (newdir);
p = tmp + strlen (tmp) - 1;
while (p > tmp
&& (*p == '/'
#ifdef HAVE_W32_SYSTEM
|| *p == '\\'
#endif
)
)
*p-- = 0;
newdir = tmp;
}
if (!is_gnupg_default_homedir (newdir))
non_default_homedir = 1;
}