2006-11-13 16:03:46 +00:00
|
|
|
--- cups-1.2.6/cups/usersys.c.getpass 2006-08-29 16:51:19.000000000 +0100
|
2006-11-13 16:26:25 +00:00
|
|
|
+++ cups-1.2.6/cups/usersys.c 2006-11-13 16:19:32.000000000 +0000
|
|
|
|
@@ -46,6 +46,8 @@
|
2006-11-13 16:03:46 +00:00
|
|
|
#include "globals.h"
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
+#include <termios.h>
|
2006-11-13 16:26:25 +00:00
|
|
|
+#include <signal.h>
|
2006-11-13 16:03:46 +00:00
|
|
|
#ifdef WIN32
|
|
|
|
# include <windows.h>
|
|
|
|
#endif /* WIN32 */
|
2006-11-13 16:26:25 +00:00
|
|
|
@@ -455,7 +457,29 @@
|
2006-11-13 16:03:46 +00:00
|
|
|
const char * /* O - Password */
|
|
|
|
_cupsGetPassword(const char *prompt) /* I - Prompt string */
|
|
|
|
{
|
|
|
|
- return (getpass(prompt));
|
|
|
|
+ static char password[100];
|
2006-11-13 16:26:25 +00:00
|
|
|
+ struct termios oldtio, newtio;
|
|
|
|
+ sigset_t oldset, newset;
|
2006-11-13 16:03:46 +00:00
|
|
|
+ int nread;
|
2006-11-13 16:26:25 +00:00
|
|
|
+ sigprocmask (SIG_BLOCK, NULL, &newset);
|
|
|
|
+ sigaddset (&newset, SIGINT);
|
|
|
|
+ sigaddset (&newset, SIGTSTP);
|
|
|
|
+ sigprocmask (SIG_BLOCK, &newset, &oldset);
|
|
|
|
+ tcgetattr (STDIN_FILENO, &oldtio);
|
|
|
|
+ newtio = oldtio;
|
|
|
|
+ newtio.c_lflag &= ~ECHO;
|
|
|
|
+ tcsetattr (STDIN_FILENO, TCSAFLUSH, &newtio);
|
2006-11-13 16:03:46 +00:00
|
|
|
+ fputs (prompt, stdout);
|
|
|
|
+ fflush (stdout);
|
|
|
|
+ nread = read (STDIN_FILENO, password, sizeof (password));
|
2006-11-13 16:26:25 +00:00
|
|
|
+ tcsetattr (STDIN_FILENO, TCSAFLUSH, &oldtio);
|
2006-11-13 16:03:46 +00:00
|
|
|
+ fputc ('\n', stdout);
|
2006-11-13 16:26:25 +00:00
|
|
|
+ sigprocmask (SIG_SETMASK, &oldset, NULL);
|
2006-11-13 16:03:46 +00:00
|
|
|
+ if (nread > 0)
|
|
|
|
+ password[nread - 1] = '\0';
|
|
|
|
+ else
|
|
|
|
+ password[0] ='\0';
|
|
|
|
+ return password;
|
|
|
|
}
|
|
|
|
#endif /* WIN32 */
|
|
|
|
|