Fix a segfault when specifying an invalid host.

[gregoa/bti.git] / bti.c

diff --git a/bti.c b/bti.c
index a06c818499414462ed6bb2b00971372cc52a8333..17a2a9396badba7f770002c67d99f842fa6e24c8 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -1,5 +1,7 @@
 /*
 /*

- * Copyright (C) 2008 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2008-2011 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2009 Bart Trojanowski <bart@jukie.net>
+ * Copyright (C) 2009-2010 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
  *
  * 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


@@ -15,6 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 

+#define _GNU_SOURCE
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>


@@ -24,79 +28,163 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <unistd.h>

+#include <time.h>

 #include <sys/stat.h>
 #include <sys/stat.h>

+#include <sys/types.h>
+#include <sys/wait.h>

 #include <curl/curl.h>
 #include <curl/curl.h>

-#include "bti_version.h"
-
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <pcre.h>
+#include <termios.h>
+#include <dlfcn.h>
+#include <oauth.h>
+#include "bti.h"

 
 #define zalloc(size)   calloc(size, 1)
 
 #define dbg(format, arg...)                                            \
        do {                                                            \
                if (debug)                                              \
 
 #define zalloc(size)   calloc(size, 1)
 
 #define dbg(format, arg...)                                            \
        do {                                                            \
                if (debug)                                              \

-                       printf("%s: " format , __func__ , ## arg );     \
+                       fprintf(stdout, "bti: %s: " format , __func__ , \
+                               ## arg);                                \

        } while (0)
 
 
        } while (0)
 
 

-static int debug = 0;
-
-enum host {
-       HOST_TWITTER = 0,
-       HOST_IDENTICA = 1,
-};
-
-struct session {
-       char *password;
-       char *account;
-       char *tweet;
-       char *proxy;
-       int bash;
-       enum host host;
-};
-
-struct bti_curl_buffer {
-       char *data;
-       int length;
-};
+int debug;

 
 static void display_help(void)
 {
 
 static void display_help(void)
 {

-       fprintf(stdout, "bti - send tweet to twitter\n");
-       fprintf(stdout, "Version: " BTI_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, "  --proxy PROXY:PORT\n");
-       fprintf(stdout, "  --host HOST\n");
-       fprintf(stdout, "  --bash\n");
-       fprintf(stdout, "  --debug\n");
-       fprintf(stdout, "  --version\n");
-       fprintf(stdout, "  --help\n");
+       fprintf(stdout, "bti - send tweet to twitter or identi.ca\n"
+               "Version: %s\n"
+               "Usage:\n"
+               "  bti [options]\n"
+               "options are:\n"
+               "  --account accountname\n"
+               "  --password password\n"
+               "  --action action\n"
+               "    ('update', 'friends', 'public', 'replies', or 'user')\n"
+               "  --user screenname\n"
+               "  --group groupname\n"
+               "  --proxy PROXY:PORT\n"
+               "  --host HOST\n"
+               "  --logfile logfile\n"
+               "  --config configfile\n"
+               "  --replyto ID\n"
+               "  --retweet ID\n"
+               "  --shrink-urls\n"
+               "  --page PAGENUMBER\n"
+               "  --bash\n"
+               "  --background\n"
+               "  --debug\n"
+               "  --verbose\n"
+               "  --dry-run\n"
+               "  --version\n"
+               "  --help\n", VERSION);

 }
 
 static void display_version(void)
 {
 }
 
 static void display_version(void)
 {

-       fprintf(stdout, "bti - version %s\n", BTI_VERSION);
+       fprintf(stdout, "bti - version %s\n", VERSION);

 }
 
 }
 

-static char *get_string_from_stdin(void)
+static char *get_string(const char *name)

 {
        char *temp;
        char *string;
 
        string = zalloc(1000);
        if (!string)
 {
        char *temp;
        char *string;
 
        string = zalloc(1000);
        if (!string)

-               return NULL;
-
+               exit(1);
+       if (name != NULL)
+               fprintf(stdout, "%s", name);

        if (!fgets(string, 999, stdin))
                return NULL;
        temp = strchr(string, '\n');
        if (!fgets(string, 999, stdin))
                return NULL;
        temp = strchr(string, '\n');

-       *temp = '\0';
+       if (temp)
+               *temp = '\0';

        return string;
 }
 
        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)
 {
        struct session *session;
 static struct session *session_alloc(void)
 {
        struct session *session;


@@ -111,14 +199,27 @@ static void session_free(struct session *session)
 {
        if (!session)
                return;
 {
        if (!session)
                return;

+       free(session->retweet);
+       free(session->replyto);

        free(session->password);
        free(session->account);
        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->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);
 }
 
        free(session);
 }
 

-static struct bti_curl_buffer *bti_curl_buffer_alloc(void)
+static struct bti_curl_buffer *bti_curl_buffer_alloc(enum action action)

 {
        struct bti_curl_buffer *buffer;
 
 {
        struct bti_curl_buffer *buffer;
 


@@ -134,6 +235,7 @@ static struct bti_curl_buffer *bti_curl_buffer_alloc(void)
                return NULL;
        }
        buffer->length = 0;
                return NULL;
        }
        buffer->length = 0;

+       buffer->action = action;

        return buffer;
 }
 
        return buffer;
 }
 


@@ -145,8 +247,26 @@ static void bti_curl_buffer_free(struct bti_curl_buffer *buffer)
        free(buffer);
 }
 
        free(buffer);
 }
 

-static const char *twitter_url = "https://twitter.com/statuses/update.xml";
-static const char *identica_url = "http://identi.ca/api/statuses/update.xml";
+const char twitter_host[]  = "http://api.twitter.com/1/statuses";
+const char identica_host[] = "https://identi.ca/api/statuses";
+const char twitter_name[]  = "twitter";
+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?oauth_callback=oob";
+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 replies_uri[]  = "/replies.xml";
+static const char retweet_uri[]  = "/retweet/";
+static const char group_uri[]    = "/../statusnet/groups/timeline/";

 
 static CURL *curl_init(void)
 {
 
 static CURL *curl_init(void)
 {


@@ -163,7 +283,100 @@ static CURL *curl_init(void)
        return curl;
 }
 
        return curl;
 }
 

-size_t curl_callback(void *buffer, size_t size, size_t nmemb, void *userp)
+/* The final place data is sent to the screen/pty/tty */
+void bti_output_line(struct session *session, xmlChar *user, xmlChar *id,
+                    xmlChar *created, xmlChar *text)
+{
+       if (session->verbose)
+               printf("[%s] {%s} (%.16s) %s\n", user, id, created, text);
+       else
+               printf("[%s] %s\n", user, text);
+}
+
+static void parse_statuses(struct session *session,
+                          xmlDocPtr doc, xmlNodePtr current)
+{
+       xmlChar *text = NULL;
+       xmlChar *user = NULL;
+       xmlChar *created = NULL;
+       xmlChar *id = 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 *)"id"))
+                               id = xmlNodeListGetString(doc, current->xmlChildrenNode, 1);
+                       if (!xmlStrcmp(current->name, (const xmlChar *)"user")) {
+                               userinfo = current->xmlChildrenNode;
+                               while (userinfo != NULL) {
+                                       if ((!xmlStrcmp(userinfo->name, (const xmlChar *)"screen_name"))) {
+                                               if (user)
+                                                       xmlFree(user);
+                                               user = xmlNodeListGetString(doc, userinfo->xmlChildrenNode, 1);
+                                       }
+                                       userinfo = userinfo->next;
+                               }
+                       }
+
+                       if (user && text && created && id) {
+                               bti_output_line(session, user, id, created, text);
+                               xmlFree(user);
+                               xmlFree(text);
+                               xmlFree(created);
+                               xmlFree(id);
+                               user = NULL;
+                               text = NULL;
+                               created = NULL;
+                               id = NULL;
+                       }
+               }
+               current = current->next;
+       }
+
+       return;
+}
+
+static void parse_timeline(char *document, struct session *session)
+{
+       xmlDocPtr doc;
+       xmlNodePtr current;
+
+       doc = xmlReadMemory(document, strlen(document), "timeline.xml",
+                           NULL, XML_PARSE_NOERROR);
+       if (doc == NULL)
+               return;
+
+       current = xmlDocGetRootElement(doc);
+       if (current == NULL) {
+               fprintf(stderr, "empty document\n");
+               xmlFreeDoc(doc);
+               return;
+       }
+
+       if (xmlStrcmp(current->name, (const xmlChar *) "statuses")) {
+               fprintf(stderr, "unexpected document type\n");
+               xmlFreeDoc(doc);
+               return;
+       }
+
+       current = current->xmlChildrenNode;
+       while (current != NULL) {
+               if ((!xmlStrcmp(current->name, (const xmlChar *)"status")))
+                       parse_statuses(session, doc, current);
+               current = current->next;
+       }
+       xmlFreeDoc(doc);
+
+       return;
+}
+
+static size_t curl_callback(void *buffer, size_t size, size_t nmemb,
+                           void *userp)

 {
        struct bti_curl_buffer *curl_buf = userp;
        size_t buffer_size = size * nmemb;
 {
        struct bti_curl_buffer *curl_buf = userp;
        size_t buffer_size = size * nmemb;


@@ -182,14 +395,133 @@ size_t curl_callback(void *buffer, size_t size, size_t nmemb, void *userp)
        curl_buf->data = temp;
        memcpy(&curl_buf->data[curl_buf->length], (char *)buffer, buffer_size);
        curl_buf->length += buffer_size;
        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, curl_buf->session);

 
        dbg("%s\n", curl_buf->data);
 
        return buffer_size;
 }
 
 
        dbg("%s\n", curl_buf->data);
 
        return buffer_size;
 }
 

