chfn: Make readline prompt for each field on a separate line

When readline is called to get user input, it is called without
a prompt argument. As a result, if the user does not enter anything
for a given field, then the next field is displayed on the same
line, yielding the following output:

  $ chfn
  Changing finger information for user.
  Password:
  Name []: Office []: Office Phone []: Home Phone []:

instead of the expected:

  $ chfn
  Changing finger information for user.
  Password:
  Full Name []:
  Room Number []:
  Work Phone []:
  Home Phone []:

This patch restores the expected behavior by feeding readline with
a character to display as "prompt".

[kzak@redhat.com: - do the same change in chsh
                  - use ' ' rather than '\n' for non-readline code]

Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index 1b203a83ed4ca5a2aaedc04330aea573126cd19f..4b2b42912bcfef0e9f5e394112f176e638ad7673 100644 (file)
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -235,12 +235,13 @@ static char *ask_new_field(struct chfn_control *ctl, const char *question,
        if (!def_val)
                def_val = "";
        while (true) {
-               printf("%s [%s]: ", question, def_val);
+               printf("%s [%s]:", question, def_val);
                __fpurge(stdin);
 #ifdef HAVE_LIBREADLINE
                rl_bind_key('\t', rl_insert);
-               if ((buf = readline(NULL)) == NULL)
+               if ((buf = readline(" ")) == NULL)
 #else
+               putchar(' ');
                if (getline(&buf, &dummy, stdin) < 0)
 #endif
                        errx(EXIT_FAILURE, _("Aborted."));

diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index a9ebec86ff66b8b67cfbb3a871b714f63582c9da..17cc9f1e085cdc2c3594b1fdd920e8bc9cd99c8b 100644 (file)
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -205,10 +205,11 @@ static char *ask_new_shell(char *question, char *oldshell)
 #endif
        if (!oldshell)
                oldshell = "";
-       printf("%s [%s]\n", question, oldshell);
+       printf("%s [%s]:", question, oldshell);
 #ifdef HAVE_LIBREADLINE
-       if ((ans = readline("> ")) == NULL)
+       if ((ans = readline(" ")) == NULL)
 #else
+       putchar(' ');
        if (getline(&ans, &dummy, stdin) < 0)
 #endif
                return NULL;