X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_nameval.c;h=8d0fa4e565ed11f6157ac91f165ba3da30a710be;hp=88ee25bfd6c87d8c0ea4324abcdc529955bae7f8;hb=6500cebaa2c93512d544719956af259ca13f83b7;hpb=4a96d43bb566f00596a31a41c535cabbf52d4f20

diff --git a/yaffs_nameval.c b/yaffs_nameval.c
index 88ee25b..8d0fa4e 100644
--- a/yaffs_nameval.c
+++ b/yaffs_nameval.c
@@ -12,114 +12,134 @@
  */
 
 /*
- * This simple implementation of a name-value store assumes a small number of values and fits
- * into a small finite buffer.
+ * This simple implementation of a name-value store assumes a small number of
+* values and fits into a small finite buffer.
  *
  * Each attribute is stored as a record:
  *  sizeof(int) bytes   record size.
  *  strnlen+1 bytes name null terminated.
  *  nbytes    value.
  *  ----------
- *  total size  stored in record size 
+ *  total size  stored in record size
+ *
+ * This code has not been tested with unicode yet.
  */
 
-
 #include "yaffs_nameval.h"
 
 #include "yportenv.h"
- 
-static int nval_find(const char *xb, int xb_size, const char *name)
+
+static int nval_find(const char *xb, int xb_size, const YCHAR *name,
+		     int *exist_size)
 {
-	int pos=0;
+	int pos = 0;
 	int size;
 
-	memcpy(&size,xb,sizeof(int));
-	while(size > 0 && (size < xb_size) && (pos + size < xb_size)){
-		if(strncmp(xb+pos+sizeof(int),name,size) == 0)
+	memcpy(&size, xb, sizeof(int));
+	while (size > 0 && (size < xb_size) && (pos + size < xb_size)) {
+		if (!strncmp((YCHAR *) (xb + pos + sizeof(int)), name, size)) {
+			if (exist_size)
+				*exist_size = size;
 			return pos;
+		}
 		pos += size;
-		if(pos < xb_size -sizeof(int))
-			memcpy(&size,xb + pos,sizeof(int));
+		if (pos < xb_size - sizeof(int))
+			memcpy(&size, xb + pos, sizeof(int));
 		else
 			size = 0;
 	}
+	if (exist_size)
+		*exist_size = 0;
 	return -1;
 }
 
 static int nval_used(const char *xb, int xb_size)
 {
-	int pos=0;
+	int pos = 0;
 	int size;
 
-	memcpy(&size,xb + pos,sizeof(int));
-	while(size > 0 && (size < xb_size) && (pos + size < xb_size)){
+	memcpy(&size, xb + pos, sizeof(int));
+	while (size > 0 && (size < xb_size) && (pos + size < xb_size)) {
 		pos += size;
-		if(pos < xb_size -sizeof(int))
-			memcpy(&size,xb + pos,sizeof(int));
+		if (pos < xb_size - sizeof(int))
+			memcpy(&size, xb + pos, sizeof(int));
 		else
 			size = 0;
 	}
 	return pos;
 }
 
-int nval_del(char *xb, int xb_size, const char *name)
+int nval_del(char *xb, int xb_size, const YCHAR *name)
 {
-	int pos  = nval_find(xb, xb_size, name);
+	int pos = nval_find(xb, xb_size, name, NULL);
 	int size;
-	
-	if(pos >= 0 && pos < xb_size){
-		/* Find size, shift rest over this record, then zero out the rest of buffer */
-		memcpy(&size,xb+pos,sizeof(int));
+
+	if (pos >= 0 && pos < xb_size) {
+		/* Find size, shift rest over this record,
+		 * then zero out the rest of buffer */
+		memcpy(&size, xb + pos, sizeof(int));
 		memcpy(xb + pos, xb + pos + size, xb_size - (pos + size));
-		memset(xb + (xb_size - size),0,size);
+		memset(xb + (xb_size - size), 0, size);
 		return 0;
-	} else
-		return -ENOENT;
+	} else {
+		return -ENODATA;
+	}
 }
 
-int nval_set(char *xb, int xb_size, const char *name, const char *buf, int bsize, int flags)
+int nval_set(char *xb, int xb_size, const YCHAR *name, const char *buf,
+		int bsize, int flags)
 {
-	int pos = nval_find(xb,xb_size,name);
-	int namelen = strnlen(name,xb_size);
+	int pos;
+	int namelen = strnlen(name, xb_size);
 	int reclen;
+	int size_exist = 0;
+	int space;
+	int start;
+
+	pos = nval_find(xb, xb_size, name, &size_exist);
 
-	if(flags & NVAL_CREATE && pos >= 0)
+	if (flags & XATTR_CREATE && pos >= 0)
 		return -EEXIST;
-	if(flags & NVAL_REPLACE && pos < 0)
-		return -ENOENT;
-
-	nval_del(xb,xb_size,name);
-
-	pos = nval_used(xb, xb_size);
-	
-	if(pos < xb_size && bsize < xb_size && namelen < xb_size){
-		reclen = (sizeof(int) + namelen + 1 + bsize);
-		if( pos + reclen < xb_size){
-			memcpy(xb + pos,&reclen,sizeof(int));
-			pos +=sizeof(int);
-			strncpy(xb + pos, name, reclen);
-			pos+= (namelen+1);
-			memcpy(xb + pos,buf,bsize);
-			pos+= bsize;
-			return 0;
-		}
+	if (flags & XATTR_REPLACE && pos < 0)
+		return -ENODATA;
+
+	start = nval_used(xb, xb_size);
+	space = xb_size - start + size_exist;
+
+	reclen = (sizeof(int) + namelen + 1 + bsize);
+
+	if (reclen > space)
+		return -ENOSPC;
+
+	if (pos >= 0) {
+		nval_del(xb, xb_size, name);
+		start = nval_used(xb, xb_size);
 	}
-	return -ENOSPC;
+
+	pos = start;
+
+	memcpy(xb + pos, &reclen, sizeof(int));
+	pos += sizeof(int);
+	strncpy((YCHAR *) (xb + pos), name, reclen);
+	pos += (namelen + 1);
+	memcpy(xb + pos, buf, bsize);
+	return 0;
 }
 
-int nval_get(const char *xb, int xb_size, const char *name, char *buf, int bsize)
+int nval_get(const char *xb, int xb_size, const YCHAR * name, char *buf,
+	     int bsize)
 {
-	int pos = nval_find(xb,xb_size,name);
+	int pos = nval_find(xb, xb_size, name, NULL);
 	int size;
-	
-	if(pos >= 0 && pos< xb_size){
-		
-		memcpy(&size,xb +pos,sizeof(int));
-		pos+=sizeof(int); /* advance past record length */
+
+	if (pos >= 0 && pos < xb_size) {
+
+		memcpy(&size, xb + pos, sizeof(int));
+		pos += sizeof(int);	/* advance past record length */
 		size -= sizeof(int);
 
 		/* Advance over name string */
-		while(xb[pos] && size > 0 && pos < xb_size){
+		while (xb[pos] && size > 0 && pos < xb_size) {
 			pos++;
 			size--;
 		}
@@ -127,13 +147,15 @@ int nval_get(const char *xb, int xb_size, const char *name, char *buf, int bsize
 		pos++;
 		size--;
 
-		if(size <= bsize){
-			memcpy(buf,xb + pos,size);
+		if (size <= bsize) {
+			memcpy(buf, xb + pos, size);
 			return size;
 		}
-		
 	}
-	return -ENOENT;
+	if (pos >= 0)
+		return -ERANGE;
+
+	return -ENODATA;
 }
 
 int nval_list(const char *xb, int xb_size, char *buf, int bsize)
@@ -144,53 +166,37 @@ int nval_list(const char *xb, int xb_size, char *buf, int bsize)
 	int ncopied = 0;
 	int filled = 0;
 
-	memcpy(&size,xb + pos,sizeof(int));
-	while(size > sizeof(int) && size <= xb_size && (pos + size) < xb_size && !filled){
-		pos+= sizeof(int);
-		size-=sizeof(int);
-		name_len = strnlen(xb + pos, size);
-		if(ncopied + name_len + 1 < bsize){
-			memcpy(buf,xb+pos,name_len);
-			buf+= name_len;
+	memcpy(&size, xb + pos, sizeof(int));
+	while (size > sizeof(int) &&
+		size <= xb_size &&
+		(pos + size) < xb_size &&
+		!filled) {
+		pos += sizeof(int);
+		size -= sizeof(int);
+		name_len = strnlen((YCHAR *) (xb + pos), size);
+		if (ncopied + name_len + 1 < bsize) {
+			memcpy(buf, xb + pos, name_len * sizeof(YCHAR));
+			buf += name_len;
 			*buf = '\0';
 			buf++;
-			ncopied += (name_len+1);
-		} else
+			if (sizeof(YCHAR) > 1) {
+				*buf = '\0';
+				buf++;
+			}
+			ncopied += (name_len + 1);
+		} else {
 			filled = 1;
-		pos+=size;
-		if(pos < xb_size -sizeof(int))
-			memcpy(&size,xb + pos,sizeof(int));
+		}
+		pos += size;
+		if (pos < xb_size - sizeof(int))
+			memcpy(&size, xb + pos, sizeof(int));
 		else
 			size = 0;
 	}
 	return ncopied;
 }
 
-int nval_load(char *xb, int xb_size, const char *src, int src_size)
-{
-	int tx_size;
-	int used;
-	
-	tx_size = xb_size;
-	if(tx_size > src_size)
-		tx_size = src_size;
-
-	memcpy(xb,src,tx_size);
-	used = nval_used(xb, xb_size);
-	
-	if( used < xb_size)
-		memset(xb+ used, 0, xb_size - used);
-	return used;	
-}
-
-int nval_save(const char *xb, int xb_size, char *dest, int dest_size)
+int nval_hasvalues(const char *xb, int xb_size)
 {
-	int tx_size;
-	
-	tx_size = xb_size;
-	if(tx_size > dest_size)
-		tx_size = dest_size;
-
-	memcpy(dest,xb,tx_size);
-	return tx_size;
+	return nval_used(xb, xb_size) > 0;
 }