-static int send_tweet(struct session *session)
+static int parse_osp_reply(const char *reply, char **token, char **secret)

 {
 {

+       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;
+               }
+       }
+
+       dbg("token: %s\n", *token);
+       dbg("secret: %s\n", *secret);
+
+       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 (!session)
+               return -EINVAL;
+
+       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 "
+               "allow 'bti' to access your account. Then paste "
+               "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;
+
+       if (parse_osp_reply(reply, &at_key, &at_secret))
+               return 1;
+
+       free(reply);
+
+       fprintf(stdout,
+               "Please put these two lines in your bti "
+               "configuration file (~/.bti):\n"
+               "access_token_key=%s\n"
+               "access_token_secret=%s\n",
+               at_key, at_secret);
+
+       return 0;
+}
+
+static int send_request(struct session *session)
+{
+       char endpoint[500];

        char user_password[500];
        char data[500];
        struct bti_curl_buffer *curl_buf;
        char user_password[500];
        char data[500];
        struct bti_curl_buffer *curl_buf;


@@ -198,186 +530,627 @@ static int send_tweet(struct session *session)
        struct curl_httppost *formpost = NULL;
        struct curl_httppost *lastptr = NULL;
        struct curl_slist *slist = NULL;
        struct curl_httppost *formpost = NULL;
        struct curl_httppost *lastptr = NULL;
        struct curl_slist *slist = NULL;

+       char *req_url = NULL;
+       char *reply = NULL;
+       char *postarg = NULL;
+       char *escaped_tweet = NULL;
+       int is_post = 0;

 
        if (!session)
                return -EINVAL;
 
 
        if (!session)
                return -EINVAL;
 

-       curl_buf = bti_curl_buffer_alloc();
-       if (!curl_buf)
-               return -ENOMEM;
+       if (!session->hosturl)
+               session->hosturl = strdup(twitter_host);
+
+       if (session->no_oauth || session->guest) {
+               curl_buf = bti_curl_buffer_alloc(session->action);
+               if (!curl_buf)
+                       return -ENOMEM;
+               curl_buf->session = session;
+
+               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);
+
+                       if (session->replyto)
+                               curl_formadd(&formpost, &lastptr,
+                                            CURLFORM_COPYNAME, "in_reply_to_status_id",
+                                            CURLFORM_COPYCONTENTS, session->replyto,
+                                            CURLFORM_END);
+
+                       curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
+                       slist = curl_slist_append(slist, "Expect:");
+                       curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
+
+                       sprintf(endpoint, "%s%s", session->hosturl, update_uri);
+                       curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+                       curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
+                       break;

 
 

-       snprintf(user_password, sizeof(user_password), "%s:%s",
-                session->account, session->password);
-       snprintf(data, sizeof(data), "status=\"%s\"", session->tweet);
+               case ACTION_FRIENDS:
+                       snprintf(user_password, sizeof(user_password), "%s:%s",
+                                session->account, session->password);
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                                       friends_uri, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+                       curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
+                       break;

 
 

-       curl = curl_init();
-       if (!curl)
-               return -EINVAL;
+               case ACTION_USER:
+                       sprintf(endpoint, "%s%s%s.xml?page=%d", session->hosturl,
+                               user_uri, session->user, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+                       break;
+
+               case ACTION_REPLIES:
+                       snprintf(user_password, sizeof(user_password), "%s:%s",
+                                session->account, session->password);
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                               replies_uri, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+                       curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
+                       break;
+
+               case ACTION_PUBLIC:
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                               public_uri, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+                       break;
+
+               case ACTION_GROUP:
+                       sprintf(endpoint, "%s%s%s.xml?page=%d",
+                               session->hosturl, group_uri, session->group,
+                               session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+                       break;
+
+               default:
+                       break;
+               }
+
+               if (session->proxy)
+                       curl_easy_setopt(curl, CURLOPT_PROXY, session->proxy);
+
+               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->background) {
+                               fprintf(stderr, "error(%d) trying to perform "
+                                               "operation\n", res);
+                               return -EINVAL;
+                       }
+               }
+
+               curl_easy_cleanup(curl);
+               if (session->action == ACTION_UPDATE)
+                       curl_formfree(formpost);
+               bti_curl_buffer_free(curl_buf);
+       } else {
+               switch (session->action) {
+               case ACTION_UPDATE:
+                       escaped_tweet = oauth_url_escape(session->tweet);
+                       if (session->replyto) {
+                               sprintf(endpoint,
+                                       "%s%s?status=%s&in_reply_to_status_id=%s",
+                                       session->hosturl, update_uri,
+                                       escaped_tweet, session->replyto);
+                       } else {
+                               sprintf(endpoint, "%s%s?status=%s",
+                                       session->hosturl, update_uri,
+                                       escaped_tweet);
+                       }
+
+                       is_post = 1;
+                       break;
+               case ACTION_USER:
+                       sprintf(endpoint, "%s%s%s.xml?page=%d",
+                               session->hosturl, user_uri, session->user,
+                               session->page);
+                       break;
+               case ACTION_REPLIES:
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                               mentions_uri, session->page);
+                       break;
+               case ACTION_PUBLIC:
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                               public_uri, session->page);
+                       break;
+               case ACTION_GROUP:
+                       sprintf(endpoint, "%s%s%s.xml?page=%d",
+                               session->hosturl, group_uri, session->group,
+                               session->page);
+                       break;
+               case ACTION_FRIENDS:
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                               friends_uri, session->page);
+                       break;
+               case ACTION_RETWEET:
+                       sprintf(endpoint, "%s%s%s.xml", session->hosturl,
+                               retweet_uri, session->retweet);
+                       is_post = 1;
+                       break;
+               default:
+                       break;
+               }
+
+               dbg("%s\n", endpoint);
+               if (!session->dry_run) {
+                       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);
+                       }
+
+                       dbg("%s\n", req_url);
+                       dbg("%s\n", reply);
+                       if (req_url)
+                               free(req_url);
+               }
+
+               if (!reply) {
+                       fprintf(stderr, "Error retrieving from URL (%s)\n", endpoint);
+                       return 1;
+               }
+
+               if ((session->action != ACTION_UPDATE) &&
+                               (session->action != ACTION_RETWEET))
+                       parse_timeline(reply, session);
+       }
+       return 0;
+}
+
+static void log_session(struct session *session, int retval)
+{
+       FILE *log_file;
+       char *filename;
+
+       /* Only log something if we have a log file set */
+       if (!session->logfile)
+               return;

 
 

-       curl_formadd(&formpost, &lastptr,
-                    CURLFORM_COPYNAME, "status",
-                    CURLFORM_COPYCONTENTS, session->tweet,
-                    CURLFORM_END);
-
-       curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
-
-       switch (session->host) {
-       case HOST_TWITTER:
-               curl_easy_setopt(curl, CURLOPT_URL, twitter_url);
-               /*
-                * twitter doesn't like the "Expect: 100-continue" header
-                * anymore, so turn it off.
-                */
-               slist = curl_slist_append(slist, "Expect:");
-               curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
+       filename = alloca(strlen(session->homedir) +
+                         strlen(session->logfile) + 3);
+
+       sprintf(filename, "%s/%s", session->homedir, session->logfile);
+
+       log_file = fopen(filename, "a+");
+       if (log_file == NULL)
+               return;
+
+       switch (session->action) {
+       case ACTION_UPDATE:
+               if (retval)
+                       fprintf(log_file, "%s: host=%s tweet failed\n",
+                               session->time, session->hostname);
+               else
+                       fprintf(log_file, "%s: host=%s tweet=%s\n",
+                               session->time, session->hostname,
+                               session->tweet);
+               break;
+       case ACTION_FRIENDS:
+               fprintf(log_file, "%s: host=%s retrieving friends timeline\n",
+                       session->time, session->hostname);
+               break;
+       case ACTION_USER:
+               fprintf(log_file, "%s: host=%s retrieving %s's timeline\n",
+                       session->time, session->hostname, session->user);
+               break;
+       case ACTION_REPLIES:
+               fprintf(log_file, "%s: host=%s retrieving replies\n",
+                       session->time, session->hostname);

                break;
                break;

-       case HOST_IDENTICA:
-               curl_easy_setopt(curl, CURLOPT_URL, identica_url);
+       case ACTION_PUBLIC:
+               fprintf(log_file, "%s: host=%s retrieving public timeline\n",
+                       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;
        }
 
                break;
        }
 

-       if (session->proxy)
-               curl_easy_setopt(curl, CURLOPT_PROXY, session->proxy);
+       fclose(log_file);
+}

 
 

-       if (debug)
-               curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
-       curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
-
-       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);
-       res = curl_easy_perform(curl);
-       if (res && !session->bash) {
-               fprintf(stderr, "error(%d) trying to send tweet\n", res);
-               return -EINVAL;
+static char *get_string_from_stdin(void)
+{
+       char *temp;
+       char *string;
+
+       string = zalloc(1000);
+       if (!string)
+               return NULL;
+
+       if (!fgets(string, 999, stdin))
+               return NULL;
+       temp = strchr(string, '\n');
+       if (temp)
+               *temp = '\0';
+       return string;
+}
+
+static void read_password(char *buf, size_t len, char *host)
+{
+       char pwd[80];
+       int retval;
+       struct termios old;
+       struct termios tp;
+
+       tcgetattr(0, &tp);
+       old = tp;
+
+       tp.c_lflag &= (~ECHO);
+       tcsetattr(0, TCSANOW, &tp);
+
+       fprintf(stdout, "Enter password for %s: ", host);
+       fflush(stdout);
+       tcflow(0, TCOOFF);
+       retval = scanf("%79s", pwd);
+       tcflow(0, TCOON);
+       fprintf(stdout, "\n");
+
+       tcsetattr(0, TCSANOW, &old);
+
+       strncpy(buf, pwd, len);
+       buf[len-1] = '\0';
+}
+
+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
+        */
+       static const char *re_magic =
+               "(([a-zA-Z][0-9a-zA-Z+\\-\\.]*:)/{1,3}"
+               "[0-9a-zA-Z;/~?:@&=+$\\.\\-_'()%]+)"
+               "(#[0-9a-zA-Z;/?:@&=+$\\.\\-_!~*'()%]+)?";
+       pcre *re;
+       const char *errptr;
+       int erroffset;
+       int ovector[10] = {0,};
+       const size_t ovsize = sizeof(ovector)/sizeof(*ovector);
+       int startoffset, tweetlen;
+       int i, rc;
+       int rbound = 10;
+       int rcount = 0;
+       int *ranges = malloc(sizeof(int) * rbound);
+
+       re = pcre_compile(re_magic,
+                       PCRE_NO_AUTO_CAPTURE,
+                       &errptr, &erroffset, NULL);
+       if (!re) {
+               fprintf(stderr, "pcre_compile @%u: %s\n", erroffset, errptr);
+               exit(1);

        }
 
        }
 

