X-Git-Url: https://git.toastfreeware.priv.at/gregoa/bti.git/blobdiff_plain/ae9c3fe1363f742e4288f75cb96daa3909b8e609..d8102a419d1573aa6a916621d336d1bf8ba53ee2:/bti.c

diff --git a/bti.c b/bti.c
index 753870c..a8fb97b 100644
--- a/bti.c
+++ b/bti.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2008 Greg Kroah-Hartman <greg@kroah.com>
  * Copyright (C) 2009 Bart Trojanowski <bart@jukie.net>
+ * Copyright (C) 2009 Amir Mohammad Saied <amirsaied@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -16,6 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#define _GNU_SOURCE
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -29,13 +32,13 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <curl/curl.h>
-#include <readline/readline.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <pcre.h>
-#include "bti_version.h"
+#include <termios.h>
+#include <dlfcn.h>
+#include <oauth.h>
 
 
 #define zalloc(size)	calloc(size, 1)
@@ -43,73 +46,181 @@
 #define dbg(format, arg...)						\
 	do {								\
 		if (debug)						\
-			printf("%s: " format , __func__ , ## arg);	\
+			fprintf(stdout, "bti: %s: " format , __func__ , \
+				## arg);				\
 	} while (0)
 
 
 static int debug;
+static int verbose;
 
 enum host {
-	HOST_TWITTER = 0,
+	HOST_TWITTER  = 0,
 	HOST_IDENTICA = 1,
+	HOST_CUSTOM   = 2
 };
 
 enum action {
-	ACTION_UPDATE = 0,
+	ACTION_UPDATE  = 0,
 	ACTION_FRIENDS = 1,
-	ACTION_USER = 2,
+	ACTION_USER    = 2,
 	ACTION_REPLIES = 4,
-	ACTION_PUBLIC = 8,
-	ACTION_UNKNOWN = 16
+	ACTION_PUBLIC  = 8,
+	ACTION_GROUP   = 16,
+	ACTION_UNKNOWN = 32
 };
 
 struct session {
-	char *password;
-	char *account;
+	char *consumer_key;
+	char *consumer_secret;
+	char *access_token_key;
+	char *access_token_secret;
 	char *tweet;
 	char *proxy;
 	char *time;
 	char *homedir;
 	char *logfile;
 	char *user;
+	char *group;
+	char *hosturl;
+	char *hostname;
+	char *configfile;
 	int bash;
+	int interactive;
 	int shrink_urls;
 	int dry_run;
+	int page;
 	enum host host;
 	enum action action;
-};
-
-struct bti_curl_buffer {
-	char *data;
-	enum action action;
-	int length;
+	void *readline_handle;
+	char *(*readline)(const char *);
 };
 
 static void display_help(void)
 {
 	fprintf(stdout, "bti - send tweet to twitter or identi.ca\n");
-	fprintf(stdout, "Version: " BTI_VERSION "\n");
+	fprintf(stdout, "Version: " VERSION "\n");
 	fprintf(stdout, "Usage:\n");
 	fprintf(stdout, "  bti [options]\n");
 	fprintf(stdout, "options are:\n");
-	fprintf(stdout, "  --account accountname\n");
-	fprintf(stdout, "  --password password\n");
 	fprintf(stdout, "  --action action\n");
-	fprintf(stdout, "    ('update', 'friends', 'public', 'replies' or 'user')\n");
+	fprintf(stdout, "    ('update', 'friends', 'public', 'replies', "
+		"'group' or 'user')\n");
 	fprintf(stdout, "  --user screenname\n");
+	fprintf(stdout, "  --group groupname\n");
 	fprintf(stdout, "  --proxy PROXY:PORT\n");
 	fprintf(stdout, "  --host HOST\n");
 	fprintf(stdout, "  --logfile logfile\n");
+	fprintf(stdout, "  --config configfile\n");
 	fprintf(stdout, "  --shrink-urls\n");
+	fprintf(stdout, "  --page PAGENUMBER\n");
 	fprintf(stdout, "  --bash\n");
 	fprintf(stdout, "  --debug\n");
+	fprintf(stdout, "  --verbose\n");
+	fprintf(stdout, "  --dry-run\n");
 	fprintf(stdout, "  --version\n");
 	fprintf(stdout, "  --help\n");
 }
 
 static void display_version(void)
 {
-	fprintf(stdout, "bti - version %s\n", BTI_VERSION);
+	fprintf(stdout, "bti - version %s\n", VERSION);
+}
+
+static char *get_string(const char *name)
+{
+	char *temp;
+	char *string;
+
+	string = zalloc(1000);
+	if (!string)
+		exit(1);
+	if (name != NULL)
+		fprintf(stdout, "%s", name);
+	if (!fgets(string, 999, stdin))
+		return NULL;
+	temp = strchr(string, '\n');
+	if (temp)
+		*temp = '\0';
+	return string;
+}
+
+/*
+ * Try to get a handle to a readline function from a variety of different
+ * libraries.  If nothing is present on the system, then fall back to an
+ * internal one.
+ *
+ * Logic originally based off of code in the e2fsutils package in the
+ * lib/ss/get_readline.c file, which is licensed under the MIT license.
+ *
+ * This keeps us from having to relicense the bti codebase if readline
+ * ever changes its license, as there is no link-time dependancy.
+ * It is a run-time thing only, and we handle any readline-like library
+ * in the same manner, making bti not be a derivative work of any
+ * other program.
+ */
+static void session_readline_init(struct session *session)
+{
+	/* Libraries we will try to use for readline/editline functionality */
+	const char *libpath = "libreadline.so.6:libreadline.so.5:"
+				"libreadline.so.4:libreadline.so:libedit.so.2:"
+				"libedit.so:libeditline.so.0:libeditline.so";
+	void *handle = NULL;
+	char *tmp, *cp, *next;
+	int (*bind_key)(int, void *);
+	void (*insert)(void);
+
+	/* default to internal function if we can't or won't find anything */
+	session->readline = get_string;
+	if (!isatty(0))
+		return;
+	session->interactive = 1;
+
+	tmp = malloc(strlen(libpath)+1);
+	if (!tmp)
+		return;
+	strcpy(tmp, libpath);
+	for (cp = tmp; cp; cp = next) {
+		next = strchr(cp, ':');
+		if (next)
+			*next++ = 0;
+		if (*cp == 0)
+			continue;
+		handle = dlopen(cp, RTLD_NOW);
+		if (handle) {
+			dbg("Using %s for readline library\n", cp);
+			break;
+		}
+	}
+	free(tmp);
+	if (!handle) {
+		dbg("No readline library found.\n");
+		return;
+	}
+
+	session->readline_handle = handle;
+	session->readline = (char *(*)(const char *))dlsym(handle, "readline");
+	if (session->readline == NULL) {
+		/* something odd happened, default back to internal stuff */
+		session->readline_handle = NULL;
+		session->readline = get_string;
+		return;
+	}
+
+	/*
+	 * If we found a library, turn off filename expansion
+	 * as that makes no sense from within bti.
+	 */
+	bind_key = (int (*)(int, void *))dlsym(handle, "rl_bind_key");
+	insert = (void (*)(void))dlsym(handle, "rl_insert");
+	if (bind_key && insert)
+		bind_key('\t', insert);
+}
+
+static void session_readline_cleanup(struct session *session)
+{
+	if (session->readline_handle)
+		dlclose(session->readline_handle);
 }
 
 static struct session *session_alloc(void)
@@ -126,80 +237,53 @@ static void session_free(struct session *session)
 {
 	if (!session)
 		return;
-	free(session->password);
-	free(session->account);
+	free(session->consumer_key);
+	free(session->consumer_secret);
+	free(session->access_token_key);
+	free(session->access_token_secret);
 	free(session->tweet);
 	free(session->proxy);
 	free(session->time);
 	free(session->homedir);
 	free(session->user);
+	free(session->group);
+	free(session->hosturl);
+	free(session->hostname);
+	free(session->configfile);
 	free(session);
 }
 
-static struct bti_curl_buffer *bti_curl_buffer_alloc(enum action action)
-{
-	struct bti_curl_buffer *buffer;
-
-	buffer = zalloc(sizeof(*buffer));
-	if (!buffer)
-		return NULL;
-
-	/* start out with a data buffer of 1 byte to
-	 * make the buffer fill logic simpler */
-	buffer->data = zalloc(1);
-	if (!buffer->data) {
-		free(buffer);
-		return NULL;
-	}
-	buffer->length = 0;
-	buffer->action = action;
-	return buffer;
-}
-
-static void bti_curl_buffer_free(struct bti_curl_buffer *buffer)
-{
-	if (!buffer)
-		return;
-	free(buffer->data);
-	free(buffer);
-}
-
-static const char *twitter_user_url    = "http://twitter.com/statuses/user_timeline/";
-static const char *twitter_update_url  = "https://twitter.com/statuses/update.xml";
-static const char *twitter_public_url  = "http://twitter.com/statuses/public_timeline.xml";
-static const char *twitter_friends_url = "https://twitter.com/statuses/friends_timeline.xml";
-static const char *twitter_replies_url = "http://twitter.com/statuses/replies.xml";
-
-static const char *identica_user_url    = "http://identi.ca/api/statuses/user_timeline/";
-static const char *identica_update_url  = "http://identi.ca/api/statuses/update.xml";
-static const char *identica_public_url  = "http://identi.ca/api/statuses/public_timeline.xml";
-static const char *identica_friends_url = "http://identi.ca/api/statuses/friends_timeline.xml";
-static const char *identica_replies_url = "http://identi.ca/api/statuses/replies.xml";
-
-static CURL *curl_init(void)
-{
-	CURL *curl;
-
-	curl = curl_easy_init();
-	if (!curl) {
-		fprintf(stderr, "Can not init CURL!\n");
-		return NULL;
-	}
-	/* some ssl sanity checks on the connection we are making */
-	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
-	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
-	return curl;
-}
-
-void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
+static const char *twitter_host  = "http://api.twitter.com/1/statuses";
+static const char *identica_host = "https://identi.ca/api/statuses";
+static const char *twitter_name  = "twitter";
+static const char *identica_name = "identi.ca";
+
+static const char *twitter_request_token_uri  = "http://twitter.com/oauth/request_token";
+static const char *twitter_access_token_uri   = "http://twitter.com/oauth/access_token";
+static const char *twitter_authorize_uri      = "http://twitter.com/oauth/authorize?oauth_token=";
+static const char *identica_request_token_uri = "http://identi.ca/api/oauth/request_token";
+static const char *identica_access_token_uri  = "http://identi.ca/api/oauth/access_token";
+static const char *identica_authorize_uri     = "http://identi.ca/api/oauth/authorize?oauth_token=";
+
+static const char *user_uri    = "/user_timeline/";
+static const char *update_uri  = "/update.xml";
+static const char *public_uri  = "/public_timeline.xml";
+static const char *friends_uri = "/friends_timeline.xml";
+static const char *mentions_uri = "/mentions.xml";
+//static const char *group_uri = "/../laconica/groups/timeline/";
+
+static void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
 {
 	xmlChar *text = NULL;
 	xmlChar *user = NULL;
+	xmlChar *created = NULL;
 	xmlNodePtr userinfo;
 
 	current = current->xmlChildrenNode;
 	while (current != NULL) {
 		if (current->type == XML_ELEMENT_NODE) {
+			if (!xmlStrcmp(current->name, (const xmlChar *)"created_at"))
+				created = xmlNodeListGetString(doc, current->xmlChildrenNode, 1);
 			if (!xmlStrcmp(current->name, (const xmlChar *)"text"))
 				text = xmlNodeListGetString(doc, current->xmlChildrenNode, 1);
 			if (!xmlStrcmp(current->name, (const xmlChar *)"user")) {
@@ -213,12 +297,20 @@ void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
 					userinfo = userinfo->next;
 				}
 			}
-			if (user && text) {
-				printf("[%s] %s\n", user, text);
+
+			if (user && text && created) {
+				if (verbose)
+					printf("[%s] (%.16s) %s\n",
+						user, created, text);
+				else
+					printf("[%s] %s\n",
+						user, text);
 				xmlFree(user);
 				xmlFree(text);
+				xmlFree(created);
 				user = NULL;
 				text = NULL;
+				created = NULL;
 			}
 		}
 		current = current->next;
@@ -231,8 +323,9 @@ static void parse_timeline(char *document)
 {
 	xmlDocPtr doc;
 	xmlNodePtr current;
-	doc = xmlReadMemory(document, strlen(document), "timeline.xml", NULL, XML_PARSE_NOERROR);
 
+	doc = xmlReadMemory(document, strlen(document), "timeline.xml",
+			    NULL, XML_PARSE_NOERROR);
 	if (doc == NULL)
 		return;
 
@@ -260,166 +353,169 @@ static void parse_timeline(char *document)
 	return;
 }
 
-size_t curl_callback(void *buffer, size_t size, size_t nmemb, void *userp)
+static int parse_osp_reply(const char *reply, char **token, char **secret)
 {
-	struct bti_curl_buffer *curl_buf = userp;
-	size_t buffer_size = size * nmemb;
-	char *temp;
+	int rc;
+	int retval = 1;
+	char **rv = NULL;
+	rc = oauth_split_url_parameters(reply, &rv);
+	qsort(rv, rc, sizeof(char *), oauth_cmpstringp);
+	if (rc == 2 || rc == 4) {
+		if (!strncmp(rv[0],"oauth_token=",11) && !strncmp(rv[1],"oauth_token_secret=",18)) {
+			if (token)
+				*token =strdup(&(rv[0][12]));
+			if (secret)
+				*secret=strdup(&(rv[1][19]));
+
+			retval = 0;
+		}
+	} else if (rc == 3) {
+		if (!strncmp(rv[1],"oauth_token=",11) && !strncmp(rv[2],"oauth_token_secret=",18)) {
+			if (token)
+				*token =strdup(&(rv[1][12]));
+			if (secret)
+				*secret=strdup(&(rv[2][19]));
+
+			retval = 0;
+		}
+	}
+
+	if (rv)
+		free(rv);
+
+	return retval;
+}
+	
+
+static int request_access_token(struct session *session)
+{
+	char *post_params = NULL;
+	char *request_url = NULL;
+	char *reply    = NULL;
+	char *at_key      = NULL;
+	char *at_secret   = NULL;
+	char *verifier    = NULL;
+	char at_uri[90];
 
-	if ((!buffer) || (!buffer_size) || (!curl_buf))
+	if (!session)
 		return -EINVAL;
 
-	/* add to the data we already have */
-	temp = zalloc(curl_buf->length + buffer_size + 1);
-	if (!temp)
-		return -ENOMEM;
+	if (session->host == HOST_TWITTER)
+		request_url = oauth_sign_url2(
+				twitter_request_token_uri, NULL,
+				OA_HMAC, NULL, session->consumer_key,
+				session->consumer_secret, NULL, NULL);
+	else if (session->host == HOST_IDENTICA)
+		request_url = oauth_sign_url2(
+				identica_request_token_uri, NULL,
+				OA_HMAC, NULL, session->consumer_key,
+				session->consumer_secret, NULL, NULL);
+	reply = oauth_http_get(request_url, post_params);
+
+	if (request_url)
+		free(request_url);
+
+	if (post_params)
+		free(post_params);
+
+	if (!reply)
+		return 1;
+
+	if (parse_osp_reply(reply, &at_key, &at_secret))
+		return 1;
+
+	free(reply);
+
+	fprintf(stdout, "Please open the following link in your browser, and ");
+	fprintf(stdout, "allow 'bti' to access your account. Then paste ");
+	fprintf(stdout, "back the provided PIN in here.\n");
+	if (session->host == HOST_TWITTER) {
+		fprintf(stdout, "%s%s\nPIN: ", twitter_authorize_uri, at_key);
+		verifier = session->readline(NULL);
+		sprintf(at_uri, "%s?oauth_verifier=%s", twitter_access_token_uri, verifier);
+	} else if (session->host == HOST_IDENTICA) {
+		fprintf(stdout, "%s%s\nPIN: ", identica_authorize_uri, at_key);
+		verifier = session->readline(NULL);
+		sprintf(at_uri, "%s?oauth_verifier=%s", identica_access_token_uri, verifier);
+	}
+	request_url = oauth_sign_url2(at_uri, NULL, OA_HMAC, NULL,
+			session->consumer_key, session->consumer_secret, at_key,
+			at_secret);
+	reply = oauth_http_get(request_url, post_params);
+
+	if (!reply)
+		return 1;
 
-	memcpy(temp, curl_buf->data, curl_buf->length);
-	free(curl_buf->data);
-	curl_buf->data = temp;
-	memcpy(&curl_buf->data[curl_buf->length], (char *)buffer, buffer_size);
-	curl_buf->length += buffer_size;
-	if (curl_buf->action)
-		parse_timeline(curl_buf->data);
+	if (parse_osp_reply(reply, &at_key, &at_secret))
+		return 1;
 
-	dbg("%s\n", curl_buf->data);
+	free(reply);
 
-	return buffer_size;
+	fprintf(stdout, "Please put these two lines in your bti configuration ");
+	fprintf(stdout, "file (~/.bti):\n");
+	fprintf(stdout, "access_token_key=%s\n", at_key);
+	fprintf(stdout, "access_token_secret=%s\n", at_secret);
+
+	return 0;
 }
 
 static int send_request(struct session *session)
 {
-	char user_password[500];
-	char data[500];
-	/* is there usernames longer than 22 chars? */
-	char user_url[70];
-	struct bti_curl_buffer *curl_buf;
-	CURL *curl = NULL;
-	CURLcode res;
-	struct curl_httppost *formpost = NULL;
-	struct curl_httppost *lastptr = NULL;
-	struct curl_slist *slist = NULL;
+	char endpoint[500];
+	char *req_url = NULL;
+	char *reply = NULL;
+	char *postarg = NULL;
+	int is_post = 0;
 
 	if (!session)
 		return -EINVAL;
 
-	curl_buf = bti_curl_buffer_alloc(session->action);
-	if (!curl_buf)
-		return -ENOMEM;
-
-	curl = curl_init();
-	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",
-			 session->account, session->password);
-		snprintf(data, sizeof(data), "status=\"%s\"", session->tweet);
-		curl_formadd(&formpost, &lastptr,
-			     CURLFORM_COPYNAME, "status",
-			     CURLFORM_COPYCONTENTS, session->tweet,
-			     CURLFORM_END);
-
-		curl_formadd(&formpost, &lastptr,
-			     CURLFORM_COPYNAME, "source",
-			     CURLFORM_COPYCONTENTS, "bti",
-			     CURLFORM_END);
-
-		curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
-		slist = curl_slist_append(slist, "Expect:");
-		curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
-		switch (session->host) {
-		case HOST_TWITTER:
-			curl_easy_setopt(curl, CURLOPT_URL, twitter_update_url);
-			break;
-		case HOST_IDENTICA:
-			curl_easy_setopt(curl, CURLOPT_URL, identica_update_url);
-			break;
-		}
-		curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
-
-		break;
-	case ACTION_FRIENDS:
-		snprintf(user_password, sizeof(user_password), "%s:%s",
-			 session->account, session->password);
-		switch (session->host) {
-		case HOST_TWITTER:
-			curl_easy_setopt(curl, CURLOPT_URL, twitter_friends_url);
-			break;
-		case HOST_IDENTICA:
-			curl_easy_setopt(curl, CURLOPT_URL, identica_friends_url);
-			break;
-		}
-		curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
-
+		sprintf(endpoint, "%s%s?status=%s", session->hosturl, update_uri, session->tweet);
+		is_post = 1;
 		break;
 	case ACTION_USER:
-		switch (session->host) {
-		case HOST_TWITTER:
-			sprintf(user_url, "%s%s.xml", twitter_user_url, session->user);
-			curl_easy_setopt(curl, CURLOPT_URL, user_url);
-			break;
-		case HOST_IDENTICA:
-			sprintf(user_url, "%s%s.xml", identica_user_url, session->user);
-			curl_easy_setopt(curl, CURLOPT_URL, user_url);
-			break;
-		}
-
+		sprintf(endpoint, "%s%s", session->hosturl, user_uri);
 		break;
 	case ACTION_REPLIES:
-		snprintf(user_password, sizeof(user_password), "%s:%s",
-			 session->account, session->password);
-		switch (session->host) {
-		case HOST_TWITTER:
-			curl_easy_setopt(curl, CURLOPT_URL, twitter_replies_url);
-			break;
-		case HOST_IDENTICA:
-			curl_easy_setopt(curl, CURLOPT_URL, identica_replies_url);
-			break;
-		}
-		curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
-
+		sprintf(endpoint, "%s%s", session->hosturl, mentions_uri);
 		break;
 	case ACTION_PUBLIC:
-		switch (session->host) {
-		case HOST_TWITTER:
-			curl_easy_setopt(curl, CURLOPT_URL, twitter_public_url);
-			break;
-		case HOST_IDENTICA:
-			curl_easy_setopt(curl, CURLOPT_URL, identica_public_url);
-			break;
-		}
-
+		sprintf(endpoint, "%s%s", session->hosturl, public_uri);
+		break;
+	case ACTION_GROUP:
+	case ACTION_FRIENDS:
+		sprintf(endpoint, "%s%s", session->hosturl, friends_uri);
 		break;
 	default:
 		break;
 	}
+	
+	if (is_post) {
+		req_url = oauth_sign_url2(
+			endpoint, &postarg, OA_HMAC, NULL,
+			session->consumer_key, session->consumer_secret,
+			session->access_token_key, session->access_token_secret
+		);
+		reply = oauth_http_post(req_url, postarg);
+	} else {
+		req_url = oauth_sign_url2(
+			endpoint, NULL, OA_HMAC, NULL,
+			session->consumer_key, session->consumer_secret,
+			session->access_token_key, session->access_token_secret
+		);
+		reply = oauth_http_get(req_url, postarg);
+	}
 
-	if (session->proxy)
-		curl_easy_setopt(curl, CURLOPT_PROXY, session->proxy);
+	if (req_url)
+		free(req_url);
 
-	if (debug)
-		curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
-
-	dbg("user_password = %s\n", user_password);
-	dbg("data = %s\n", data);
-	dbg("proxy = %s\n", session->proxy);
-
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_callback);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, curl_buf);
-	if (!session->dry_run) {
-		res = curl_easy_perform(curl);
-		if (res && !session->bash) {
-			fprintf(stderr, "error(%d) trying to perform operation\n", res);
-			return -EINVAL;
-		}
-	}
+	parse_timeline(reply);
 
-	curl_easy_cleanup(curl);
-	if (session->action == ACTION_UPDATE)
-		curl_formfree(formpost);
-	bti_curl_buffer_free(curl_buf);
 	return 0;
 }
 
