Changeset 232337c3a3aba420a779aeb61b1dfbff267b6e6f

Show
Ignore:
Timestamp:
12/05/08 13:46:01 (5 months ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1210592761 +0200
git-parent:

[643f11c411510d757f898ad790dc4253142aa62b]

git-author:
Rafaël Carré <funman@videolan.org> 1210592761 +0200
Message:

Fix #1581 - Really fix #986 - rc : do not read stdin when we can't

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/control/rc.c

    r643f11c r232337c  
    142142    if( p_intf->p_sys->i_socket == -1 ) 
    143143    { 
    144         utf8_vfprintf( stdout, psz_fmt, args ); 
    145         printf( "\r\n" ); 
     144        if( !p_intf->p_sys->pi_socket_listen ) 
     145        { 
     146            utf8_vfprintf( stdout, psz_fmt, args ); 
     147            printf( "\r\n" ); 
     148        } 
    146149    } 
    147150    else 
    …… 
    22982301#endif 
    22992302 
     2303    if( p_intf->p_sys->i_socket == -1 && p_intf->p_sys->pi_socket_listen ) 
     2304    { 
     2305        /* Do not try to read stdin if we are listening on a socket */ 
     2306        msleep( INTF_IDLE_SLEEP ); 
     2307        return VLC_FALSE; 
     2308    } 
     2309 
    23002310    while( !p_intf->b_die && *pi_size < MAX_LINE_LENGTH && 
    23012311           (i_read = net_ReadNonBlock( p_intf, p_intf->p_sys->i_socket == -1 ?