[oe-commits] org.oe.dev libopieobex0: properly fix issues at hand

[polyonymous commit]

libopieobex0: properly fix issues at hand

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: 2950e7062db26731bcd069eca7a2f1c4a0fea4e5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2950e7062db26731bcd069eca7a2f1c4a0fea4e5
Files:
1
packages/libopieobex/files/obex-fixes.patch
packages/libopieobex/libopieobex0_cvs.bb
Diffs:

#
# mt diff -r6fd460565613d699cae261cd8e22796680a94854 -r2950e7062db26731bcd069eca7a2f1c4a0fea4e5
#
# 
# 
# patch "packages/libopieobex/files/obex-fixes.patch"
#  from [f260522e1a1995d0c1b62fb67cfd12e634571a8a]
#    to [3deae881c30dc85a674ba40ab513ea25aaed8f6b]
# 
# patch "packages/libopieobex/libopieobex0_cvs.bb"
#  from [aa3648a5aa5f6950f93d337e29c5cc0aad73ae48]
#    to [ddfb3da6248450a036239ce20bf7dcb24af49aea]
# 
============================================================
--- packages/libopieobex/files/obex-fixes.patch	f260522e1a1995d0c1b62fb67cfd12e634571a8a
+++ packages/libopieobex/files/obex-fixes.patch	3deae881c30dc85a674ba40ab513ea25aaed8f6b
@@ -20,10 +20,10 @@ diff --git a/obexserver.cpp b/obexserver
  DEFINES     += BLUETOOTH
  }
 diff --git a/obexserver.cpp b/obexserver.cpp
-index f1fb205..786e9f7 100644
+index f1fb205..a98c64f 100644
 --- a/obexserver.cpp
 +++ b/obexserver.cpp
-@@ -207,7 +207,18 @@ static void obex_conn_event (obex_t *handle, obex_object_t *object,
+@@ -207,7 +207,19 @@ static void obex_conn_event (obex_t *handle, obex_object_t *object,
              /* Comes when a server-request has been received. */
              handle_request (handle, object, event, obex_cmd);
              break;
@@ -35,6 +35,7 @@ index f1fb205..786e9f7 100644
 +		    break;
 +		case OBEX_CMD_DISCONNECT:
 +		    OBEX_TransportDisconnect(handle);
++		    _exit(0);
 +		    break;
 +		default:
 +		    break;
@@ -43,15 +44,20 @@ index f1fb205..786e9f7 100644
          case OBEX_EV_LINKERR:
              break;
      }
-@@ -424,20 +435,12 @@ bool ObexServer::start(RunMode runmode, Communication comm)
+@@ -423,21 +435,15 @@ bool ObexServer::start(RunMode runmode, Communication comm)
+             fcntl( fd[ 1 ], F_SETFD, FD_CLOEXEC );
  
          if (initObex() == 0) {
++	    if ( fd[ 1 ] ) {
++		::close(fd[1]);
++		fd[1] = 0;
++	    }
              do {
 -                int result; //Connection result
-                 if ( fd[ 1 ] ) {
-                     ::close(fd[1]);
-                     fd[1] = 0;
-                 }
+-                if ( fd[ 1 ] ) {
+-                    ::close(fd[1]);
+-                    fd[1] = 0;
+-                }
 -                if ((result = OBEX_HandleInput(m_obex, 60)) < 0) {
 -                    if (errno != ECONNRESET) {
 -                        printf("OBEX_HandleInput error %d\n", errno);
@@ -61,8 +67,10 @@ index f1fb205..786e9f7 100644
 -                    else
 -                        _exit(0);
 -                }
-+                if (OBEX_HandleInput(m_obex, 10) < 0)
-+                    _exit(0);
++                if (OBEX_HandleInput(m_obex, 60) < 0) {
++		    fprintf(stderr,"failed to OBEX_HandleInput(), errno=%d\n");
++                    _exit(errno?errno:-1);
++		}
              } while(1);
          }
          char resultByte = 1;
============================================================
--- packages/libopieobex/libopieobex0_cvs.bb	aa3648a5aa5f6950f93d337e29c5cc0aad73ae48
+++ packages/libopieobex/libopieobex0_cvs.bb	ddfb3da6248450a036239ce20bf7dcb24af49aea
@@ -1,6 +1,6 @@ PV = "${OPIE_CVS_PV}"
 require libopieobex0.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r3"
+PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
            ${HANDHELDS_CVS};module=opie/pics \