system_cmds-735.20.1.tar.gz

[apple/system_cmds.git] / getty.tproj / chat.c

diff --git a/getty.tproj/chat.c b/getty.tproj/chat.c
index 147ef845e5ec75a63c3f8cd2f6d563b0ded9e7d4..d79aae7f9fb7e25da64b519d902d0a773d9e197a 100644 (file)
--- a/getty.tproj/chat.c
+++ b/getty.tproj/chat.c
@@ -23,8 +23,10 @@
  * For semi-intelligent modem handling.
  */
 
+#include <sys/cdefs.h>
+
 #ifndef lint
-static const char rcsid[] =
+__unused static const char rcsid[] =
   "$FreeBSD: src/libexec/getty/chat.c,v 1.11 2005/04/06 17:42:24 stefanf Exp $";
 #endif /* not lint */
 
@@ -367,9 +369,9 @@ chat_expect(const char *str)
                                }
                        }
                        alarm(0);
-                       chat_unalarm();
-                       alarmed = 0;
-                       free(got);
+                       chat_unalarm();
+                       alarmed = 0;
+                       free(got);
                }
        }
 
@@ -390,7 +392,7 @@ chat_send(char const *str)
 {
        int r = 0;
 
-       if (chat_debug && CHATDEBUG_SEND)
+       if (chat_debug & CHATDEBUG_SEND)
                syslog(LOG_DEBUG, "chat_send '%s'", cleanstr(str, strlen(str)));
 
        if (*str) {
@@ -401,13 +403,13 @@ chat_send(char const *str)
                         unsigned char ch = (unsigned char)*str++;
 
                         if (alarmed)
-                               r = 3;
+                       r = 3;
                         else if (ch == PAUSE_CH)
                                usleep(500000); /* 1/2 second */
                        else  {
                                usleep(10000);  /* be kind to modem */
                                 if (write(STDOUT_FILENO, &ch, 1) != 1)
-                                       r = alarmed ? 3 : 2;
+                                       r = alarmed ? 3 : 2;
                         }
                 }
                 alarm(0);