/*
- * $Id: cnid_cdb_add.c,v 1.4 2008-12-03 18:35:44 didg Exp $
+ * $Id: cnid_cdb_add.c,v 1.8 2009-11-20 17:22:11 didg Exp $
*
* Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
* All Rights Reserved. See COPYRIGHT.
buf[CNID_DEV_LEN + CNID_INO_LEN - 8] = ino;
}
-unsigned char *make_cnid_data(const struct stat *st,const cnid_t did,
+unsigned char *make_cnid_data(u_int32_t flags, const struct stat *st, const cnid_t did,
const char *name, const size_t len)
{
static unsigned char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
if (len > MAXPATHLEN)
return NULL;
- make_devino_data(buf, st->st_dev, st->st_ino);
+ make_devino_data(buf, !(flags & CNID_FLAG_NODEV)?st->st_dev:0, st->st_ino);
buf += CNID_DEVINO_LEN;
i = S_ISDIR(st->st_mode)?1:0;
}
/* --------------- */
-int db_stamp(void *buffer, size_t size)
+static int db_stamp(void *buffer, size_t size)
{
time_t t;
memset(buffer, 0, size);
/* ... Return id if it is valid, or if Rootinfo is read-only. */
if (id || (db->flags & CNIDFLAG_DB_RO)) {
#ifdef DEBUG
- LOG(log_info, logtype_default, "cnid_add: Looked up did %u, name %s as %u", ntohl(did), name, ntohl(id));
+ LOG(log_debug9, logtype_default, "cnid_add: Looked up did %u, name %s as %u", ntohl(did), name, ntohl(id));
#endif
return id;
}
memset(&key, 0, sizeof(key));
memset(&data, 0, sizeof(data));
- if ((data.data = make_cnid_data(st, did, name, len)) == NULL) {
+ if ((data.data = make_cnid_data(cdb->flags, st, did, name, len)) == NULL) {
LOG(log_error, logtype_default, "cnid_add: Path name is too long");
errno = CNID_ERR_PATH;
return CNID_INVALID;
}
#ifdef DEBUG
- LOG(log_info, logtype_default, "cnid_add: Returned CNID for did %u, name %s as %u", ntohl(did), name, ntohl(hint));
+ LOG(log_debug9, logtype_default, "cnid_add: Returned CNID for did %u, name %s as %u", ntohl(did), name, ntohl(hint));
#endif
return hint;
memcpy(buffer, (char*)data.data + CNID_DEV_OFS, len);
#ifdef DEBUG
- LOG(log_info, logtype_cnid, "cnid_getstamp: Returning stamp");
+ LOG(log_debug9, logtype_cnid, "cnid_getstamp: Returning stamp");
#endif
return 0;
}