From 3b00110c49e5af372386f9a871867de35c6e8457 Mon Sep 17 00:00:00 2001 From: Andrew Bettison Date: Thu, 24 May 2012 13:00:31 +0930 Subject: [PATCH] Fix bug in rhizome_bundle_import() Introduced by recent rhizome import path improvements --- rhizome.c | 7 +++++-- rhizome_fetch.c | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rhizome.c b/rhizome.c index 7028e8f7..3b039d23 100644 --- a/rhizome.c +++ b/rhizome.c @@ -33,13 +33,16 @@ int rhizome_bundle_import(rhizome_manifest *m_in, rhizome_manifest **m_out, char *groups[], int ttl, int verifyP, int checkFileP, int signP) { + if (debug&DEBUG_RHIZOMESYNC) + DEBUGF("rhizome_bundle_import(m_in=%p, m_out=%p, bundle=%s, groups=%p, ttl=%d, verifyP=%d, checkFileP=%d, signP=%d)", + m_in, m_out, bundle ? bundle : "(null)", groups, ttl, verifyP, checkFileP, signP); if (m_out) *m_out = NULL; char filename[1024]; char manifestname[1024]; /* make sure import path exists */ - if (!create_rhizome_import_dir()) + if (create_rhizome_import_dir() == -1) return -1; if (!FORM_RHIZOME_IMPORT_PATH(filename, "file.%s", bundle) @@ -54,7 +57,7 @@ int rhizome_bundle_import(rhizome_manifest *m_in, rhizome_manifest **m_out, return WHY("Could not read manifest file."); } else { if (debug&DEBUG_RHIZOMESYNC) - WHYF("Importing direct from manifest structure fileHashedP=%d", m->fileHashedP); + DEBUGF("Importing direct from manifest structure fileHashedP=%d", m->fileHashedP); } /* Add the manifest and its associated file to the Rhizome database. */ diff --git a/rhizome_fetch.c b/rhizome_fetch.c index 36aacdd7..73c7d44d 100644 --- a/rhizome_fetch.c +++ b/rhizome_fetch.c @@ -806,7 +806,7 @@ int rhizome_fetch_poll() } q->manifest->finalised=1; q->manifest->manifest_bytes=q->manifest->manifest_all_bytes; - if (!rhizome_write_manifest_file(q->manifest,filename)) { + if (rhizome_write_manifest_file(q->manifest,filename) != -1) { rhizome_bundle_import(q->manifest, NULL, id, NULL /* no additional groups */, q->manifest->ttl - 1 /* TTL */, @@ -815,7 +815,6 @@ int rhizome_fetch_poll() 0 /* do not sign it, just keep existing signatures */); q->manifest=NULL; } else { - WHY("rhizome_write_manifest_file() failed"); rhizome_manifest_free(q->manifest); q->manifest=NULL; }