force correct construction of filenames for manifests and data files

(strbuf_* not working for these right now).
This commit is contained in:
gardners 2012-05-21 22:31:35 +09:30
parent f96ba5be18
commit 322806a150
2 changed files with 6 additions and 1 deletions

View File

@ -43,6 +43,11 @@ int rhizome_bundle_import(rhizome_manifest *m_in, rhizome_manifest **m_out, cons
WHYF("filename='%s'",filename);
WHYF("manifestname='%s'",manifestname);
snprintf(filename,1024,"%s/import/file.%s",rhizome_datastore_path(),bundle);
snprintf(manifestname,1024,"%s/import/manifest.%s",rhizome_datastore_path(),bundle);
WHYF("PGS filename='%s'",filename);
WHYF("PGS manifestname='%s'",manifestname);
/* Read manifest file if no manifest was given */
rhizome_manifest *m = m_in;
if (!m_in) {

View File

@ -58,7 +58,7 @@ int rhizome_set_datastore_path(const char *path)
int form_rhizome_datastore_path(char * buf, size_t bufsiz, const char *fmt, ...)
{
strbuf b = strbuf_local(buf, bufsiz);
strbuf_sprintf(b, "%s/", rhizome_datastore_path());
strbuf_sprintf(b, "%s/", rhizome_datastore_path());
va_list ap;
va_start(ap, fmt);
va_list ap2;