From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Thu, 7 May 2015 15:43:19 +0000 (-0600)
Subject: get_pty() should return bool
X-Git-Tag: SUDO_1_8_14^2~148
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c9ff3dc4b5ebc9d437d7b4cac2561fb7e012bce;p=sudo

get_pty() should return bool
---

diff --git a/src/get_pty.c b/src/get_pty.c
index ba6c98e82..87af29580 100644
--- a/src/get_pty.c
+++ b/src/get_pty.c
@@ -58,12 +58,12 @@
 #include "sudo.h"
 
 #if defined(HAVE_OPENPTY)
-int
+bool
 get_pty(int *master, int *slave, char *name, size_t namesz, uid_t ttyuid)
 {
     struct group *gr;
     gid_t ttygid = -1;
-    int rval = 0;
+    bool rval = false;
     debug_decl(get_pty, SUDO_DEBUG_PTY)
 
     if ((gr = getgrnam("tty")) != NULL)
@@ -71,18 +71,18 @@ get_pty(int *master, int *slave, char *name, size_t namesz, uid_t ttyuid)
 
     if (openpty(master, slave, name, NULL, NULL) == 0) {
 	if (chown(name, ttyuid, ttygid) == 0)
-	    rval = 1;
+	    rval = true;
     }
 
     debug_return_bool(rval);
 }
 
 #elif defined(HAVE__GETPTY)
-int
+bool
 get_pty(int *master, int *slave, char *name, size_t namesz, uid_t ttyuid)
 {
     char *line;
-    int rval = 0;
+    bool rval = false;
     debug_decl(get_pty, SUDO_DEBUG_PTY)
 
     /* IRIX-style dynamic ptys (may fork) */
@@ -92,7 +92,7 @@ get_pty(int *master, int *slave, char *name, size_t namesz, uid_t ttyuid)
 	if (*slave != -1) {
 	    (void) chown(line, ttyuid, -1);
 	    strlcpy(name, line, namesz);
-	    rval = 1;
+	    rval = true;
 	} else {
 	    close(*master);
 	    *master = -1;
@@ -116,11 +116,11 @@ posix_openpt(int oflag)
 }
 # endif /* HAVE_POSIX_OPENPT */
 
-int
+bool
 get_pty(int *master, int *slave, char *name, size_t namesz, uid_t ttyuid)
 {
     char *line;
-    int rval = 0;
+    bool rval = false;
     debug_decl(get_pty, SUDO_DEBUG_PTY)
 
     *master = posix_openpt(O_RDWR|O_NOCTTY);
@@ -146,7 +146,7 @@ get_pty(int *master, int *slave, char *name, size_t namesz, uid_t ttyuid)
 # endif
 	(void) chown(line, ttyuid, -1);
 	strlcpy(name, line, namesz);
-	rval = 1;
+	rval = true;
     }
 done:
     debug_return_bool(rval);
@@ -156,13 +156,13 @@ done:
 
 static char line[] = "/dev/ptyXX";
 
-int
+bool
 get_pty(int *master, int *slave, char *name, size_t namesz, uid_t ttyuid)
 {
     char *bank, *cp;
     struct group *gr;
     gid_t ttygid = -1;
-    int rval = 0;
+    bool rval = false;
     debug_decl(get_pty, SUDO_DEBUG_PTY)
 
     if ((gr = getgrnam("tty")) != NULL)
@@ -187,7 +187,7 @@ get_pty(int *master, int *slave, char *name, size_t namesz, uid_t ttyuid)
 	    *slave = open(line, O_RDWR|O_NOCTTY, 0);
 	    if (*slave != -1) {
 		    strlcpy(name, line, namesz);
-		    rval = 1; /* success */
+		    rval = true; /* success */
 		    goto done;
 	    }
 	    (void) close(*master);
diff --git a/src/sudo.h b/src/sudo.h
index e4c048440..5d8ef53b5 100644
--- a/src/sudo.h
+++ b/src/sudo.h
@@ -195,7 +195,7 @@ int parse_args(int argc, char **argv, int *nargc, char ***nargv,
 extern int tgetpass_flags;
 
 /* get_pty.c */
-int get_pty(int *master, int *slave, char *name, size_t namesz, uid_t uid);
+bool get_pty(int *master, int *slave, char *name, size_t namesz, uid_t uid);
 
 /* sudo.c */
 bool exec_setup(struct command_details *details, const char *ptyname, int ptyfd);