* Makefile.in: use libupdate so to not get multiple copies of

		object files upon rebuild.

	* vhangup.c (ptyint_vhangup): Make sure preprocessor directives
		are at left margin.

	* open_slave.c (pty_open_slave): Make sure preprocessor directives
		are at left margin.

	* open_ctty.c (pty_open_ctty): Make sure preprocessor directives
		are at left margin.

	* cleanup.c (pty_cleanup): Add missing declarations for retval and
		fd.  Also, align preprocessor directives with left margin.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6421 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog
index 58bb11c3a4d663e66d8337f069a63b5aac82a019..bd625eba0fe168fcba78bb9e2da48b23e1303089 100644 (file)
--- a/src/util/pty/ChangeLog
+++ b/src/util/pty/ChangeLog
@@ -1,5 +1,17 @@
 Fri Aug  4 00:59:20 1995  Tom Yu  <tlyu@dragons-lair.MIT.EDU>
 
+       * Makefile.in: use libupdate so to not get multiple copies of
+               object files upon rebuild.
+
+       * vhangup.c (ptyint_vhangup): Make sure preprocessor directives
+               are at left margin.
+
+       * open_slave.c (pty_open_slave): Make sure preprocessor directives
+               are at left margin.
+
+       * open_ctty.c (pty_open_ctty): Make sure preprocessor directives
+               are at left margin.
+
        * cleanup.c (pty_cleanup): Add missing declarations for retval and
                fd.  Also, align preprocessor directives with left margin.
 

diff --git a/src/util/pty/Makefile.in b/src/util/pty/Makefile.in
index d80a81579444f9054fc1a25f4b75157615941167..0dccd9926829c0dc3b992e5738201f40d358b8c4 100644 (file)
--- a/src/util/pty/Makefile.in
+++ b/src/util/pty/Makefile.in
@@ -8,7 +8,7 @@ SED = sed
 
 LIBOBJS= cleanup.o getpty.o initialize_slave.o open_ctty.o open_slave.o \
    update_utmp.o update_wtmp.o vhangup.o void_assoc.o pty_err.o logwtmp.o init.o
-
+LIBUPDATE= $(BUILDTOP)/util/libupdate
 LIBDONE=DONE
 LIB_SUBDIRS=.
 INSTALLFILE = cp
@@ -47,16 +47,21 @@ install:: libpty.h
 
 
 
-libpty.a: $(LIBOBJS)
-       $(ARCHIVE) $@ $(LIBOBJS)
+libpty.a: DONE
+       @if test -f $@ ; then \
+               (set -x; $(LIBUPDATE) $@ DONE .) \
+       else \
+               (set -x; $(LIBUPDATE) --force $@ DONE .) \
+       fi
        $(RANLIB) $@
+       touch libpty.stamp
 
 DONE:: $(LIBOBJS)
         $(RM) DONE
         echo $(LIBOBJS) >DONE
 
 clean-unix::
-       $(RM) $(LIBOBJS)
+       $(RM) $(LIBOBJS) libpty.stamp
 
 clean-mac::
        $(RM) libpty.a

diff --git a/src/util/pty/logwtmp.c b/src/util/pty/logwtmp.c
index 53861f54b2703691681a2587d23e438c511fca1a..70b4ae6b059ef72483f873bd34cd9e8faebdd9c9 100644 (file)
--- a/src/util/pty/logwtmp.c
+++ b/src/util/pty/logwtmp.c
@@ -24,10 +24,10 @@
 long pty_logwtmp (tty, user, host )
     char *user, *tty, *host;
 {
-    #ifdef HAVE_LOGWTMP
+#ifdef HAVE_LOGWTMP
     logwtmp(tty,user,host);
     return 0;
-    #else
+#else
         struct utmp ut;
     char *tmpx;
     char utmp_id[5];

diff --git a/src/util/pty/open_ctty.c b/src/util/pty/open_ctty.c
index e61b5c545c81e373184864aa41c8ab2fc7832c77..6ef9c740999c9bb840af201133ab43a9578d4daf 100644 (file)
--- a/src/util/pty/open_ctty.c
+++ b/src/util/pty/open_ctty.c
@@ -53,7 +53,7 @@ pty_open_ctty (slave, fd)
     *fd = open(slave, O_RDWR);
     if (*fd < 0 )
        return PTY_OPEN_SLAVE_OPENFAIL;
-    #ifdef ultrix
+#ifdef ultrix
     setpgrp(0, getpid());
 #endif
 #ifdef ultrix

diff --git a/src/util/pty/open_slave.c b/src/util/pty/open_slave.c
index 823865882fba25c4cc4f9bb1b6673efc18316177..11c4f6cca332c0830a861d9cb44e0df848b19cf7 100644 (file)
--- a/src/util/pty/open_slave.c
+++ b/src/util/pty/open_slave.c
@@ -51,17 +51,17 @@ return PTY_OPEN_SLAVE_CHMODFAIL;
 #endif /*HAVE_FCHMOD*/
 #ifdef HAVE_FCHOWN
     if ( fchown(vfd, 0, 0 ) == -1 ) 
-       #else
+#else
        if ( chown(slave, 0, 0 ) == -1 ) 
 #endif /* HAVE_FCHOWN*/
            return PTY_OPEN_SLAVE_CHOWNFAIL;
 
-           #ifdef VHANG_FIRST
+#ifdef VHANG_FIRST
     ptyint_vhangup();
 #endif
 
     (void) close(vfd);
-    #ifdef HAVE_REVOKE
+#ifdef HAVE_REVOKE
     if (revoke (slave) < 0 ) {
        return PTY_OPEN_SLAVE_REVOKEFAIL;
     }

diff --git a/src/util/pty/vhangup.c b/src/util/pty/vhangup.c
index 73d5b7c105cca7d5d382d68a592717c698511320..25dd9cc23f30188e9cc3689279060e1bf2bd706c 100644 (file)
--- a/src/util/pty/vhangup.c
+++ b/src/util/pty/vhangup.c
@@ -23,7 +23,7 @@
 
 void ptyint_vhangup()
 {
-    #ifdef POSIX_SIGNALS
+#ifdef POSIX_SIGNALS
     struct sigaction sa;
     /* Initialize "sa" structure. */
     (void) sigemptyset(&sa.sa_mask);
@@ -31,7 +31,7 @@ void ptyint_vhangup()
     
 #endif
 
-        #ifdef POSIX_SIGNALS
+#ifdef POSIX_SIGNALS
        sa.sa_handler = SIG_IGN;
        (void) sigaction(SIGHUP, &sa, (struct sigaction *)0);
        vhangup();