@@ -428,22 +524,18 @@ static void parse_configfile(struct session *session)
 	FILE *config_file;
 	char *line = NULL;
 	size_t len = 0;
-	char *account = NULL;
-	char *password = NULL;
+	char *consumer_key = NULL;
+	char *consumer_secret = NULL;
+	char *access_token_key = NULL;
+	char *access_token_secret = NULL;
 	char *host = NULL;
 	char *proxy = NULL;
 	char *logfile = NULL;
 	char *action = NULL;
 	char *user = NULL;
-	char *file;
 	int shrink_urls = 0;
 
-	/* config file is ~/.bti  */
-	file = alloca(strlen(session->homedir) + 7);
-
-	sprintf(file, "%s/.bti", session->homedir);
-
-	config_file = fopen(file, "r");
+	config_file = fopen(session->configfile, "r");
 
 	/* No error if file does not exist or is unreadable.  */
 	if (config_file == NULL)
@@ -468,15 +560,26 @@ static void parse_configfile(struct session *session)
 		if (c[0] == '\0')
 			continue;
 
-		if (!strncasecmp(c, "account", 7) && (c[7] == '=')) {
-			c += 8;
+		if (!strncasecmp(c, "consumer_key", 12) &&
+			   (c[12] == '=')) {
+			c += 13;
+			if (c[0] != '\0')
+				consumer_key = strdup(c);
+		} else if (!strncasecmp(c, "consumer_secret", 15) &&
+			   (c[15] == '=')) {
+			c += 16;
 			if (c[0] != '\0')
-				account = strdup(c);
-		} else if (!strncasecmp(c, "password", 8) &&
-			   (c[8] == '=')) {
-			c += 9;
+				consumer_secret = strdup(c);
+		} else if (!strncasecmp(c, "access_token_key", 16) &&
+			   (c[16] == '=')) {
+			c += 17;
 			if (c[0] != '\0')
-				password = strdup(c);
+				access_token_key = strdup(c);
+		} else if (!strncasecmp(c, "access_token_secret", 19) &&
+			   (c[19] == '=')) {
+			c += 20;
+			if (c[0] != '\0')
+				access_token_secret = strdup(c);
 		} else if (!strncasecmp(c, "host", 4) &&
 			   (c[4] == '=')) {
 			c += 5;
@@ -508,18 +611,37 @@ static void parse_configfile(struct session *session)
 			if (!strncasecmp(c, "true", 4) ||
 					!strncasecmp(c, "yes", 3))
 				shrink_urls = 1;
+		} else if (!strncasecmp(c, "verbose", 7) &&
+				(c[7] == '=')) {
+			c += 8;
+			if (!strncasecmp(c, "true", 4) ||
+					!strncasecmp(c, "yes", 3))
+				verbose = 1;
 		}
 	} while (!feof(config_file));
 
