build system: use AC_SEARCH_LIBS rather than assuming -ldl is needed.

[gregoa/bti.git] / bti.c

diff --git a/bti.c b/bti.c
index fcf2da1bad5f9bfe9c0922b0008790a5b5aa9ddd..588de2fc50d1a51bf91a7e2218b4f5a9898bbaac 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -33,12 +33,13 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <curl/curl.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 <termios.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>

 
 
 #define zalloc(size)   calloc(size, 1)
 
 
 #define zalloc(size)   calloc(size, 1)


@@ -73,6 +74,10 @@ enum action {
 struct session {
        char *password;
        char *account;
 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 *tweet;
        char *proxy;
        char *time;


@@ -81,12 +86,19 @@ struct session {
        char *user;
        char *group;
        char *hosturl;
        char *user;
        char *group;
        char *hosturl;

+       char *hostname;
+       char *configfile;
+       char *replyto;

        int bash;
        int bash;

+       int interactive;

        int shrink_urls;
        int dry_run;
        int page;
        int shrink_urls;
        int dry_run;
        int page;

+       int no_oauth;

        enum host host;
        enum action action;
        enum host host;
        enum action action;

+       void *readline_handle;
+       char *(*readline)(const char *);

 };
 
 struct bti_curl_buffer {
 };
 
 struct bti_curl_buffer {


@@ -112,6 +124,8 @@ static void display_help(void)
        fprintf(stdout, "  --proxy PROXY:PORT\n");
        fprintf(stdout, "  --host HOST\n");
        fprintf(stdout, "  --logfile logfile\n");
        fprintf(stdout, "  --proxy PROXY:PORT\n");
        fprintf(stdout, "  --host HOST\n");
        fprintf(stdout, "  --logfile logfile\n");

+       fprintf(stdout, "  --config configfile\n");
+       fprintf(stdout, "  --replyto ID\n");

        fprintf(stdout, "  --shrink-urls\n");
        fprintf(stdout, "  --page PAGENUMBER\n");
        fprintf(stdout, "  --bash\n");
        fprintf(stdout, "  --shrink-urls\n");
        fprintf(stdout, "  --page PAGENUMBER\n");
        fprintf(stdout, "  --bash\n");


@@ -127,6 +141,102 @@ static void display_version(void)
        fprintf(stdout, "bti - version %s\n", 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)
 {
        struct session *session;
 static struct session *session_alloc(void)
 {
        struct session *session;


@@ -141,8 +251,13 @@ static void session_free(struct session *session)
 {
        if (!session)
                return;
 {
        if (!session)
                return;

+       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->time);
        free(session->tweet);
        free(session->proxy);
        free(session->time);


@@ -150,6 +265,8 @@ static void session_free(struct session *session)
        free(session->user);
        free(session->group);
        free(session->hosturl);
        free(session->user);
        free(session->group);
        free(session->hosturl);

+       free(session->hostname);
+       free(session->configfile);

        free(session);
 }
 
        free(session);
 }
 


@@ -181,15 +298,25 @@ static void bti_curl_buffer_free(struct bti_curl_buffer *buffer)
        free(buffer);
 }
 
        free(buffer);
 }
 

-static const char *twitter_host  = "https://twitter.com/statuses";
+static const char *twitter_host  = "http://api.twitter.com/1/statuses";

 static const char *identica_host = "https://identi.ca/api/statuses";
 static const char *identica_host = "https://identi.ca/api/statuses";

-
-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 *replies_uri = "/replies.xml";
-static const char *group_uri = "/../laconica/groups/timeline/";
+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 *replies_uri  = "/replies.xml";
+static const char *group_uri    = "/../statusnet/groups/timeline/";

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


@@ -211,6 +338,7 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
        xmlChar *text = NULL;
        xmlChar *user = NULL;
        xmlChar *created = NULL;
        xmlChar *text = NULL;
        xmlChar *user = NULL;
        xmlChar *created = NULL;

+       xmlChar *id = NULL;

        xmlNodePtr userinfo;
 
        current = current->xmlChildrenNode;
        xmlNodePtr userinfo;
 
        current = current->xmlChildrenNode;


@@ -220,6 +348,8 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
                                created = xmlNodeListGetString(doc, current->xmlChildrenNode, 1);
                        if (!xmlStrcmp(current->name, (const xmlChar *)"text"))
                                text = xmlNodeListGetString(doc, current->xmlChildrenNode, 1);
                                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(current->name, (const xmlChar *)"user")) {
                                userinfo = current->xmlChildrenNode;
                                while (userinfo != NULL) {


@@ -232,19 +362,21 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
                                }
                        }
 
                                }
                        }
 

