Changeset 1348:6221ddafe23f in roaraudio

Timestamp:

03/23/09 16:51:56 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

worte better handling of tailing slashes, corrected DECnet call to roar_vio_socket_get_port()

File:

• libroar/vio_socket.c (modified) (3 diffs)

libroar/vio_socket.c

@@ -309 +309 @@
  char           * proto = NULL;
  int              port;
- int              len;
+ char           * ts;
 
  if ( service == NULL || domain == -1 || type == -1 )
   return -1;
 
- if ( (len = strlen(service)) < 1 )
-  return -1;
-
- if ( service[len-1] == '/' )
-  service[len-1] = 0;
+ if ( (ts = strstr(service, "/")) != NULL )
+  *ts = 0;
 
  if ( sscanf(service, "%i", &port) == 1 )
   return port;
+
+ if ( ts != NULL )
+  *ts = '/';
 
  switch (domain) {
@@ -351 +351 @@
  }
 
+ if ( ts != NULL )
+  *ts = 0;
+
  if ( (serv = getservbyname(service, proto)) == NULL ) {
   ROAR_ERR("roar_vio_socket_get_port(*): Unknown service: %s/%s: %s", service, proto, strerror(errno));
-  return -1;
- }
+
+  if ( ts != NULL )
+   *ts = '/';
+
+  return -1;
+ }
+
+ if ( ts != NULL )
+  *ts = '/';
 
  return ROAR_NET2HOST16(serv->s_port);
@@ -386 +396 @@
 
  if ( object == -1 )
-  object = roar_vio_socket_get_port(object, AF_DECnet, SOCK_STREAM);
+  object = roar_vio_socket_get_port(objname, AF_DECnet, SOCK_STREAM);
 
  if ( object == -1 )