-       curl_easy_cleanup(curl);
-       curl_formfree(formpost);
-       bti_curl_buffer_free(curl_buf);
-       return 0;
+       tweetlen = strlen(tweet);
+       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);
+               }
+
+               for (i = 0; i < rc; i += 2) {
+                       if ((rcount+2) == rbound) {
+                               rbound *= 2;
+                               ranges = realloc(ranges, sizeof(int) * rbound);
+                       }
+
+                       ranges[rcount++] = ovector[i];
+                       ranges[rcount++] = ovector[i+1];
+               }
+
+               startoffset = ovector[1];
+       }
+
+       pcre_free(re);
+
+       *pranges = ranges;
+       return rcount;

 }
 
 }
 

-static void parse_configfile(struct session *session)
+/**
+ * bidirectional popen() call
+ *
+ * @param rwepipe - int array of size three
+ * @param exe - program to run
+ * @param argv - argument list
+ * @return pid or -1 on error
+ *
+ * The caller passes in an array of three integers (rwepipe), on successful
+ * execution it can then write to element 0 (stdin of exe), and read from
+ * element 1 (stdout) and 2 (stderr).
+ */
+static int popenRWE(int *rwepipe, const char *exe, const char *const argv[])

 {
 {

-       FILE *config_file;
-       char *line = NULL;
-       size_t len = 0;
-       char *account = NULL;
-       char *password = NULL;
-       char *host = NULL;
-       char *proxy = NULL;
-       char *file;
-       char *home = getenv("HOME");
+       int in[2];
+       int out[2];
+       int err[2];
+       int pid;
+       int rc;
+
+       rc = pipe(in);
+       if (rc < 0)
+               goto error_in;
+
+       rc = pipe(out);
+       if (rc < 0)
+               goto error_out;
+
+       rc = pipe(err);
+       if (rc < 0)
+               goto error_err;
+
+       pid = fork();
+       if (pid > 0) {
+               /* parent */
+               close(in[0]);
+               close(out[1]);
+               close(err[1]);
+               rwepipe[0] = in[1];
+               rwepipe[1] = out[0];
+               rwepipe[2] = err[0];
+               return pid;
+       } else if (pid == 0) {
+               /* child */
+               close(in[1]);
+               close(out[0]);
+               close(err[0]);
+               close(0);
+               rc = dup(in[0]);
+               close(1);
+               rc = dup(out[1]);
+               close(2);
+               rc = dup(err[1]);
+
+               execvp(exe, (char **)argv);
+               exit(1);
+       } else
+               goto error_fork;
+
+       return pid;
+
+error_fork:
+       close(err[0]);
+       close(err[1]);
+error_err:
+       close(out[0]);
+       close(out[1]);
+error_out:
+       close(in[0]);
+       close(in[1]);
+error_in:
+       return -1;
+}

 
 

-       /* config file is ~/.bti  */
-       file = alloca(strlen(home) + 7);
+static int pcloseRWE(int pid, int *rwepipe)
+{
+       int rc, status;
+       close(rwepipe[0]);
+       close(rwepipe[1]);
+       close(rwepipe[2]);
+       rc = waitpid(pid, &status, 0);
+       return status;
+}

 
 

-       sprintf(file, "%s/.bti", home);
+static char *shrink_one_url(int *rwepipe, char *big)
+{
+       int biglen = strlen(big);
+       char *small;
+       int smalllen;
+       int rc;

 
 

-       config_file = fopen(file, "r");
+       rc = dprintf(rwepipe[0], "%s\n", big);
+       if (rc < 0)
+               return big;

 
 

-       /* No error if file does not exist or is unreadable.  */
-       if (config_file == NULL)
-               return;
+       smalllen = biglen + 128;
+       small = malloc(smalllen);
+       if (!small)
+               return big;

 
 

-       do {
-               ssize_t n = getline(&line, &len, config_file);
-               if (n < 0)
-                       break;
-               if (line[n - 1] == '\n')
-                       line[n - 1] = '\0';
-               /* Parse file.  Format is the usual value pairs:
-                  account=name
-                  passwort=value
-                  # is a comment character
-               */
-               *strchrnul(line, '#') = '\0';
-               char *c = line;
-               while (isspace(*c))
-                       c++;
-               /* Ignore blank lines.  */
-               if (c[0] == '\0')
-                       continue;
+       rc = read(rwepipe[1], small, smalllen);
+       if (rc < 0 || rc > biglen)
+               goto error_free_small;
+
+       if (strncmp(small, "http://", 7))
+               goto error_free_small;

 
 

-               if (!strncasecmp(c, "account", 7) && (c[7] == '=')) {
-                       c += 8;
-                       if (c[0] != '\0')
-                               account = strdup(c);
-               } else if (!strncasecmp(c, "password", 8) &&
-                          (c[8] == '=')) {
-                       c += 9;
-                       if (c[0] != '\0')
-                               password = strdup(c);
-               } else if (!strncasecmp(c, "host", 4) &&
-                          (c[4] == '=')) {
-                       c += 5;
-                       if (c[0] != '\0')
-                               host = strdup(c);
-               } else if (!strncasecmp(c, "proxy", 5) &&
-                          (c[5] == '=')) {
-                       c += 6;
-                       if (c[0] != '\0')
-                               proxy = strdup(c);
+       smalllen = rc;
+       while (smalllen && isspace(small[smalllen-1]))
+                       small[--smalllen] = 0;
+
+       free(big);
+       return small;
+
+error_free_small:
+       free(small);
+       return big;
+}
+
+static char *shrink_urls(char *text)
+{
+       int *ranges;
+       int rcount;
+       int i;
+       int inofs = 0;
+       int outofs = 0;
+       const char *const shrink_args[] = {
+               "bti-shrink-urls",
+               NULL
+       };
+       int shrink_pid;
+       int shrink_pipe[3];
+       int inlen = strlen(text);
+
+       dbg("before len=%u\n", inlen);
+
+       shrink_pid = popenRWE(shrink_pipe, shrink_args[0], shrink_args);
+       if (shrink_pid < 0)
+               return text;
+
+       rcount = find_urls(text, &ranges);
+       if (!rcount)
+               return text;
+
+       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;
+               char *url = strndup(text + url_start, long_url_len);
+               int short_url_len;
+               int not_url_len = url_start - inofs;
+
+               dbg("long  url[%u]: %s\n", long_url_len, url);
+               url = shrink_one_url(shrink_pipe, url);
+               short_url_len = url ? strlen(url) : 0;
+               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 */
+                       if (inofs) {
+                               strncpy(text + outofs, text + inofs,
+                                               not_url_len + long_url_len);
+                       }
+                       inofs += not_url_len + long_url_len;
+                       outofs += not_url_len + long_url_len;
+
+               } else {
+                       /* copy the unmodified block */
+                       strncpy(text + outofs, text + inofs, not_url_len);
+                       inofs += not_url_len;
+                       outofs += not_url_len;
+
+                       /* copy the new url */
+                       strncpy(text + outofs, url, short_url_len);
+                       inofs += long_url_len;
+                       outofs += short_url_len;

                }
                }

-       } while (!feof(config_file));
-
-       if (password)
-               session->password = password;
-       if (account)
-               session->account = account;
-       if (host) {
-               if (strcasecmp(host, "twitter") == 0)
-                       session->host = HOST_TWITTER;
-               if (strcasecmp(host, "identica") == 0)
-                       session->host = HOST_IDENTICA;
-               free(host);
+
+               free(url);

        }
        }

