X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=4daeb5a3bc35510a757ccf76f9e13bb3f8c12aab;hp=4981e95ef5a7b152d8a2f4d8b09f6c91c2adb4a0;hb=58821e4d5e593e4a828a1d79215e9480e9a6ca4f;hpb=baf330c1024cc324c631594ab1a56f30d240b9fa

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 4981e95..4daeb5a 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -1,4 +1,5 @@
 
+#include <assert.h>
 #include <string.h>
 #include <stdint.h>
 #include <asm/byteorder.h>
@@ -37,6 +38,25 @@
  *   4-byte len, id
  */
 
+/* Deep copy a boot_option.
+*/
+struct boot_option *boot_option_copy(void* ctx, const struct boot_option *opt)
+{
+	struct boot_option *new = talloc(ctx, struct boot_option);
+
+	if (new) {
+		new->id = talloc_strdup(new, opt->id);
+		new->name = talloc_strdup(new, opt->name);
+		new->description = talloc_strdup(new, opt->description);
+		new->icon_file = talloc_strdup(new, opt->icon_file);
+		new->boot_image_file = talloc_strdup(new, opt->boot_image_file);
+		new->initrd_file = talloc_strdup(new, opt->initrd_file);
+		new->boot_args = talloc_strdup(new, opt->boot_args);
+		memset(&new->list, 0, sizeof(new->list));
+	}
+
+	return new;
+}
 
 /* Write a string into the buffer, starting at pos.
  *
@@ -65,7 +85,8 @@ int pb_protocol_serialise_string(char *pos, const char *str)
  * @param[out] str	Pointer to resuling string
  * @return		zero on success, non-zero on failure
  */
-static int read_string(void *ctx, char **pos, int *len, char **str)
+static int read_string(void *ctx, const char **pos, unsigned int *len,
+	char **str)
 {
 	uint32_t str_len, read_len;
 
@@ -93,10 +114,11 @@ static int read_string(void *ctx, char **pos, int *len, char **str)
 }
 
 char *pb_protocol_deserialise_string(void *ctx,
-		struct pb_protocol_message *message)
+		const struct pb_protocol_message *message)
 {
-	char *buf, *str;
-	int len;
+	const char *buf;
+	char *str;
+	unsigned int len;
 
 	len = message->payload_len;
 	buf = message->payload;
@@ -114,7 +136,7 @@ static int optional_strlen(const char *str)
 	return strlen(str);
 }
 
-int pb_protocol_device_len(struct device *dev)
+int pb_protocol_device_len(const struct device *dev)
 {
 	struct boot_option *opt;
 	int len;
@@ -138,7 +160,7 @@ int pb_protocol_device_len(struct device *dev)
 	return len;
 }
 
-int pb_protocol_serialise_device(struct device *dev, char *buf, int buf_len)
+int pb_protocol_serialise_device(const struct device *dev, char *buf, int buf_len)
 {
 	struct boot_option *opt;
 	uint32_t n;
@@ -172,6 +194,8 @@ int pb_protocol_serialise_device(struct device *dev, char *buf, int buf_len)
 		pos += pb_protocol_serialise_string(pos, opt->boot_args);
 	}
 
+	assert(pos <= buf + buf_len);
+
 	return 0;
 }
 
@@ -221,7 +245,8 @@ struct pb_protocol_message *pb_protocol_create_message(void *ctx,
 struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd)
 {
 	struct pb_protocol_message *message, m;
-	int rc, len;
+	int rc;
+	unsigned int len;
 
 	/* use the stack for the initial 8-byte read */
 
@@ -254,11 +279,12 @@ struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd)
 
 
 struct device *pb_protocol_deserialise_device(void *ctx,
-		struct pb_protocol_message *message)
+		const struct pb_protocol_message *message)
 {
 	struct device *dev;
-	char *pos;
-	int i, n_options, len;
+	const char *pos;
+	int i, n_options;
+	unsigned int len;
 
 	len = message->payload_len;
 	pos = message->payload;