Merge remote branch 'gregkh/master'

diff --git a/bti.c b/bti.c
index 1f1279e11f0a975849db8123b336d0a9f4cb5a77..41d2d9bd5ac2b7bd992cb8b87f8ba61658b7f2fa 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -338,6 +338,9 @@ static int send_request(struct session *session)
        if (!curl)
                return -EINVAL;
 
+       if (!session->hosturl)
+               session->hosturl = strdup(twitter_host);
+
        switch (session->action) {
        case ACTION_UPDATE:
                snprintf(user_password, sizeof(user_password), "%s:%s",
@@ -669,7 +672,7 @@ static void read_password(char *buf, size_t len)
        tp.c_lflag &= (~ECHO);
        tcsetattr(0, TCSANOW, &tp);
 
-       fprintf(stdout, "Enter twitter password: ");
+       fprintf(stdout, "Enter password: ");
        fflush(stdout);
        tcflow(0, TCOOFF);
        retval = scanf("%79s", pwd);
@@ -1138,7 +1141,7 @@ int main(int argc, char *argv[], char *envp[])
        }
 
        if (!session->account) {
-               fprintf(stdout, "Enter twitter account: ");
+               fprintf(stdout, "Enter account: ");
                session->account = readline(NULL);
        }