X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-info.c;h=745b4fdb7b9aad3f94194c7df4485896ec4bcae6;hp=402fa76e8d24476a4bfab7dff855075c2248d2d8;hb=50025605e0f9942da513c9dcfde289495afefd17;hpb=ecc9ec579feb4b7cc86bcf7caed3cb841faf3c9e

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index 402fa76e8..745b4fdb7 100644
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -15,8 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -32,22 +30,18 @@
 
 #include "udev.h"
 
-static void print_all_attributes(struct udev *udev, const char *devpath, const char *key)
+static void print_all_attributes(struct udev_device *device, const char *key)
 {
-	char path[PATH_SIZE];
+	struct udev *udev = udev_device_get_udev(device);
 	DIR *dir;
 	struct dirent *dent;
 
-	strlcpy(path, udev_get_sys_path(udev), sizeof(path));
-	strlcat(path, devpath, sizeof(path));
-
-	dir = opendir(path);
+	dir = opendir(udev_device_get_syspath(device));
 	if (dir != NULL) {
 		for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
 			struct stat statbuf;
-			char filename[PATH_SIZE];
-			char *attr_value;
-			char value[NAME_SIZE];
+			char filename[UTIL_PATH_SIZE];
+			const char *value;
 			size_t len;
 
 			if (dent->d_name[0] == '.')
@@ -58,43 +52,39 @@ static void print_all_attributes(struct udev *udev, const char *devpath, const c
 			if (strcmp(dent->d_name, "dev") == 0)
 				continue;
 
-			strlcpy(filename, path, sizeof(filename));
-			strlcat(filename, "/", sizeof(filename));
-			strlcat(filename, dent->d_name, sizeof(filename));
+			util_strlcpy(filename, udev_device_get_syspath(device), sizeof(filename));
+			util_strlcat(filename, "/", sizeof(filename));
+			util_strlcat(filename, dent->d_name, sizeof(filename));
 			if (lstat(filename, &statbuf) != 0)
 				continue;
 			if (S_ISLNK(statbuf.st_mode))
 				continue;
 
-			attr_value = sysfs_attr_get_value(udev, devpath, dent->d_name);
-			if (attr_value == NULL)
+			value = udev_device_get_sysattr_value(device, dent->d_name);
+			if (value == NULL)
 				continue;
-			len = strlcpy(value, attr_value, sizeof(value));
-			if(len >= sizeof(value))
-				len = sizeof(value) - 1;
 			dbg(udev, "attr '%s'='%s'(%zi)\n", dent->d_name, value, len);
 
 			/* skip nonprintable attributes */
-			while (len && isprint(value[len-1]))
+			len = strlen(value);
+			while (len > 0 && isprint(value[len-1]))
 				len--;
-			if (len) {
+			if (len > 0) {
 				dbg(udev, "attribute value of '%s' non-printable, skip\n", dent->d_name);
 				continue;
 			}
 
 			printf("    %s{%s}==\"%s\"\n", key, dent->d_name, value);
 		}
+		closedir(dir);
 	}
 	printf("\n");
 }
 
-static int print_device_chain(struct udev *udev, const char *devpath)
+static int print_device_chain(struct udev_device *device)
 {
-	struct sysfs_device *dev;
-
-	dev = sysfs_device_get(udev, devpath);
-	if (dev == NULL)
-		return -1;
+	struct udev_device *device_parent;
+	const char *str;
 
 	printf("\n"
 	       "Udevinfo starts with the device specified by the devpath and then\n"
@@ -104,111 +94,75 @@ static int print_device_chain(struct udev *udev, const char *devpath)
 	       "and the attributes from one single parent device.\n"
 	       "\n");
 
-	printf("  looking at device '%s':\n", dev->devpath);
-	printf("    KERNEL==\"%s\"\n", dev->kernel);
-	printf("    SUBSYSTEM==\"%s\"\n", dev->subsystem);
-	printf("    DRIVER==\"%s\"\n", dev->driver);
-	print_all_attributes(udev, dev->devpath, "ATTR");
-
-	/* walk up the chain of devices */
-	while (1) {
-		dev = sysfs_device_get_parent(udev, dev);
-		if (dev == NULL)
+	printf("  looking at device '%s':\n", udev_device_get_devpath(device));
+	printf("    KERNEL==\"%s\"\n", udev_device_get_sysname(device));
+	str = udev_device_get_subsystem(device);
+	if (str == NULL)
+		str = "";
+	printf("    SUBSYSTEM==\"%s\"\n", str);
+	str = udev_device_get_driver(device);
+	if (str == NULL)
+		str = "";
+	printf("    DRIVER==\"%s\"\n", str);
+	print_all_attributes(device, "ATTR");
+
+	device_parent = device;
+	do {
+		device_parent = udev_device_get_parent(device_parent);
+		if (device_parent == NULL)
 			break;
-		printf("  looking at parent device '%s':\n", dev->devpath);
-		printf("    KERNELS==\"%s\"\n", dev->kernel);
-		printf("    SUBSYSTEMS==\"%s\"\n", dev->subsystem);
-		printf("    DRIVERS==\"%s\"\n", dev->driver);
-
-		print_all_attributes(udev, dev->devpath, "ATTRS");
-	}
+		printf("  looking at parent device '%s':\n", udev_device_get_devpath(device_parent));
+		printf("    KERNELS==\"%s\"\n", udev_device_get_sysname(device_parent));
+		str = udev_device_get_subsystem(device_parent);
+		if (str == NULL)
+			str = "";
+		printf("    SUBSYSTEMS==\"%s\"\n", str);
+		str = udev_device_get_driver(device_parent);
+		if (str == NULL)
+			str = "";
+		printf("    DRIVERS==\"%s\"\n", str);
+		print_all_attributes(device_parent, "ATTRS");
+	} while (device_parent != NULL);
 
 	return 0;
 }
 
-static void print_record(struct udevice *udevice)
+static void print_record(struct udev_device *device)
 {
-	struct name_entry *name_loop;
-
-	printf("P: %s\n", udevice->dev->devpath);
-	printf("N: %s\n", udevice->name);
-	list_for_each_entry(name_loop, &udevice->symlink_list, node)
-		printf("S: %s\n", name_loop->name);
-	if (udevice->link_priority != 0)
-		printf("L: %i\n", udevice->link_priority);
-	if (udevice->partitions != 0)
-		printf("A:%u\n", udevice->partitions);
-	if (udevice->ignore_remove)
-		printf("R:%u\n", udevice->ignore_remove);
-	list_for_each_entry(name_loop, &udevice->env_list, node)
-		printf("E: %s\n", name_loop->name);
-}
+	size_t len;
+	const char *str;
+	int i;
+	struct udev_list_entry *list_entry;
 
-static void export_db(struct udev *udev)
-{
-	LIST_HEAD(name_list);
-	struct name_entry *name_loop;
-
-	udev_db_get_all_entries(udev, &name_list);
-	list_for_each_entry(name_loop, &name_list, node) {
-		struct udevice *udevice_db;
-
-		udevice_db = udev_device_init(udev);
-		if (udevice_db == NULL)
-			continue;
-		if (udev_db_get_device(udevice_db, name_loop->name) == 0)
-			print_record(udevice_db);
-			printf("\n");
-		udev_device_cleanup(udevice_db);
-	}
-	name_list_cleanup(udev, &name_list);
-}
+	printf("P: %s\n", udev_device_get_devpath(device));
 
-static int lookup_device_by_name(struct udev *udev, struct udevice **udevice, const char *name)
-{
-	LIST_HEAD(name_list);
-	int count;
-	struct name_entry *device;
-	int rc  = -1;
+	len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
+	str = udev_device_get_devnode(device);
+	if (str != NULL)
+		printf("N: %s\n", &str[len+1]);
 
-	count = udev_db_get_devices_by_name(udev, name, &name_list);
-	if (count <= 0)
-		goto out;
+	i = udev_device_get_devlink_priority(device);
+	if (i != 0)
+		printf("L: %i\n", i);
 
-	info(udev, "found %i devices for '%s'\n", count, name);
+	i = udev_device_get_num_fake_partitions(device);
+	if (i != 0)
+		printf("A:%u\n", i);
 
-	/* select the device that seems to match */
-	list_for_each_entry(device, &name_list, node) {
-		struct udevice *udevice_loop;
-		char filename[PATH_SIZE];
-		struct stat statbuf;
+	i = udev_device_get_ignore_remove(device);
+	if (i != 0)
+		printf("R:%u\n", i);
 
-		udevice_loop = udev_device_init(udev);
-		if (udevice_loop == NULL)
-			break;
-		if (udev_db_get_device(udevice_loop, device->name) != 0)
-			goto next;
-		info(udev, "found db entry '%s'\n", device->name);
-
-		/* make sure, we don't get a link of a different device */
-		strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
-		strlcat(filename, "/", sizeof(filename));
-		strlcat(filename, name, sizeof(filename));
-		if (stat(filename, &statbuf) != 0)
-			goto next;
-		if (major(udevice_loop->devt) > 0 && udevice_loop->devt != statbuf.st_rdev) {
-			info(udev, "skip '%s', dev_t doesn't match\n", udevice_loop->name);
-			goto next;
-		}
-		rc = 0;
-		*udevice = udevice_loop;
-		break;
-next:
-		udev_device_cleanup(udevice_loop);
+	udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(device)) {
+		len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
+		printf("S: %s\n", &udev_list_entry_get_name(list_entry)[len+1]);
 	}
-out:
-	name_list_cleanup(udev, &name_list);
-	return rc;
+
+	udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(device))
+		printf("E: %s=%s\n",
+		       udev_list_entry_get_name(list_entry),
+		       udev_list_entry_get_value(list_entry));
+	printf("\n");
 }
 
 static int stat_device(const char *name, int export, const char *prefix)
