mirror of
git://git.gnupg.org/gnupg.git
synced 2025-04-17 15:44:34 +02:00
common: Use gpgrt functions for mkdir and chdir.
* common/sysutils.c (gnupg_mkdir): Divert to gpgrt_mkdir. (gnupg_chdir): Divert to gpgrt_chdir
This commit is contained in:
parent
5305ce17ff
commit
eec70e539e
@ -795,29 +795,9 @@ modestr_to_mode (const char *modestr)
|
|||||||
int
|
int
|
||||||
gnupg_mkdir (const char *name, const char *modestr)
|
gnupg_mkdir (const char *name, const char *modestr)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_W32CE_SYSTEM
|
/* Note that gpgrt_mkdir also sets ERRNO in addition to returing an
|
||||||
wchar_t *wname;
|
* gpg-error style error code. */
|
||||||
(void)modestr;
|
return gpgrt_mkdir (name, modestr);
|
||||||
|
|
||||||
wname = utf8_to_wchar (name);
|
|
||||||
if (!wname)
|
|
||||||
return -1;
|
|
||||||
if (!CreateDirectoryW (wname, NULL))
|
|
||||||
{
|
|
||||||
xfree (wname);
|
|
||||||
return -1; /* ERRNO is automagically provided by gpg-error.h. */
|
|
||||||
}
|
|
||||||
xfree (wname);
|
|
||||||
return 0;
|
|
||||||
#elif MKDIR_TAKES_ONE_ARG
|
|
||||||
(void)modestr;
|
|
||||||
/* Note: In the case of W32 we better use CreateDirectory and try to
|
|
||||||
set appropriate permissions. However using mkdir is easier
|
|
||||||
because this sets ERRNO. */
|
|
||||||
return mkdir (name);
|
|
||||||
#else
|
|
||||||
return mkdir (name, modestr_to_mode (modestr));
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -826,7 +806,9 @@ gnupg_mkdir (const char *name, const char *modestr)
|
|||||||
int
|
int
|
||||||
gnupg_chdir (const char *name)
|
gnupg_chdir (const char *name)
|
||||||
{
|
{
|
||||||
return chdir (name);
|
/* Note that gpgrt_chdir also sets ERRNO in addition to returing an
|
||||||
|
* gpg-error style error code. */
|
||||||
|
return gpgrt_chdir (name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user