-	if (password)
-		session->password = password;
-	if (account)
-		session->account = account;
+	if (consumer_key)
+		session->consumer_key = consumer_key;
+	if (consumer_secret)
+		session->consumer_secret = consumer_secret;
+	if (access_token_key)
+		session->access_token_key = access_token_key;
+	if (access_token_secret)
+		session->access_token_secret = access_token_secret;
 	if (host) {
-		if (strcasecmp(host, "twitter") == 0)
+		if (strcasecmp(host, "twitter") == 0) {
 			session->host = HOST_TWITTER;
-		if (strcasecmp(host, "identica") == 0)
+			session->hosturl = strdup(twitter_host);
+			session->hostname = strdup(twitter_name);
+		} else if (strcasecmp(host, "identica") == 0) {
 			session->host = HOST_IDENTICA;
+			session->hosturl = strdup(identica_host);
+			session->hostname = strdup(identica_name);
+		} else {
+			session->host = HOST_CUSTOM;
+			session->hosturl = strdup(host);
+			session->hostname = strdup(host);
+		}
 		free(host);
 	}
 	if (proxy) {
@@ -540,13 +662,14 @@ static void parse_configfile(struct session *session)
 			session->action = ACTION_REPLIES;
 		else if (strcasecmp(action, "public") == 0)
 			session->action = ACTION_PUBLIC;
+		else if (strcasecmp(action, "group") == 0)
+			session->action = ACTION_GROUP;
 		else
 			session->action = ACTION_UNKNOWN;
 		free(action);
 	}
