exa/codecrypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

keyring: small clarifications

Browse source
This commit is contained in:
Mirek Kratochvil 2013-04-20 09:57:18 +02:00
parent 19f00a49dd
commit 9731e41beb
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/keyring.cpp
View file

@ -284,20 +284,21 @@ static bool ensure_empty_sencode_file (const std::string&fn)
static bool prepare_user_dir (const std::string&dir) static bool prepare_user_dir (const std::string&dir)
{ {
//try to create the directory //try to create the directory, continue if it's already there
mkdir (dir.c_str(), 0777); if (mkdir (dir.c_str(), 0777) ) {
if (errno != EEXIST) return false;
}
//and no matter what, verify it's there //and no matter what, verify it's there
struct stat st; struct stat st;
if (stat (dir.c_str(), &st) ) if (stat (dir.c_str(), &st) )
return false; return false;
//and is really a directory.
if (!S_ISDIR (st.st_mode) ) if (!S_ISDIR (st.st_mode) )
return false; return false;
//create empty key storages, if not present //finally create empty key storages, if not present
std::string fn;
return ensure_empty_sencode_file (dir + PUBKEYS_FILENAME) && return ensure_empty_sencode_file (dir + PUBKEYS_FILENAME) &&
ensure_empty_sencode_file (dir + SECRETS_FILENAME); ensure_empty_sencode_file (dir + SECRETS_FILENAME);
} }
@ -321,6 +322,7 @@ static bool file_get_sencode (const std::string&fn, sencode**out)
in.read (&data[0], st.st_size); in.read (&data[0], st.st_size);
in.close(); in.close();
//and decode it
if (!sencode_decode (data, out) ) if (!sencode_decode (data, out) )
return false; return false;