Changeset 4047:e5effb0a413e in roaraudio


Ignore:
Timestamp:
07/09/10 14:50:21 (14 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

less magics, don't use roar_exit(), use strncpy()

File:
1 edited

Legend:

Unmodified
Added
Removed
  • roarclients/roarctl.c

    r4014 r4047  
    195195 int  i; 
    196196 
    197  snprintf(file, 79, "/proc/%i/exe", pid); 
    198  file[79] = 0; 
     197 snprintf(file, sizeof(file)-1, "/proc/%i/exe", pid); 
     198 file[sizeof(file)-1] = 0; 
    199199 
    200200 ret[0] = '?'; 
    201201 ret[1] = 0; 
    202202 
    203  if ( (i = readlink(file, buf, 79)) != -1 ) { 
     203 if ( (i = readlink(file, buf, sizeof(buf)-1)) != -1 ) { 
    204204  buf[i] = 0; 
    205205  if ( (r = strrchr(buf, '/')) != NULL ) { 
    206206   r++; 
    207    if ( *r != 0 ) 
    208     strcpy(ret, r); 
     207   if ( *r != 0 ) { 
     208    strncpy(ret, r, sizeof(ret)-1); 
     209    ret[sizeof(ret)-1] = 0; 
     210   } 
    209211  } 
    210212 } 
     
    10011003 
    10021004  } else if ( !strcmp(k, "exit") ) { 
    1003    if ( roar_exit(&con) == -1 ) { 
     1005   if ( roar_terminate(&con, 0) == -1 ) { 
    10041006    fprintf(stderr, "Error: can not quit server\n"); 
    10051007   } else { 
Note: See TracChangeset for help on using the changeset viewer.