1 diff -r 9b63083c0717 -r 038856dd5d0b common.h

     2 --- a/common.h	Mon Nov 28 14:17:13 2011 +0100

     3 +++ b/common.h	Mon Nov 28 14:21:56 2011 +0100

     4 @@ -273,7 +273,7 @@

     5  char *home_filename(char *name);

     6  void read_ldapvi_history(void);

     7  void write_ldapvi_history(void);

     8 -char *getline(char *prompt, char *value);

     9 +char *ldapvi_getline(char *prompt, char *value);

    10  char *get_password();

    11  char *append(char *a, char *b);

    12  void *xalloc(size_t size);

    13 diff -r 9b63083c0717 -r 038856dd5d0b ldapvi.c

    14 --- a/ldapvi.c	Mon Nov 28 14:17:13 2011 +0100

    15 +++ b/ldapvi.c	Mon Nov 28 14:21:56 2011 +0100

    16 @@ -470,7 +470,7 @@

    17  		bo->authmethod = LDAP_AUTH_SASL;

    18  		puts("Switching to SASL authentication.");

    19  	}

    20 -	bo->sasl_mech = getline("SASL mechanism", bo->sasl_mech);

    21 +	bo->sasl_mech = ldapvi_getline("SASL mechanism", bo->sasl_mech);

    22  }

    23  

    24  static int

    25 diff -r 9b63083c0717 -r 038856dd5d0b misc.c

    26 --- a/misc.c	Mon Nov 28 14:17:13 2011 +0100

    27 +++ b/misc.c	Mon Nov 28 14:21:56 2011 +0100

    28 @@ -315,7 +315,7 @@

    29  }

    30  

    31  char *

    32 -getline(char *prompt, char *value)

    33 +ldapvi_getline(char *prompt, char *value)

    34  {

    35  	tdialog d;

    36  	init_dialog(&d, DIALOG_DEFAULT, prompt, value);