Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 5d1e027
Make query_yesno() read and write via the controlling tty for the process, thus allowing us to use stdin / stdout for file IO.
Matthew Seaman committed 13 years ago
commit 5d1e027b53f30cd29a90051295f7e3f33b09e07a
parent f932e38
1 file changed +19 -6
modified pkg/utils.c
@@ -31,11 +31,13 @@
#include <sys/stat.h>



#include <err.h>
+ 
#include <fcntl.h>

#include <inttypes.h>

#include <libutil.h>

#include <string.h>

#include <unistd.h>

#include <stdarg.h>
+ 
#include <paths.h>

#include <pkg.h>



#include "pkgcli.h"
@@ -43,23 +45,34 @@
bool

query_yesno(const char *msg, ...)

{
- 
	int c;
- 
	bool r = false;
- 
	va_list ap;
+ 
	int	 c;
+ 
	bool	 r = false;
+ 
	va_list	 ap;
+ 
	int	 tty_fd;
+ 
	FILE	*tty;
+
+ 
	tty_fd = open(_PATH_TTY, O_RDWR|O_TTY_INIT);
+ 
	if (tty_fd == -1)
+ 
		return (r);		/* No ctty -- return the
+ 
					 * default answer */
+
+ 
	tty = fdopen(tty_fd, "r+");



	va_start(ap, msg);
- 
	vprintf(msg, ap);
+ 
	vfprintf(tty, msg, ap);

	va_end(ap);
- 
	c = getchar();
+ 
	c = getc(tty);

	if (c == 'y' || c == 'Y')

		r = true;

	else if (c == '\n' || c == EOF)

		return false;
- 
	while ((c = getchar()) != '\n' && c != EOF)
+ 
	while ((c = getc(tty)) != '\n' && c != EOF)

		continue;
+ 
	fclose(tty);
+ 


	return r;

}