CVS: The file 'apps/bluetooth/experimental/btd.c' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in apps/bluetooth/experimental:

Name            Old version     New version     Comment
----            -----------     -----------     -------
btd.c           1.29            1.30=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Do not select() on stdin.


The diff of the modified file(s):

--- btd.c	2001/10/03 17:47:47	1.29
+++ btd.c	2001/10/05 14:14:16	1.30
@@ -317,7 +317,6 @@
=20=20=20
   while (1)
   {
-    int i, waiting_iparsp =3D 0;
     tv.tv_sec =3D 0;
     tv.tv_usec =3D 500000;
=20
@@ -326,17 +325,14 @@
     if (ipa_fd >=3D 0)
       FD_SET(ipa_fd, &rfd);
=20=20=20=20=20
-    FD_SET(0, &rfd);
-
     result =3D select(FD_SETSIZE, &rfd, NULL, NULL, &tv);
     switch (result)
     {
      case 0:
       {
-        /* Timeout, check for new rfcomm cons */
-
+#ifdef USE_IPASSIGN
         /* Check for outstanding IPA requests */
-        i =3D 0;
+        int i =3D 0, waiting_iparsp =3D 0;
         while (i < BT_NBR_DATAPORTS)
         {
           if ((STATE(i) =3D=3D WAITING_PPPCONF) ||
@@ -350,20 +346,21 @@
=20=20=20=20=20=20=20=20=20
         if (waiting_iparsp)
           break;
+#endif
+=20=20=20=20=20=20=20=20
+        /* Timeout, check for new rfcomm cons */
=20=20=20=20=20=20=20=20=20
         discover_connections(bt_cfd);
       }
       break;
=20=20=20=20=20=20=20
      case -1:
-      {
         if (errno !=3D EINTR)
         {
           /* Error */
           perror("select");
=20
           /* FIXME -- e.g if ipa server restarts !!! */
-        }
       }
       break;
=20=20=20=20=20=20=20