@@ -230,25 +184,52 @@ static int stat_device(const char *name, int export, const char *prefix)
 	return 0;
 }
 
+static int export_devices(struct udev *udev)
+{
+	struct udev_enumerate *udev_enumerate;
+	struct udev_list_entry *list_entry;
+
+	udev_enumerate = udev_enumerate_new(udev);
+	if (udev_enumerate == NULL)
+		return -1;
+	udev_enumerate_scan_devices(udev_enumerate);
+	udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(udev_enumerate)) {
+		struct udev_device *device;
+
+		device = udev_device_new_from_syspath(udev, udev_list_entry_get_name(list_entry));
+		if (device != NULL) {
+			if (udev_device_get_devnode(device) != NULL)
+				print_record(device);
+			udev_device_unref(device);
+		}
+	}
+	udev_enumerate_unref(udev_enumerate);
+	return 0;
+}
+
 int udevadm_info(struct udev *udev, int argc, char *argv[])
 {
-	struct udevice *udevice = NULL;
+	struct udev_device *device = NULL;
 	int root = 0;
 	int export = 0;
 	const char *export_prefix = NULL;
+	char path[UTIL_PATH_SIZE];
+	char name[UTIL_PATH_SIZE];
+	struct udev_list_entry *list_entry;
+	int rc = 0;
 
 	static const struct option options[] = {
-		{ "name", 1, NULL, 'n' },
-		{ "path", 1, NULL, 'p' },
-		{ "query", 1, NULL, 'q' },
-		{ "attribute-walk", 0, NULL, 'a' },
-		{ "export-db", 0, NULL, 'e' },
-		{ "root", 0, NULL, 'r' },
-		{ "device-id-of-file", 1, NULL, 'd' },
-		{ "export", 0, NULL, 'x' },
-		{ "export-prefix", 1, NULL, 'P' },
-		{ "version", 0, NULL, 1 }, /* -V outputs braindead format */
-		{ "help", 0, NULL, 'h' },
+		{ "name", required_argument, NULL, 'n' },
+		{ "path", required_argument, NULL, 'p' },
+		{ "query", required_argument, NULL, 'q' },
+		{ "attribute-walk", no_argument, NULL, 'a' },
+		{ "export-db", no_argument, NULL, 'e' },
+		{ "root", no_argument, NULL, 'r' },
+		{ "device-id-of-file", required_argument, NULL, 'd' },
+		{ "export", no_argument, NULL, 'x' },
+		{ "export-prefix", required_argument, NULL, 'P' },
+		{ "version", no_argument, NULL, 'V' },
+		{ "help", no_argument, NULL, 'h' },
 		{}
 	};
 
@@ -269,13 +250,9 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		QUERY_ALL,
 	} query = QUERY_NONE;
 