-                       if (user && text && created) {
+                       if (user && text && created && id) {

                                if (verbose)
                                if (verbose)

-                                       printf("[%s] (%.16s) %s\n",
-                                               user, created, text);
+                                       printf("[%s] {%s} (%.16s) %s\n",
+                                               user, id, created, text);

                                else
                                        printf("[%s] %s\n",
                                                user, text);
                                xmlFree(user);
                                xmlFree(text);
                                xmlFree(created);
                                else
                                        printf("[%s] %s\n",
                                                user, text);
                                xmlFree(user);
                                xmlFree(text);
                                xmlFree(created);

+                               xmlFree(id);

                                user = NULL;
                                text = NULL;
                                created = NULL;
                                user = NULL;
                                text = NULL;
                                created = NULL;

+                               id = NULL;

                        }
                }
                current = current->next;
                        }
                }
                current = current->next;


@@ -315,9 +447,122 @@ static size_t curl_callback(void *buffer, size_t size, size_t nmemb,
        return buffer_size;
 }
 
        return buffer_size;
 }
 

+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 ");
+       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;
+
+       if (parse_osp_reply(reply, &at_key, &at_secret))
+               return 1;
+
+       free(reply);
+
+       fprintf(stdout, "Please put these two lines in your bti ");
+       fprintf(stdout, "configuration 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)
 {
 static int send_request(struct session *session)
 {

-       char endpoint[100];
+       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;


@@ -326,105 +571,185 @@ static int send_request(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(session->action);
-       if (!curl_buf)
-               return -ENOMEM;
+       if (!session->hosturl)
+               session->hosturl = strdup(twitter_host);

 
 

-       curl = curl_init();
-       if (!curl)
-               return -EINVAL;
+       if (session->no_oauth) {
+               curl_buf = bti_curl_buffer_alloc(session->action);
+               if (!curl_buf)
+                       return -ENOMEM;

 
 

-       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);
-
-               sprintf(endpoint, "%s%s", session->hosturl, update_uri);
-               curl_easy_setopt(curl, CURLOPT_URL, endpoint);
-               curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
+               curl = curl_init();
+               if (!curl)
+                       return -EINVAL;

 
 

-               break;
-       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);
+               if (!session->hosturl)
+                       session->hosturl = strdup(twitter_host);

 
 

-               break;
-       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);
+               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;

 
 

-               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);
+               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;

 
 

-               break;
-       case ACTION_PUBLIC:
-               sprintf(endpoint, "%s%s?page=%d", session->hosturl, public_uri, session->page);
-               curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+               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;

 
 

-               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);
+               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;

 
 

-               break;
-       default:
-               break;
-       }
+               case ACTION_PUBLIC:
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                               public_uri, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+                       break;

 
 

-       if (session->proxy)
-               curl_easy_setopt(curl, CURLOPT_PROXY, session->proxy);
+               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;

 
 

-       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;
+               default:
+                       break;

                }
                }

-       }

 
 

