From: Amir Mohammad Saied <amirsaied@gmail.com>
Date: Thu, 31 Dec 2009 10:39:25 +0000 (+0330)
Subject: Merge remote branch 'gregkh/master'
X-Git-Url: https://git.toastfreeware.priv.at/gregoa/bti.git/commitdiff_plain/efbfcf69af74348a17a2fef09f7f60c572c3e455?hp=1fdc0e3770308d677733ed18cbbc40841c8621d0

Merge remote branch 'gregkh/master'
---

diff --git a/bti.c b/bti.c
index 1f1279e..41d2d9b 100644
--- 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);
 	}