author | Michael Krelin <hacker@klever.net> | 2007-07-16 00:02:29 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-16 00:02:29 (UTC) |
commit | 0f2f877bd115c0f50af3dabae03473515e7ff808 (patch) (unidiff) | |
tree | 37d0fb83d81147a3e31fb56ff7f0d9893265f34e /core/obex | |
parent | 174edcd91bcb969c4ee71a824849d8737223dd8f (diff) | |
download | opie-0f2f877bd115c0f50af3dabae03473515e7ff808.zip opie-0f2f877bd115c0f50af3dabae03473515e7ff808.tar.gz opie-0f2f877bd115c0f50af3dabae03473515e7ff808.tar.bz2 |
pass erno 'upstream'
-rw-r--r-- | core/obex/obexserver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/obex/obexserver.cpp b/core/obex/obexserver.cpp index 286961f..a98c64f 100644 --- a/core/obex/obexserver.cpp +++ b/core/obex/obexserver.cpp | |||
@@ -433,25 +433,25 @@ bool ObexServer::start(RunMode runmode, Communication comm) | |||
433 | // Closing of fd[1] indicates that the execvp succeeded! | 433 | // Closing of fd[1] indicates that the execvp succeeded! |
434 | if ( fd[ 1 ] ) | 434 | if ( fd[ 1 ] ) |
435 | fcntl( fd[ 1 ], F_SETFD, FD_CLOEXEC ); | 435 | fcntl( fd[ 1 ], F_SETFD, FD_CLOEXEC ); |
436 | 436 | ||
437 | if (initObex() == 0) { | 437 | if (initObex() == 0) { |
438 | if ( fd[ 1 ] ) { | 438 | if ( fd[ 1 ] ) { |
439 | ::close(fd[1]); | 439 | ::close(fd[1]); |
440 | fd[1] = 0; | 440 | fd[1] = 0; |
441 | } | 441 | } |
442 | do { | 442 | do { |
443 | if (OBEX_HandleInput(m_obex, 60) < 0) { | 443 | if (OBEX_HandleInput(m_obex, 60) < 0) { |
444 | fprintf(stderr,"failed to OBEX_HandleInput(), errno=%d\n"); | 444 | fprintf(stderr,"failed to OBEX_HandleInput(), errno=%d\n"); |
445 | _exit(1); | 445 | _exit(errno?errno:-1); |
446 | } | 446 | } |
447 | } while(1); | 447 | } while(1); |
448 | } | 448 | } |
449 | char resultByte = 1; | 449 | char resultByte = 1; |
450 | if ( fd[ 1 ] ) | 450 | if ( fd[ 1 ] ) |
451 | write( fd[ 1 ], &resultByte, 1 ); | 451 | write( fd[ 1 ], &resultByte, 1 ); |
452 | _exit( -1 ); | 452 | _exit( -1 ); |
453 | } | 453 | } |
454 | else if ( -1 == pid_ ) | 454 | else if ( -1 == pid_ ) |
455 | { | 455 | { |
456 | // forking failed | 456 | // forking failed |
457 | 457 | ||