Port name string length now no longer needs to be passed around.

[libserialport.git] / serialport.c

diff --git a/serialport.c b/serialport.c
index e8de069fb9d1d34d344bf943f86b70aba016dc70..3c81f9ef097af937f250f2a5ef7a23789493327f 100644 (file)
--- a/serialport.c
+++ b/serialport.c
@@ -45,25 +45,37 @@
 
 #include "serialport.h"
 
-static char **sp_list_new(void)
+static struct sp_port *sp_port_new(const char *portname)
 {
-       char **list;
-       if ((list = malloc(sizeof(char *))))
-               list[0] = NULL;
-       return list;
+       struct sp_port *port;
+       int len;
+
+       if (!(port = malloc(sizeof(struct sp_port))))
+               return NULL;
+
+       len = strlen(portname) + 1;
+
+       if (!(port->name = malloc(len)))
+       {
+               free(port);
+               return NULL;
+       }
+
+       memcpy(port->name, portname, len);
+
+       return port;
 }
 
-static char **sp_list_append(char **list, void *data, size_t len)
+static struct sp_port **sp_list_append(struct sp_port **list, const char *portname)
 {
        void *tmp;
        unsigned int count;
        for (count = 0; list[count]; count++);
-       if (!(tmp = realloc(list, sizeof(char *) * (count + 2))))
+       if (!(tmp = realloc(list, sizeof(struct sp_port *) * (count + 2))))
                goto fail;
        list = tmp;
-       if (!(list[count] = malloc(len)))
+       if (!(list[count] = sp_port_new(portname)))
                goto fail;
-       memcpy(list[count], data, len);
        list[count + 1] = NULL;
        return list;
 fail:
@@ -76,9 +88,14 @@ fail:
  *
  * @return A null-terminated array of port name strings.
  */
-char **sp_list_ports(void)
+struct sp_port **sp_list_ports(void)
 {
-       char **list = NULL;
+       struct sp_port **list;
+
+       if (!(list = malloc(sizeof(struct sp_port **))))
+               return NULL;
+
+       list[0] = NULL;
 
 #ifdef _WIN32
        HKEY key;
@@ -86,6 +103,8 @@ char **sp_list_ports(void)
        DWORD max_value_len, max_data_size, max_data_len;
        DWORD value_len, data_size, data_len;
        DWORD type, index = 0;
+       char *name;
+       int name_len;
 
        if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("HARDWARE\\DEVICEMAP\\SERIALCOMM"),
                        0, KEY_QUERY_VALUE, &key) != ERROR_SUCCESS)
@@ -98,8 +117,6 @@ char **sp_list_ports(void)
                goto out_close;
        if (!(data = malloc((max_data_len + 1) * sizeof(TCHAR))))
                goto out_free_value;
-       if (!(list = sp_list_new()))
-               goto out;
        while (
                value_len = max_value_len,
                data_size = max_data_size,
@@ -108,9 +125,20 @@ char **sp_list_ports(void)
        {
                data_len = data_size / sizeof(TCHAR);
                data[data_len] = '\0';
+#ifdef UNICODE
+               name_len = WideCharToMultiByte(CP_ACP, 0, data, -1, NULL, 0, NULL, NULL)
+#else
+               name_len = data_len + 1;
+#endif
+               if (!(name = malloc(name_len)))
+                       goto out;
+#ifdef UNICODE
+               WideCharToMultiByte(CP_ACP, 0, data, -1, name, name_len, NULL, NULL);
+#else
+               strcpy(name, data);
+#endif
                if (type == REG_SZ)
-                       if (!(list = sp_list_append(list,
-                                       data, (data_len + 1) * sizeof(TCHAR))))
+                       if (!(list = sp_list_append(list, name)))
                                goto out;
                index++;
        }
@@ -146,9 +174,6 @@ out_close:
        if (!(path = malloc(PATH_MAX)))
                goto out_release;
 
-       if (!(list = sp_list_new()))
-               goto out;
-
        while ((port = IOIteratorNext(iter))) {
                cf_path = IORegistryEntryCreateCFProperty(port,
                                CFSTR(kIOCalloutDeviceKey), kCFAllocatorDefault, 0);
@@ -157,7 +182,7 @@ out_close:
                                        path, PATH_MAX, kCFStringEncodingASCII);
                        CFRelease(cf_path);
                        if (result)
-                               if (!(list = sp_list_append(list, path, strlen(path) + 1)))
+                               if (!(list = sp_list_append(list, path)))
                                {
                                        IOObjectRelease(port);
                                        goto out;
@@ -189,8 +214,6 @@ out_release:
        udev_enumerate_add_match_subsystem(ud_enumerate, "tty");
        udev_enumerate_scan_devices(ud_enumerate);
        ud_list = udev_enumerate_get_list_entry(ud_enumerate);
-       if (!(list = sp_list_new()))
-               goto out;
        udev_list_entry_foreach(ud_entry, ud_list)
        {
                path = udev_list_entry_get_name(ud_entry);
@@ -218,7 +241,7 @@ out_release:
                        if (serial_info.type == PORT_UNKNOWN)
                                goto skip;
                }
-               list = sp_list_append(list, (void *)name, strlen(name) + 1);
+               list = sp_list_append(list, name);
 skip:
                udev_device_unref(ud_dev);
                if (!list)
@@ -234,7 +257,7 @@ out:
 /**
  * Free a port list returned by sp_list_ports.
  */
-void sp_free_port_list(char **list)
+void sp_free_port_list(struct sp_port **list)
 {
        unsigned int i;
        for (i = 0; list[i]; i++)
@@ -269,16 +292,11 @@ static int sp_validate_port(struct sp_port *port)
  * @return SP_OK on success, SP_ERR_FAIL on failure,
  *         or SP_ERR_ARG if an invalid port or name is passed.
  */
-int sp_open(struct sp_port *port, char *portname, int flags)
+int sp_open(struct sp_port *port, int flags)
 {
        if (!port)
                return SP_ERR_ARG;
 
-       if (!portname)
-               return SP_ERR_ARG;
-
-       port->name = portname;
-
 #ifdef _WIN32
        DWORD desired_access = 0, flags_and_attributes = 0;
        /* Map 'flags' to the OS-specific settings. */