-       if (proxy) {
-               if (session->proxy)
-                       free(session->proxy);
-               session->proxy = proxy;
+
+       /* copy the last block after the last match */
+       if (inofs) {
+               int tail = inlen - inofs;
+               if (tail) {
+                       strncpy(text + outofs, text + inofs, tail);
+                       outofs += tail;
+               }

        }
 
        }
 

-       /* Free buffer and close file.  */
-       free(line);
-       fclose(config_file);
+       free(ranges);
+
+       (void)pcloseRWE(shrink_pid, shrink_pipe);
+
+       text[outofs] = 0;
+       dbg("after len=%u\n", outofs);
+       return text;

 }
 
 int main(int argc, char *argv[], char *envp[])
 {
        static const struct option options[] = {
                { "debug", 0, NULL, 'd' },
 }
 
 int main(int argc, char *argv[], char *envp[])
 {
        static const struct option options[] = {
                { "debug", 0, NULL, 'd' },

+               { "verbose", 0, NULL, 'V' },

                { "account", 1, NULL, 'a' },
                { "password", 1, NULL, 'p' },
                { "host", 1, NULL, 'H' },
                { "proxy", 1, NULL, 'P' },
                { "account", 1, NULL, 'a' },
                { "password", 1, NULL, 'p' },
                { "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' },
                { "help", 0, NULL, 'h' },
                { "bash", 0, NULL, 'b' },

+               { "background", 0, NULL, 'B' },
+               { "dry-run", 0, NULL, 'n' },
+               { "page", 1, NULL, 'g' },

                { "version", 0, NULL, 'v' },
                { "version", 0, NULL, 'v' },

+               { "config", 1, NULL, 'c' },
+               { "replyto", 1, NULL, 'r' },
+               { "retweet", 1, NULL, 'w' },

                { }
        };
        struct session *session;
        pid_t child;
        char *tweet;
                { }
        };
        struct session *session;
        pid_t child;
        char *tweet;

-       int retval;
+       char *retweet;
+       static char password[80];
+       int retval = 0;

        int option;
        char *http_proxy;
        int option;
        char *http_proxy;

-#if 0
-       char *home = getenv("HOME");
-       char *pwd = getenv("PWD");
-       char *dir;
-#endif
+       time_t t;
+       int page_nr;
+
+       debug = 0;
+

        session = session_alloc();
        if (!session) {
                fprintf(stderr, "no more memory...\n");
                return -1;
        }
 
        session = session_alloc();
        if (!session) {
                fprintf(stderr, "no more memory...\n");
                return -1;
        }
 

-       curl_global_init(CURL_GLOBAL_ALL);
+       /* get the current time so that we can log it later */
+       time(&t);
+       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"));
+
+       /* 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. */
 
        /* Set environment variables first, before reading command line options
         * or config file values. */


@@ -389,10 +1162,11 @@ int main(int argc, char *argv[], char *envp[])
                dbg("http_proxy = %s\n", session->proxy);
        }
 
                dbg("http_proxy = %s\n", session->proxy);
        }
 