-	char path[PATH_SIZE] = "";
-	char name[PATH_SIZE] = "";
-	struct name_entry *name_loop;
-	int rc = 0;
-
 	while (1) {
 		int option;
+		struct stat statbuf;
 
 		option = getopt_long(argc, argv, "aed:n:p:q:rxPVh", options, NULL);
 		if (option == -1)
@@ -284,42 +261,64 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		dbg(udev, "option '%c'\n", option);
 		switch (option) {
 		case 'n':
+			if (device != NULL) {
+				fprintf(stderr, "device already specified\n");
+				rc = 2;
+				goto exit;
+			}
 			/* remove /dev if given */
-			if (strncmp(optarg, udev_get_dev_path(udev), strlen(udev_get_dev_path(udev))) == 0)
-				strlcpy(name, &optarg[strlen(udev_get_dev_path(udev))+1], sizeof(name));
-			else
-				strlcpy(name, optarg, sizeof(name));
+			if (strncmp(optarg, udev_get_dev_path(udev), strlen(udev_get_dev_path(udev))) != 0) {
+				util_strlcpy(name, udev_get_dev_path(udev), sizeof(name));
+				util_strlcat(name, "/", sizeof(name));
+				util_strlcat(name, optarg, sizeof(name));
+			} else {
+				util_strlcpy(name, optarg, sizeof(name));
+			}
 			util_remove_trailing_chars(name, '/');
-			dbg(udev, "name: %s\n", name);
+			if (stat(name, &statbuf) < 0) {
+				fprintf(stderr, "device node not found\n");
+				rc = 2;
+				goto exit;
+			} else {
+				char type;
+
+				if (S_ISBLK(statbuf.st_mode)) {
+					type = 'b';
+				} else if (S_ISCHR(statbuf.st_mode)) {
+					type = 'c';
+				} else {
+					fprintf(stderr, "device node has wrong file type\n");
+					rc = 2;
+					goto exit;
+				}
+				device = udev_device_new_from_devnum(udev, type, statbuf.st_rdev);
+				if (device == NULL) {
+					fprintf(stderr, "device node not found\n");
+					rc = 2;
+					goto exit;
+				}
+			}
 			break;
 		case 'p':
-			/* remove /sys if given */
-			if (strncmp(optarg, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) == 0)
-				strlcpy(path, &optarg[strlen(udev_get_sys_path(udev))], sizeof(path));
-			else
-				strlcpy(path, optarg, sizeof(path));
+			if (device != NULL) {
+				fprintf(stderr, "device already specified\n");
+				rc = 2;
+				goto exit;
+			}
+			/* add sys dir if needed */
+			if (strncmp(optarg, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0) {
+				util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
+				util_strlcat(path, optarg, sizeof(path));
+			} else {
+				util_strlcpy(path, optarg, sizeof(path));
+			}
 			util_remove_trailing_chars(path, '/');
-
-			/* possibly resolve to real devpath */
-			if (sysfs_resolve_link(udev, path, sizeof(path)) != 0) {
-				char temp[PATH_SIZE];
-				char *pos;
-
-				/* also check if the parent is a link */
-				strlcpy(temp, path, sizeof(temp));
-				pos = strrchr(temp, '/');
-				if (pos != 0) {
-					char tail[PATH_SIZE];
-
-					strlcpy(tail, pos, sizeof(tail));
-					pos[0] = '\0';
-					if (sysfs_resolve_link(udev, temp, sizeof(temp)) == 0) {
-						strlcpy(path, temp, sizeof(path));
-						strlcat(path, tail, sizeof(path));
-					}
-				}
+			device = udev_device_new_from_syspath(udev, path);
+			if (device == NULL) {
+				fprintf(stderr, "device path not found\n");
+				rc = 2;
+				goto exit;
 			}
-			dbg(udev, "path: %s\n", path);
 			break;
 		case 'q':
 			action = ACTION_QUERY;
@@ -344,7 +343,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 				break;
 			}
 			fprintf(stderr, "unknown query type\n");
-			rc = 2;
+			rc = 3;
 			goto exit;
 		case 'r':
 			if (action == ACTION_NONE)
@@ -353,13 +352,13 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 			break;
 		case 'd':
 			action = ACTION_DEVICE_ID_FILE;
-			strlcpy(name, optarg, sizeof(name));
+			util_strlcpy(name, optarg, sizeof(name));
 			break;
 		case 'a':
 			action = ACTION_ATTRIBUTE_WALK;
 			break;
 		case 'e':
-			export_db(udev);
+			export_devices(udev);
 			goto exit;
 		case 'x':
 			export = 1;
@@ -367,26 +366,23 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		case 'P':
 			export_prefix = optarg;
 			break;
-		case 1:
-			printf("%s\n", VERSION);
-			goto exit;
 		case 'V':
-			printf("udevinfo, version %s\n", VERSION);
+			printf("%s\n", VERSION);
 			goto exit;
 		case 'h':
 			printf("Usage: udevadm info OPTIONS\n"
-			       "  --query=<type>             query database for the specified value:\n"
+			       "  --query=<type>             query device information:\n"
 			       "      name                     name of device node\n"
 			       "      symlink                  pointing to node\n"
-			       "      path                     sysfs device path\n"
+			       "      path                     sys device path\n"
 			       "      env                      the device related imported environment\n"
 			       "      all                      all values\n"
-			       "  --path=<devpath>           sysfs device path used for query or chain\n"
-			       "  --name=<name>              node or symlink name used for query\n"
-			       "  --root                     prepend to query result or print udev_root\n"
-			       "  --attribute-walk           print all key matches while walking along chain\n"
+			       "  --path=<syspath>           sys device path used for query or attribute walk\n"
+			       "  --name=<name>              node or symlink name used for query or attribute walk\n"
+			       "  --root                     prepend dev directory to path names\n"
+			       "  --attribute-walk           print all key matches while walking along the chain\n"
 			       "                             of parent devices\n"
-			       "  --device-id-of-file=<file> print major/minor of underlying device\n"
+			       "  --device-id-of-file=<file> print major:minor of device containing this file\n"
 			       "  --export-db                export the content of the udev database\n"
 			       "  --help                     print this text\n"
 			       "\n");
@@ -396,59 +392,61 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		}
 	}
 
-	/* run action */
 	switch (action) {
 	case ACTION_QUERY:
-		/* needs devpath or node/symlink name for query */
-		if (path[0] != '\0') {
-			udevice = udev_device_init(udev);
-			if (udevice == NULL) {
-				rc = 1;
-				goto exit;
-			}
-			if (udev_db_get_device(udevice, path) != 0) {
-				fprintf(stderr, "no record for '%s' in database\n", path);
-				rc = 3;
-				goto exit;
-			}
-		} else if (name[0] != '\0') {
-			if (lookup_device_by_name(udev, &udevice, name) != 0) {
-				fprintf(stderr, "node name not found\n");
-				rc = 4;
-				goto exit;
-			}
-		} else {
-			fprintf(stderr, "query needs --path or node --name specified\n");
+		if (device == NULL) {
+			fprintf(stderr, "query needs a valid device specified by --path= or --name=\n");
 			rc = 4;
 			goto exit;
 		}
 
 		switch(query) {
 		case QUERY_NAME:
-			if (root)
-				printf("%s/%s\n", udev_get_dev_path(udev), udevice->name);
-			else
-				printf("%s\n", udevice->name);
+			if (root) {
+				printf("%s\n", udev_device_get_devnode(device));
+			} else {
+				size_t len;
+				const char *node;
+
+				len = strlen(udev_get_dev_path(udev));
+				node = udev_device_get_devnode(device);
+				if (node == NULL) {
+					fprintf(stderr, "no device node found\n");
+					rc = 5;
+					goto exit;
+				}
+					printf("%s\n", &udev_device_get_devnode(device)[len+1]);
+			}
 			break;
 		case QUERY_SYMLINK:
-			list_for_each_entry(name_loop, &udevice->symlink_list, node) {
-				char c = name_loop->node.next != &udevice->symlink_list ? ' ' : '\n';
-
-				if (root)
-					printf("%s/%s%c", udev_get_dev_path(udev), name_loop->name, c);
-				else
-					printf("%s%c", name_loop->name, c);
+			list_entry = udev_device_get_devlinks_list_entry(device);
+			while (list_entry != NULL) {
+				if (root) {
+					printf("%s", udev_list_entry_get_name(list_entry));
+				} else {
+					size_t len;
+
+					len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
+					printf("%s", &udev_list_entry_get_name(list_entry)[len+1]);
+				}
+				list_entry = udev_list_entry_get_next(list_entry);
+				if (list_entry != NULL)
+					printf(" ");
 			}
+			printf("\n");
 			break;
 		case QUERY_PATH:
-			printf("%s\n", udevice->dev->devpath);
+			printf("%s\n", udev_device_get_devpath(device));
 			goto exit;
 		case QUERY_ENV:
-			list_for_each_entry(name_loop, &udevice->env_list, node)
-				printf("%s\n", name_loop->name);
+			list_entry = udev_device_get_properties_list_entry(device);
+			while (list_entry != NULL) {
+				printf("%s=%s\n", udev_list_entry_get_name(list_entry), udev_list_entry_get_value(list_entry));
+				list_entry = udev_list_entry_get_next(list_entry);
+			}
 			break;
 		case QUERY_ALL:
-			print_record(udevice);
+			print_record(device);
 			break;
 		default:
 			fprintf(stderr, "unknown query type\n");
@@ -456,32 +454,16 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		}
 		break;
 	case ACTION_ATTRIBUTE_WALK:
-		if (path[0] != '\0') {
-			if (print_device_chain(udev, path) != 0) {
-				fprintf(stderr, "no valid sysfs device found\n");
-				rc = 4;
-				goto exit;
-			}
-		} else if (name[0] != '\0') {
-			if (lookup_device_by_name(udev, &udevice, name) != 0) {
-				fprintf(stderr, "node name not found\n");
-				rc = 4;
-				goto exit;
-			}
-			if (print_device_chain(udev, udevice->dev->devpath) != 0) {
-				fprintf(stderr, "no valid sysfs device found\n");
-				rc = 4;
-				goto exit;
-			}
-		} else {
-			fprintf(stderr, "attribute walk needs --path or node --name specified\n");
-			rc = 5;
+		if (device == NULL) {
+			fprintf(stderr, "query needs a valid device specified by --path= or --name=\n");
+			rc = 4;
 			goto exit;
 		}
+		print_device_chain(device);
 		break;
 	case ACTION_DEVICE_ID_FILE:
 		if (stat_device(name, export, export_prefix) != 0)
-			rc = 6;
+			rc = 1;
 		break;
 	case ACTION_ROOT:
 		printf("%s\n", udev_get_dev_path(udev));
@@ -493,6 +475,6 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 	}
 
 exit:
-	udev_device_cleanup(udevice);
+	udev_device_unref(device);
 	return rc;
 }