FIX: ocat was using incorrect ghash storage

This commit is contained in:
Jan-Piet Mens
2015-09-01 16:01:37 +02:00
parent fb910babc4
commit 4ccf2ef2d4

View File

@@ -92,7 +92,7 @@ static int user_device_list(char *name, int level, JsonNode *obj)
void append_device_details(JsonNode *userlist, char *user, char *device)
{
char path[BUFSIZ], *ghash;
JsonNode *node, *last, *card, *geo;
JsonNode *node, *last, *card;
snprintf(path, BUFSIZ, "%s/last/%s/%s/%s-%s.json",
STORAGEDIR, user, device, user, device);
@@ -120,16 +120,10 @@ void append_device_details(JsonNode *userlist, char *user, char *device)
}
if ((node = json_find_member(last, "ghash")) != NULL) {
ghash = node->string_;
snprintf(path, BUFSIZ, "%s/ghash/%-3.3s/%s.json",
STORAGEDIR, ghash, ghash);
geo = json_mkobject();
if (json_copy_from_file(geo, path) == TRUE) {
json_copy_to_object(last, geo, FALSE);
} else {
json_delete(geo);
}
ghash = node->string_;
get_geo(last, ghash);
}