[svn-upgrade] Integrating new upstream version, bti (011)

[debian/bti.git] / bti.c

diff --git a/bti.c b/bti.c
index a06c818499414462ed6bb2b00971372cc52a8333..8370b2eb91cc2975920fe07342276cfbc1dff56e 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -24,8 +24,10 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <unistd.h>

+#include <time.h>

 #include <sys/stat.h>
 #include <curl/curl.h>
 #include <sys/stat.h>
 #include <curl/curl.h>

+#include <readline/readline.h>

 #include "bti_version.h"
 
 
 #include "bti_version.h"
 
 


@@ -50,6 +52,8 @@ struct session {
        char *account;
        char *tweet;
        char *proxy;
        char *account;
        char *tweet;
        char *proxy;

+       char *time;
+       char *homedir;

        int bash;
        enum host host;
 };
        int bash;
        enum host host;
 };


@@ -83,17 +87,14 @@ static void display_version(void)
 
 static char *get_string_from_stdin(void)
 {
 
 static char *get_string_from_stdin(void)
 {

-       char *temp;
-       char *string;
+       static char *string = (char *)NULL;
+       if (string) {
+               free(string);
+               string = (char *)NULL;
+       }

 
 

-       string = zalloc(1000);
-       if (!string)
-               return NULL;
+       string = readline("tweet: ");

 
 

-       if (!fgets(string, 999, stdin))
-               return NULL;
-       temp = strchr(string, '\n');
-       *temp = '\0';

        return string;
 }
 
        return string;
 }
 


@@ -115,6 +116,8 @@ static void session_free(struct session *session)
        free(session->account);
        free(session->tweet);
        free(session->proxy);
        free(session->account);
        free(session->tweet);
        free(session->proxy);

+       free(session->time);
+       free(session->homedir);

        free(session);
 }
 
        free(session);
 }
 


@@ -271,12 +274,11 @@ static void parse_configfile(struct session *session)
        char *host = NULL;
        char *proxy = NULL;
        char *file;
        char *host = NULL;
        char *proxy = NULL;
        char *file;

-       char *home = getenv("HOME");

 
        /* config file is ~/.bti  */
 
        /* config file is ~/.bti  */

-       file = alloca(strlen(home) + 7);
+       file = alloca(strlen(session->homedir) + 7);

 
 

-       sprintf(file, "%s/.bti", home);
+       sprintf(file, "%s/.bti", session->homedir);

 
        config_file = fopen(file, "r");
 
 
        config_file = fopen(file, "r");
 


@@ -347,6 +349,40 @@ static void parse_configfile(struct session *session)
        fclose(config_file);
 }
 
        fclose(config_file);
 }
 

+static void log_session(struct session *session, int retval)
+{
+       FILE *log_file;
+       char *filename;
+       char *host;
+
+       /* logfile is ~/.bti.log  */
+       filename = alloca(strlen(session->homedir) + 10);
+
+       sprintf(filename, "%s/.bti.log", session->homedir);
+
+       log_file = fopen(filename, "a+");
+       if (log_file == NULL)
+               return;
+       switch (session->host) {
+       case HOST_TWITTER:
+               host = "twitter";
+               break;
+       case HOST_IDENTICA:
+               host = "identi.ca";
+               break;
+       default:
+               host = "unknown";
+               break;
+       }
+
+       if (retval)
+               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);
+
+       fclose(log_file);
+}
+

 int main(int argc, char *argv[], char *envp[])
 {
        static const struct option options[] = {
 int main(int argc, char *argv[], char *envp[])
 {
        static const struct option options[] = {


@@ -363,20 +399,29 @@ int main(int argc, char *argv[], char *envp[])
        struct session *session;
        pid_t child;
        char *tweet;
        struct session *session;
        pid_t child;
        char *tweet;

-       int retval;
+       int retval = 0;

        int option;
        char *http_proxy;
        int option;
        char *http_proxy;

+       time_t t;

 #if 0
 #if 0

-       char *home = getenv("HOME");

        char *pwd = getenv("PWD");
        char *dir;
 #endif
        char *pwd = getenv("PWD");
        char *dir;
 #endif

+
+       rl_bind_key('\t', rl_insert);

        session = session_alloc();
        if (!session) {
                fprintf(stderr, "no more memory...\n");
                return -1;
        }
 
        session = session_alloc();
        if (!session) {
                fprintf(stderr, "no more memory...\n");
                return -1;
        }
 

+       /* get the current time so that we can log it later */
+       time(&t);
+       session->time = strdup(ctime(&t));
+       session->time[strlen(session->time)-1] = 0x00;
+
+       session->homedir = strdup(getenv("HOME"));
+

        curl_global_init(CURL_GLOBAL_ALL);
 
        /* Set environment variables first, before reading command line options
        curl_global_init(CURL_GLOBAL_ALL);
 
        /* Set environment variables first, before reading command line options


@@ -496,12 +541,11 @@ int main(int argc, char *argv[], char *envp[])
        }
 
        retval = send_tweet(session);
        }
 
        retval = send_tweet(session);

-       if (retval && !session->bash) {
+       if (retval && !session->bash)

                fprintf(stderr, "tweet failed\n");
                fprintf(stderr, "tweet failed\n");

-               return -1;
-       }

 
 

-       session_free(session);
+//     log_session(session, retval);

 exit:
 exit:

-       return 0;
+       session_free(session);
+       return retval;;

 }
 }