Typo fix.

[gregoa/bti.git] / bti.c

diff --git a/bti.c b/bti.c
index a8fb97b5f4d3738201fa4a040046d3df759558de..20e6d7b728cd3432e65623028faa534c5ba58042 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -32,6 +32,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>

+#include <curl/curl.h>

 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>


@@ -71,6 +72,8 @@ enum action {
 };
 
 struct session {
 };
 
 struct session {

+       char *password;
+       char *account;

        char *consumer_key;
        char *consumer_secret;
        char *access_token_key;
        char *consumer_key;
        char *consumer_secret;
        char *access_token_key;


@@ -85,17 +88,25 @@ struct session {
        char *hosturl;
        char *hostname;
        char *configfile;
        char *hosturl;
        char *hostname;
        char *configfile;

+       char *replyto;

        int bash;
        int interactive;
        int shrink_urls;
        int dry_run;
        int page;
        int bash;
        int interactive;
        int shrink_urls;
        int dry_run;
        int page;

+       int no_oauth;

        enum host host;
        enum action action;
        void *readline_handle;
        char *(*readline)(const char *);
 };
 
        enum host host;
        enum action action;
        void *readline_handle;
        char *(*readline)(const char *);
 };
 

+struct bti_curl_buffer {
+       char *data;
+       enum action action;
+       int length;
+};
+

 static void display_help(void)
 {
        fprintf(stdout, "bti - send tweet to twitter or identi.ca\n");
 static void display_help(void)
 {
        fprintf(stdout, "bti - send tweet to twitter or identi.ca\n");


@@ -103,6 +114,8 @@ static void display_help(void)
        fprintf(stdout, "Usage:\n");
        fprintf(stdout, "  bti [options]\n");
        fprintf(stdout, "options are:\n");
        fprintf(stdout, "Usage:\n");
        fprintf(stdout, "  bti [options]\n");
        fprintf(stdout, "options are:\n");

+       fprintf(stdout, "  --account accountname\n");
+       fprintf(stdout, "  --password password\n");

        fprintf(stdout, "  --action action\n");
        fprintf(stdout, "    ('update', 'friends', 'public', 'replies', "
                "'group' or 'user')\n");
        fprintf(stdout, "  --action action\n");
        fprintf(stdout, "    ('update', 'friends', 'public', 'replies', "
                "'group' or 'user')\n");


@@ -112,6 +125,7 @@ static void display_help(void)
        fprintf(stdout, "  --host HOST\n");
        fprintf(stdout, "  --logfile logfile\n");
        fprintf(stdout, "  --config configfile\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");


@@ -237,6 +251,9 @@ static void session_free(struct session *session)
 {
        if (!session)
                return;
 {
        if (!session)
                return;

+       free(session->replyto);
+       free(session->password);
+       free(session->account);

        free(session->consumer_key);
        free(session->consumer_secret);
        free(session->access_token_key);
        free(session->consumer_key);
        free(session->consumer_secret);
        free(session->access_token_key);


@@ -253,30 +270,75 @@ static void session_free(struct session *session)
        free(session);
 }
 
        free(session);
 }
 

-static const char *twitter_host  = "http://api.twitter.com/1/statuses";
-static const char *identica_host = "https://identi.ca/api/statuses";
-static const char *twitter_name  = "twitter";
-static const char *identica_name = "identi.ca";
-
-static const char *twitter_request_token_uri  = "http://twitter.com/oauth/request_token";
-static const char *twitter_access_token_uri   = "http://twitter.com/oauth/access_token";
-static const char *twitter_authorize_uri      = "http://twitter.com/oauth/authorize?oauth_token=";
-static const char *identica_request_token_uri = "http://identi.ca/api/oauth/request_token";
-static const char *identica_access_token_uri  = "http://identi.ca/api/oauth/access_token";
-static const char *identica_authorize_uri     = "http://identi.ca/api/oauth/authorize?oauth_token=";
-
-static const char *user_uri    = "/user_timeline/";
-static const char *update_uri  = "/update.xml";
-static const char *public_uri  = "/public_timeline.xml";
-static const char *friends_uri = "/friends_timeline.xml";
-static const char *mentions_uri = "/mentions.xml";
-//static const char *group_uri = "/../laconica/groups/timeline/";
+static struct bti_curl_buffer *bti_curl_buffer_alloc(enum action action)
+{
+       struct bti_curl_buffer *buffer;
+
+       buffer = zalloc(sizeof(*buffer));
+       if (!buffer)
+               return NULL;
+
+       /* start out with a data buffer of 1 byte to
+        * make the buffer fill logic simpler */
+       buffer->data = zalloc(1);
+       if (!buffer->data) {
+               free(buffer);
+               return NULL;
+       }
+       buffer->length = 0;
+       buffer->action = action;
+       return buffer;
+}
+
+static void bti_curl_buffer_free(struct bti_curl_buffer *buffer)
+{
+       if (!buffer)
+               return;
+       free(buffer->data);
+       free(buffer);
+}
+
+static const char twitter_host[]  = "http://api.twitter.com/1/statuses";
+static const char identica_host[] = "https://identi.ca/api/statuses";
+static const char twitter_name[]  = "twitter";
+static const char identica_name[] = "identi.ca";
+
+static const char twitter_request_token_uri[]  = "http://twitter.com/oauth/request_token";
+static const char twitter_access_token_uri[]   = "http://twitter.com/oauth/access_token";
+static const char twitter_authorize_uri[]      = "http://twitter.com/oauth/authorize?oauth_token=";
+static const char identica_request_token_uri[] = "http://identi.ca/api/oauth/request_token";
+static const char identica_access_token_uri[]  = "http://identi.ca/api/oauth/access_token";
+static const char identica_authorize_uri[]     = "http://identi.ca/api/oauth/authorize?oauth_token=";
+
+static const char user_uri[]     = "/user_timeline/";
+static const char update_uri[]   = "/update.xml";
+static const char public_uri[]   = "/public_timeline.xml";
+static const char friends_uri[]  = "/friends_timeline.xml";
+static const char mentions_uri[] = "/mentions.xml";
+static const char replies_uri[]  = "/replies.xml";
+static const char group_uri[]    = "/../statusnet/groups/timeline/";
+
+static CURL *curl_init(void)
+{
+       CURL *curl;
+
+       curl = curl_easy_init();
+       if (!curl) {
+               fprintf(stderr, "Can not init CURL!\n");
+               return NULL;
+       }
+       /* some ssl sanity checks on the connection we are making */
+       curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
+       curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
+       return curl;
+}

 
 static void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
 {
        xmlChar *text = NULL;
        xmlChar *user = NULL;
        xmlChar *created = NULL;
 
 static void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
 {
        xmlChar *text = NULL;
        xmlChar *user = NULL;
        xmlChar *created = NULL;

+       xmlChar *id = NULL;

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


@@ -286,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) {


@@ -298,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;


@@ -353,6 +419,34 @@ static void parse_timeline(char *document)
        return;
 }
 
        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;
+       char *temp;
+
+       if ((!buffer) || (!buffer_size) || (!curl_buf))
+               return -EINVAL;
+
+       /* add to the data we already have */
+       temp = zalloc(curl_buf->length + buffer_size + 1);
+       if (!temp)
+               return -ENOMEM;
+
+       memcpy(temp, curl_buf->data, curl_buf->length);
+       free(curl_buf->data);
+       curl_buf->data = temp;
+       memcpy(&curl_buf->data[curl_buf->length], (char *)buffer, buffer_size);
+       curl_buf->length += buffer_size;
+       if (curl_buf->action)
+               parse_timeline(curl_buf->data);
+
+       dbg("%s\n", curl_buf->data);
+
+       return buffer_size;
+}
+

 static int parse_osp_reply(const char *reply, char **token, char **secret)
 {
        int rc;
 static int parse_osp_reply(const char *reply, char **token, char **secret)
 {
        int rc;


@@ -361,31 +455,35 @@ static int parse_osp_reply(const char *reply, char **token, char **secret)
        rc = oauth_split_url_parameters(reply, &rv);
        qsort(rv, rc, sizeof(char *), oauth_cmpstringp);
        if (rc == 2 || rc == 4) {
        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 (!strncmp(rv[0], "oauth_token=", 11) &&
+                   !strncmp(rv[1], "oauth_token_secret=", 18)) {

                        if (token)
                        if (token)

-                               *token =strdup(&(rv[0][12]));
+                               *token = strdup(&(rv[0][12]));

                        if (secret)
                        if (secret)

-                               *secret=strdup(&(rv[1][19]));
+                               *secret = strdup(&(rv[1][19]));

 
                        retval = 0;
                }
        } else if (rc == 3) {
 
                        retval = 0;
                }
        } else if (rc == 3) {

-               if (!strncmp(rv[1],"oauth_token=",11) && !strncmp(rv[2],"oauth_token_secret=",18)) {
+               if (!strncmp(rv[1], "oauth_token=", 11) &&
+                   !strncmp(rv[2], "oauth_token_secret=", 18)) {

                        if (token)
                        if (token)

-                               *token =strdup(&(rv[1][12]));
+                               *token = strdup(&(rv[1][12]));

                        if (secret)
                        if (secret)

-                               *secret=strdup(&(rv[2][19]));
+                               *secret = strdup(&(rv[2][19]));

 
                        retval = 0;
                }
        }
 
 
                        retval = 0;
                }
        }
 

+       dbg("token: %s\n", *token);
+       dbg("secret: %s\n", *secret);
+

        if (rv)
                free(rv);
 
        return retval;
 }
        if (rv)
                free(rv);
 
        return retval;
 }

