build system: use consistently pkg-config to check for dependencies

[gregoa/bti.git] / bti.c

diff --git a/bti.c b/bti.c
index 8e009357b3b482ba67655d0e39a0a50cbdb001e2..588de2fc50d1a51bf91a7e2218b4f5a9898bbaac 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -88,6 +88,7 @@ struct session {
        char *hosturl;
        char *hostname;
        char *configfile;
        char *hosturl;
        char *hostname;
        char *configfile;

+       char *replyto;

        int bash;
        int interactive;
        int shrink_urls;
        int bash;
        int interactive;
        int shrink_urls;


@@ -124,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");


@@ -249,6 +251,7 @@ 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->password);
        free(session->account);
        free(session->consumer_key);


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


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

+       xmlChar *id = NULL;

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


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


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


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


@@ -474,7 +484,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)
 {


@@ -521,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)


@@ -540,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);
 


@@ -562,6 +574,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)


@@ -583,67 +596,75 @@ 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);
-
-                               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)


@@ -673,51 +694,51 @@ 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) {

-                       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 {
                        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);
                }
 
                        reply = oauth_http_get(req_url, postarg);
                }
 


@@ -748,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");


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


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


@@ -1285,6 +1314,7 @@ 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;
                { }
        };
        struct session *session;


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


@@ -1353,6 +1384,10 @@ int main(int argc, char *argv[], char *envp[])
                        dbg("page = %d\n", page_nr);
                        session->page = page_nr;
                        break;
                        dbg("page = %d\n", page_nr);
                        session->page = page_nr;
                        break;

+               case 'r':
+                       session->replyto = strdup(optarg);
+                       dbg("in_reply_to_status_id = %s\n", session->replyto);
+                       break;

                case 'p':
                        if (session->password)
                                free(session->password);
                case 'p':
                        if (session->password)
                                free(session->password);


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


@@ -1474,25 +1510,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) {