Got rid of four warnings in Shantonu's new getpass.c. Needed to #include

[mmh] / sbr / getpass.c

diff --git a/sbr/getpass.c b/sbr/getpass.c
index 6a53b72..a8238fb 100644 (file)
--- a/sbr/getpass.c
+++ b/sbr/getpass.c
@@ -30,12 +30,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $ID$
+ * $Id$
  */
 
 #include <stdio.h>
-#include <unistd.h>
+#include <stdlib.h>   /* for calloc() */
 #include <termios.h>
+#include <unistd.h>   /* for ttyname() */
+#include "h/mh.h"     /* for adios() */
 
 #define PASSWORD_LEN 128
 
@@ -43,18 +45,22 @@
 #define TCSANOW 0
 #endif
 
-char *getpass(const char *prompt)
+char *
+getpass(const char *prompt)
 {
   struct termios oterm, term;
   int ch;
-  char *p, *ttystring, buf[PASSWORD_LEN+1];
+  char *p, *ttystring, *buf;
   FILE *fout, *fin;
 
+  if(!(buf = (char *)calloc((size_t)(PASSWORD_LEN+1), sizeof(char))))
+    adios(NULL, "unable to allocate string storage");
+
   /* Find if stdin is connect to a terminal. If so, read directly from
    * the terminal, and turn off echo. Otherwise read from stdin.
    */
 
-  if((ttystring = ttyname(fileno(stdin))) == NULL) {
+  if((ttystring = (char *)ttyname(fileno(stdin))) == NULL) {
     fout = stderr;
     fin = stdin;
   }
@@ -80,5 +86,5 @@ char *getpass(const char *prompt)
     (void)fputc('\n', fout);
     (void)fclose(fin);
   }
-  return(buf);
+  return((char *)buf);
 }