X-Git-Url: https://git.toastfreeware.priv.at/gregoa/bti.git/blobdiff_plain/2d61b845f8754057c57794f1ed896424e0dd427a..8a4839e0036c849faf468e8e888e8465c2c4e5ea:/bti.c diff --git a/bti.c b/bti.c index 6d826d2..9c3b7f4 100644 --- a/bti.c +++ b/bti.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2008 Greg Kroah-Hartman + * Copyright (C) 2008-2011 Greg Kroah-Hartman * Copyright (C) 2009 Bart Trojanowski - * Copyright (C) 2009 Amir Mohammad Saied + * Copyright (C) 2009-2010 Amir Mohammad Saied * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -40,7 +40,7 @@ #include #include #include - +#include "bti.h" #define zalloc(size) calloc(size, 1) @@ -52,88 +52,36 @@ } while (0) -static int debug; -static int verbose; - -enum host { - HOST_TWITTER = 0, - HOST_IDENTICA = 1, - HOST_CUSTOM = 2 -}; - -enum action { - ACTION_UPDATE = 0, - ACTION_FRIENDS = 1, - ACTION_USER = 2, - ACTION_REPLIES = 4, - ACTION_PUBLIC = 8, - ACTION_GROUP = 16, - ACTION_UNKNOWN = 32 -}; - -struct session { - char *password; - char *account; - char *consumer_key; - char *consumer_secret; - char *access_token_key; - char *access_token_secret; - char *tweet; - char *proxy; - char *time; - char *homedir; - char *logfile; - char *user; - char *group; - char *hosturl; - char *hostname; - char *configfile; - char *replyto; - 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 *); -}; - -struct bti_curl_buffer { - char *data; - enum action action; - int length; -}; +int debug; static void display_help(void) { - fprintf(stdout, "bti - send tweet to twitter or identi.ca\n"); - fprintf(stdout, "Version: " VERSION "\n"); - fprintf(stdout, "Usage:\n"); - fprintf(stdout, " bti [options]\n"); - fprintf(stdout, "options are:\n"); - fprintf(stdout, " --account accountname\n"); - fprintf(stdout, " --password password\n"); - fprintf(stdout, " --action action\n"); - fprintf(stdout, " ('update', 'friends', 'public', 'replies', " - "'group' or 'user')\n"); - fprintf(stdout, " --user screenname\n"); - fprintf(stdout, " --group groupname\n"); - fprintf(stdout, " --proxy PROXY:PORT\n"); - fprintf(stdout, " --host HOST\n"); - fprintf(stdout, " --logfile logfile\n"); - fprintf(stdout, " --config configfile\n"); - fprintf(stdout, " --replyto ID\n"); - fprintf(stdout, " --shrink-urls\n"); - fprintf(stdout, " --page PAGENUMBER\n"); - fprintf(stdout, " --bash\n"); - fprintf(stdout, " --debug\n"); - fprintf(stdout, " --verbose\n"); - fprintf(stdout, " --dry-run\n"); - fprintf(stdout, " --version\n"); - fprintf(stdout, " --help\n"); + fprintf(stdout, "bti - send tweet to twitter or identi.ca\n" + "Version: %s\n" + "Usage:\n" + " bti [options]\n" + "options are:\n" + " --account accountname\n" + " --password password\n" + " --action action\n" + " ('update', 'friends', 'public', 'replies', or 'user')\n" + " --user screenname\n" + " --group groupname\n" + " --proxy PROXY:PORT\n" + " --host HOST\n" + " --logfile logfile\n" + " --config configfile\n" + " --replyto ID\n" + " --retweet ID\n" + " --shrink-urls\n" + " --page PAGENUMBER\n" + " --bash\n" + " --background\n" + " --debug\n" + " --verbose\n" + " --dry-run\n" + " --version\n" + " --help\n", VERSION); } static void display_version(void) @@ -251,6 +199,7 @@ static void session_free(struct session *session) { if (!session) return; + free(session->retweet); free(session->replyto); free(session->password); free(session->account); @@ -298,25 +247,26 @@ static void bti_curl_buffer_free(struct bti_curl_buffer *buffer) 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/"; +const char twitter_host[] = "http://api.twitter.com/1/statuses"; +const char identica_host[] = "https://identi.ca/api/statuses"; +const char twitter_name[] = "twitter"; +const char identica_name[] = "identi.ca"; + +static const char twitter_request_token_uri[] = "http://twitter.com/oauth/request_token"; +static const char twitter_access_token_uri[] = "http://twitter.com/oauth/access_token"; +static const char twitter_authorize_uri[] = "http://twitter.com/oauth/authorize?oauth_token="; +static const char identica_request_token_uri[] = "http://identi.ca/api/oauth/request_token?oauth_callback=oob"; +static const char identica_access_token_uri[] = "http://identi.ca/api/oauth/access_token"; +static const char identica_authorize_uri[] = "http://identi.ca/api/oauth/authorize?oauth_token="; + +static const char user_uri[] = "/user_timeline/"; +static const char update_uri[] = "/update.xml"; +static const char public_uri[] = "/public_timeline.xml"; +static const char friends_uri[] = "/friends_timeline.xml"; +static const char mentions_uri[] = "/mentions.xml"; +static const char replies_uri[] = "/replies.xml"; +static const char retweet_uri[] = "/retweet/"; +static const char group_uri[] = "/../statusnet/groups/timeline/"; static CURL *curl_init(void) { @@ -333,7 +283,18 @@ static CURL *curl_init(void) return curl; } -static void parse_statuses(xmlDocPtr doc, xmlNodePtr current) +/* The final place data is sent to the screen/pty/tty */ +static void bti_output_line(struct session *session, xmlChar *user, xmlChar *id, + xmlChar *created, xmlChar *text) +{ + if (session->verbose) + printf("[%s] {%s} (%.16s) %s\n", user, id, created, text); + else + printf("[%s] %s\n", user, text); +} + +static void parse_statuses(struct session *session, + xmlDocPtr doc, xmlNodePtr current) { xmlChar *text = NULL; xmlChar *user = NULL; @@ -363,12 +324,7 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current) } if (user && text && created && id) { - if (verbose) - printf("[%s] {%s} (%.16s) %s\n", - user, id, created, text); - else - printf("[%s] %s\n", - user, text); + bti_output_line(session, user, id, created, text); xmlFree(user); xmlFree(text); xmlFree(created); @@ -385,7 +341,7 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current) return; } -static void parse_timeline(char *document) +static void parse_timeline(char *document, struct session *session) { xmlDocPtr doc; xmlNodePtr current; @@ -411,7 +367,7 @@ static void parse_timeline(char *document) current = current->xmlChildrenNode; while (current != NULL) { if ((!xmlStrcmp(current->name, (const xmlChar *)"status"))) - parse_statuses(doc, current); + parse_statuses(session, doc, current); current = current->next; } xmlFreeDoc(doc); @@ -440,7 +396,7 @@ static size_t curl_callback(void *buffer, size_t size, size_t nmemb, 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); + parse_timeline(curl_buf->data, curl_buf->session); dbg("%s\n", curl_buf->data); @@ -455,7 +411,8 @@ 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) { - 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) *token = strdup(&(rv[0][12])); if (secret) @@ -464,7 +421,8 @@ static int parse_osp_reply(const char *reply, char **token, char **secret) 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) *token = strdup(&(rv[1][12])); if (secret) @@ -487,7 +445,7 @@ static int request_access_token(struct session *session) { char *post_params = NULL; char *request_url = NULL; - char *reply = NULL; + char *reply = NULL; char *at_key = NULL; char *at_secret = NULL; char *verifier = NULL; @@ -522,21 +480,25 @@ static int request_access_token(struct session *session) 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"); + fprintf(stdout, + "Please open the following link in your browser, and " + "allow 'bti' to access your account. Then paste " + "back the provided PIN in here.\n"); if (session->host == HOST_TWITTER) { fprintf(stdout, "%s%s\nPIN: ", twitter_authorize_uri, at_key); verifier = session->readline(NULL); - sprintf(at_uri, "%s?oauth_verifier=%s", twitter_access_token_uri, verifier); + 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); + 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); + session->consumer_key, + session->consumer_secret, + at_key, at_secret); reply = oauth_http_get(request_url, post_params); if (!reply) @@ -547,10 +509,12 @@ static int request_access_token(struct session *session) free(reply); - fprintf(stdout, "Please put these two lines in your bti configuration "); - fprintf(stdout, "file (~/.bti):\n"); - fprintf(stdout, "access_token_key=%s\n", at_key); - fprintf(stdout, "access_token_secret=%s\n", at_secret); + fprintf(stdout, + "Please put these two lines in your bti " + "configuration file (~/.bti):\n" + "access_token_key=%s\n" + "access_token_secret=%s\n", + at_key, at_secret); return 0; } @@ -578,10 +542,11 @@ static int send_request(struct session *session) if (!session->hosturl) session->hosturl = strdup(twitter_host); - if (session->no_oauth) { + if (session->no_oauth || session->guest) { curl_buf = bti_curl_buffer_alloc(session->action); if (!curl_buf) return -ENOMEM; + curl_buf->session = session; curl = curl_init(); if (!curl) @@ -591,72 +556,75 @@ static int send_request(struct session *session) 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); + 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, "status", - CURLFORM_COPYCONTENTS, session->tweet, - CURLFORM_END); + CURLFORM_COPYNAME, "in_reply_to_status_id", + CURLFORM_COPYCONTENTS, session->replyto, + 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; + 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) @@ -673,7 +641,7 @@ static int send_request(struct session *session) curl_easy_setopt(curl, CURLOPT_WRITEDATA, curl_buf); if (!session->dry_run) { res = curl_easy_perform(curl); - if (res && !session->bash) { + if (res && !session->background) { fprintf(stderr, "error(%d) trying to perform " "operation\n", res); return -EINVAL; @@ -686,245 +654,81 @@ static int send_request(struct session *session) bti_curl_buffer_free(curl_buf); } else { switch (session->action) { - case ACTION_UPDATE: - escaped_tweet = oauth_url_escape(session->tweet); + case ACTION_UPDATE: + escaped_tweet = oauth_url_escape(session->tweet); + if (session->replyto) { 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; - } + "%s%s?status=%s&in_reply_to_status_id=%s", + session->hosturl, update_uri, + escaped_tweet, session->replyto); + } else { + sprintf(endpoint, "%s%s?status=%s", + session->hosturl, update_uri, + escaped_tweet); + } - 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); + is_post = 1; + break; + case ACTION_USER: + sprintf(endpoint, "%s%s%s.xml?page=%d", + session->hosturl, user_uri, session->user, + session->page); + break; + case ACTION_REPLIES: + sprintf(endpoint, "%s%s?page=%d", session->hosturl, + mentions_uri, session->page); + break; + case ACTION_PUBLIC: + sprintf(endpoint, "%s%s?page=%d", session->hosturl, + public_uri, session->page); + break; + case ACTION_GROUP: + sprintf(endpoint, "%s%s%s.xml?page=%d", + session->hosturl, group_uri, session->group, + session->page); + break; + case ACTION_FRIENDS: + sprintf(endpoint, "%s%s?page=%d", session->hosturl, + friends_uri, session->page); + break; + case ACTION_RETWEET: + sprintf(endpoint, "%s%s%s.xml", session->hosturl, + retweet_uri, session->retweet); + is_post = 1; + break; + default: + break; } - dbg("%s\n", req_url); - dbg("%s\n", reply); - if (req_url) - free(req_url); - - if (session->action != ACTION_UPDATE) - parse_timeline(reply); - } - return 0; -} - -static void parse_configfile(struct session *session) -{ - FILE *config_file; - char *line = NULL; - size_t len = 0; - char *account = NULL; - char *password = NULL; - char *consumer_key = NULL; - char *consumer_secret = NULL; - char *access_token_key = NULL; - char *access_token_secret = NULL; - char *host = NULL; - char *proxy = NULL; - char *logfile = NULL; - char *action = NULL; - char *user = NULL; - char *replyto = NULL; - int shrink_urls = 0; - - config_file = fopen(session->configfile, "r"); - - /* No error if file does not exist or is unreadable. */ - if (config_file == NULL) - return; - - do { - ssize_t n = getline(&line, &len, config_file); - if (n < 0) - break; - if (line[n - 1] == '\n') - line[n - 1] = '\0'; - /* Parse file. Format is the usual value pairs: - account=name - passwort=value - # is a comment character - */ - *strchrnul(line, '#') = '\0'; - char *c = line; - while (isspace(*c)) - c++; - /* Ignore blank lines. */ - if (c[0] == '\0') - continue; + dbg("%s\n", endpoint); + if (!session->dry_run) { + if (is_post) { + req_url = oauth_sign_url2(endpoint, &postarg, OA_HMAC, + NULL, session->consumer_key, + session->consumer_secret, + session->access_token_key, + session->access_token_secret); + reply = oauth_http_post(req_url, postarg); + } else { + req_url = oauth_sign_url2(endpoint, NULL, OA_HMAC, NULL, + session->consumer_key, + session->consumer_secret, + session->access_token_key, + session->access_token_secret); + reply = oauth_http_get(req_url, postarg); + } - 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') - 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; - if (c[0] != '\0') - host = strdup(c); - } else if (!strncasecmp(c, "proxy", 5) && - (c[5] == '=')) { - c += 6; - if (c[0] != '\0') - proxy = strdup(c); - } else if (!strncasecmp(c, "logfile", 7) && - (c[7] == '=')) { - 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; - if (c[0] != '\0') - action = strdup(c); - } else if (!strncasecmp(c, "user", 4) && - (c[4] == '=')) { - c += 5; - if (c[0] != '\0') - user = strdup(c); - } else if (!strncasecmp(c, "shrink-urls", 11) && - (c[11] == '=')) { - c += 12; - if (!strncasecmp(c, "true", 4) || - !strncasecmp(c, "yes", 3)) - shrink_urls = 1; - } else if (!strncasecmp(c, "verbose", 7) && - (c[7] == '=')) { - c += 8; - if (!strncasecmp(c, "true", 4) || - !strncasecmp(c, "yes", 3)) - verbose = 1; + dbg("%s\n", req_url); + dbg("%s\n", reply); + if (req_url) + free(req_url); } - } while (!feof(config_file)); - - if (password) - session->password = password; - if (account) - session->account = account; - if (consumer_key) - session->consumer_key = consumer_key; - if (consumer_secret) - session->consumer_secret = consumer_secret; - if (access_token_key) - session->access_token_key = access_token_key; - if (access_token_secret) - session->access_token_secret = access_token_secret; - if (host) { - if (strcasecmp(host, "twitter") == 0) { - 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); - session->hostname = strdup(identica_name); - } else { - session->host = HOST_CUSTOM; - session->hosturl = strdup(host); - session->hostname = strdup(host); - } - free(host); - } - if (proxy) { - if (session->proxy) - free(session->proxy); - session->proxy = proxy; - } - if (logfile) - session->logfile = logfile; - if (replyto) - session->replyto = replyto; - if (action) { - if (strcasecmp(action, "update") == 0) - session->action = ACTION_UPDATE; - else if (strcasecmp(action, "friends") == 0) - session->action = ACTION_FRIENDS; - else if (strcasecmp(action, "user") == 0) - session->action = ACTION_USER; - else if (strcasecmp(action, "replies") == 0) - session->action = ACTION_REPLIES; - else if (strcasecmp(action, "public") == 0) - session->action = ACTION_PUBLIC; - else if (strcasecmp(action, "group") == 0) - session->action = ACTION_GROUP; - else - session->action = ACTION_UNKNOWN; - free(action); - } - if (user) - session->user = user; - session->shrink_urls = shrink_urls; - /* Free buffer and close file. */ - free(line); - fclose(config_file); + if ((session->action != ACTION_UPDATE) && + (session->action != ACTION_RETWEET)) + parse_timeline(reply, session); + } + return 0; } static void log_session(struct session *session, int retval) @@ -1303,16 +1107,19 @@ int main(int argc, char *argv[], char *envp[]) { "shrink-urls", 0, NULL, 's' }, { "help", 0, NULL, 'h' }, { "bash", 0, NULL, 'b' }, + { "background", 0, NULL, 'B' }, { "dry-run", 0, NULL, 'n' }, { "page", 1, NULL, 'g' }, { "version", 0, NULL, 'v' }, { "config", 1, NULL, 'c' }, { "replyto", 1, NULL, 'r' }, + { "retweet", 1, NULL, 'w' }, { } }; struct session *session; pid_t child; char *tweet; + char *retweet; static char password[80]; int retval = 0; int option; @@ -1321,7 +1128,6 @@ int main(int argc, char *argv[], char *envp[]) int page_nr; debug = 0; - verbose = 0; session = session_alloc(); if (!session) { @@ -1351,10 +1157,11 @@ int main(int argc, char *argv[], char *envp[]) dbg("http_proxy = %s\n", session->proxy); } - parse_configfile(session); + bti_parse_configfile(session); while (1) { - option = getopt_long_only(argc, argv, "dp:P:H:a:A:u:c:hg:G:sr:nVv", + option = getopt_long_only(argc, argv, + "dp:P:H:a:A:u:c:hg:G:sr:nVv", options, NULL); if (option == -1) break; @@ -1363,7 +1170,7 @@ int main(int argc, char *argv[], char *envp[]) debug = 1; break; case 'V': - verbose = 1; + session->verbose = 1; break; case 'a': if (session->account) @@ -1380,6 +1187,10 @@ int main(int argc, char *argv[], char *envp[]) session->replyto = strdup(optarg); dbg("in_reply_to_status_id = %s\n", session->replyto); break; + case 'w': + session->retweet = strdup(optarg); + dbg("Retweet ID = %s\n", session->retweet); + break; case 'p': if (session->password) free(session->password); @@ -1405,6 +1216,8 @@ int main(int argc, char *argv[], char *envp[]) session->action = ACTION_PUBLIC; else if (strcasecmp(optarg, "group") == 0) session->action = ACTION_GROUP; + else if (strcasecmp(optarg,"retweet") == 0) + session->action = ACTION_RETWEET; else session->action = ACTION_UNKNOWN; dbg("action = %d\n", session->action); @@ -1453,6 +1266,9 @@ int main(int argc, char *argv[], char *envp[]) break; case 'b': session->bash = 1; + /* fall-through intended */ + case 'B': + session->background = 1; break; case 'c': if (session->configfile) @@ -1461,10 +1277,11 @@ int main(int argc, char *argv[], char *envp[]) 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); + bti_parse_configfile(session); break; case 'h': display_help(); @@ -1491,10 +1308,17 @@ int main(int argc, char *argv[], char *envp[]) 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_USER || + session->action == ACTION_PUBLIC) { + /* Some actions may still work without authentication */ + session->guest = 1; + } else { + fprintf(stderr, + "Twitter no longer supports HTTP basic authentication.\n" + "Both consumer key, and consumer secret are required" + " for bti in order to behave as an OAuth consumer.\n"); + goto exit; + } } if (session->action == ACTION_GROUP) { fprintf(stderr, "Groups only work in Identi.ca.\n"); @@ -1507,24 +1331,26 @@ int main(int argc, char *argv[], char *envp[]) if (session->no_oauth) { if (!session->account) { - fprintf(stdout, "Enter account for %s: ", session->hostname); + fprintf(stdout, "Enter account for %s: ", + session->hostname); session->account = session->readline(NULL); } if (!session->password) { - read_password(password, sizeof(password), session->hostname); + read_password(password, sizeof(password), + session->hostname); session->password = strdup(password); } - } else { - if (!session->access_token_key || !session->access_token_secret) { + } else if (!session->guest) { + if (!session->access_token_key || + !session->access_token_secret) { request_access_token(session); goto exit; } } if (session->action == ACTION_UNKNOWN) { - fprintf(stderr, "Unknown action, valid actions are:\n"); - fprintf(stderr, "'update', 'friends', 'public', " - "'replies', 'group' or 'user'.\n"); + fprintf(stderr, "Unknown action, valid actions are:\n" + "'update', 'friends', 'public', 'replies', 'group' or 'user'.\n"); goto exit; } @@ -1533,8 +1359,23 @@ int main(int argc, char *argv[], char *envp[]) session->group = session->readline(NULL); } + if (session->action == ACTION_RETWEET) { + fprintf(stdout, "Status ID to retweet: "); + retweet = get_string_from_stdin(); + + if (!retweet || strlen(retweet) == 0) { + dbg("no retweet?\n"); + return -1; + } + + session->retweet = zalloc(strlen(retweet) + 10); + sprintf(session->retweet,"%s", retweet); + free(retweet); + dbg("retweet ID = %s\n", session->retweet); + } + if (session->action == ACTION_UPDATE) { - if (session->bash || !session->interactive) + if (session->background || !session->interactive) tweet = get_string_from_stdin(); else tweet = session->readline("tweet: "); @@ -1566,7 +1407,7 @@ int main(int argc, char *argv[], char *envp[]) /* fork ourself so that the main shell can get on * with it's life as we try to connect and handle everything */ - if (session->bash) { + if (session->background) { child = fork(); if (child) { dbg("child is %d\n", child); @@ -1575,7 +1416,7 @@ int main(int argc, char *argv[], char *envp[]) } retval = send_request(session); - if (retval && !session->bash) + if (retval && !session->background) fprintf(stderr, "operation failed\n"); log_session(session, retval);