-       curl_easy_cleanup(curl);
-       if (session->action == ACTION_UPDATE)
-               curl_formfree(formpost);
-       bti_curl_buffer_free(curl_buf);
+               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->bash) {
+                               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);
+                       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;
+               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);
+               }
+
+               dbg("%s\n", req_url);
+               dbg("%s\n", reply);
+               if (req_url)
+                       free(req_url);
+
+               if (session->action != ACTION_UPDATE)
+                       parse_timeline(reply);
+       }

        return 0;
 }
 
        return 0;
 }
 


@@ -435,20 +760,19 @@ static void parse_configfile(struct session *session)
        size_t len = 0;
        char *account = NULL;
        char *password = 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 *host = NULL;
        char *proxy = NULL;
        char *logfile = NULL;
        char *action = NULL;
        char *user = NULL;

-       char *file;
+       char *replyto = NULL;

        int shrink_urls = 0;
 
        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)
 
        /* No error if file does not exist or is unreadable.  */
        if (config_file == NULL)


@@ -482,6 +806,26 @@ static void parse_configfile(struct session *session)
                        c += 9;
                        if (c[0] != '\0')
                                password = strdup(c);
                        c += 9;
                        if (c[0] != '\0')
                                password = strdup(c);

+               } else 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')
+                               consumer_secret = strdup(c);
+               } else if (!strncasecmp(c, "access_token_key", 16) &&
+                          (c[16] == '=')) {
+                       c += 17;
+                       if (c[0] != '\0')
+                               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;
                } else if (!strncasecmp(c, "host", 4) &&
                           (c[4] == '=')) {
                        c += 5;


@@ -497,6 +841,11 @@ static void parse_configfile(struct session *session)
                        c += 8;
                        if (c[0] != '\0')
                                logfile = strdup(c);
                        c += 8;
                        if (c[0] != '\0')
                                logfile = strdup(c);

+               } else if (!strncasecmp(c, "replyto", 7) &&
+                          (c[7] == '=')) {
+                       c += 8;
+                       if (c[0] != '\0')
+                               replyto = strdup(c);

                } else if (!strncasecmp(c, "action", 6) &&
                           (c[6] == '=')) {
                        c += 7;
                } else if (!strncasecmp(c, "action", 6) &&
                           (c[6] == '=')) {
                        c += 7;


@@ -526,16 +875,27 @@ static void parse_configfile(struct session *session)
                session->password = password;
        if (account)
                session->account = account;
                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) {
                        session->host = HOST_TWITTER;
                        session->hosturl = strdup(twitter_host);
        if (host) {
                if (strcasecmp(host, "twitter") == 0) {
                        session->host = HOST_TWITTER;
                        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);
                } 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);
                } else {
                        session->host = HOST_CUSTOM;
                        session->hosturl = strdup(host);

+                       session->hostname = strdup(host);

                }
                free(host);
        }
                }
                free(host);
        }


@@ -546,6 +906,8 @@ static void parse_configfile(struct session *session)
        }
        if (logfile)
                session->logfile = logfile;
        }
        if (logfile)
                session->logfile = logfile;

