changeset: 6927:d215a36fd8ee user: Kevin McCarthy <ke...@8t8.us> date: Wed Feb 08 07:48:07 2017 -0800 link: http://dev.mutt.org/hg/mutt/rev/d215a36fd8ee
Fix build for bdb. Changeset fca7e504ab6a removed #else/#endif around two blocks of code that won't compile with bdb enabled. Restore those directives. Thanks to Richard Russon for pointing out the problem and saving me from having egg all over my face with the 1.8 release! diffs (33 lines): diff -r 09bb4a62ceb1 -r d215a36fd8ee hcache.c --- a/hcache.c Tue Feb 07 19:36:43 2017 -0800 +++ b/hcache.c Wed Feb 08 07:48:07 2017 -0800 @@ -841,12 +841,12 @@ h->db->get(h->db, NULL, &key, &data, 0); return data.data; -#endif - +#else strncpy(path, h->folder, sizeof (path)); safe_strcat(path, sizeof (path), filename); ksize = strlen (h->folder) + keylen (path + strlen (h->folder)); +#endif #ifdef HAVE_QDBM data = vlget(h->db, path, ksize, NULL); @@ -943,12 +943,12 @@ databuf.ulen = dlen; return h->db->put(h->db, NULL, &key, &databuf, 0); -#endif - +#else strncpy(path, h->folder, sizeof (path)); safe_strcat(path, sizeof (path), filename); ksize = strlen(h->folder) + keylen(path + strlen(h->folder)); +#endif #if HAVE_QDBM return vlput(h->db, path, ksize, data, dlen, VL_DOVER);
