isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce name space pollution in libsudo_util.so

Browse Source
This commit is contained in:
Todd C. Miller
2014-06-26 16:21:19 -06:00
parent 9b3c19cc36
commit d36846a699
8 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tgetpass.c
View File

@@ -119,9 +119,9 @@ restart:
*/
if (!ISSET(flags, TGP_ECHO)) {
if (ISSET(flags, TGP_MASK))
neednl = term_cbreak(input);
neednl = sudo_term_cbreak(input);
else
neednl = term_noecho(input);
neednl = sudo_term_noecho(input);
}
/*
@@ -164,7 +164,7 @@ restart:
restore:
/* Restore old tty settings and signals. */
if (!ISSET(flags, TGP_ECHO))
term_restore(input, 1);
sudo_term_restore(input, 1);
(void) sigaction(SIGALRM, &savealrm, NULL);
(void) sigaction(SIGINT, &saveint, NULL);
(void) sigaction(SIGHUP, &savehup, NULL);
@@ -261,7 +261,7 @@ sudo_askpass(const char *askpass, const char *prompt)
debug_return_str_masked(pass);
}
extern int term_erase, term_kill;
extern int sudo_term_erase, sudo_term_kill;
static char *
getln(int fd, char *buf, size_t bufsiz, int feedback)
@@ -282,7 +282,7 @@ getln(int fd, char *buf, size_t bufsiz, int feedback)
if (nr != 1 || c == '\n' || c == '\r')
break;
if (feedback) {
if (c == term_kill) {
if (c == sudo_term_kill) {
while (cp > buf) {
if (write(fd, "\b \b", 3) == -1)
break;
@@ -290,7 +290,7 @@ getln(int fd, char *buf, size_t bufsiz, int feedback)
}
left = bufsiz;
continue;
} else if (c == term_erase) {
} else if (c == sudo_term_erase) {
if (cp > buf) {
if (write(fd, "\b \b", 3) == -1)
break;