Rename pty.c -> get_pty.c

--HG--
branch : 1.7

diff --git a/Makefile.in b/Makefile.in
index 7259c3606935cdbd7ae1c447bdd43ccfe0f0b8e3..e18900a7013acb679ad5c7c46ec750727f8481d7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,10 +104,10 @@ PROGS = @PROGS@
 
 SRCS = aix.c alias.c alloc.c audit.c boottime.c bsm_audit.c check.c \
        closefrom.c def_data.c defaults.c env.c error.c exec.c fileops.c \
-       find_path.c fnmatch.c getcwd.c getprogname.c getspwuid.c gettime.c \
-       glob.c goodpath.c gram.c gram.y interfaces.c iolog.c isblank.c lbuf.c \
-       ldap.c list.c logging.c match.c mksiglist.c mkstemp.c memrchr.c \
-       nanosleep.c parse.c parse_args.c pwutil.c pty.c set_perms.c \
+       find_path.c fnmatch.c get_pty.c getcwd.c getprogname.c getspwuid.c \
+       gettime.c glob.c goodpath.c gram.c gram.y interfaces.c iolog.c \
+       isblank.c lbuf.c ldap.c list.c logging.c match.c mksiglist.c mkstemp.c \
+       memrchr.c nanosleep.c parse.c parse_args.c pwutil.c set_perms.c \
        sigaction.c snprintf.c strcasecmp.c strerror.c strlcat.c strlcpy.c \
        strsignal.c sudo.c sudo_noexec.c sudo_edit.c sudo_nss.c term.c \
        testsudoers.c tgetpass.c toke.c toke.l tsgetgrpw.c utimes.c \
@@ -281,6 +281,8 @@ find_path.o: $(srcdir)/find_path.c $(SUDODEP)
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/find_path.c
 fnmatch.o: $(srcdir)/fnmatch.c $(srcdir)/emul/fnmatch.h $(srcdir)/compat.h config.h
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/fnmatch.c
+get_pty.o: $(srcdir)/get_pty.c $(SUDODEP)
+       $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/get_pty.c
 getcwd.o: $(srcdir)/getcwd.c $(srcdir)/compat.h config.h
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/getcwd.c
 getdate.o: $(srcdir)/getdate.c $(srcdir)/compat.h config.h
@@ -327,8 +329,6 @@ parse_args.o: $(srcdir)/parse_args.c $(SUDODEP)
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/parse_args.c
 pwutil.o: $(srcdir)/pwutil.c $(SUDODEP)
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/pwutil.c
-pty.o: $(srcdir)/pty.c $(SUDODEP)
-       $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/pty.c
 redblack.o: $(srcdir)/redblack.c $(SUDODEP) $(srcdir)/redblack.h
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/redblack.c
 set_perms.o: $(srcdir)/set_perms.c $(SUDODEP)

diff --git a/configure b/configure
index efcb58a31622ddc32d96ba618846d50600ff1136..766fed94fac7a11dadebbbff76bfd97ad7f0152d 100755 (executable)
--- a/configure
+++ b/configure
@@ -17987,7 +17987,7 @@ if test "x$ac_cv_func_tcsetpgrp" = x""yes; then :
 #define HAVE_TCSETPGRP 1
 _ACEOF
 
-       SUDO_OBJS="${SUDO_OBJS} iolog.o pty.o"
+       SUDO_OBJS="${SUDO_OBJS} get_pty.o iolog.o:
        PROGS="$PROGS sudoreplay"
        REPLAY=""
 

diff --git a/configure.in b/configure.in
index b60d080212f6c802472d8a9686bdd949e633511f..3b1afc169a90acc71a94be20386f35be5b33a1c2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2638,12 +2638,12 @@ SUDO_TIMEDIR
 SUDO_IO_LOGDIR
 
 dnl
-dnl If I/O logging is enabled, build sudoreplay and add iolog.o pty.o for sudo
+dnl If I/O logging is enabled, build sudoreplay and add get_pty.o iolog.o
 dnl
 if test "${with_iologdir-yes}" != "no"; then
     # Require POSIX job control for I/O log support
     AC_CHECK_FUNCS(tcsetpgrp, [
-       SUDO_OBJS="${SUDO_OBJS} iolog.o pty.o"
+       SUDO_OBJS="${SUDO_OBJS} get_pty.o iolog.o:
        PROGS="$PROGS sudoreplay"
        REPLAY=""
 

diff --git a/pty.c b/get_pty.c
similarity index 100%
rename from pty.c
rename to get_pty.c