-       parse_configfile(session);
+       bti_parse_configfile(session);

 
        while (1) {
 
        while (1) {

-               option = getopt_long_only(argc, argv, "dqe:p:P:H:a:h",
+               option = getopt_long_only(argc, argv,
+                                         "dp:P:H:a:A:u:c:hg:G:sr:nVv",

                                          options, NULL);
                if (option == -1)
                        break;
                                          options, NULL);
                if (option == -1)
                        break;


@@ -400,12 +1174,28 @@ int main(int argc, char *argv[], char *envp[])
                case 'd':
                        debug = 1;
                        break;
                case 'd':
                        debug = 1;
                        break;

+               case 'V':
+                       session->verbose = 1;
+                       break;

                case 'a':
                        if (session->account)
                                free(session->account);
                        session->account = strdup(optarg);
                        dbg("account = %s\n", session->account);
                        break;
                case 'a':
                        if (session->account)
                                free(session->account);
                        session->account = strdup(optarg);
                        dbg("account = %s\n", session->account);
                        break;

+               case 'g':
+                       page_nr = atoi(optarg);
+                       dbg("page = %d\n", page_nr);
+                       session->page = page_nr;
+                       break;
+               case 'r':
+                       session->replyto = strdup(optarg);
+                       dbg("in_reply_to_status_id = %s\n", session->replyto);
+                       break;
+               case 'w':
+                       session->retweet = strdup(optarg);
+                       dbg("Retweet ID = %s\n", session->retweet);
+                       break;

                case 'p':
                        if (session->password)
                                free(session->password);
                case 'p':
                        if (session->password)
                                free(session->password);


@@ -418,19 +1208,92 @@ int main(int argc, char *argv[], char *envp[])
                        session->proxy = strdup(optarg);
                        dbg("proxy = %s\n", session->proxy);
                        break;
                        session->proxy = strdup(optarg);
                        dbg("proxy = %s\n", session->proxy);
                        break;

+               case 'A':
+                       if (strcasecmp(optarg, "update") == 0)
+                               session->action = ACTION_UPDATE;
+                       else if (strcasecmp(optarg, "friends") == 0)
+                               session->action = ACTION_FRIENDS;
+                       else if (strcasecmp(optarg, "user") == 0)
+                               session->action = ACTION_USER;
+                       else if (strcasecmp(optarg, "replies") == 0)
+                               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 if (strcasecmp(optarg,"retweet") == 0)
+                               session->action = ACTION_RETWEET;
+                       else
+                               session->action = ACTION_UNKNOWN;
+                       dbg("action = %d\n", session->action);
+                       break;
+               case 'u':
+                       if (session->user)
+                               free(session->user);
+                       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);
+                       session->logfile = strdup(optarg);
+                       dbg("logfile = %s\n", session->logfile);
+                       break;
+               case 's':
+                       session->shrink_urls = 1;
+                       break;

                case 'H':
                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;
                                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->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':
                        dbg("host = %d\n", session->host);
                        break;
                case 'b':

-                       session->bash= 1;
+                       session->bash = 1;
+                       /* fall-through intended */
+               case 'B':
+                       session->background = 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...
+                        */
+                       bti_parse_configfile(session);

                        break;
                case 'h':
                        display_help();
                        goto exit;
                        break;
                case 'h':
                        display_help();
                        goto exit;

+               case 'n':
+                       session->dry_run = 1;
+                       break;

                case 'v':
                        display_version();
                        goto exit;
                case 'v':
                        display_version();
                        goto exit;


@@ -440,68 +1303,130 @@ int main(int argc, char *argv[], char *envp[])
                }
        }
 
                }
        }
 

