deal with ^D in input, don't return a pointer into the stack, don't

malloc unneeded memory

diff --git a/clients/passwd/chfn.c b/clients/passwd/chfn.c
index 332ada02b539c187ab2d010d5e0ac1c757a62c46..004e714f96290f1af272fc6b238c24a04cfe5851 100644 (file)
--- a/clients/passwd/chfn.c
+++ b/clients/passwd/chfn.c
@@ -230,7 +230,7 @@ char *ask(question, def_val, phone_num)
   char *def_val;
   int phone_num;               /* True if this must contain only digits */
 {
-    char buf[BUFSIZ];
+    static char buf[BUFSIZ];
     int ok = FALSE;
     char *result;
     int i;
@@ -242,7 +242,8 @@ char *ask(question, def_val, phone_num)
     {
        ok = TRUE;
        printf("%s [%s]: ", question, def_val);
-       (void) fgets(buf, sizeof(buf), stdin);
+       if (fgets(buf, sizeof(buf), stdin) == NULL)
+         leave(0);
        buf[strlen(buf) - 1] = NULL;
        if (strlen(buf) == 0)
            result = def_val;
@@ -292,11 +293,9 @@ char *ask(question, def_val, phone_num)
     }
     
     /* Remove dashes if necessary */
-    if (dashes) {
+    if (dashes && result == buf) {
        char *tmp1, *tmp2;
-       result = strsave(buf);
-       tmp1 = (char *)buf;
-       tmp2 = result;
+       tmp1 = tmp2 = (char *)buf;
        do {
            if (*(tmp1) != '-')
                *(tmp2++) = *(tmp1);