-       

 
 static int request_access_token(struct session *session)
 {
 
 static int request_access_token(struct session *session)
 {


@@ -432,15 +530,18 @@ static int request_access_token(struct session *session)
        if (session->host == HOST_TWITTER) {
                fprintf(stdout, "%s%s\nPIN: ", twitter_authorize_uri, at_key);
                verifier = session->readline(NULL);
        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);
+               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);
        } 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);
+               sprintf(at_uri, "%s?oauth_verifier=%s",
+                       identica_access_token_uri, verifier);

        }
        request_url = oauth_sign_url2(at_uri, NULL, OA_HMAC, NULL,
        }
        request_url = oauth_sign_url2(at_uri, NULL, OA_HMAC, NULL,

-                       session->consumer_key, session->consumer_secret, at_key,
-                       at_secret);
+                                     session->consumer_key,
+                                     session->consumer_secret,
+                                     at_key, at_secret);

        reply = oauth_http_get(request_url, post_params);
 
        if (!reply)
        reply = oauth_http_get(request_url, post_params);
 
        if (!reply)


@@ -451,8 +552,8 @@ static int request_access_token(struct session *session)
 
        free(reply);
 
 
        free(reply);
 

-       fprintf(stdout, "Please put these two lines in your bti configuration ");
-       fprintf(stdout, "file (~/.bti):\n");
+       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);
 
        fprintf(stdout, "access_token_key=%s\n", at_key);
        fprintf(stdout, "access_token_secret=%s\n", at_secret);
 


