[svn-upgrade] new version bti (028)
[debian/bti.git] / bti.c
diff --git a/bti.c b/bti.c
index 8feb8da..23de0e7 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2008-2010 Greg Kroah-Hartman <greg@kroah.com>
  * Copyright (C) 2009 Bart Trojanowski <bart@jukie.net>
  * Copyright (C) 2009 Amir Mohammad Saied <amirsaied@gmail.com>
  *
@@ -90,6 +90,7 @@ struct session {
        char *configfile;
        char *replyto;
        int bash;
+       int background;
        int interactive;
        int shrink_urls;
        int dry_run;
@@ -109,31 +110,31 @@ struct bti_curl_buffer {
 
 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"
+               "  --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)
@@ -298,25 +299,25 @@ 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/";
+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)
 {
@@ -455,20 +456,22 @@ 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]));
+                               *token = strdup(&(rv[0][12]));
                        if (secret)
-                               *secret=strdup(&(rv[1][19]));
+                               *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 (!strncmp(rv[1], "oauth_token=", 11) &&
+                   !strncmp(rv[2], "oauth_token_secret=", 18)) {
                        if (token)
-                               *token =strdup(&(rv[1][12]));
+                               *token = strdup(&(rv[1][12]));
                        if (secret)
-                               *secret=strdup(&(rv[2][19]));
+                               *secret = strdup(&(rv[2][19]));
 
                        retval = 0;
                }
@@ -482,7 +485,6 @@ static int parse_osp_reply(const char *reply, char **token, char **secret)
 
        return retval;
 }
-       
 
 static int request_access_token(struct session *session)
 {
@@ -523,21 +525,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)
@@ -548,10 +554,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;
 }
@@ -592,72 +600,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)
@@ -674,7 +685,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;
@@ -687,52 +698,51 @@ 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);
-                               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;
+               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
-                                       );
+                       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
-                                       );
+                       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);
                }
 
@@ -1304,6 +1314,7 @@ 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' },
@@ -1355,7 +1366,8 @@ int main(int argc, char *argv[], char *envp[])
        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;
@@ -1454,6 +1466,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)
@@ -1462,8 +1477,9 @@ 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);
                        break;
@@ -1492,9 +1508,10 @@ 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");
+                       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) {
@@ -1502,31 +1519,32 @@ int main(int argc, char *argv[], char *envp[])
                        goto exit;
                }
        } else {
-               if (!session->consumer_key || !session->consumer_secret) {
+               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);
+                       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) {
+               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;
        }
 
@@ -1536,7 +1554,7 @@ int main(int argc, char *argv[], char *envp[])
        }
 
        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: ");
@@ -1568,7 +1586,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);
@@ -1577,7 +1595,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);