-	if (user) {
+	if (user)
 		session->user = user;
-	}
 	session->shrink_urls = shrink_urls;
 
 	/* Free buffer and close file.  */
@@ -558,7 +681,6 @@ static void log_session(struct session *session, int retval)
 {
 	FILE *log_file;
 	char *filename;
-	char *host;
 
 	/* Only log something if we have a log file set */
 	if (!session->logfile)
@@ -572,42 +694,36 @@ static void log_session(struct session *session, int retval)
 	log_file = fopen(filename, "a+");
 	if (log_file == NULL)
 		return;
-	switch (session->host) {
-	case HOST_TWITTER:
-		host = "twitter";
-		break;
-	case HOST_IDENTICA:
-		host = "identi.ca";
-		break;
-	default:
-		host = "unknown";
-		break;
-	}
 
 	switch (session->action) {
 	case ACTION_UPDATE:
 		if (retval)
 			fprintf(log_file, "%s: host=%s tweet failed\n",
-				session->time, host);
+				session->time, session->hostname);
 		else
 			fprintf(log_file, "%s: host=%s tweet=%s\n",
-				session->time, host, session->tweet);
+				session->time, session->hostname,
+				session->tweet);
 		break;
 	case ACTION_FRIENDS:
 		fprintf(log_file, "%s: host=%s retrieving friends timeline\n",
-			session->time, host);
+			session->time, session->hostname);
 		break;
 	case ACTION_USER:
 		fprintf(log_file, "%s: host=%s retrieving %s's timeline\n",
-			session->time, host, session->user);
+			session->time, session->hostname, session->user);
 		break;
 	case ACTION_REPLIES:
 		fprintf(log_file, "%s: host=%s retrieving replies\n",
-			session->time, host);
+			session->time, session->hostname);
 		break;
 	case ACTION_PUBLIC:
 		fprintf(log_file, "%s: host=%s retrieving public timeline\n",
-			session->time, host);
+			session->time, session->hostname);
+		break;
+	case ACTION_GROUP:
+		fprintf(log_file, "%s: host=%s retrieving group timeline\n",
+			session->time, session->hostname);
 		break;
 	default:
 		break;