-       if (!session->account) {
-               fprintf(stdout, "Enter twitter account: ");
-               session->account = get_string_from_stdin();
+       session_readline_init(session);
+       /*
+        * Show the version to make it easier to determine what
+        * is going on here
+        */
+       if (debug)
+               display_version();
+
+       if (session->host == HOST_TWITTER) {
+               if (!session->consumer_key || !session->consumer_secret) {
+                       if (session->action == ACTION_USER ||
+                                       session->action == ACTION_PUBLIC) {
+                               /* Some actions may still work without authentication */
+                               session->guest = 1;
+                       } else {
+                               fprintf(stderr,
+                                               "Twitter no longer supports HTTP basic authentication.\n"
+                                               "Both consumer key, and consumer secret are required"
+                                               " for bti in order to behave as an OAuth consumer.\n");
+                               goto exit;
+                       }
+               }
+               if (session->action == ACTION_GROUP) {
+                       fprintf(stderr, "Groups only work in Identi.ca.\n");
+                       goto exit;
+               }
+       } else {
+               if (!session->consumer_key || !session->consumer_secret)
+                       session->no_oauth = 1;

        }
 
        }
 

-       if (!session->password) {
-               fprintf(stdout, "Enter twitter password: ");
-               session->password = get_string_from_stdin();
+       if (session->no_oauth) {
+               if (!session->account) {
+                       fprintf(stdout, "Enter account for %s: ",
+                               session->hostname);
+                       session->account = session->readline(NULL);
+               }
+               if (!session->password) {
+                       read_password(password, sizeof(password),
+                                     session->hostname);
+                       session->password = strdup(password);
+               }
+       } else if (!session->guest) {
+               if (!session->access_token_key ||
+                   !session->access_token_secret) {
+                       request_access_token(session);
+                       goto exit;
+               }

        }
        }

