release 013

[gregoa/bti.git] / bti.c

diff --git a/bti.c b/bti.c
index 8370b2eb91cc2975920fe07342276cfbc1dff56e..b4af7f0a349db889ff868771961f7cfa701d727c 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -36,11 +36,11 @@
 #define dbg(format, arg...)                                            \
        do {                                                            \
                if (debug)                                              \
-                       printf("%s: " format , __func__ , ## arg );     \
+                       printf("%s: " format , __func__ , ## arg);      \
        } while (0)
 
 
-static int debug = 0;
+static int debug;
 
 enum host {
        HOST_TWITTER = 0,
@@ -54,6 +54,7 @@ struct session {
        char *proxy;
        char *time;
        char *homedir;
+       char *logfile;
        int bash;
        enum host host;
 };
@@ -74,6 +75,7 @@ static void display_help(void)
        fprintf(stdout, "  --password password\n");
        fprintf(stdout, "  --proxy PROXY:PORT\n");
        fprintf(stdout, "  --host HOST\n");
+       fprintf(stdout, "  --logfile logfile\n");
        fprintf(stdout, "  --bash\n");
        fprintf(stdout, "  --debug\n");
        fprintf(stdout, "  --version\n");
@@ -85,7 +87,7 @@ static void display_version(void)
        fprintf(stdout, "bti - version %s\n", BTI_VERSION);
 }
 
-static char *get_string_from_stdin(void)
+static char *get_string_from_stdin(char *prompt)
 {
        static char *string = (char *)NULL;
        if (string) {
@@ -93,7 +95,7 @@ static char *get_string_from_stdin(void)
                string = (char *)NULL;
        }
 
-       string = readline("tweet: ");
+       string = readline(prompt);
 
        return string;
 }
@@ -222,6 +224,11 @@ static int send_tweet(struct session *session)
                     CURLFORM_COPYCONTENTS, session->tweet,
                     CURLFORM_END);
 
+       curl_formadd(&formpost, &lastptr,
+                    CURLFORM_COPYNAME, "source",
+                    CURLFORM_COPYCONTENTS, "bti",
+                    CURLFORM_END);
+
        curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
 
        switch (session->host) {
@@ -273,6 +280,7 @@ static void parse_configfile(struct session *session)
        char *password = NULL;
        char *host = NULL;
        char *proxy = NULL;
+       char *logfile = NULL;
        char *file;
 
        /* config file is ~/.bti  */
@@ -324,6 +332,11 @@ static void parse_configfile(struct session *session)
                        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);
                }
        } while (!feof(config_file));
 
@@ -343,6 +356,8 @@ static void parse_configfile(struct session *session)
                        free(session->proxy);
                session->proxy = proxy;
        }
+       if (logfile)
+               session->logfile = logfile;
 
        /* Free buffer and close file.  */
        free(line);
@@ -355,10 +370,14 @@ static void log_session(struct session *session, int retval)
        char *filename;
        char *host;
 
-       /* logfile is ~/.bti.log  */
-       filename = alloca(strlen(session->homedir) + 10);
+       /* Only log something if we have a log file set */
+       if (!session->logfile)
+               return;
+
+       filename = alloca(strlen(session->homedir) +
+                         strlen(session->logfile) + 3);
 
-       sprintf(filename, "%s/.bti.log", session->homedir);
+       sprintf(filename, "%s/%s", session->homedir, session->logfile);
 
        log_file = fopen(filename, "a+");
        if (log_file == NULL)
@@ -376,9 +395,11 @@ static void log_session(struct session *session, int retval)
        }
 
        if (retval)
-               fprintf(log_file, "%s: host=%s tweet failed\n", session->time, host);
+               fprintf(log_file, "%s: host=%s tweet failed\n",
+                       session->time, host);
        else
-               fprintf(log_file, "%s: host=%s tweet=%s\n", session->time, host, session->tweet);
+               fprintf(log_file, "%s: host=%s tweet=%s\n",
+                       session->time, host, session->tweet);
 
        fclose(log_file);
 }
@@ -391,6 +412,7 @@ int main(int argc, char *argv[], char *envp[])
                { "password", 1, NULL, 'p' },
                { "host", 1, NULL, 'H' },
                { "proxy", 1, NULL, 'P' },
+               { "logfile", 1, NULL, 'L' },
                { "help", 0, NULL, 'h' },
                { "bash", 0, NULL, 'b' },
                { "version", 0, NULL, 'v' },
@@ -403,12 +425,10 @@ int main(int argc, char *argv[], char *envp[])
        int option;
        char *http_proxy;
        time_t t;
-#if 0
-       char *pwd = getenv("PWD");
-       char *dir;
-#endif
 
+       debug = 0;
        rl_bind_key('\t', rl_insert);
+
        session = session_alloc();
        if (!session) {
                fprintf(stderr, "no more memory...\n");
@@ -463,6 +483,12 @@ int main(int argc, char *argv[], char *envp[])
                        session->proxy = strdup(optarg);
                        dbg("proxy = %s\n", session->proxy);
                        break;
+               case 'L':
+                       if (session->logfile)
+                               free(session->logfile);
+                       session->logfile = strdup(optarg);
+                       dbg("logfile = %s\n", session->logfile);
+                       break;
                case 'H':
                        if (strcasecmp(optarg, "twitter") == 0)
                                session->host = HOST_TWITTER;
@@ -471,7 +497,7 @@ int main(int argc, char *argv[], char *envp[])
                        dbg("host = %d\n", session->host);
                        break;
                case 'b':
-                       session->bash= 1;
+                       session->bash = 1;
                        break;
                case 'h':
                        display_help();
@@ -487,38 +513,28 @@ int main(int argc, char *argv[], char *envp[])
 
        if (!session->account) {
                fprintf(stdout, "Enter twitter account: ");
-               session->account = get_string_from_stdin();
+               session->account = get_string_from_stdin("");
        }
 
        if (!session->password) {
                fprintf(stdout, "Enter twitter password: ");
-               session->password = get_string_from_stdin();
-       }
-#if 0
-       /* get the current working directory basename */
-       if (strcmp(pwd, home) == 0)
-               dir = "~";
-       else {
-               dir = strrchr(pwd, '/');
-               if (dir)
-                       dir++;
-               else
-                       dir = "?";
+               session->password = get_string_from_stdin("");
        }
-#endif
-       tweet = get_string_from_stdin();
+
+       if (session->bash)
+               tweet = get_string_from_stdin("");
+       else
+               tweet = get_string_from_stdin("tweet: ");
        if (!tweet || strlen(tweet) == 0) {
                dbg("no tweet?\n");
                return -1;
        }
 
-//     session->tweet = zalloc(strlen(tweet) + strlen(dir) + 10);
        session->tweet = zalloc(strlen(tweet) + 10);
 
        /* if --bash is specified, add the "PWD $ " to
         * the start of the tweet. */
        if (session->bash)
-//             sprintf(session->tweet, "%s $ %s", dir, tweet);
                sprintf(session->tweet, "$ %s", tweet);
        else
                sprintf(session->tweet, "%s", tweet);
@@ -544,7 +560,7 @@ int main(int argc, char *argv[], char *envp[])
        if (retval && !session->bash)
                fprintf(stderr, "tweet failed\n");
 
-//     log_session(session, retval);
+       log_session(session, retval);
 exit:
        session_free(session);
        return retval;;