From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 10 Aug 2014 21:51:53 +0000 (+0100)
Subject: lib: remove xgetpass()
X-Git-Tag: v2.26-rc1~447^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96c4bc4dd2a35ccb8ab10b5341fa4f90ace146f4;p=thirdparty%2Futil-linux.git

lib: remove xgetpass()

This function is not in use, and it has reference to obsoleted getpass().

Reference: http://man7.org/linux/man-pages/man3/getpass.3.html
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/include/Makemodule.am b/include/Makemodule.am
index dd5c3f58c5..65002457d5 100644
--- a/include/Makemodule.am
+++ b/include/Makemodule.am
@@ -49,7 +49,6 @@ dist_noinst_HEADERS += \
 	include/ttyutils.h \
 	include/widechar.h \
 	include/xalloc.h \
-	include/xgetpass.h \
 	include/pt-sgi.h \
 	include/pt-bsd.h \
 	include/pt-mbr.h \
diff --git a/include/xgetpass.h b/include/xgetpass.h
deleted file mode 100644
index b5a3c87de1..0000000000
--- a/include/xgetpass.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef UTIL_LINUX_XGETPASS_H
-#define UTIL_LINUX_XGETPASS_H
-
-extern char *xgetpass(int pfd, const char *prompt);
-
-#endif /* UTIL_LINUX_XGETPASS_H */
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 78298691b4..6450902159 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -24,7 +24,6 @@ libcommon_la_SOURCES = \
 	lib/sysfs.c \
 	lib/timeutils.c \
 	lib/ttyutils.c \
-	lib/xgetpass.c \
 	lib/exec_shell.c \
 	lib/readutmp.c
 
diff --git a/lib/xgetpass.c b/lib/xgetpass.c
deleted file mode 100644
index ba2089470c..0000000000
--- a/lib/xgetpass.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * A function to read the passphrase either from the terminal or from
- * an open file descriptor.
- *
- * Public domain.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-
-#include "c.h"
-#include "xgetpass.h"
-
-char *xgetpass(int pfd, const char *prompt)
-{
-	char *pass = NULL;
-	int len = 0, i;
-
-        if (pfd < 0) /* terminal */
-		return getpass(prompt);
-
-	for (i=0; ; i++) {
-		if (i >= len-1) {
-			char *tmppass = pass;
-			len += 128;
-
-			pass = realloc(tmppass, len);
-			if (!pass) {
-				pass = tmppass; /* the old buffer hasn't changed */
-				break;
-			}
-		}
-		if (pass && (read(pfd, pass + i, 1) != 1 ||
-			     pass[i] == '\n' || pass[i] == 0))
-			break;
-	}
-
-	if (pass)
-		pass[i] = '\0';
-	return pass;
-}
-