-#if 0
-       /* get the current working directory basename */
-       if (strcmp(pwd, home) == 0)
-               dir = "~";
-       else {
-               dir = strrchr(pwd, '/');
-               if (dir)
-                       dir++;
-               else
-                       dir = "?";
+
+       if (session->action == ACTION_UNKNOWN) {
+               fprintf(stderr, "Unknown action, valid actions are:\n"
+                       "'update', 'friends', 'public', 'replies', 'group' or 'user'.\n");
+               goto exit;

        }
        }

-#endif
-       tweet = get_string_from_stdin();
-       if (!tweet || strlen(tweet) == 0) {
-               dbg("no tweet?\n");
-               return -1;
+
+       if (session->action == ACTION_GROUP && !session->group) {
+               fprintf(stdout, "Enter group name: ");
+               session->group = session->readline(NULL);

        }
 
        }
 

-//     session->tweet = zalloc(strlen(tweet) + strlen(dir) + 10);
-       session->tweet = zalloc(strlen(tweet) + 10);
+       if (session->action == ACTION_RETWEET) {
+               fprintf(stdout, "Status ID to retweet: ");
+               retweet = get_string_from_stdin();

 
 

-       /* if --bash is specified, add the "PWD $ " to
-        * the start of the tweet. */
-       if (session->bash)
-//             sprintf(session->tweet, "%s $ %s", dir, tweet);
-               sprintf(session->tweet, "$ %s", tweet);
-       else
-               sprintf(session->tweet, "%s", tweet);
-       free(tweet);
+               if (!retweet || strlen(retweet) == 0) {
+                       dbg("no retweet?\n");
+                       return -1;
+               }

 
 

-       dbg("account = %s\n", session->account);
-       dbg("password = %s\n", session->password);
-       dbg("tweet = %s\n", session->tweet);
+               session->retweet = zalloc(strlen(retweet) + 10);
+               sprintf(session->retweet,"%s", retweet);
+               free(retweet);
+               dbg("retweet ID = %s\n", session->retweet);
+       }
+
+       if (session->action == ACTION_UPDATE) {
+               if (session->background || !session->interactive)
+                       tweet = get_string_from_stdin();
+               else
+                       tweet = session->readline("tweet: ");
+               if (!tweet || strlen(tweet) == 0) {
+                       dbg("no tweet?\n");
+                       return -1;
+               }
+
+               if (session->shrink_urls)
+                       tweet = shrink_urls(tweet);
+
+               session->tweet = zalloc(strlen(tweet) + 10);
+               if (session->bash)
+                       sprintf(session->tweet, "%c %s",
+                               getuid() ? '$' : '#', tweet);
+               else
+                       sprintf(session->tweet, "%s", tweet);
+
+               free(tweet);
+               dbg("tweet = %s\n", session->tweet);
+       }
+
+       if (session->page == 0)
+               session->page = 1;
+       dbg("config file = %s\n", session->configfile);

        dbg("host = %d\n", session->host);
        dbg("host = %d\n", session->host);

+       dbg("action = %d\n", session->action);

 
        /* fork ourself so that the main shell can get on
         * with it's life as we try to connect and handle everything
         */
 
        /* fork ourself so that the main shell can get on
         * with it's life as we try to connect and handle everything
         */

-       if (session->bash) {
+       if (session->background) {

                child = fork();
                child = fork();

-                       if (child) {
+               if (child) {

                        dbg("child is %d\n", child);
                        exit(0);
                }
        }
 
                        dbg("child is %d\n", child);
                        exit(0);
                }
        }
 

-       retval = send_tweet(session);
-       if (retval && !session->bash) {
-               fprintf(stderr, "tweet failed\n");
-               return -1;
-       }
+       retval = send_request(session);
+       if (retval && !session->background)
+               fprintf(stderr, "operation failed\n");

 
 

-       session_free(session);
+       log_session(session, retval);

 exit:
 exit:

-       return 0;
+       session_readline_cleanup(session);
+       session_free(session);
+       return retval;;

 }
 }