@@ -462,9 +563,18 @@ static int request_access_token(struct session *session)
 static int send_request(struct session *session)
 {
        char endpoint[500];
 static int send_request(struct session *session)
 {
        char endpoint[500];

+       char user_password[500];
+       char data[500];
+       struct bti_curl_buffer *curl_buf;
+       CURL *curl = NULL;
+       CURLcode res;
+       struct curl_httppost *formpost = NULL;
+       struct curl_httppost *lastptr = NULL;
+       struct curl_slist *slist = NULL;

        char *req_url = NULL;
        char *reply = NULL;
        char *postarg = NULL;
        char *req_url = NULL;
        char *reply = NULL;
        char *postarg = NULL;

+       char *escaped_tweet = NULL;

        int is_post = 0;
 
        if (!session)
        int is_post = 0;
 
        if (!session)


@@ -473,49 +583,173 @@ static int send_request(struct session *session)
        if (!session->hosturl)
                session->hosturl = strdup(twitter_host);
 
        if (!session->hosturl)
                session->hosturl = strdup(twitter_host);
 

-       switch (session->action) {
-       case ACTION_UPDATE:
-               sprintf(endpoint, "%s%s?status=%s", session->hosturl, update_uri, session->tweet);
-               is_post = 1;
-               break;
-       case ACTION_USER:
-               sprintf(endpoint, "%s%s", session->hosturl, user_uri);
-               break;
-       case ACTION_REPLIES:
-               sprintf(endpoint, "%s%s", session->hosturl, mentions_uri);
-               break;
-       case ACTION_PUBLIC:
-               sprintf(endpoint, "%s%s", session->hosturl, public_uri);
-               break;
-       case ACTION_GROUP:
-       case ACTION_FRIENDS:
-               sprintf(endpoint, "%s%s", session->hosturl, friends_uri);
-               break;
-       default:
-               break;
-       }
-       
-       if (is_post) {
-               req_url = oauth_sign_url2(
-                       endpoint, &postarg, OA_HMAC, NULL,
-                       session->consumer_key, session->consumer_secret,
-                       session->access_token_key, session->access_token_secret
-               );
-               reply = oauth_http_post(req_url, postarg);
+       if (session->no_oauth) {
+               curl_buf = bti_curl_buffer_alloc(session->action);
+               if (!curl_buf)
+                       return -ENOMEM;
+
+               curl = curl_init();
+               if (!curl)
+                       return -EINVAL;
+
+               if (!session->hosturl)
+                       session->hosturl = strdup(twitter_host);
+
+               switch (session->action) {
+               case ACTION_UPDATE:
+                       snprintf(user_password, sizeof(user_password), "%s:%s",
+                                session->account, session->password);
+                       snprintf(data, sizeof(data), "status=\"%s\"",
+                                session->tweet);
+                       curl_formadd(&formpost, &lastptr,
+                                    CURLFORM_COPYNAME, "status",
+                                    CURLFORM_COPYCONTENTS, session->tweet,
+                                    CURLFORM_END);
+
+                       curl_formadd(&formpost, &lastptr,
+                                    CURLFORM_COPYNAME, "source",
+                                    CURLFORM_COPYCONTENTS, "bti",
+                                    CURLFORM_END);
+
+                       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;
+
+               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;
+
+               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->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 {
        } 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);
-       }
+               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 (req_url)
-               free(req_url);
+               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);
+               }

 
 

-       parse_timeline(reply);
+               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;
 }
 


