Changeset 5896:aef8b3923086 in roaraudio for libroar/socket.c

Timestamp:

04/14/13 13:55:14 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

cleanup of usage of hard coded buffer lengths. Migrated some cases to usage of sizeof()

File:

• libroar/socket.c (modified) (5 diffs)

libroar/socket.c

@@ -1081 +1081 @@
   return -1;
 
- if ( (len = snprintf(buf, 1024, "CONNECT %s:%i HTTP/1.0\r\nUser-Agent: libroar\r\n\r\n", host, port)) == -1 )
+ if ( (len = snprintf(buf, sizeof(buf), "CONNECT %s:%i HTTP/1.0\r\nUser-Agent: libroar\r\n\r\n", host, port)) == -1 )
   return -1;
 
@@ -1087 +1087 @@
   return -1;
 
- while ( (len = read(fh, buf, 1024)) ) {
-  if ( len == 1024 ) { // overlong lion
+ while ( (len = read(fh, buf, sizeof(buf))) ) {
+  if ( len == sizeof(buf) ) { // overlong lion
    return -1;
   } else if ( len == 2 && buf[0] == '\r' && buf[1] == '\n' ) {
@@ -1108 +1108 @@
  char * sep;
  char * bin_ssh;
- char   cmd[1024] = {0}, rcmd[1024] = {0};
+ char   cmd[1024] = "", rcmd[1024] = "";
  int    proxy_port = 22;
  int    use_socat = 0;
@@ -1152 +1152 @@
   if ( use_socat ) {
    if ( *host == '/' ) {
-    snprintf(rcmd, 1023, "socat stdio unix-connect:\"%s\"", host);
+    snprintf(rcmd, sizeof(rcmd)-1, "socat stdio unix-connect:\"%s\"", host);
    } else {
-    snprintf(rcmd, 1023, "socat stdio tcp:\"%s\":%i", host, port);
+    snprintf(rcmd, sizeof(rcmd)-1, "socat stdio tcp:\"%s\":%i", host, port);
    }
   } else {
-   snprintf(rcmd, 1023, "$(which netcat nc 2> /dev/null | grep -v \" \" | head -n 1) \"%s\" %i", host, port);
-  }
-
-  rcmd[1023] = 0;
+   snprintf(rcmd, sizeof(rcmd)-1, "$(which netcat nc 2> /dev/null | grep -v \" \" | head -n 1) \"%s\" %i", host, port);
+  }
+
+  rcmd[sizeof(rcmd)-1] = 0;
  }
 
@@ -1169 +1169 @@
   return -1;
 
- snprintf(cmd, 1023, "%s -p %i -l '%s' '%s' '%s'", bin_ssh, proxy_port, user, proxy_addr, rcmd);
- cmd[1023] = 0;
+ snprintf(cmd, sizeof(cmd)-1, "%s -p %i -l '%s' '%s' '%s'", bin_ssh, proxy_port, user, proxy_addr, rcmd);
+ cmd[sizeof(cmd)-1] = 0;
 
  roar_mm_free(bin_ssh);