Merge branch 'master' of github.com:gregkh/bti

[gregoa/bti.git] / bti.c

diff --git a/bti.c b/bti.c
index 18b8116c56d576754e8bb307450d59e2335a068c..b3dac6ea8e944fc44f51b13111138328c77ae33d 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -116,7 +116,7 @@ static char *get_string(const char *name)
  * lib/ss/get_readline.c file, which is licensed under the MIT license.
  *
  * This keeps us from having to relicense the bti codebase if readline
- * ever changes its license, as there is no link-time dependancy.
+ * ever changes its license, as there is no link-time dependency.
  * It is a run-time thing only, and we handle any readline-like library
  * in the same manner, making bti not be a derivative work of any
  * other program.
@@ -268,6 +268,9 @@ static const char replies_uri[]  = "/replies.xml";
 static const char retweet_uri[]  = "/retweet/";
 static const char group_uri[]    = "/../statusnet/groups/timeline/";
 
+static const char config_default[]     = "/etc/bti";
+static const char config_user_default[]        = ".bti";
+
 static CURL *curl_init(void)
 {
        CURL *curl;
@@ -324,7 +327,8 @@ static void parse_statuses(struct session *session,
                        }
 
                        if (user && text && created && id) {
-                               bti_output_line(session, user, id, created, text);
+                               bti_output_line(session, user, id,
+                                               created, text);
                                xmlFree(user);
                                xmlFree(text);
                                xmlFree(created);
@@ -445,7 +449,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;
@@ -573,8 +577,10 @@ static int send_request(struct session *session)
 
                        if (session->replyto)
                                curl_formadd(&formpost, &lastptr,
-                                            CURLFORM_COPYNAME, "in_reply_to_status_id",
-                                            CURLFORM_COPYCONTENTS, session->replyto,
+                                            CURLFORM_COPYNAME,
+                                            "in_reply_to_status_id",
+                                            CURLFORM_COPYCONTENTS,
+                                            session->replyto,
                                             CURLFORM_END);
 
                        curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
@@ -641,10 +647,37 @@ 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->background) {
-                               fprintf(stderr, "error(%d) trying to perform "
-                                               "operation\n", res);
-                               return -EINVAL;
+                       if (!session->background) {
+                               xmlDocPtr doc;
+                               xmlNodePtr current;
+
+                               if (res) {
+                                       fprintf(stderr, "error(%d) trying to "
+                                               "perform operation\n", res);
+                                       return -EINVAL;
+                               }
+
+                               doc = xmlReadMemory(curl_buf->data,
+                                                   curl_buf->length,
+                                                   "response.xml", NULL,
+                                                   XML_PARSE_NOERROR);
+                               if (doc == NULL)
+                                       return -EINVAL;
+
+                               current = xmlDocGetRootElement(doc);
+                               if (current == NULL) {
+                                       fprintf(stderr, "empty document\n");
+                                       xmlFreeDoc(doc);
+                                       return -EINVAL;
+                               }
+
+                               if (xmlStrcmp(current->name, (const xmlChar *)"status")) {
+                                       fprintf(stderr, "unexpected document type\n");
+                                       xmlFreeDoc(doc);
+                                       return -EINVAL;
+                               }
+
+                               xmlFreeDoc(doc);
                        }
                }
 
@@ -724,6 +757,11 @@ static int send_request(struct session *session)
                                free(req_url);
                }
 
+               if (!reply) {
+                       fprintf(stderr, "Error retrieving from URL (%s)\n", endpoint);
+                       return -EIO;
+               }
+
                if ((session->action != ACTION_UPDATE) &&
                                (session->action != ACTION_RETWEET))
                        parse_timeline(reply, session);
@@ -1119,11 +1157,12 @@ int main(int argc, char *argv[], char *envp[])
        struct session *session;
        pid_t child;
        char *tweet;
-       char *retweet;
        static char password[80];
        int retval = 0;
        int option;
        char *http_proxy;
+       char *home;
+       const char *config_file;
        time_t t;
        int page_nr;
 
@@ -1140,12 +1179,23 @@ int main(int argc, char *argv[], char *envp[])
        session->time = strdup(ctime(&t));
        session->time[strlen(session->time)-1] = 0x00;
 
-       /* Get the home directory so we can try to find a config file */
-       session->homedir = strdup(getenv("HOME"));
+       /*
+        * Get the home directory so we can try to find a config file.
+        * If we have no home dir set up, look in /etc/bti
+        */
+       home = getenv("HOME");
+       if (home) {
+               /* We have a home dir, so this might be a user */
+               session->homedir = strdup(home);
+               config_file = config_user_default;
+       } else {
+               session->homedir = strdup("");
+               config_file = config_default;
+       }
 
        /* set up a default config file location (traditionally ~/.bti) */
-       session->configfile = zalloc(strlen(session->homedir) + 7);
-       sprintf(session->configfile, "%s/.bti", session->homedir);
+       session->configfile = zalloc(strlen(session->homedir) + strlen(config_file) + 7);
+       sprintf(session->configfile, "%s/%s", session->homedir, config_file);
 
        /* Set environment variables first, before reading command line options
         * or config file values. */
@@ -1161,7 +1211,7 @@ int main(int argc, char *argv[], char *envp[])
 
        while (1) {
                option = getopt_long_only(argc, argv,
-                                         "dp:P:H:a:A:u:c:hg:G:sr:nVv",
+                                         "dp:P:H:a:A:u:c:hg:G:sr:nVvw:",
                                          options, NULL);
                if (option == -1)
                        break;
@@ -1216,7 +1266,7 @@ 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)
+                       else if (strcasecmp(optarg, "retweet") == 0)
                                session->action = ACTION_RETWEET;
                        else
                                session->action = ACTION_UNKNOWN;
@@ -1310,7 +1360,10 @@ int main(int argc, char *argv[], char *envp[])
                if (!session->consumer_key || !session->consumer_secret) {
                        if (session->action == ACTION_USER ||
                                        session->action == ACTION_PUBLIC) {
-                               /* Some actions may still work without authentication */
+                               /*
+                                * Some actions may still work without
+                                * authentication
+                                */
                                session->guest = 1;
                        } else {
                                fprintf(stderr,
@@ -1360,17 +1413,21 @@ int main(int argc, char *argv[], char *envp[])
        }
 
        if (session->action == ACTION_RETWEET) {
-               fprintf(stdout, "Status ID to retweet: ");
-               retweet = get_string_from_stdin();
+               if (!session->retweet) {
+                       char *rtid;
+
+                       fprintf(stdout, "Status ID to retweet: ");
+                       rtid = get_string_from_stdin();
+                       session->retweet = zalloc(strlen(rtid) + 10);
+                       sprintf(session->retweet, "%s", rtid);
+                       free(rtid);
+               }
 
-               if (!retweet || strlen(retweet) == 0) {
+               if (!session->retweet || strlen(session->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);
        }