- /* Load .volinfo file */
- if (loadvolinfo(argv[1], &volinfo) == -1) {
- LOG(log_error, logtype_cnid, "Cant load volinfo for \"%s\"", argv[1]);
- exit(EXIT_FAILURE);
- }
- /* Put "/.AppleDB" at end of volpath, get path from volinfo file */
- char dbpath[MAXPATHLEN+1];
- if ((strlen(volinfo.v_dbpath) + strlen("/.AppleDB")) > MAXPATHLEN ) {
- LOG(log_error, logtype_cnid, "CNID db pathname too long: \"%s\"", volinfo.v_dbpath);
- exit(EXIT_FAILURE);
- }
- strncpy(dbpath, volinfo.v_dbpath, MAXPATHLEN - strlen("/.AppleDB"));
- strcat(dbpath, "/.AppleDB");
+ EC_NULL( dbpath = bfromcstr(vol->v_dbpath) );
+ EC_ZERO( bcatcstr(dbpath, "/.AppleDB") );