[BACK]Return to ox_launch.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / io

Diff for /OpenXM_contrib2/asir2000/io/ox_launch.c between version 1.11 and 1.12

version 1.11, 2000/12/16 07:12:01 version 1.12, 2001/06/06 02:21:40
Line 44 
Line 44 
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY   * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  * $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.10 2000/11/08 06:21:17 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.11 2000/12/16 07:12:01 noro Exp $
 */  */
 #include <setjmp.h>  #include <setjmp.h>
 #include <signal.h>  #include <signal.h>
Line 353  int nolog;
Line 353  int nolog;
                                 close(i);                                  close(i);
 #endif  #endif
                 }                  }
                 if ( !strcmp(dname,"1" ) ) /* XXX: for ssh */                  if ( !nolog && !strcmp(dname,"1" ) ) /* XXX: for ssh */
                         execl(prog,prog,0);                          execl(prog,prog,0);
                 else if ( nolog || !strcmp(dname,"0") ) {                  else if ( nolog || !strcmp(dname,"0") ) {
                         FILE *null;                          FILE *null;
Line 361  int nolog;
Line 361  int nolog;
                         null = fopen("/dev/null","wb");                          null = fopen("/dev/null","wb");
                         dup2(fileno(null),1);                          dup2(fileno(null),1);
                         dup2(fileno(null),2);                          dup2(fileno(null),2);
                         if ( strcmp(dname,"0") )                          if ( !strcmp(dname,"1") ) {
                                   /* XXX */
                                   putenv("DISPLAY=");
                                   execl(prog,prog,0);
                           } else if ( strcmp(dname,"0") )
                                 execl(prog,prog,"-display",dname,0);                                  execl(prog,prog,"-display",dname,0);
                         else {                          else {
                                 putenv("DISPLAY=");                                  putenv("DISPLAY=");

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.12

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>