system_cmds-735.20.1.tar.gz

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

diff --git a/getty.tproj/main.c b/getty.tproj/main.c
index c25373c3639bdc17673ac36baaf10c65906471d6..12c78b6fdbd3e6b5652fad2dd39a5ce8f71e5b70 100644 (file)
--- a/getty.tproj/main.c
+++ b/getty.tproj/main.c
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
 
 #include <sys/cdefs.h>
 #ifndef lint

-static const char copyright[] =
+__unused static const char copyright[] =

 "@(#) Copyright (c) 1980, 1993\n\
        The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 "@(#) Copyright (c) 1980, 1993\n\
        The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */


@@ -43,7 +43,7 @@ static const char copyright[] =
 #if 0
 static char sccsid[] = "@(#)from: main.c       8.1 (Berkeley) 6/20/93";
 #endif
 #if 0
 static char sccsid[] = "@(#)from: main.c       8.1 (Berkeley) 6/20/93";
 #endif

-static const char rcsid[] =
+__unused static const char rcsid[] =

   "$FreeBSD: src/libexec/getty/main.c,v 1.47 2005/04/06 17:42:24 stefanf Exp $";
 #endif /* not lint */
 
   "$FreeBSD: src/libexec/getty/main.c,v 1.47 2005/04/06 17:42:24 stefanf Exp $";
 #endif /* not lint */
 


@@ -59,7 +59,11 @@ static const char rcsid[] =
 #include <errno.h>
 #include <fcntl.h>
 #include <locale.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <locale.h>

+#ifdef __APPLE__
+#include <util.h>
+#else

 #include <libutil.h>
 #include <libutil.h>

+#endif

 #include <setjmp.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <stdlib.h>


@@ -111,8 +115,6 @@ char        ttyn[32];
 #define        OBUFSIZ         128
 #define        TABBUFSIZ       512
 
 #define        OBUFSIZ         128
 #define        TABBUFSIZ       512
 

-char   defent[TABBUFSIZ];
-char   tabent[TABBUFSIZ];

 const  char *tname;
 
 char   *env[128];
 const  char *tname;
 
 char   *env[128];


@@ -154,7 +156,7 @@ static void putf(const char *);
 static void    putpad(const char *);
 static void    puts(const char *);
 static void    timeoverrun(int);
 static void    putpad(const char *);
 static void    puts(const char *);
 static void    timeoverrun(int);

-static char    *getline(int);
+static char    *getty_getline(int);

 static void    setttymode(int);
 static int     opentty(const char *, int);
 
 static void    setttymode(int);
 static int     opentty(const char *, int);
 


@@ -214,7 +216,7 @@ main(int argc, char *argv[])
        limit.rlim_cur = GETTY_TIMEOUT;
        (void)setrlimit(RLIMIT_CPU, &limit);
 
        limit.rlim_cur = GETTY_TIMEOUT;
        (void)setrlimit(RLIMIT_CPU, &limit);
 

-       gettable("default", defent);
+       gettable("default");

        gendefaults();
        tname = "default";
        if (argc > 1)
        gendefaults();
        tname = "default";
        if (argc > 1)


@@ -288,12 +290,12 @@ main(int argc, char *argv[])
                        int i, rfds;
                        struct timeval to;
 
                        int i, rfds;
                        struct timeval to;
 

-                       rfds = 1 << 0;  /* FD_SET */
-                       to.tv_sec = RT;
-                       to.tv_usec = 0;
-                       i = select(32, (fd_set*)&rfds, (fd_set*)NULL,
-                                      (fd_set*)NULL, RT ? &to : NULL);
-                       if (i < 0) {
+                       rfds = 1 << 0;  /* FD_SET */
+                       to.tv_sec = RT;
+                       to.tv_usec = 0;
+                       i = select(32, (fd_set*)&rfds, (fd_set*)NULL,
+                                      (fd_set*)NULL, RT ? &to : NULL);
+                       if (i < 0) {

                                syslog(LOG_ERR, "select %s: %m", ttyn);
                        } else if (i == 0) {
                                syslog(LOG_NOTICE, "recycle tty %s", ttyn);
                                syslog(LOG_ERR, "select %s: %m", ttyn);
                        } else if (i == 0) {
                                syslog(LOG_NOTICE, "recycle tty %s", ttyn);


@@ -321,7 +323,7 @@ main(int argc, char *argv[])
        for (;;) {
 
                /*
        for (;;) {
 
                /*

-                * if a delay was specified then sleep for that 
+                * if a delay was specified then sleep for that

                 * number of seconds before writing the initial prompt
                 */
                if (first_sleep && DE) {
                 * number of seconds before writing the initial prompt
                 */
                if (first_sleep && DE) {


@@ -354,7 +356,7 @@ main(int argc, char *argv[])
                        if ((fd = open(IF, O_RDONLY)) != -1) {
                                char * cp;
 
                        if ((fd = open(IF, O_RDONLY)) != -1) {
                                char * cp;
 

-                               while ((cp = getline(fd)) != NULL) {
+                               while ((cp = getty_getline(fd)) != NULL) {

                                          putf(cp);
                                }
                                close(fd);
                                          putf(cp);
                                }
                                close(fd);


@@ -477,7 +479,7 @@ opentty(const char *tty, int flags)
                }
                sleep(60);
        }
                }
                sleep(60);
        }

-       if (login_tty(i) < 0) { 
+       if (login_tty(i) < 0) {

 #ifndef __APPLE__
                if (daemon(0,0) < 0) {
                        syslog(LOG_ERR,"daemon: %m");
 #ifndef __APPLE__
                if (daemon(0,0) < 0) {
                        syslog(LOG_ERR,"daemon: %m");


@@ -495,7 +497,7 @@ opentty(const char *tty, int flags)
 }
 
 static void
 }
 
 static void

-defttymode()
+defttymode(void)

 {
 
        /* Start with default tty settings. */
 {
 
        /* Start with default tty settings. */


@@ -746,7 +748,7 @@ prompt(void)
 
 
 static char *
 
 
 static char *

-getline(int fd)
+getty_getline(int fd)

 {
        int i = 0;
        static char linebuf[512];
 {
        int i = 0;
        static char linebuf[512];


@@ -840,9 +842,8 @@ putf(const char *cp)
 static void
 dogettytab()
 {
 static void
 dogettytab()
 {

-       

        /* Read the database entry. */
        /* Read the database entry. */

-       gettable(tname, tabent);
+       gettable(tname);

 
        /*
         * Avoid inheriting the parity values from the default entry
 
        /*
         * Avoid inheriting the parity values from the default entry