@@ -524,6 +758,8 @@ static void parse_configfile(struct session *session)
        FILE *config_file;
        char *line = NULL;
        size_t len = 0;
        FILE *config_file;
        char *line = NULL;
        size_t len = 0;

+       char *account = NULL;
+       char *password = NULL;

        char *consumer_key = NULL;
        char *consumer_secret = NULL;
        char *access_token_key = NULL;
        char *consumer_key = NULL;
        char *consumer_secret = NULL;
        char *access_token_key = NULL;


@@ -533,6 +769,7 @@ static void parse_configfile(struct session *session)
        char *logfile = NULL;
        char *action = NULL;
        char *user = NULL;
        char *logfile = NULL;
        char *action = NULL;
        char *user = NULL;

+       char *replyto = NULL;

        int shrink_urls = 0;
 
        config_file = fopen(session->configfile, "r");
        int shrink_urls = 0;
 
        config_file = fopen(session->configfile, "r");


@@ -560,7 +797,16 @@ static void parse_configfile(struct session *session)
                if (c[0] == '\0')
                        continue;
 
                if (c[0] == '\0')
                        continue;
 

-               if (!strncasecmp(c, "consumer_key", 12) &&
+               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, "consumer_key", 12) &&

                           (c[12] == '=')) {
                        c += 13;
                        if (c[0] != '\0')
                           (c[12] == '=')) {
                        c += 13;
                        if (c[0] != '\0')


@@ -595,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;


@@ -620,6 +871,10 @@ static void parse_configfile(struct session *session)
                }
        } while (!feof(config_file));
 
                }
        } while (!feof(config_file));
 

+       if (password)
+               session->password = password;
+       if (account)
+               session->account = account;

        if (consumer_key)
                session->consumer_key = consumer_key;
        if (consumer_secret)
        if (consumer_key)
                session->consumer_key = consumer_key;
        if (consumer_secret)


@@ -651,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;


@@ -749,6 +1006,32 @@ static char *get_string_from_stdin(void)
        return string;
 }
 
        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)
 {
        /*
 static int find_urls(const char *tweet, int **pranges)
 {
        /*


@@ -1016,6 +1299,8 @@ int main(int argc, char *argv[], char *envp[])
        static const struct option options[] = {
                { "debug", 0, NULL, 'd' },
                { "verbose", 0, NULL, 'V' },
        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' },
                { "action", 1, NULL, 'A' },
                { "host", 1, NULL, 'H' },
                { "proxy", 1, NULL, 'P' },
                { "action", 1, NULL, 'A' },


@@ -1029,11 +1314,13 @@ int main(int argc, char *argv[], char *envp[])
                { "page", 1, NULL, 'g' },
                { "version", 0, NULL, 'v' },
                { "config", 1, NULL, 'c' },
                { "page", 1, NULL, 'g' },
                { "version", 0, NULL, 'v' },
                { "config", 1, NULL, 'c' },

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

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

+       static char password[80];

        int retval = 0;
        int option;
        char *http_proxy;
        int retval = 0;
        int option;
        char *http_proxy;


@@ -1074,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:c: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;


@@ -1085,11 +1373,27 @@ int main(int argc, char *argv[], char *envp[])
                case 'V':
                        verbose = 1;
                        break;
                case 'V':
                        verbose = 1;
                        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 '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 'p':
+                       if (session->password)
+                               free(session->password);
+                       session->password = strdup(optarg);
+                       dbg("password = %s\n", session->password);
+                       break;

                case 'P':
                        if (session->proxy)
                                free(session->proxy);
                case 'P':
                        if (session->proxy)
                                free(session->proxy);


@@ -1165,8 +1469,9 @@ int main(int argc, char *argv[], char *envp[])
                        dbg("configfile = %s\n", session->configfile);
 
                        /*
                        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...
+                        * 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;
                         */
                        parse_configfile(session);
                        break;


@@ -1193,14 +1498,39 @@ int main(int argc, char *argv[], char *envp[])
        if (debug)
                display_version();
 
        if (debug)
                display_version();
 

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


@@ -1210,11 +1540,6 @@ 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: ");
                session->group = session->readline(NULL);
        if (session->action == ACTION_GROUP && !session->group) {
                fprintf(stdout, "Enter group name: ");
                session->group = session->readline(NULL);