Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

client: not an error if a file starts with account_ but is not account file 

For example, if you rename account_X.xml to account_X.xml.bak,
if should not be reported as an error.
Same for statistics files.
This commit is contained in:
David Anderson 2018-02-28 16:16:52 -08:00
parent 4d3a787498
commit 66127de897
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client/file_names.cpp
View File

@ -267,13 +267,8 @@ void get_account_filename(char* master_url, char* path, int len) {
snprintf(path, len, "account_%s.xml", buf);
}
static bool bad_account_filename(const char* filename) {
msg_printf(NULL, MSG_INTERNAL_ERROR, "Invalid account filename: %s", filename);
return false;
}
// account filenames are of the form
// account_URL.xml
// Is this an account file?
// Account filenames are of the form account_URL.xml
// where URL is master URL with slashes replaced by underscores
//
bool is_account_file(const char* filename) {
@ -283,11 +278,11 @@ bool is_account_file(const char* filename) {
q = filename + strlen("account_");
p = strstr(q, ".xml");
if (!p) return bad_account_filename(filename);
if (p == q) return bad_account_filename(filename);
if (!p) return false;
if (p == q) return false;
q = p + strlen(".xml");
if (strlen(q)) return bad_account_filename(filename);
if (strlen(q)) return false;
return true;
}
@ -302,16 +297,16 @@ bool is_statistics_file(const char* filename) {
q = filename + strlen("statistics_");
p = strstr(q, ".");
if (!p) return bad_account_filename(filename);
if (p == q) return bad_account_filename(filename);
if (!p) return false;
if (p == q) return false;
q = p+1;
p = strstr(q, ".xml");
if (!p) return bad_account_filename(filename);
if (p == q) return bad_account_filename(filename);
if (!p) return false;
if (p == q) return false;
q = p + strlen(".xml");
if (strlen(q)) return bad_account_filename(filename);
if (strlen(q)) return false;
return true;
}