more formatting cleanups

[gregoa/bti.git] / bti.c

diff --git a/bti.c b/bti.c
index c3ddfdd21fe209cf6e31ef0dd186e5d5d479c251..e7157dfa45777433613584d480086a69677f21b6 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -310,13 +310,13 @@ static const char *identica_request_token_uri = "http://identi.ca/api/oauth/requ
 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 *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 *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 *mentions_uri = "/mentions.xml";

-static const char *replies_uri = "/replies.xml";
-static const char *group_uri = "/../statusnet/groups/timeline/";
+static const char *replies_uri  = "/replies.xml";
+static const char *group_uri    = "/../statusnet/groups/timeline/";

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


@@ -455,20 +455,20 @@ 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;
                }


@@ -482,7 +482,6 @@ static int parse_osp_reply(const char *reply, char **token, char **secret)
 
        return retval;
 }
 
        return retval;
 }

-       

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


@@ -570,6 +569,7 @@ static int send_request(struct session *session)
        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)


@@ -591,72 +591,73 @@ static int send_request(struct session *session)
                        session->hosturl = strdup(twitter_host);
 
                switch (session->action) {
                        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,
                                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)
                }
 
                if (session->proxy)


@@ -686,36 +687,34 @@ static int send_request(struct session *session)
                bti_curl_buffer_free(curl_buf);
        } else {
                switch (session->action) {
                bti_curl_buffer_free(curl_buf);
        } else {
                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%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) {
                }
 
                if (is_post) {


@@ -1500,25 +1499,27 @@ int main(int argc, char *argv[], char *envp[])
                        goto exit;
                }
        } else {
                        goto exit;
                }
        } else {

-               if (!session->consumer_key || !session->consumer_secret) {
+               if (!session->consumer_key || !session->consumer_secret)

                        session->no_oauth = 1;
                        session->no_oauth = 1;

-               }

        }
        }

-       
+

        if (session->no_oauth) {
                if (!session->account) {
        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) {
                        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 {
                        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;
                        request_access_token(session);
                        goto exit;

-               } 
+               }

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