@@ -628,13 +744,17 @@ static char *get_string_from_stdin(void)
 	if (!fgets(string, 999, stdin))
 		return NULL;
 	temp = strchr(string, '\n');
-	*temp = '\0';
+	if (temp)
+		*temp = '\0';
 	return string;
 }
 
 static int find_urls(const char *tweet, int **pranges)
 {
-	// magic obtained from http://www.geekpedia.com/KB65_How-to-validate-an-URL-using-RegEx-in-Csharp.html
+	/*
+	 * magic obtained from
+	 * http://www.geekpedia.com/KB65_How-to-validate-an-URL-using-RegEx-in-Csharp.html
+	 */
 	static const char *re_magic =
 		"(([a-zA-Z][0-9a-zA-Z+\\-\\.]*:)/{1,3}"
 		"[0-9a-zA-Z;/~?:@&=+$\\.\\-_'()%]+)"
@@ -655,23 +775,24 @@ static int find_urls(const char *tweet, int **pranges)
 			&errptr, &erroffset, NULL);
 	if (!re) {
 		fprintf(stderr, "pcre_compile @%u: %s\n", erroffset, errptr);
-		exit (1);
+		exit(1);
 	}
 
 	tweetlen = strlen(tweet);
-	for (startoffset=0; startoffset<tweetlen; ) {
+	for (startoffset = 0; startoffset < tweetlen; ) {
 
 		rc = pcre_exec(re, NULL, tweet, strlen(tweet), startoffset, 0,
 				ovector, ovsize);
 		if (rc == PCRE_ERROR_NOMATCH)
 			break;
 
-		if (rc<0) {
-			fprintf(stderr, "pcre_exec @%u: %s\n", erroffset, errptr);
-			exit (1);
+		if (rc < 0) {
+			fprintf(stderr, "pcre_exec @%u: %s\n",
+				erroffset, errptr);
+			exit(1);
 		}
 
-		for (i=0; i<rc; i+=2) {
+		for (i = 0; i < rc; i += 2) {
 			if ((rcount+2) == rbound) {
 				rbound *= 2;
 				ranges = realloc(ranges, sizeof(int) * rbound);
@@ -711,19 +832,20 @@ static int popenRWE(int *rwepipe, const char *exe, const char *const argv[])
 	int rc;
 
 	rc = pipe(in);
-	if (rc<0)
+	if (rc < 0)
 		goto error_in;
 
 	rc = pipe(out);
-	if (rc<0)
+	if (rc < 0)
 		goto error_out;
 
 	rc = pipe(err);
-	if (rc<0)
+	if (rc < 0)
 		goto error_err;
 
 	pid = fork();
-	if (pid > 0) { // parent
+	if (pid > 0) {
+		/* parent */
 		close(in[0]);
 		close(out[1]);
 		close(err[1]);
@@ -731,7 +853,8 @@ static int popenRWE(int *rwepipe, const char *exe, const char *const argv[])
 		rwepipe[1] = out[0];
 		rwepipe[2] = err[0];
 		return pid;
-	} else if (pid == 0) { // child
+	} else if (pid == 0) {
+		/* child */
 		close(in[1]);
 		close(out[0]);
 		close(err[0]);
@@ -742,7 +865,7 @@ static int popenRWE(int *rwepipe, const char *exe, const char *const argv[])
 		close(2);
 		rc = dup(err[1]);
 
-		execvp(exe, (char**)argv);
+		execvp(exe, (char **)argv);
 		exit(1);
 	} else
 		goto error_fork;
@@ -799,7 +922,7 @@ static char *shrink_one_url(int *rwepipe, char *big)
 	while (smalllen && isspace(small[smalllen-1]))
 			small[--smalllen] = 0;
 
-	free (big);
+	free(big);
 	return small;
 
 error_free_small:
@@ -832,7 +955,7 @@ static char *shrink_urls(char *text)
 	if (!rcount)
 		return text;
 
-	for (i=0; i<rcount; i+=2) {
+	for (i = 0; i < rcount; i += 2) {
 		int url_start = ranges[i];
 		int url_end = ranges[i+1];
 		int long_url_len = url_end - url_start;
@@ -846,7 +969,8 @@ static char *shrink_urls(char *text)
 		dbg("short url[%u]: %s\n", short_url_len, url);
 
 		if (!url || short_url_len >= long_url_len) {
-			// the short url ended up being too long or unavailable
+			/* The short url ended up being too long
+			 * or unavailable */
 			if (inofs) {
 				strncpy(text + outofs, text + inofs,
 						not_url_len + long_url_len);
@@ -855,21 +979,21 @@ static char *shrink_urls(char *text)
 			outofs += not_url_len + long_url_len;
 
 		} else {
-			// copy the unmodified block
+			/* copy the unmodified block */
 			strncpy(text + outofs, text + inofs, not_url_len);
 			inofs += not_url_len;
 			outofs += not_url_len;
 
-			// copy the new url
+			/* copy the new url */
 			strncpy(text + outofs, url, short_url_len);
 			inofs += long_url_len;
 			outofs += short_url_len;
 		}
 
-		free (url);
+		free(url);
 	}
 
-	// copy the last block after the last match
+	/* copy the last block after the last match */
 	if (inofs) {
 		int tail = inlen - inofs;
 		if (tail) {
@@ -891,18 +1015,20 @@ int main(int argc, char *argv[], char *envp[])
 {
 	static const struct option options[] = {
 		{ "debug", 0, NULL, 'd' },
-		{ "account", 1, NULL, 'a' },
-		{ "password", 1, NULL, 'p' },
+		{ "verbose", 0, NULL, 'V' },
 		{ "host", 1, NULL, 'H' },
 		{ "proxy", 1, NULL, 'P' },
 		{ "action", 1, NULL, 'A' },
 		{ "user", 1, NULL, 'u' },
+		{ "group", 1, NULL, 'G' },
 		{ "logfile", 1, NULL, 'L' },
 		{ "shrink-urls", 0, NULL, 's' },
 		{ "help", 0, NULL, 'h' },
 		{ "bash", 0, NULL, 'b' },
 		{ "dry-run", 0, NULL, 'n' },
+		{ "page", 1, NULL, 'g' },
 		{ "version", 0, NULL, 'v' },
+		{ "config", 1, NULL, 'c' },
 		{ }
 	};
 	struct session *session;
@@ -912,9 +1038,10 @@ int main(int argc, char *argv[], char *envp[])
 	int option;
 	char *http_proxy;
 	time_t t;
+	int page_nr;
 
 	debug = 0;
-	rl_bind_key('\t', rl_insert);
+	verbose = 0;
 
 	session = session_alloc();
 	if (!session) {
@@ -927,9 +1054,12 @@ int main(int argc, char *argv[], char *envp[])
 	session->time = strdup(ctime(&t));
 	session->time[strlen(session->time)-1] = 0x00;
 
+	/* Get the home directory so we can try to find a config file */
 	session->homedir = strdup(getenv("HOME"));
 
-	curl_global_init(CURL_GLOBAL_ALL);
+	/* set up a default config file location (traditionally ~/.bti) */
+	session->configfile = zalloc(strlen(session->homedir) + 7);
+	sprintf(session->configfile, "%s/.bti", session->homedir);
 
 	/* Set environment variables first, before reading command line options
 	 * or config file values. */
@@ -944,7 +1074,7 @@ int main(int argc, char *argv[], char *envp[])
 	parse_configfile(session);
 
 	while (1) {
-		option = getopt_long_only(argc, argv, "dqe:p:P:H:a:A:u:h",
+		option = getopt_long_only(argc, argv, "dp:P:H:a:A:u:c:hg:G:snVv",
 					  options, NULL);
 		if (option == -1)
 			break;
@@ -952,17 +1082,13 @@ int main(int argc, char *argv[], char *envp[])
 		case 'd':
 			debug = 1;
 			break;
-		case 'a':
-			if (session->account)
-				free(session->account);
-			session->account = strdup(optarg);
-			dbg("account = %s\n", session->account);
+		case 'V':
+			verbose = 1;
 			break;
-		case 'p':
-			if (session->password)
-				free(session->password);
-			session->password = strdup(optarg);
-			dbg("password = %s\n", session->password);
+		case 'g':
+			page_nr = atoi(optarg);
+			dbg("page = %d\n", page_nr);
+			session->page = page_nr;
 			break;
 		case 'P':
 			if (session->proxy)
@@ -981,6 +1107,8 @@ int main(int argc, char *argv[], char *envp[])
 				session->action = ACTION_REPLIES;
 			else if (strcasecmp(optarg, "public") == 0)
 				session->action = ACTION_PUBLIC;
+			else if (strcasecmp(optarg, "group") == 0)
+				session->action = ACTION_GROUP;
 			else
 				session->action = ACTION_UNKNOWN;
 			dbg("action = %d\n", session->action);
@@ -991,6 +1119,13 @@ int main(int argc, char *argv[], char *envp[])
 			session->user = strdup(optarg);
 			dbg("user = %s\n", session->user);
 			break;
+
+		case 'G':
+			if (session->group)
+				free(session->group);
+			session->group = strdup(optarg);
+			dbg("group = %s\n", session->group);
+			break;
 		case 'L':
 			if (session->logfile)
 				free(session->logfile);
@@ -1001,15 +1136,40 @@ int main(int argc, char *argv[], char *envp[])
 			session->shrink_urls = 1;
 			break;
 		case 'H':
-			if (strcasecmp(optarg, "twitter") == 0)
+			if (session->hosturl)
+				free(session->hosturl);
+			if (session->hostname)
+				free(session->hostname);
+			if (strcasecmp(optarg, "twitter") == 0) {
 				session->host = HOST_TWITTER;
-			if (strcasecmp(optarg, "identica") == 0)
+				session->hosturl = strdup(twitter_host);
+				session->hostname = strdup(twitter_name);
+			} else if (strcasecmp(optarg, "identica") == 0) {
 				session->host = HOST_IDENTICA;
+				session->hosturl = strdup(identica_host);
+				session->hostname = strdup(identica_name);
+			} else {
+				session->host = HOST_CUSTOM;
+				session->hosturl = strdup(optarg);
+				session->hostname = strdup(optarg);
+			}
 			dbg("host = %d\n", session->host);
 			break;
 		case 'b':
 			session->bash = 1;
 			break;
+		case 'c':
+			if (session->configfile)
+				free(session->configfile);
+			session->configfile = strdup(optarg);
+			dbg("configfile = %s\n", session->configfile);
+
+			/*
+			 * read the config file now.  Yes, this could override previously
+			 * set options from the command line, but the user asked for it...
+			 */
+			parse_configfile(session);
+			break;
 		case 'h':
 			display_help();
 			goto exit;
@@ -1025,27 +1185,46 @@ int main(int argc, char *argv[], char *envp[])
 		}
 	}
 
+	session_readline_init(session);
+	/*
+	 * Show the version to make it easier to determine what
+	 * is going on here
+	 */
+	if (debug)
+		display_version();
+
+	if (!session->consumer_key || !session->consumer_secret) {
+		fprintf(stderr, "Both consumer key, and consumer secret are required.\n");
+		goto exit;
+	}
+	
+	if (!session->access_token_key || !session->access_token_secret) {
+		request_access_token(session);
+		goto exit;
+	}
+
 	if (session->action == ACTION_UNKNOWN) {
 		fprintf(stderr, "Unknown action, valid actions are:\n");
-		fprintf(stderr, "'update', 'friends', 'public', 'replies' or 'user'.\n");
+		fprintf(stderr, "'update', 'friends', 'public', "
+			"'replies', 'group' or 'user'.\n");
 		goto exit;
 	}
 
-	if (!session->account) {
-		fprintf(stdout, "Enter twitter account: ");
-		session->account = readline(NULL);
+	if (session->host == HOST_TWITTER && session->action == ACTION_GROUP) {
+		fprintf(stderr, "Groups only work in Identi.ca.\n");
+		goto exit;
 	}
 
-	if (!session->password) {
-		fprintf(stdout, "Enter twitter password: ");
-		session->password = readline(NULL);
+	if (session->action == ACTION_GROUP && !session->group) {
+		fprintf(stdout, "Enter group name: ");
+		session->group = session->readline(NULL);
 	}
 
 	if (session->action == ACTION_UPDATE) {
-		if (session->bash)
+		if (session->bash || !session->interactive)
 			tweet = get_string_from_stdin();
 		else
-			tweet = readline("tweet: ");
+			tweet = session->readline("tweet: ");
 		if (!tweet || strlen(tweet) == 0) {
 			dbg("no tweet?\n");
 			return -1;
@@ -1056,7 +1235,8 @@ int main(int argc, char *argv[], char *envp[])
 
 		session->tweet = zalloc(strlen(tweet) + 10);
 		if (session->bash)
-			sprintf(session->tweet, "$ %s", tweet);
+			sprintf(session->tweet, "%c %s",
+				getuid() ? '$' : '#', tweet);
 		else
 			sprintf(session->tweet, "%s", tweet);
 
@@ -1064,11 +1244,9 @@ int main(int argc, char *argv[], char *envp[])
 		dbg("tweet = %s\n", session->tweet);
 	}
 
-	if (!session->user)
-		session->user = strdup(session->account);
-
-	dbg("account = %s\n", session->account);
-	dbg("password = %s\n", session->password);
+	if (session->page == 0)
+		session->page = 1;
+	dbg("config file = %s\n", session->configfile);
 	dbg("host = %d\n", session->host);
 	dbg("action = %d\n", session->action);
 
@@ -1089,6 +1267,7 @@ int main(int argc, char *argv[], char *envp[])
 
 	log_session(session, retval);
 exit:
+	session_readline_cleanup(session);
 	session_free(session);
 	return retval;;
 }