Cleanup: remove most of the payload pointer magic from libfstree

Now that dir_info_t and file_info_t have reasonably small, use them in
tree_node_t directly instead of doing pointer arithmetic magic on the
payload area.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

1 files changed, 21 insertions, 52 deletions

diff --git a/lib/fstree/mknode.c b/lib/fstree/mknode.c
index 19df268..f90bd00 100644
--- a/lib/fstree/mknode.c
+++ b/lib/fstree/mknode.c
@@ -7,7 +7,6 @@
 #include "config.h"
 
 #include "fstree.h"
-#include "util.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -17,50 +16,26 @@ tree_node_t *fstree_mknode(tree_node_t *parent, const char *name,
 			   size_t name_len, const char *extra,
 			   const struct stat *sb)
 {
-	size_t size = sizeof(tree_node_t), total;
 	tree_node_t *n;
+	size_t size;
 	char *ptr;
 
-	switch (sb->st_mode & S_IFMT) {
-	case S_IFLNK:
-		if (extra == NULL) {
-			errno = EINVAL;
-			return NULL;
-		}
-		if (SZ_ADD_OV(size, strlen(extra), &size) ||
-		    SZ_ADD_OV(size, 1, &size)) {
-			goto fail_ov;
-		}
-		break;
-	case S_IFDIR:
-		if (SZ_ADD_OV(size, sizeof(*n->data.dir), &size))
-			goto fail_ov;
-		break;
-	case S_IFREG:
-		if (SZ_ADD_OV(size, sizeof(*n->data.file), &size))
-			goto fail_ov;
-
-		if (extra != NULL) {
-			if (SZ_ADD_OV(size, strlen(extra), &size) ||
-			    SZ_ADD_OV(size, 1, &size)) {
-				goto fail_ov;
-			}
-		}
-		break;
+	if (S_ISLNK(sb->st_mode) && extra == NULL) {
+		errno = EINVAL;
+		return NULL;
 	}
 
-	if (SZ_ADD_OV(size, name_len, &total) ||
-	    SZ_ADD_OV(total, 1, &total)) {
-		goto fail_ov;
-	}
+	size = sizeof(tree_node_t) + name_len + 1;
+	if (extra != NULL)
+		size += strlen(extra) + 1;
 
-	n = calloc(1, total);
+	n = calloc(1, size);
 	if (n == NULL)
 		return NULL;
 
 	if (parent != NULL) {
-		n->next = parent->data.dir->children;
-		parent->data.dir->children = n;
+		n->next = parent->data.dir.children;
+		parent->data.dir.children = n;
 		n->parent = parent;
 	}
 
@@ -68,24 +43,23 @@ tree_node_t *fstree_mknode(tree_node_t *parent, const char *name,
 	n->gid = sb->st_gid;
 	n->mode = sb->st_mode;
 	n->mod_time = sb->st_mtime;
+	n->name = (char *)n->payload;
+	memcpy(n->name, name, name_len);
+
+	if (extra != NULL) {
+		ptr = n->name + name_len + 1;
+		strcpy(ptr, extra);
+	} else {
+		ptr = NULL;
+	}
 
 	switch (sb->st_mode & S_IFMT) {
-	case S_IFDIR:
-		n->data.dir = (dir_info_t *)n->payload;
-		break;
 	case S_IFREG:
-		n->data.file = (file_info_t *)n->payload;
-		if (extra != NULL) {
-			ptr = (char *)n->payload + sizeof(file_info_t);
-			n->data.file->input_file = ptr;
-			strcpy(n->data.file->input_file, extra);
-		}
+		n->data.file.input_file = ptr;
 		break;
 	case S_IFLNK:
 		n->mode = S_IFLNK | 0777;
-		n->data.slink_target = (char *)n->payload;
-		if (extra != NULL)
-			strcpy(n->data.slink_target, extra);
+		n->data.slink_target = ptr;
 		break;
 	case S_IFBLK:
 	case S_IFCHR:
@@ -93,10 +67,5 @@ tree_node_t *fstree_mknode(tree_node_t *parent, const char *name,
 		break;
 	}
 
-	n->name = (char *)n + size;
-	memcpy(n->name, name, name_len);
 	return n;
-fail_ov:
-	errno = EOVERFLOW;
-	return NULL;
 }