+       if (replyto)
+               session->replyto = replyto;

        if (action) {
                if (strcasecmp(action, "update") == 0)
                        session->action = ACTION_UPDATE;
        if (action) {
                if (strcasecmp(action, "update") == 0)
                        session->action = ACTION_UPDATE;


@@ -576,7 +938,6 @@ static void log_session(struct session *session, int retval)
 {
        FILE *log_file;
        char *filename;
 {
        FILE *log_file;
        char *filename;

-       char *host;

 
        /* Only log something if we have a log file set */
        if (!session->logfile)
 
        /* Only log something if we have a log file set */
        if (!session->logfile)


@@ -590,46 +951,36 @@ static void log_session(struct session *session, int retval)
        log_file = fopen(filename, "a+");
        if (log_file == NULL)
                return;
        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 = session->hosturl;
-               break;
-       }

 
        switch (session->action) {
        case ACTION_UPDATE:
                if (retval)
                        fprintf(log_file, "%s: host=%s tweet failed\n",
 
        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",
                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",
                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",
                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",
                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",
                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",
                break;
        case ACTION_GROUP:
                fprintf(log_file, "%s: host=%s retrieving group timeline\n",

-                       session->time, host);
+                       session->time, session->hostname);

                break;
        default:
                break;
                break;
        default:
                break;


@@ -650,13 +1001,15 @@ static char *get_string_from_stdin(void)
        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;
 }
 

-void read_password(char *buf, size_t len)
+static void read_password(char *buf, size_t len, char *host)

 {
        char pwd[80];
 {
        char pwd[80];

+       int retval;

        struct termios old;
        struct termios tp;
 
        struct termios old;
        struct termios tp;
 


@@ -666,9 +1019,11 @@ void read_password(char *buf, size_t len)
        tp.c_lflag &= (~ECHO);
        tcsetattr(0, TCSANOW, &tp);
 
        tp.c_lflag &= (~ECHO);
        tcsetattr(0, TCSANOW, &tp);
 

-       fprintf(stdout, "Enter twitter password: ");
+       fprintf(stdout, "Enter password for %s: ", host);

        fflush(stdout);
        fflush(stdout);

-       scanf("%79s", pwd);
+       tcflow(0, TCOOFF);
+       retval = scanf("%79s", pwd);
+       tcflow(0, TCOON);

        fprintf(stdout, "\n");
 
        tcsetattr(0, TCSANOW, &old);
        fprintf(stdout, "\n");
 
        tcsetattr(0, TCSANOW, &old);


@@ -958,6 +1313,8 @@ int main(int argc, char *argv[], char *envp[])
                { "dry-run", 0, NULL, 'n' },
                { "page", 1, NULL, 'g' },
                { "version", 0, NULL, 'v' },
                { "dry-run", 0, NULL, 'n' },
                { "page", 1, NULL, 'g' },
                { "version", 0, NULL, 'v' },

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

                { }
        };
        struct session *session;
                { }
        };
        struct session *session;


@@ -972,7 +1329,6 @@ int main(int argc, char *argv[], char *envp[])
 
        debug = 0;
        verbose = 0;
 
        debug = 0;
        verbose = 0;

-       rl_bind_key('\t', rl_insert);

 
        session = session_alloc();
        if (!session) {
 
        session = session_alloc();
        if (!session) {


@@ -985,9 +1341,12 @@ int main(int argc, char *argv[], char *envp[])
        session->time = strdup(ctime(&t));
        session->time[strlen(session->time)-1] = 0x00;
 
        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"));
 
        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. */
 
        /* Set environment variables first, before reading command line options
         * or config file values. */


@@ -1002,7 +1361,8 @@ int main(int argc, char *argv[], char *envp[])
        parse_configfile(session);
 
        while (1) {
        parse_configfile(session);
 
        while (1) {

-               option = getopt_long_only(argc, argv, "dp:P:H:a:A:u:hg:G:snVv",
+               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;


@@ -1024,6 +1384,10 @@ int main(int argc, char *argv[], char *envp[])
                        dbg("page = %d\n", page_nr);
                        session->page = page_nr;
                        break;
                        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 'p':
                        if (session->password)
                                free(session->password);
                case 'p':
                        if (session->password)
                                free(session->password);


@@ -1078,21 +1442,39 @@ int main(int argc, char *argv[], char *envp[])
                case 'H':
                        if (session->hosturl)
                                free(session->hosturl);
                case 'H':
                        if (session->hosturl)
                                free(session->hosturl);

+                       if (session->hostname)
+                               free(session->hostname);

                        if (strcasecmp(optarg, "twitter") == 0) {
                                session->host = HOST_TWITTER;
                                session->hosturl = strdup(twitter_host);
                        if (strcasecmp(optarg, "twitter") == 0) {
                                session->host = HOST_TWITTER;
                                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);
                        } 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);
                        } 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;
                        }
                        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;
                case 'h':
                        display_help();
                        goto exit;


@@ -1108,13 +1490,47 @@ 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
         */
        /*
         * Show the version to make it easier to determine what
         * is going on here
         */

-       if (debug) {
+       if (debug)

                display_version();
                display_version();

-               fprintf(stderr, "%s", session->group);
+
+       if (session->host == HOST_TWITTER) {
+               if (!session->consumer_key || !session->consumer_secret) {
+                       fprintf(stderr, "Twitter no longer supuports HTTP basic authentication.\n");
+                       fprintf(stderr, "Both consumer key, and consumer secret are required");
+                       fprintf(stderr, " 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->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->access_token_key ||
+                   !session->access_token_secret) {
+                       request_access_token(session);
+                       goto exit;
+               }

        }
 
        if (session->action == ACTION_UNKNOWN) {
        }
 
        if (session->action == ACTION_UNKNOWN) {


@@ -1124,32 +1540,16 @@ int main(int argc, char *argv[], char *envp[])
                goto exit;
        }
 
                goto exit;
        }
 

-       if (session->host == HOST_TWITTER && session->action == ACTION_GROUP) {
-               fprintf(stderr, "Groups only work in Identi.ca.\n");
-               goto exit;
-       }
-

        if (session->action == ACTION_GROUP && !session->group) {
                fprintf(stdout, "Enter group name: ");
        if (session->action == ACTION_GROUP && !session->group) {
                fprintf(stdout, "Enter group name: ");

-               session->group = readline(NULL);
-       }
-
-       if (!session->account) {
-               fprintf(stdout, "Enter twitter account: ");
-               session->account = readline(NULL);
-       }
-
-       if (!session->password) {
-               read_password(password, sizeof(password));
-               session->password = strdup(password);
-               free(password);
+               session->group = session->readline(NULL);

        }
 
        if (session->action == ACTION_UPDATE) {
        }
 
        if (session->action == ACTION_UPDATE) {

-               if (session->bash)
+               if (session->bash || !session->interactive)

                        tweet = get_string_from_stdin();
                else
                        tweet = get_string_from_stdin();
                else

-                       tweet = readline("tweet: ");
+                       tweet = session->readline("tweet: ");

                if (!tweet || strlen(tweet) == 0) {
                        dbg("no tweet?\n");
                        return -1;
                if (!tweet || strlen(tweet) == 0) {
                        dbg("no tweet?\n");
                        return -1;


@@ -1160,7 +1560,8 @@ int main(int argc, char *argv[], char *envp[])
 
                session->tweet = zalloc(strlen(tweet) + 10);
                if (session->bash)
 
                session->tweet = zalloc(strlen(tweet) + 10);
                if (session->bash)

-                       sprintf(session->tweet, "%c %s", getuid() ? '$' : '#', tweet);
+                       sprintf(session->tweet, "%c %s",
+                               getuid() ? '$' : '#', tweet);

                else
                        sprintf(session->tweet, "%s", tweet);
 
                else
                        sprintf(session->tweet, "%s", tweet);
 


@@ -1168,13 +1569,9 @@ int main(int argc, char *argv[], char *envp[])
                dbg("tweet = %s\n", session->tweet);
        }
 
                dbg("tweet = %s\n", session->tweet);
        }
 

-       if (!session->user)
-               session->user = strdup(session->account);
-

        if (session->page == 0)
                session->page = 1;
        if (session->page == 0)
                session->page = 1;

-       dbg("account = %s\n", session->account);
-       dbg("password = %s\n", session->password);
+       dbg("config file = %s\n", session->configfile);

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


@@ -1195,6 +1592,7 @@ int main(int argc, char *argv[], char *envp[])
 
        log_session(session, retval);
 exit:
 
        log_session(session, retval);
 exit:

+       session_readline_cleanup(session);

        session_free(session);
        return retval;;
 }
        session_free(session);
        return retval;;
 }